From eadd73759eee9fa72226e28d922ac451ffb74837 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 14:15:30 -0800
Subject: [PATCH 001/367] api: rewrite docx.Document()

* retrofit add api-open-document.feature to drive integration of
  document open call
* extract _default_docx_path() to make testing seam
---
 docx/__init__.py                           |   3 +-
 docx/api.py                                |  46 +++++----
 docx/document.py                           |  23 +++++
 docx/opc/package.py                        |   2 +-
 docx/parts/document.py                     |   8 ++
 features/api-open-document.feature         |  16 +++
 features/steps/api.py                      |  32 +++++-
 features/steps/test_files/doc-default.docx | Bin 0 -> 21366 bytes
 tests/test_api.py                          | 112 +++++++++++++--------
 9 files changed, 175 insertions(+), 67 deletions(-)
 create mode 100644 docx/document.py
 create mode 100644 features/api-open-document.feature
 create mode 100644 features/steps/test_files/doc-default.docx

diff --git a/docx/__init__.py b/docx/__init__.py
index 5e0fb6edb..acf37b458 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-from docx.api import Document  # noqa
+from docx.api import Document     # noqa
+from docx.api import DocumentNew  # noqa
 
 __version__ = '0.8.1'
 
diff --git a/docx/api.py b/docx/api.py
index 6fdc132de..d3b7c495f 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -18,8 +18,27 @@
 from docx.shared import lazyproperty
 
 
-_thisdir = os.path.split(__file__)[0]
-_default_docx_path = os.path.join(_thisdir, 'templates', 'default.docx')
+def DocumentNew(docx=None):
+    """
+    Return a |Document| object loaded from *docx*, where *docx* can be
+    either a path to a ``.docx`` file (a string) or a file-like object. If
+    *docx* is missing or ``None``, the built-in default document "template"
+    is loaded.
+    """
+    docx = _default_docx_path() if docx is None else docx
+    document_part = Package.open(docx).main_document_part
+    if document_part.content_type != CT.WML_DOCUMENT_MAIN:
+        tmpl = "file '%s' is not a Word file, content type is '%s'"
+        raise ValueError(tmpl % (docx, document_part.content_type))
+    return document_part.document
+
+
+def _default_docx_path():
+    """
+    Return the path to the built-in default .docx package.
+    """
+    _thisdir = os.path.split(__file__)[0]
+    return os.path.join(_thisdir, 'templates', 'default.docx')
 
 
 class Document(object):
@@ -30,10 +49,9 @@ class Document(object):
     is loaded.
     """
     def __init__(self, docx=None):
-        super(Document, self).__init__()
-        document_part, package = self._open(docx)
-        self._document_part = document_part
-        self._package = package
+        document = DocumentNew(docx)
+        self._document_part = document._part
+        self._package = document._part.package
 
     def add_heading(self, text='', level=1):
         """
@@ -172,19 +190,3 @@ def tables(self):
         such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
         """
         return self._document_part.tables
-
-    @staticmethod
-    def _open(docx):
-        """
-        Return a (document_part, package) 2-tuple loaded from *docx*, where
-        *docx* can be either a path to a ``.docx`` file (a string) or a
-        file-like object. If *docx* is ``None``, the built-in default
-        document "template" is loaded.
-        """
-        docx = _default_docx_path if docx is None else docx
-        package = Package.open(docx)
-        document_part = package.main_document
-        if document_part.content_type != CT.WML_DOCUMENT_MAIN:
-            tmpl = "file '%s' is not a Word file, content type is '%s'"
-            raise ValueError(tmpl % (docx, document_part.content_type))
-        return document_part, package
diff --git a/docx/document.py b/docx/document.py
new file mode 100644
index 000000000..854e7e351
--- /dev/null
+++ b/docx/document.py
@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+"""
+|Document| and closely related objects
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from .shared import ElementProxy
+
+
+class Document(ElementProxy):
+    """
+    WordprocessingML (WML) document.
+    """
+
+    __slots__ = ('_part',)
+
+    def __init__(self, element, part):
+        super(Document, self).__init__(element)
+        self._part = part
diff --git a/docx/opc/package.py b/docx/opc/package.py
index 3595f46a6..b0ea37ea5 100644
--- a/docx/opc/package.py
+++ b/docx/opc/package.py
@@ -98,7 +98,7 @@ def load_rel(self, reltype, target, rId, is_external=False):
         return self.rels.add_relationship(reltype, target, rId, is_external)
 
     @property
-    def main_document(self):
+    def main_document_part(self):
         """
         Return a reference to the main document part for this package.
         Examples include a document part for a WordprocessingML package, a
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 9055ecdb5..1e24423c0 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -11,6 +11,7 @@
 from collections import Sequence
 
 from ..blkcntnr import BlockItemContainer
+from ..document import Document
 from ..enum.section import WD_SECTION
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
@@ -53,6 +54,13 @@ def body(self):
         """
         return _Body(self._element.body, self)
 
+    @property
+    def document(self):
+        """
+        A |Document| object providing access to the content of this document.
+        """
+        return Document(self._element, self)
+
     def get_or_add_image_part(self, image_descriptor):
         """
         Return an ``(image_part, rId)`` 2-tuple for the image identified by
diff --git a/features/api-open-document.feature b/features/api-open-document.feature
new file mode 100644
index 000000000..9f9f67c70
--- /dev/null
+++ b/features/api-open-document.feature
@@ -0,0 +1,16 @@
+Feature: Open a document
+  In order work on a document
+  As a developer using python-docx
+  I need a way to open a document
+
+
+  Scenario: Open a specified document
+    Given I have python-docx installed
+     When I call docx.Document() with the path of a .docx file
+     Then document is a Document object
+
+
+  Scenario: Open the default document
+    Given I have python-docx installed
+     When I call docx.Document() with no arguments
+     Then document is a Document object
diff --git a/features/steps/api.py b/features/steps/api.py
index 62c5ec5d9..9144bd46e 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -4,15 +4,25 @@
 Step implementations for basic API features
 """
 
-from behave import then, when
+from behave import given, then, when
 
+import docx
+
+from docx import DocumentNew
 from docx.shared import Inches
 from docx.table import Table
 
-from helpers import test_file
+from helpers import test_docx, test_file
+
+
+# given ====================================================
 
+@given('I have python-docx installed')
+def given_I_have_python_docx_installed(context):
+    pass
 
-# when ====================================================
+
+# when =====================================================
 
 @when('I add a 2 x 2 table specifying only row and column count')
 def when_add_2x2_table_specifying_only_row_and_col_count(context):
@@ -101,8 +111,24 @@ def when_add_picture_specifying_only_image_file(context):
     context.picture = document.add_picture(test_file('monty-truth.png'))
 
 
+@when('I call docx.Document() with no arguments')
+def when_I_call_docx_Document_with_no_arguments(context):
+    context.document = DocumentNew()
+
+
+@when('I call docx.Document() with the path of a .docx file')
+def when_I_call_docx_Document_with_the_path_of_a_docx_file(context):
+    context.document = DocumentNew(test_docx('doc-default'))
+
+
 # then =====================================================
 
+@then('document is a Document object')
+def then_document_is_a_Document_object(context):
+    document = context.document
+    assert isinstance(document, docx.document.Document)
+
+
 @then('the document contains a 2 x 2 table')
 def then_document_contains_2x2_table(context):
     document = context.document
diff --git a/features/steps/test_files/doc-default.docx b/features/steps/test_files/doc-default.docx
new file mode 100644
index 0000000000000000000000000000000000000000..442db336e496e5611ae15932908908ef3ebef338
GIT binary patch
literal 21366
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

literal 0
HcmV?d00001

diff --git a/tests/test_api.py b/tests/test_api.py
index 6456ff0c2..ee127236c 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -10,7 +10,9 @@
 
 import pytest
 
-from docx.api import Document
+import docx
+
+from docx.api import Document, DocumentNew
 from docx.enum.text import WD_BREAK
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
@@ -25,34 +27,70 @@
 from docx.text.run import Run
 
 from .unitutil.mock import (
-    instance_mock, class_mock, method_mock, property_mock, var_mock
+    function_mock, instance_mock, class_mock, method_mock, property_mock
 )
 
 
 class DescribeDocument(object):
 
-    def it_opens_a_docx_on_construction(self, init_fixture):
-        docx_, open_ = init_fixture
-        document = Document(docx_)
-        open_.assert_called_once_with(docx_)
-        assert isinstance(document, Document)
-
-    def it_can_open_a_docx_file(self, open_fixture):
-        docx_, Package_, package_, document_part_ = open_fixture
-        document_part, package = Document._open(docx_)
-        Package_.open.assert_called_once_with(docx_)
-        assert document_part is document_part
-        assert package is package_
-
-    def it_opens_default_template_if_no_file_provided(
-            self, Package_, default_docx_):
-        Document._open(None)
-        Package_.open.assert_called_once_with(default_docx_)
-
-    def it_should_raise_if_not_a_Word_file(self, Package_, package_, docx_):
-        package_.main_document.content_type = 'foobar'
+    def it_opens_a_docx_file(self, open_fixture):
+        docx, Package_, document_ = open_fixture
+        document = DocumentNew(docx)
+        Package_.open.assert_called_once_with(docx)
+        assert document is document_
+
+    def it_opens_the_default_docx_if_none_specified(self, default_fixture):
+        docx, Package_, document_ = default_fixture
+        document = DocumentNew()
+        Package_.open.assert_called_once_with(docx)
+        assert document is document_
+
+    def it_raises_on_not_a_Word_file(self, raise_fixture):
+        not_a_docx = raise_fixture
         with pytest.raises(ValueError):
-            Document._open(docx_)
+            Document(not_a_docx)
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def default_fixture(self, _default_docx_path_, Package_, document_):
+        docx = 'barfoo.docx'
+        _default_docx_path_.return_value = docx
+        document_part = Package_.open.return_value.main_document_part
+        document_part.document = document_
+        document_part.content_type = CT.WML_DOCUMENT_MAIN
+        return docx, Package_, document_
+
+    @pytest.fixture
+    def open_fixture(self, Package_, document_):
+        docx = 'foobar.docx'
+        document_part = Package_.open.return_value.main_document_part
+        document_part.document = document_
+        document_part.content_type = CT.WML_DOCUMENT_MAIN
+        return docx, Package_, document_
+
+    @pytest.fixture
+    def raise_fixture(self, Package_):
+        not_a_docx = 'foobar.xlsx'
+        Package_.open.return_value.main_document_part.content_type = 'BOGUS'
+        return not_a_docx
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _default_docx_path_(self, request):
+        return function_mock(request, 'docx.api._default_docx_path')
+
+    @pytest.fixture
+    def document_(self, request):
+        return instance_mock(request, docx.document.Document)
+
+    @pytest.fixture
+    def Package_(self, request):
+        return class_mock(request, 'docx.api.Package')
+
+
+class DescribeDocumentOld(object):
 
     def it_can_add_a_heading(self, add_heading_fixture):
         document, text, level, style, paragraph_ = add_heading_fixture
@@ -219,10 +257,6 @@ def num_part_get_fixture(self, document, document_part_, numbering_part_):
         document_part_.part_related_by.return_value = numbering_part_
         return document, document_part_, numbering_part_
 
-    @pytest.fixture
-    def open_fixture(self, docx_, Package_, package_, document_part_):
-        return docx_, Package_, package_, document_part_
-
     @pytest.fixture
     def paragraphs_fixture(self, document, paragraphs_):
         return document, paragraphs_
@@ -254,10 +288,6 @@ def add_paragraph_(self, request, paragraph_):
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)
 
-    @pytest.fixture
-    def default_docx_(self, request):
-        return var_mock(request, 'docx.api._default_docx_path')
-
     @pytest.fixture
     def Document_inline_shapes_(self, request, inline_shapes_):
         return property_mock(
@@ -268,6 +298,10 @@ def Document_inline_shapes_(self, request, inline_shapes_):
     def document(self, open_):
         return Document()
 
+    @pytest.fixture
+    def document_obj_(self, request):
+        return instance_mock(request, docx.document.Document)
+
     @pytest.fixture
     def document_part_(
             self, request, paragraph_, paragraphs_, section_, table_,
@@ -282,10 +316,6 @@ def document_part_(
         document_part_.tables = tables_
         return document_part_
 
-    @pytest.fixture
-    def docx_(self, request):
-        return instance_mock(request, str)
-
     @pytest.fixture
     def inline_shapes_(self, request):
         return instance_mock(request, InlineShapes)
@@ -307,10 +337,12 @@ def numbering_part_(self, request):
         return instance_mock(request, NumberingPart)
 
     @pytest.fixture
-    def open_(self, request, document_part_, package_):
-        return method_mock(
-            request, Document, '_open',
-            return_value=(document_part_, package_)
+    def open_(self, request, document_obj_, document_part_, package_):
+        document_part_.package = package_
+        document_obj_._part = document_part_
+        return function_mock(
+            request, 'docx.api.DocumentNew',
+            return_value=document_obj_
         )
 
     @pytest.fixture
@@ -322,7 +354,7 @@ def Package_(self, request, package_):
     @pytest.fixture
     def package_(self, request, document_part_):
         package_ = instance_mock(request, Package)
-        package_.main_document = document_part_
+        package_.main_document_part = document_part_
         return package_
 
     @pytest.fixture

From ce2f4cdecf205bb8378865b9b596d4a406d66d9a Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 16:16:48 -0800
Subject: [PATCH 002/367] doc: add Document._body

---
 docx/document.py       | 23 +++++++++++++++++++++-
 tests/test_document.py | 44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_document.py

diff --git a/docx/document.py b/docx/document.py
index 854e7e351..b4c360508 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -8,6 +8,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from .blkcntnr import BlockItemContainer
 from .shared import ElementProxy
 
 
@@ -16,8 +17,28 @@ class Document(ElementProxy):
     WordprocessingML (WML) document.
     """
 
-    __slots__ = ('_part',)
+    __slots__ = ('_part', '__body')
 
     def __init__(self, element, part):
         super(Document, self).__init__(element)
         self._part = part
+        self.__body = None
+
+    @property
+    def _body(self):
+        """
+        The |_Body| instance containing the content for this document.
+        """
+        if self.__body is None:
+            self.__body = _Body(self._element.body, self)
+        return self.__body
+
+
+class _Body(BlockItemContainer):
+    """
+    Proxy for ``<w:body>`` element in this document, having primarily a
+    container role.
+    """
+    def __init__(self, body_elm, parent):
+        super(_Body, self).__init__(body_elm, parent)
+        self._body = body_elm
diff --git a/tests/test_document.py b/tests/test_document.py
new file mode 100644
index 000000000..11855bb71
--- /dev/null
+++ b/tests/test_document.py
@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+"""
+Test suite for the docx.document module
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+import pytest
+
+from docx.document import _Body, Document
+
+from .unitutil.cxml import element
+from .unitutil.mock import class_mock, instance_mock
+
+
+class DescribeDocument(object):
+
+    def it_provides_access_to_the_document_body(self, body_fixture):
+        document, body_elm, _Body_, body_ = body_fixture
+        body = document._body
+        _Body_.assert_called_once_with(body_elm, document)
+        assert body is body_
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def body_fixture(self, _Body_, body_):
+        document_elm = element('w:document/w:body')
+        body_elm = document_elm[0]
+        document = Document(document_elm, None)
+        return document, body_elm, _Body_, body_
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _Body_(self, request, body_):
+        return class_mock(request, 'docx.document._Body', return_value=body_)
+
+    @pytest.fixture
+    def body_(self, request):
+        return instance_mock(request, _Body)

From be56d1db7e193f9352522cd5fde884a87e0fe480 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 16:36:57 -0800
Subject: [PATCH 003/367] acpt: migrate doc-add-paragraph.feature

---
 ...raph.feature => doc-add-paragraph.feature} |  8 ++---
 features/steps/api.py                         | 24 ---------------
 features/steps/document.py                    | 29 +++++++++++++++++++
 3 files changed, 33 insertions(+), 28 deletions(-)
 rename features/{api-add-paragraph.feature => doc-add-paragraph.feature} (82%)

diff --git a/features/api-add-paragraph.feature b/features/doc-add-paragraph.feature
similarity index 82%
rename from features/api-add-paragraph.feature
rename to features/doc-add-paragraph.feature
index ead200014..1e5428f92 100644
--- a/features/api-add-paragraph.feature
+++ b/features/doc-add-paragraph.feature
@@ -1,17 +1,17 @@
 Feature: Add a paragraph with optional text and style
   In order to populate the text of a document
-  As a programmer using the basic python-docx API
-  I want to add a styled paragraph of text in a single step
+  As a developer using python-docx
+  I need a way to add a styled paragraph of text in a single step
 
 
   Scenario: Add an empty paragraph
-    Given a document
+    Given a blank document
      When I add a paragraph without specifying text or style
      Then the last paragraph is the empty paragraph I added
 
 
   Scenario: Add a paragraph specifying its text
-    Given a document
+    Given a blank document
      When I add a paragraph specifying its text
      Then the last paragraph contains the text I specified
 
diff --git a/features/steps/api.py b/features/steps/api.py
index 9144bd46e..d047ce6ab 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -56,30 +56,6 @@ def when_add_page_break_to_document(context):
     document.add_page_break()
 
 
-@when('I add a paragraph specifying its style as a {kind}')
-def when_I_add_a_paragraph_specifying_its_style_as_a(context, kind):
-    document = context.document
-    style = context.style = document.styles['Heading 1']
-    style_spec = {
-        'style object': style,
-        'style name':   'Heading 1',
-    }[kind]
-    document.add_paragraph(style=style_spec)
-
-
-@when('I add a paragraph specifying its text')
-def when_add_paragraph_specifying_text(context):
-    document = context.document
-    context.paragraph_text = 'foobar'
-    document.add_paragraph(context.paragraph_text)
-
-
-@when('I add a paragraph without specifying text or style')
-def when_add_paragraph_without_specifying_text_or_style(context):
-    document = context.document
-    document.add_paragraph()
-
-
 @when('I add a picture specifying 1.75" width and 2.5" height')
 def when_add_picture_specifying_width_and_height(context):
     document = context.document
diff --git a/features/steps/document.py b/features/steps/document.py
index b99b27d12..c5760f9da 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -18,6 +18,11 @@
 
 # given ===================================================
 
+@given('a blank document')
+def given_a_blank_document(context):
+    context.document = Document()
+
+
 @given('a document having three sections')
 def given_a_document_having_three_sections(context):
     context.document = Document(test_docx('doc-access-sections'))
@@ -38,6 +43,30 @@ def given_a_single_section_document_having_portrait_layout(context):
 
 # when ====================================================
 
+@when('I add a paragraph specifying its style as a {kind}')
+def when_I_add_a_paragraph_specifying_its_style_as_a(context, kind):
+    document = context.document
+    style = context.style = document.styles['Heading 1']
+    style_spec = {
+        'style object': style,
+        'style name':   'Heading 1',
+    }[kind]
+    document.add_paragraph(style=style_spec)
+
+
+@when('I add a paragraph specifying its text')
+def when_add_paragraph_specifying_text(context):
+    document = context.document
+    context.paragraph_text = 'foobar'
+    document.add_paragraph(context.paragraph_text)
+
+
+@when('I add a paragraph without specifying text or style')
+def when_add_paragraph_without_specifying_text_or_style(context):
+    document = context.document
+    document.add_paragraph()
+
+
 @when('I add an even-page section to the document')
 def when_I_add_an_even_page_section_to_the_document(context):
     context.section = context.document.add_section(WD_SECTION.EVEN_PAGE)

From fb5e7d798c41ba782e553b7c06d254782cc46b44 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 16:42:43 -0800
Subject: [PATCH 004/367] doc: add Document.part

---
 docx/document.py       |  7 +++++++
 tests/test_document.py | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index b4c360508..fd7df6e5f 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -24,6 +24,13 @@ def __init__(self, element, part):
         self._part = part
         self.__body = None
 
+    @property
+    def part(self):
+        """
+        The |DocumentPart| object of this document.
+        """
+        return self._part
+
     @property
     def _body(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 11855bb71..3ee3e15ab 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -11,6 +11,7 @@
 import pytest
 
 from docx.document import _Body, Document
+from docx.parts.document import DocumentPart
 
 from .unitutil.cxml import element
 from .unitutil.mock import class_mock, instance_mock
@@ -18,6 +19,10 @@
 
 class DescribeDocument(object):
 
+    def it_provides_access_to_the_document_part(self, part_fixture):
+        document, part_ = part_fixture
+        assert document.part is part_
+
     def it_provides_access_to_the_document_body(self, body_fixture):
         document, body_elm, _Body_, body_ = body_fixture
         body = document._body
@@ -33,6 +38,11 @@ def body_fixture(self, _Body_, body_):
         document = Document(document_elm, None)
         return document, body_elm, _Body_, body_
 
+    @pytest.fixture
+    def part_fixture(self, document_part_):
+        document = Document(None, document_part_)
+        return document, document_part_
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
@@ -42,3 +52,7 @@ def _Body_(self, request, body_):
     @pytest.fixture
     def body_(self, request):
         return instance_mock(request, _Body)
+
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)

From 4f983127cb002058ae5b6ae36ee047b6ec58a138 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 16:54:42 -0800
Subject: [PATCH 005/367] doc: add Document.add_paragraph()

---
 docx/document.py       | 11 +++++++++++
 tests/test_document.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/docx/document.py b/docx/document.py
index fd7df6e5f..9a6a26669 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -24,6 +24,17 @@ def __init__(self, element, part):
         self._part = part
         self.__body = None
 
+    def add_paragraph(self, text='', style=None):
+        """
+        Return a paragraph newly added to the end of the document, populated
+        with *text* and having paragraph style *style*. *text* can contain
+        tab (``\\t``) characters, which are converted to the appropriate XML
+        form for a tab. *text* can also include newline (``\\n``) or carriage
+        return (``\\r``) characters, each of which is converted to a line
+        break.
+        """
+        return self._body.add_paragraph(text, style)
+
     @property
     def part(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 3ee3e15ab..55af6cf40 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -12,13 +12,20 @@
 
 from docx.document import _Body, Document
 from docx.parts.document import DocumentPart
+from docx.text.paragraph import Paragraph
 
 from .unitutil.cxml import element
-from .unitutil.mock import class_mock, instance_mock
+from .unitutil.mock import class_mock, instance_mock, property_mock
 
 
 class DescribeDocument(object):
 
+    def it_can_add_a_paragraph(self, add_paragraph_fixture):
+        document, text, style, paragraph_ = add_paragraph_fixture
+        paragraph = document.add_paragraph(text, style)
+        document._body.add_paragraph.assert_called_once_with(text, style)
+        assert paragraph is paragraph_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -31,6 +38,17 @@ def it_provides_access_to_the_document_body(self, body_fixture):
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('',         None),
+        ('',         'Heading 1'),
+        ('foo\rbar', 'Body Text'),
+    ])
+    def add_paragraph_fixture(self, request, body_prop_, paragraph_):
+        text, style = request.param
+        document = Document(None, None)
+        body_prop_.return_value.add_paragraph.return_value = paragraph_
+        return document, text, style, paragraph_
+
     @pytest.fixture
     def body_fixture(self, _Body_, body_):
         document_elm = element('w:document/w:body')
@@ -53,6 +71,14 @@ def _Body_(self, request, body_):
     def body_(self, request):
         return instance_mock(request, _Body)
 
+    @pytest.fixture
+    def body_prop_(self, request):
+        return property_mock(request, Document, '_body')
+
     @pytest.fixture
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)
+
+    @pytest.fixture
+    def paragraph_(self, request):
+        return instance_mock(request, Paragraph)

From 11394a0d37438f2335f6e8cf6b5fe0a77c0dab0f Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 17:06:06 -0800
Subject: [PATCH 006/367] api: remove old Document.add_paragraph()

---
 docx/api.py       | 12 ++----------
 tests/test_api.py | 18 ------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index d3b7c495f..a0899cd1a 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -49,7 +49,7 @@ class Document(object):
     is loaded.
     """
     def __init__(self, docx=None):
-        document = DocumentNew(docx)
+        self._document = document = DocumentNew(docx)
         self._document_part = document._part
         self._package = document._part.package
 
@@ -78,15 +78,7 @@ def add_page_break(self):
         return p
 
     def add_paragraph(self, text='', style=None):
-        """
-        Return a paragraph newly added to the end of the document, populated
-        with *text* and having paragraph style *style*. *text* can contain
-        tab (``\\t``) characters, which are converted to the appropriate XML
-        form for a tab. *text* can also include newline (``\\n``) or carriage
-        return (``\\r``) characters, each of which is converted to a line
-        break.
-        """
-        return self._document_part.add_paragraph(text, style)
+        return self._document.add_paragraph(text, style)
 
     def add_picture(self, image_path_or_stream, width=None, height=None):
         """
diff --git a/tests/test_api.py b/tests/test_api.py
index ee127236c..c3c17bfe5 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -104,14 +104,6 @@ def it_should_raise_on_heading_level_out_of_range(self, document):
         with pytest.raises(ValueError):
             document.add_heading(level=10)
 
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        document, text, style, paragraph_ = add_paragraph_fixture
-        paragraph = document.add_paragraph(text, style)
-        document._document_part.add_paragraph.assert_called_once_with(
-            text, style
-        )
-        assert paragraph is paragraph_
-
     def it_can_add_a_page_break(self, add_page_break_fixture):
         document, document_part_, paragraph_, run_ = add_page_break_fixture
         paragraph = document.add_page_break()
@@ -197,16 +189,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('',         None),
-        ('',         'Heading 1'),
-        ('foo\rbar', 'Body Text'),
-    ])
-    def add_paragraph_fixture(self, request, document, document_part_,
-                              paragraph_):
-        text, style = request.param
-        return document, text, style, paragraph_
-
     @pytest.fixture(params=[
         (0, 'Title'),
         (1, 'Heading 1'),

From f615c58a9ac64e4bfe4d741b884a2d96571a199d Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 17:16:43 -0800
Subject: [PATCH 007/367] acpt: migrate doc-add-heading.feature

---
 features/api-add-heading.feature | 30 ------------------------------
 features/doc-add-heading.feature | 25 +++++++++++++++++++++++++
 features/steps/api.py            | 31 -------------------------------
 features/steps/document.py       | 29 +++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 61 deletions(-)
 delete mode 100644 features/api-add-heading.feature
 create mode 100644 features/doc-add-heading.feature

diff --git a/features/api-add-heading.feature b/features/api-add-heading.feature
deleted file mode 100644
index 795797f28..000000000
--- a/features/api-add-heading.feature
+++ /dev/null
@@ -1,30 +0,0 @@
-Feature: Add a section heading with text
-  In order add a section heading to a document
-  As a programmer using the basic python-docx API
-  I need a method to add a heading with its text in a single step
-
-
-  Scenario: Add a heading specifying only its text
-    Given a document
-     When I add a heading specifying only its text
-     Then the style of the last paragraph is 'Heading 1'
-      And the last paragraph contains the heading text
-
-
-  Scenario Outline: Add a heading specifying level
-    Given a document
-     When I add a heading specifying level=<heading level>
-     Then the style of the last paragraph is '<paragraph style>'
-
-   Examples: Heading level styles
-     | heading level | paragraph style |
-     |       0       | Title           |
-     |       1       | Heading 1       |
-     |       2       | Heading 2       |
-     |       3       | Heading 3       |
-     |       4       | Heading 4       |
-     |       5       | Heading 5       |
-     |       6       | Heading 6       |
-     |       7       | Heading 7       |
-     |       8       | Heading 8       |
-     |       9       | Heading 9       |
diff --git a/features/doc-add-heading.feature b/features/doc-add-heading.feature
new file mode 100644
index 000000000..33b975d55
--- /dev/null
+++ b/features/doc-add-heading.feature
@@ -0,0 +1,25 @@
+Feature: Add a heading paragraph
+  In order add a heading to a document
+  As a developer using python-docx
+  I need a way to add a heading with its text and level in a single step
+
+
+  Scenario: Add a heading specifying only its text
+    Given a blank document
+     When I add a heading specifying only its text
+     Then the style of the last paragraph is 'Heading 1'
+      And the last paragraph contains the heading text
+
+
+  Scenario Outline: Add a heading specifying level
+    Given a blank document
+     When I add a heading specifying level=<level>
+     Then the style of the last paragraph is '<style>'
+
+   Examples: Heading level styles
+     | level | style     |
+     |   0   | Title     |
+     |   1   | Heading 1 |
+     |   2   | Heading 2 |
+     |   5   | Heading 5 |
+     |   9   | Heading 9 |
diff --git a/features/steps/api.py b/features/steps/api.py
index d047ce6ab..de1d0d31a 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -36,20 +36,6 @@ def when_add_2x2_table_specifying_style_name(context, style_name):
     document.add_table(rows=2, cols=2, style=style_name)
 
 
-@when('I add a heading specifying level={level_str}')
-def when_add_heading_specifying_level(context, level_str):
-    level = int(level_str)
-    document = context.document
-    document.add_heading(level=level)
-
-
-@when('I add a heading specifying only its text')
-def when_add_heading_specifying_only_its_text(context):
-    document = context.document
-    context.heading_text = 'Spam vs. Eggs'
-    document.add_heading(context.heading_text)
-
-
 @when('I add a page break to the document')
 def when_add_page_break_to_document(context):
     document = context.document
@@ -124,14 +110,6 @@ def then_last_paragraph_contains_only_a_page_break(context):
     assert p.runs[0]._r[0].type == 'page'
 
 
-@then('the last paragraph contains the heading text')
-def then_last_p_contains_heading_text(context):
-    document = context.document
-    text = context.heading_text
-    p = document.paragraphs[-1]
-    assert p.text == text
-
-
 @then('the last paragraph contains the text I specified')
 def then_last_p_contains_specified_text(context):
     document = context.document
@@ -152,12 +130,3 @@ def then_last_p_is_empty_paragraph_added(context):
     document = context.document
     p = document.paragraphs[-1]
     assert p.text == ''
-
-
-@then('the style of the last paragraph is \'{style_name}\'')
-def then_the_style_of_the_last_paragraph_is_style(context, style_name):
-    document = context.document
-    paragraph = document.paragraphs[-1]
-    assert paragraph.style.name == style_name, (
-        'got %s' % paragraph.style.name
-    )
diff --git a/features/steps/document.py b/features/steps/document.py
index c5760f9da..5f1d593a3 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -43,6 +43,18 @@ def given_a_single_section_document_having_portrait_layout(context):
 
 # when ====================================================
 
+@when('I add a heading specifying level={level}')
+def when_add_heading_specifying_level(context, level):
+    context.document.add_heading(level=int(level))
+
+
+@when('I add a heading specifying only its text')
+def when_add_heading_specifying_only_its_text(context):
+    document = context.document
+    context.heading_text = text = 'Spam vs. Eggs'
+    document.add_heading(text)
+
+
 @when('I add a paragraph specifying its style as a {kind}')
 def when_I_add_a_paragraph_specifying_its_style_as_a(context, kind):
     document = context.document
@@ -122,6 +134,14 @@ def then_the_first_section_is_portrait(context):
     assert first_section.page_height == expected_height
 
 
+@then('the last paragraph contains the heading text')
+def then_last_p_contains_heading_text(context):
+    document = context.document
+    text = context.heading_text
+    paragraph = document.paragraphs[-1]
+    assert paragraph.text == text
+
+
 @then('the length of the section collection is 3')
 def then_the_length_of_the_section_collection_is_3(context):
     sections = context.document.sections
@@ -137,3 +157,12 @@ def then_the_second_section_is_landscape(context):
     assert new_section.orientation == WD_ORIENT.LANDSCAPE
     assert new_section.page_width == expected_width
     assert new_section.page_height == expected_height
+
+
+@then('the style of the last paragraph is \'{style_name}\'')
+def then_the_style_of_the_last_paragraph_is_style(context, style_name):
+    document = context.document
+    paragraph = document.paragraphs[-1]
+    assert paragraph.style.name == style_name, (
+        'got %s' % paragraph.style.name
+    )

From 1d19d4589bcb8c8cc731d9174d5df592b3803fa2 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 17:26:12 -0800
Subject: [PATCH 008/367] doc: add Document.add_heading()

---
 docx/document.py       | 14 ++++++++++++++
 tests/test_document.py | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docx/document.py b/docx/document.py
index 9a6a26669..8a610542c 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -24,6 +24,20 @@ def __init__(self, element, part):
         self._part = part
         self.__body = None
 
+    def add_heading(self, text='', level=1):
+        """
+        Return a heading paragraph newly added to the end of the document,
+        containing *text* and having its paragraph style determined by
+        *level*. If *level* is 0, the style is set to `Title`. If *level* is
+        1 (or omitted), `Heading 1` is used. Otherwise the style is set to
+        `Heading {level}`. Raises |ValueError| if *level* is outside the
+        range 0-9.
+        """
+        if not 0 <= level <= 9:
+            raise ValueError("level must be in range 0-9, got %d" % level)
+        style = 'Title' if level == 0 else 'Heading %d' % level
+        return self.add_paragraph(text, style)
+
     def add_paragraph(self, text='', style=None):
         """
         Return a paragraph newly added to the end of the document, populated
diff --git a/tests/test_document.py b/tests/test_document.py
index 55af6cf40..6c942d776 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -15,11 +15,26 @@
 from docx.text.paragraph import Paragraph
 
 from .unitutil.cxml import element
-from .unitutil.mock import class_mock, instance_mock, property_mock
+from .unitutil.mock import (
+    class_mock, instance_mock, method_mock, property_mock
+)
 
 
 class DescribeDocument(object):
 
+    def it_can_add_a_heading(self, add_heading_fixture):
+        document, text, level, style, paragraph_ = add_heading_fixture
+        paragraph = document.add_heading(text, level)
+        document.add_paragraph.assert_called_once_with(text, style)
+        assert paragraph is paragraph_
+
+    def it_raises_on_heading_level_out_of_range(self):
+        document = Document(None, None)
+        with pytest.raises(ValueError):
+            document.add_heading(level=-1)
+        with pytest.raises(ValueError):
+            document.add_heading(level=10)
+
     def it_can_add_a_paragraph(self, add_paragraph_fixture):
         document, text, style, paragraph_ = add_paragraph_fixture
         paragraph = document.add_paragraph(text, style)
@@ -38,6 +53,19 @@ def it_provides_access_to_the_document_body(self, body_fixture):
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture(params=[
+        (0, 'Title'),
+        (1, 'Heading 1'),
+        (2, 'Heading 2'),
+        (9, 'Heading 9'),
+    ])
+    def add_heading_fixture(self, request, add_paragraph_, paragraph_):
+        level, style = request.param
+        document = Document(None, None)
+        text = 'Spam vs. Bacon'
+        add_paragraph_.return_value = paragraph_
+        return document, text, level, style, paragraph_
+
     @pytest.fixture(params=[
         ('',         None),
         ('',         'Heading 1'),
@@ -63,6 +91,10 @@ def part_fixture(self, document_part_):
 
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def add_paragraph_(self, request):
+        return method_mock(request, Document, 'add_paragraph')
+
     @pytest.fixture
     def _Body_(self, request, body_):
         return class_mock(request, 'docx.document._Body', return_value=body_)

From 3a9523ae82095078dbcc9e669ae23f2212293c77 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 17:30:01 -0800
Subject: [PATCH 009/367] api: remove old Document.add_heading()

---
 docx/api.py       | 13 +------------
 tests/test_api.py | 32 +-------------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index a0899cd1a..b21bde1fb 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -54,18 +54,7 @@ def __init__(self, docx=None):
         self._package = document._part.package
 
     def add_heading(self, text='', level=1):
-        """
-        Return a heading paragraph newly added to the end of the document,
-        containing *text* and having its paragraph style determined by
-        *level*. If *level* is 0, the style is set to `Title`. If *level* is
-        1 (or omitted), `Heading 1` is used. Otherwise the style is set to
-        `Heading {level}`. Raises |ValueError| if *level* is outside the
-        range 0-9.
-        """
-        if not 0 <= level <= 9:
-            raise ValueError("level must be in range 0-9, got %d" % level)
-        style = 'Title' if level == 0 else 'Heading %d' % level
-        return self.add_paragraph(text, style)
+        return self._document.add_heading(text, level)
 
     def add_page_break(self):
         """
diff --git a/tests/test_api.py b/tests/test_api.py
index c3c17bfe5..28d6e16dc 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -27,7 +27,7 @@
 from docx.text.run import Run
 
 from .unitutil.mock import (
-    function_mock, instance_mock, class_mock, method_mock, property_mock
+    function_mock, instance_mock, class_mock, property_mock
 )
 
 
@@ -92,18 +92,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_heading(self, add_heading_fixture):
-        document, text, level, style, paragraph_ = add_heading_fixture
-        paragraph = document.add_heading(text, level)
-        document.add_paragraph.assert_called_once_with(text, style)
-        assert paragraph is paragraph_
-
-    def it_should_raise_on_heading_level_out_of_range(self, document):
-        with pytest.raises(ValueError):
-            document.add_heading(level=-1)
-        with pytest.raises(ValueError):
-            document.add_heading(level=10)
-
     def it_can_add_a_page_break(self, add_page_break_fixture):
         document, document_part_, paragraph_, run_ = add_page_break_fixture
         paragraph = document.add_page_break()
@@ -189,18 +177,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (0, 'Title'),
-        (1, 'Heading 1'),
-        (2, 'Heading 2'),
-        (9, 'Heading 9'),
-    ])
-    def add_heading_fixture(self, request, document, add_paragraph_,
-                            paragraph_):
-        level, style = request.param
-        text = 'Spam vs. Bacon'
-        return document, text, level, style, paragraph_
-
     @pytest.fixture
     def add_page_break_fixture(
             self, document, document_part_, paragraph_, run_):
@@ -260,12 +236,6 @@ def tables_fixture(self, document, tables_):
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def add_paragraph_(self, request, paragraph_):
-        return method_mock(
-            request, Document, 'add_paragraph', return_value=paragraph_
-        )
-
     @pytest.fixture
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)

From 57d67eb2bfcacb06af4176cb2518d3e1fc885321 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 17:42:30 -0800
Subject: [PATCH 010/367] acpt: migrate doc-add-page-break.feature

---
 ...e-break.feature => doc-add-page-break.feature} |  7 ++++---
 features/steps/api.py                             | 15 ---------------
 features/steps/document.py                        | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)
 rename features/{api-add-page-break.feature => doc-add-page-break.feature} (62%)

diff --git a/features/api-add-page-break.feature b/features/doc-add-page-break.feature
similarity index 62%
rename from features/api-add-page-break.feature
rename to features/doc-add-page-break.feature
index 82284d9ef..fcb5a9846 100644
--- a/features/api-add-page-break.feature
+++ b/features/doc-add-page-break.feature
@@ -1,9 +1,10 @@
 Feature: Add a page break
   In order to force a page break at a particular location
-  As a programmer using the basic python-docx API
-  I need a method that adds a hard page break on its own paragraph
+  As a developer using the python-docx
+  I need a way to add a hard page break on its own paragraph
+
 
   Scenario: Add a hard page break paragraph
-    Given a document
+    Given a blank document
      When I add a page break to the document
      Then the last paragraph contains only a page break
diff --git a/features/steps/api.py b/features/steps/api.py
index de1d0d31a..2e2eae6db 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -36,12 +36,6 @@ def when_add_2x2_table_specifying_style_name(context, style_name):
     document.add_table(rows=2, cols=2, style=style_name)
 
 
-@when('I add a page break to the document')
-def when_add_page_break_to_document(context):
-    document = context.document
-    document.add_page_break()
-
-
 @when('I add a picture specifying 1.75" width and 2.5" height')
 def when_add_picture_specifying_width_and_height(context):
     document = context.document
@@ -101,15 +95,6 @@ def then_document_contains_2x2_table(context):
     context.table_ = table
 
 
-@then('the last paragraph contains only a page break')
-def then_last_paragraph_contains_only_a_page_break(context):
-    document = context.document
-    p = document.paragraphs[-1]
-    assert len(p.runs) == 1
-    assert len(p.runs[0]._r) == 1
-    assert p.runs[0]._r[0].type == 'page'
-
-
 @then('the last paragraph contains the text I specified')
 def then_last_p_contains_specified_text(context):
     document = context.document
diff --git a/features/steps/document.py b/features/steps/document.py
index 5f1d593a3..46ba33a6e 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -55,6 +55,12 @@ def when_add_heading_specifying_only_its_text(context):
     document.add_heading(text)
 
 
+@when('I add a page break to the document')
+def when_add_page_break_to_document(context):
+    document = context.document
+    document.add_page_break()
+
+
 @when('I add a paragraph specifying its style as a {kind}')
 def when_I_add_a_paragraph_specifying_its_style_as_a(context, kind):
     document = context.document
@@ -134,6 +140,15 @@ def then_the_first_section_is_portrait(context):
     assert first_section.page_height == expected_height
 
 
+@then('the last paragraph contains only a page break')
+def then_last_paragraph_contains_only_a_page_break(context):
+    document = context.document
+    paragraph = document.paragraphs[-1]
+    assert len(paragraph.runs) == 1
+    assert len(paragraph.runs[0]._r) == 1
+    assert paragraph.runs[0]._r[0].type == 'page'
+
+
 @then('the last paragraph contains the heading text')
 def then_last_p_contains_heading_text(context):
     document = context.document

From aaae2e6028e28ffd8ec40039a5a8048cab0b22da Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 17:58:09 -0800
Subject: [PATCH 011/367] doc: add Document.add_page_break()

---
 docx/document.py       | 10 ++++++++++
 tests/test_document.py | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index 8a610542c..6acb16f93 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -9,6 +9,7 @@
 )
 
 from .blkcntnr import BlockItemContainer
+from .enum.text import WD_BREAK
 from .shared import ElementProxy
 
 
@@ -38,6 +39,15 @@ def add_heading(self, text='', level=1):
         style = 'Title' if level == 0 else 'Heading %d' % level
         return self.add_paragraph(text, style)
 
+    def add_page_break(self):
+        """
+        Return a paragraph newly added to the end of the document and
+        containing only a page break.
+        """
+        paragraph = self.add_paragraph()
+        paragraph.add_run().add_break(WD_BREAK.PAGE)
+        return paragraph
+
     def add_paragraph(self, text='', style=None):
         """
         Return a paragraph newly added to the end of the document, populated
diff --git a/tests/test_document.py b/tests/test_document.py
index 6c942d776..a28316aca 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -11,8 +11,10 @@
 import pytest
 
 from docx.document import _Body, Document
+from docx.enum.text import WD_BREAK
 from docx.parts.document import DocumentPart
 from docx.text.paragraph import Paragraph
+from docx.text.run import Run
 
 from .unitutil.cxml import element
 from .unitutil.mock import (
@@ -35,6 +37,14 @@ def it_raises_on_heading_level_out_of_range(self):
         with pytest.raises(ValueError):
             document.add_heading(level=10)
 
+    def it_can_add_a_page_break(self, add_page_break_fixture):
+        document, paragraph_, run_ = add_page_break_fixture
+        paragraph = document.add_page_break()
+        document.add_paragraph.assert_called_once_with()
+        paragraph_.add_run.assert_called_once_with()
+        run_.add_break.assert_called_once_with(WD_BREAK.PAGE)
+        assert paragraph is paragraph_
+
     def it_can_add_a_paragraph(self, add_paragraph_fixture):
         document, text, style, paragraph_ = add_paragraph_fixture
         paragraph = document.add_paragraph(text, style)
@@ -66,6 +76,13 @@ def add_heading_fixture(self, request, add_paragraph_, paragraph_):
         add_paragraph_.return_value = paragraph_
         return document, text, level, style, paragraph_
 
+    @pytest.fixture
+    def add_page_break_fixture(self, add_paragraph_, paragraph_, run_):
+        document = Document(None, None)
+        add_paragraph_.return_value = paragraph_
+        paragraph_.add_run.return_value = run_
+        return document, paragraph_, run_
+
     @pytest.fixture(params=[
         ('',         None),
         ('',         'Heading 1'),
@@ -114,3 +131,7 @@ def document_part_(self, request):
     @pytest.fixture
     def paragraph_(self, request):
         return instance_mock(request, Paragraph)
+
+    @pytest.fixture
+    def run_(self, request):
+        return instance_mock(request, Run)

From 99c713fd003b12b8997d94a8c9b381c3962ec706 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 18:01:45 -0800
Subject: [PATCH 012/367] api: remove old Document.add_page_break()

---
 docx/api.py                  | 10 +---------
 docx/parts/document.py       |  6 ------
 tests/parts/test_document.py | 11 -----------
 tests/test_api.py            | 26 +-------------------------
 4 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index b21bde1fb..806f43431 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -11,7 +11,6 @@
 import os
 
 from docx.enum.section import WD_SECTION
-from docx.enum.text import WD_BREAK
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
 from docx.package import Package
 from docx.parts.numbering import NumberingPart
@@ -57,14 +56,7 @@ def add_heading(self, text='', level=1):
         return self._document.add_heading(text, level)
 
     def add_page_break(self):
-        """
-        Return a paragraph newly added to the end of the document and
-        containing only a page break.
-        """
-        p = self._document_part.add_paragraph()
-        r = p.add_run()
-        r.add_break(WD_BREAK.PAGE)
-        return p
+        return self._document.add_page_break()
 
     def add_paragraph(self, text='', style=None):
         return self._document.add_paragraph(text, style)
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 1e24423c0..3d2887173 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -25,12 +25,6 @@ class DocumentPart(XmlPart):
     """
     Main document part of a WordprocessingML (WML) package, aka a .docx file.
     """
-    def add_paragraph(self, text='', style=None):
-        """
-        Return a paragraph newly added to the end of body content.
-        """
-        return self.body.add_paragraph(text, style)
-
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         """
         Return a |Section| object representing a new section added at the end
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index ca2d58d2e..9b908b5ec 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -69,12 +69,6 @@ def it_provides_access_to_the_inline_shapes_in_the_document(
         InlineShapes_.assert_called_once_with(body_elm, document)
         assert inline_shapes is InlineShapes_.return_value
 
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        document_part, body_, p_ = add_paragraph_fixture
-        p = document_part.add_paragraph()
-        body_.add_paragraph.assert_called_once_with('', None)
-        assert p is p_
-
     def it_can_add_a_section(self, add_section_fixture):
         (document_part, start_type_, body_elm_, new_sectPr_, Section_,
          section_) = add_section_fixture
@@ -144,11 +138,6 @@ def it_creates_default_styles_part_if_not_present_to_help(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_paragraph_fixture(self, document_part_body_, body_, p_):
-        document_part = DocumentPart(None, None, None, None)
-        return document_part, body_, p_
-
     @pytest.fixture
     def add_section_fixture(
             self, document_elm_, start_type_, body_elm_, sectPr_, Section_,
diff --git a/tests/test_api.py b/tests/test_api.py
index 28d6e16dc..d5470cc61 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -13,7 +13,6 @@
 import docx
 
 from docx.api import Document, DocumentNew
-from docx.enum.text import WD_BREAK
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
 from docx.package import Package
@@ -23,7 +22,6 @@
 from docx.shape import InlineShape
 from docx.styles.styles import Styles
 from docx.table import Table
-from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
 from .unitutil.mock import (
@@ -92,14 +90,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_page_break(self, add_page_break_fixture):
-        document, document_part_, paragraph_, run_ = add_page_break_fixture
-        paragraph = document.add_page_break()
-        document_part_.add_paragraph.assert_called_once_with()
-        paragraph_.add_run.assert_called_once_with()
-        run_.add_break.assert_called_once_with(WD_BREAK.PAGE)
-        assert paragraph is paragraph_
-
     def it_can_add_a_picture(self, add_picture_fixture):
         document, image_path_, width, height, run_, picture_ = (
             add_picture_fixture
@@ -177,11 +167,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_page_break_fixture(
-            self, document, document_part_, paragraph_, run_):
-        return document, document_part_, paragraph_, run_
-
     @pytest.fixture
     def add_picture_fixture(self, request, run_, picture_):
         document = Document()
@@ -255,13 +240,10 @@ def document_obj_(self, request):
         return instance_mock(request, docx.document.Document)
 
     @pytest.fixture
-    def document_part_(
-            self, request, paragraph_, paragraphs_, section_, table_,
-            tables_):
+    def document_part_(self, request, paragraphs_, section_, table_, tables_):
         document_part_ = instance_mock(
             request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
         )
-        document_part_.add_paragraph.return_value = paragraph_
         document_part_.add_section.return_value = section_
         document_part_.add_table.return_value = table_
         document_part_.paragraphs = paragraphs_
@@ -309,12 +291,6 @@ def package_(self, request, document_part_):
         package_.main_document_part = document_part_
         return package_
 
-    @pytest.fixture
-    def paragraph_(self, request, run_):
-        paragraph_ = instance_mock(request, Paragraph)
-        paragraph_.add_run.return_value = run_
-        return paragraph_
-
     @pytest.fixture
     def paragraphs_(self, request):
         return instance_mock(request, list)

From 08703b63e3f08bf6d4a7572e2d0eb52ca9f10d46 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 18:17:16 -0800
Subject: [PATCH 013/367] acpt: migrate doc-add-picture.feature

---
 ...icture.feature => doc-add-picture.feature} | 26 ++++++++------
 features/steps/api.py                         | 34 +------------------
 features/steps/document.py                    | 34 ++++++++++++++++++-
 features/steps/shape.py                       | 32 ++++++++---------
 4 files changed, 63 insertions(+), 63 deletions(-)
 rename features/{api-add-picture.feature => doc-add-picture.feature} (58%)

diff --git a/features/api-add-picture.feature b/features/doc-add-picture.feature
similarity index 58%
rename from features/api-add-picture.feature
rename to features/doc-add-picture.feature
index 2ec910c63..51f35f161 100644
--- a/features/api-add-picture.feature
+++ b/features/doc-add-picture.feature
@@ -1,26 +1,30 @@
-Feature: Append an inline picture on its own paragraph
+Feature: Append an inline picture in its own paragraph
   In order add an image to a document
-  As a programmer using the basic python-docx API
-  I need a method that adds a picture in its own paragraph
+  As a developer using python-docx
+  I need a way to add a picture in its own paragraph
+
 
   Scenario: Add a picture at native size
-    Given a document
+    Given a blank document
      When I add a picture specifying only the image file
      Then the document contains the inline picture
       And the picture has its native width and height
 
+
   Scenario: Add a picture specifying both width and height
-    Given a document
+    Given a blank document
      When I add a picture specifying 1.75" width and 2.5" height
-     Then the picture width is 1.75 inches
-      And the picture height is 2.5 inches
+     Then picture.width is 1.75 inches
+      And picture.height is 2.5 inches
+
 
   Scenario: Add a picture specifying only width
-    Given a document
+    Given a blank document
      When I add a picture specifying a width of 1.5 inches
-     Then the picture height is 2.14 inches
+     Then picture.height is 2.14 inches
+
 
   Scenario: Add a picture specifying only height
-    Given a document
+    Given a blank document
      When I add a picture specifying a height of 1.5 inches
-     Then the picture width is 1.05 inches
+     Then picture.width is 1.05 inches
diff --git a/features/steps/api.py b/features/steps/api.py
index 2e2eae6db..58a00a8bf 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -9,10 +9,9 @@
 import docx
 
 from docx import DocumentNew
-from docx.shared import Inches
 from docx.table import Table
 
-from helpers import test_docx, test_file
+from helpers import test_docx
 
 
 # given ====================================================
@@ -36,37 +35,6 @@ def when_add_2x2_table_specifying_style_name(context, style_name):
     document.add_table(rows=2, cols=2, style=style_name)
 
 
-@when('I add a picture specifying 1.75" width and 2.5" height')
-def when_add_picture_specifying_width_and_height(context):
-    document = context.document
-    context.picture = document.add_picture(
-        test_file('monty-truth.png'),
-        width=Inches(1.75), height=Inches(2.5)
-    )
-
-
-@when('I add a picture specifying a height of 1.5 inches')
-def when_add_picture_specifying_height(context):
-    document = context.document
-    context.picture = document.add_picture(
-        test_file('monty-truth.png'), height=Inches(1.5)
-    )
-
-
-@when('I add a picture specifying a width of 1.5 inches')
-def when_add_picture_specifying_width(context):
-    document = context.document
-    context.picture = document.add_picture(
-        test_file('monty-truth.png'), width=Inches(1.5)
-    )
-
-
-@when('I add a picture specifying only the image file')
-def when_add_picture_specifying_only_image_file(context):
-    document = context.document
-    context.picture = document.add_picture(test_file('monty-truth.png'))
-
-
 @when('I call docx.Document() with no arguments')
 def when_I_call_docx_Document_with_no_arguments(context):
     context.document = DocumentNew()
diff --git a/features/steps/document.py b/features/steps/document.py
index 46ba33a6e..d0ae4f585 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -12,8 +12,9 @@
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import Sections
 from docx.section import Section
+from docx.shared import Inches
 
-from helpers import test_docx
+from helpers import test_docx, test_file
 
 
 # given ===================================================
@@ -85,6 +86,37 @@ def when_add_paragraph_without_specifying_text_or_style(context):
     document.add_paragraph()
 
 
+@when('I add a picture specifying 1.75" width and 2.5" height')
+def when_add_picture_specifying_width_and_height(context):
+    document = context.document
+    context.picture = document.add_picture(
+        test_file('monty-truth.png'),
+        width=Inches(1.75), height=Inches(2.5)
+    )
+
+
+@when('I add a picture specifying a height of 1.5 inches')
+def when_add_picture_specifying_height(context):
+    document = context.document
+    context.picture = document.add_picture(
+        test_file('monty-truth.png'), height=Inches(1.5)
+    )
+
+
+@when('I add a picture specifying a width of 1.5 inches')
+def when_add_picture_specifying_width(context):
+    document = context.document
+    context.picture = document.add_picture(
+        test_file('monty-truth.png'), width=Inches(1.5)
+    )
+
+
+@when('I add a picture specifying only the image file')
+def when_add_picture_specifying_only_image_file(context):
+    document = context.document
+    context.picture = document.add_picture(test_file('monty-truth.png'))
+
+
 @when('I add an even-page section to the document')
 def when_I_add_an_even_page_section_to_the_document(context):
     context.section = context.document.add_section(WD_SECTION.EVEN_PAGE)
diff --git a/features/steps/shape.py b/features/steps/shape.py
index ec8c427a2..5ea4e33f8 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -164,25 +164,21 @@ def then_picture_has_native_width_and_height(context):
     assert picture.height == 2717800, 'got %d' % picture.height
 
 
-@then('the picture height is 2.14 inches')
-def then_picture_height_is_value_2(context):
-    picture = context.picture
-    assert picture.height == 1956816, 'got %d' % picture.height
-
-
-@then('the picture height is 2.5 inches')
-def then_picture_height_is_value(context):
-    picture = context.picture
-    assert picture.height == 2286000, 'got %d' % picture.height
-
-
-@then('the picture width is 1.05 inches')
-def then_picture_width_is_value_2(context):
+@then('picture.height is {inches} inches')
+def then_picture_height_is_value(context, inches):
+    expected_value = {
+        '2.14': 1956816,
+        '2.5':  2286000,
+    }[inches]
     picture = context.picture
-    assert picture.width == 961402, 'got %d' % picture.width
+    assert picture.height == expected_value, 'got %d' % picture.height
 
 
-@then('the picture width is 1.75 inches')
-def then_picture_width_is_value(context):
+@then('picture.width is {inches} inches')
+def then_picture_width_is_value(context, inches):
+    expected_value = {
+        '1.05':  961402,
+        '1.75': 1600200,
+    }[inches]
     picture = context.picture
-    assert picture.width == 1600200, 'got %d' % picture.width
+    assert picture.width == expected_value, 'got %d' % picture.width

From 253b179e18cabc445b6286490304fbf7f1a56cca Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 20:21:03 -0800
Subject: [PATCH 014/367] doc: add Document.add_picture()

---
 docx/document.py       | 16 ++++++++++++++++
 tests/test_document.py | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index 6acb16f93..971e67e61 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -59,6 +59,22 @@ def add_paragraph(self, text='', style=None):
         """
         return self._body.add_paragraph(text, style)
 
+    def add_picture(self, image_path_or_stream, width=None, height=None):
+        """
+        Return a new picture shape added in its own paragraph at the end of
+        the document. The picture contains the image at
+        *image_path_or_stream*, scaled based on *width* and *height*. If
+        neither width nor height is specified, the picture appears at its
+        native size. If only one is specified, it is used to compute
+        a scaling factor that is then applied to the unspecified dimension,
+        preserving the aspect ratio of the image. The native size of the
+        picture is calculated using the dots-per-inch (dpi) value specified
+        in the image file, defaulting to 72 dpi if no value is specified, as
+        is often the case.
+        """
+        run = self.add_paragraph().add_run()
+        return run.add_picture(image_path_or_stream, width, height)
+
     @property
     def part(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index a28316aca..1cb5c109f 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -13,6 +13,7 @@
 from docx.document import _Body, Document
 from docx.enum.text import WD_BREAK
 from docx.parts.document import DocumentPart
+from docx.shape import InlineShape
 from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
@@ -51,6 +52,12 @@ def it_can_add_a_paragraph(self, add_paragraph_fixture):
         document._body.add_paragraph.assert_called_once_with(text, style)
         assert paragraph is paragraph_
 
+    def it_can_add_a_picture(self, add_picture_fixture):
+        document, path, width, height, run_, picture_ = add_picture_fixture
+        picture = document.add_picture(path, width, height)
+        run_.add_picture.assert_called_once_with(path, width, height)
+        assert picture is picture_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -94,6 +101,14 @@ def add_paragraph_fixture(self, request, body_prop_, paragraph_):
         body_prop_.return_value.add_paragraph.return_value = paragraph_
         return document, text, style, paragraph_
 
+    @pytest.fixture
+    def add_picture_fixture(self, request, add_paragraph_, run_, picture_):
+        document = Document(None, None)
+        path, width, height = 'foobar.png', 100, 200
+        add_paragraph_.return_value.add_run.return_value = run_
+        run_.add_picture.return_value = picture_
+        return document, path, width, height, run_, picture_
+
     @pytest.fixture
     def body_fixture(self, _Body_, body_):
         document_elm = element('w:document/w:body')
@@ -132,6 +147,10 @@ def document_part_(self, request):
     def paragraph_(self, request):
         return instance_mock(request, Paragraph)
 
+    @pytest.fixture
+    def picture_(self, request):
+        return instance_mock(request, InlineShape)
+
     @pytest.fixture
     def run_(self, request):
         return instance_mock(request, Run)

From c617f18b9567aa002260c677da5dacb34383de2a Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 20:24:43 -0800
Subject: [PATCH 015/367] api: remove old Document.add_picture()

---
 docx/api.py       | 18 ++----------------
 tests/test_api.py | 22 ----------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 806f43431..543ebadd9 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -61,22 +61,8 @@ def add_page_break(self):
     def add_paragraph(self, text='', style=None):
         return self._document.add_paragraph(text, style)
 
-    def add_picture(self, image_path_or_stream, width=None, height=None):
-        """
-        Return a new picture shape added in its own paragraph at the end of
-        the document. The picture contains the image at
-        *image_path_or_stream*, scaled based on *width* and *height*. If
-        neither width nor height is specified, the picture appears at its
-        native size. If only one is specified, it is used to compute
-        a scaling factor that is then applied to the unspecified dimension,
-        preserving the aspect ratio of the image. The native size of the
-        picture is calculated using the dots-per-inch (dpi) value specified
-        in the image file, defaulting to 72 dpi if no value is specified, as
-        is often the case.
-        """
-        run = self.add_paragraph().add_run()
-        picture = run.add_picture(image_path_or_stream, width, height)
-        return picture
+    def add_picture(self, image_descriptor, width=None, height=None):
+        return self._document.add_picture(image_descriptor, width, height)
 
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         """
diff --git a/tests/test_api.py b/tests/test_api.py
index d5470cc61..70316a5f4 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -19,7 +19,6 @@
 from docx.parts.document import DocumentPart, InlineShapes
 from docx.parts.numbering import NumberingPart
 from docx.section import Section
-from docx.shape import InlineShape
 from docx.styles.styles import Styles
 from docx.table import Table
 from docx.text.run import Run
@@ -90,14 +89,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_picture(self, add_picture_fixture):
-        document, image_path_, width, height, run_, picture_ = (
-            add_picture_fixture
-        )
-        picture = document.add_picture(image_path_, width, height)
-        run_.add_picture.assert_called_once_with(image_path_, width, height)
-        assert picture is picture_
-
     def it_can_add_a_section(self, add_section_fixture):
         document, start_type_, section_ = add_section_fixture
         section = document.add_section(start_type_)
@@ -167,15 +158,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_picture_fixture(self, request, run_, picture_):
-        document = Document()
-        image_path_ = instance_mock(request, str, name='image_path_')
-        width, height = 100, 200
-        class_mock(request, 'docx.text.paragraph.Run', return_value=run_)
-        run_.add_picture.return_value = picture_
-        return (document, image_path_, width, height, run_, picture_)
-
     @pytest.fixture
     def add_section_fixture(self, document, start_type_, section_):
         return document, start_type_, section_
@@ -295,10 +277,6 @@ def package_(self, request, document_part_):
     def paragraphs_(self, request):
         return instance_mock(request, list)
 
-    @pytest.fixture
-    def picture_(self, request):
-        return instance_mock(request, InlineShape)
-
     @pytest.fixture
     def run_(self, request):
         return instance_mock(request, Run)

From 664905cd3b6cfd30fb251d3a91cff4fb97d9196b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 21:30:11 -0800
Subject: [PATCH 016/367] doc: add Document.add_section()

---
 docx/document.py       | 13 +++++++++++++
 tests/test_document.py | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/docx/document.py b/docx/document.py
index 971e67e61..4d567fb9f 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -9,7 +9,9 @@
 )
 
 from .blkcntnr import BlockItemContainer
+from .enum.section import WD_SECTION
 from .enum.text import WD_BREAK
+from .section import Section
 from .shared import ElementProxy
 
 
@@ -75,6 +77,17 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         run = self.add_paragraph().add_run()
         return run.add_picture(image_path_or_stream, width, height)
 
+    def add_section(self, start_type=WD_SECTION.NEW_PAGE):
+        """
+        Return a |Section| object representing a new section added at the end
+        of the document. The optional *start_type* argument must be a member
+        of the :ref:`WdSectionStart` enumeration, and defaults to
+        ``WD_SECTION.NEW_PAGE`` if not provided.
+        """
+        new_sectPr = self._element.body.add_section_break()
+        new_sectPr.start_type = start_type
+        return Section(new_sectPr)
+
     @property
     def part(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 1cb5c109f..7838e0ca2 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -11,13 +11,14 @@
 import pytest
 
 from docx.document import _Body, Document
+from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
 from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
-from .unitutil.cxml import element
+from .unitutil.cxml import element, xml
 from .unitutil.mock import (
     class_mock, instance_mock, method_mock, property_mock
 )
@@ -58,6 +59,17 @@ def it_can_add_a_picture(self, add_picture_fixture):
         run_.add_picture.assert_called_once_with(path, width, height)
         assert picture is picture_
 
+    def it_can_add_a_section(self, add_section_fixture):
+        document, start_type, Section_ = add_section_fixture[:3]
+        section_, expected_xml = add_section_fixture[3:]
+
+        section = document.add_section(start_type)
+
+        assert document.element.xml == expected_xml
+        sectPr = document.element.xpath('w:body/w:sectPr')[0]
+        Section_.assert_called_once_with(sectPr)
+        assert section is section_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -109,6 +121,25 @@ def add_picture_fixture(self, request, add_paragraph_, run_, picture_):
         run_.add_picture.return_value = picture_
         return document, path, width, height, run_, picture_
 
+    @pytest.fixture(params=[
+        ('w:sectPr',                        WD_SECTION.EVEN_PAGE,
+         'w:sectPr/w:type{w:val=evenPage}'),
+        ('w:sectPr/w:type{w:val=evenPage}', WD_SECTION.ODD_PAGE,
+         'w:sectPr/w:type{w:val=oddPage}'),
+        ('w:sectPr/w:type{w:val=oddPage}',  WD_SECTION.NEW_PAGE,
+         'w:sectPr'),
+    ])
+    def add_section_fixture(self, request, Section_):
+        sentinel, start_type, new_sentinel = request.param
+        document_cxml = 'w:document/w:body/(w:p,%s)' % sentinel
+        document = Document(element(document_cxml), None)
+        expected_xml = xml(
+            'w:document/w:body/(w:p,w:p/w:pPr/%s,%s)' %
+            (sentinel, new_sentinel)
+        )
+        section_ = Section_.return_value
+        return document, start_type, Section_, section_, expected_xml
+
     @pytest.fixture
     def body_fixture(self, _Body_, body_):
         document_elm = element('w:document/w:body')
@@ -154,3 +185,7 @@ def picture_(self, request):
     @pytest.fixture
     def run_(self, request):
         return instance_mock(request, Run)
+
+    @pytest.fixture
+    def Section_(self, request):
+        return class_mock(request, 'docx.document.Section')

From 7c88a58fd9d88fc12613cc12ab0c0d43e229a8f6 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 21:44:27 -0800
Subject: [PATCH 017/367] api: remove old Document.add_section()

---
 docx/api.py                  |  8 +-----
 docx/parts/document.py       | 10 --------
 tests/parts/test_document.py | 50 +-----------------------------------
 tests/test_api.py            | 19 +-------------
 4 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 543ebadd9..7a9b9e252 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -65,13 +65,7 @@ def add_picture(self, image_descriptor, width=None, height=None):
         return self._document.add_picture(image_descriptor, width, height)
 
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
-        """
-        Return a |Section| object representing a new section added at the end
-        of the document. The optional *start_type* argument must be a member
-        of the :ref:`WdSectionStart` enumeration defaulting to
-        ``WD_SECTION.NEW_PAGE`` if not provided.
-        """
-        return self._document_part.add_section(start_type)
+        return self._document.add_section(start_type)
 
     def add_table(self, rows, cols, style='Light Shading Accent 1'):
         """
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 3d2887173..a0733e545 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -12,7 +12,6 @@
 
 from ..blkcntnr import BlockItemContainer
 from ..document import Document
-from ..enum.section import WD_SECTION
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
 from ..section import Section
@@ -25,15 +24,6 @@ class DocumentPart(XmlPart):
     """
     Main document part of a WordprocessingML (WML) package, aka a .docx file.
     """
-    def add_section(self, start_type=WD_SECTION.NEW_PAGE):
-        """
-        Return a |Section| object representing a new section added at the end
-        of the document.
-        """
-        new_sectPr = self._element.body.add_section_break()
-        new_sectPr.start_type = start_type
-        return Section(new_sectPr)
-
     def add_table(self, rows, cols):
         """
         Return a table having *rows* rows and *cols* columns, newly appended
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 9b908b5ec..8024c0004 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -9,8 +9,7 @@
 import pytest
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
-from docx.oxml.parts.document import CT_Body, CT_Document
-from docx.oxml.section import CT_SectPr
+from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.package import ImageParts, Package
 from docx.parts.document import _Body, DocumentPart, InlineShapes, Sections
@@ -69,15 +68,6 @@ def it_provides_access_to_the_inline_shapes_in_the_document(
         InlineShapes_.assert_called_once_with(body_elm, document)
         assert inline_shapes is InlineShapes_.return_value
 
-    def it_can_add_a_section(self, add_section_fixture):
-        (document_part, start_type_, body_elm_, new_sectPr_, Section_,
-         section_) = add_section_fixture
-        section = document_part.add_section(start_type_)
-        body_elm_.add_section_break.assert_called_once_with()
-        assert new_sectPr_.start_type == start_type_
-        Section_.assert_called_once_with(new_sectPr_)
-        assert section is section_
-
     def it_can_add_a_table(self, add_table_fixture):
         document_part, rows, cols, body_, table_ = add_table_fixture
         table = document_part.add_table(rows, cols)
@@ -138,16 +128,6 @@ def it_creates_default_styles_part_if_not_present_to_help(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_section_fixture(
-            self, document_elm_, start_type_, body_elm_, sectPr_, Section_,
-            section_):
-        document_part = DocumentPart(None, None, document_elm_, None)
-        return (
-            document_part, start_type_, body_elm_, sectPr_, Section_,
-            section_
-        )
-
     @pytest.fixture
     def add_table_fixture(self, document_part_body_, body_, table_):
         document_part = DocumentPart(None, None, None, None)
@@ -255,16 +235,6 @@ def body_(self, request, p_, table_):
         body_.add_table.return_value = table_
         return body_
 
-    @pytest.fixture
-    def body_elm_(self, request, sectPr_):
-        body_elm_ = instance_mock(request, CT_Body)
-        body_elm_.add_section_break.return_value = sectPr_
-        return body_elm_
-
-    @pytest.fixture
-    def document_elm_(self, request, body_elm_):
-        return instance_mock(request, CT_Document, body=body_elm_)
-
     @pytest.fixture
     def document_part_body_(self, request, body_):
         return property_mock(
@@ -326,28 +296,10 @@ def relate_to_(self, request, rId_):
     def rId_(self, request):
         return instance_mock(request, str)
 
-    @pytest.fixture
-    def Section_(self, request, section_):
-        return class_mock(
-            request, 'docx.parts.document.Section', return_value=section_
-        )
-
-    @pytest.fixture
-    def section_(self, request):
-        return instance_mock(request, Section)
-
     @pytest.fixture
     def Sections_(self, request):
         return class_mock(request, 'docx.parts.document.Sections')
 
-    @pytest.fixture
-    def sectPr_(self, request):
-        return instance_mock(request, CT_SectPr)
-
-    @pytest.fixture
-    def start_type_(self, request):
-        return instance_mock(request, int)
-
     @pytest.fixture
     def style_(self, request):
         return instance_mock(request, BaseStyle)
diff --git a/tests/test_api.py b/tests/test_api.py
index 70316a5f4..c76d4bd10 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -89,14 +89,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_section(self, add_section_fixture):
-        document, start_type_, section_ = add_section_fixture
-        section = document.add_section(start_type_)
-        document._document_part.add_section.assert_called_once_with(
-            start_type_
-        )
-        assert section is section_
-
     def it_can_add_a_table(self, add_table_fixture):
         document, rows, cols, style, table_ = add_table_fixture
         table = document.add_table(rows, cols, style)
@@ -158,10 +150,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_section_fixture(self, document, start_type_, section_):
-        return document, start_type_, section_
-
     @pytest.fixture
     def add_table_fixture(self, request, document, document_part_, table_):
         rows, cols = 4, 2
@@ -222,11 +210,10 @@ def document_obj_(self, request):
         return instance_mock(request, docx.document.Document)
 
     @pytest.fixture
-    def document_part_(self, request, paragraphs_, section_, table_, tables_):
+    def document_part_(self, request, paragraphs_, table_, tables_):
         document_part_ = instance_mock(
             request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
         )
-        document_part_.add_section.return_value = section_
         document_part_.add_table.return_value = table_
         document_part_.paragraphs = paragraphs_
         document_part_.tables = tables_
@@ -285,10 +272,6 @@ def run_(self, request):
     def section_(self, request):
         return instance_mock(request, Section)
 
-    @pytest.fixture
-    def start_type_(self, request):
-        return instance_mock(request, int)
-
     @pytest.fixture
     def styles_(self, request):
         return instance_mock(request, Styles)

From e1306620381315dcb5b08766c148ac688a7e414c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 22:05:18 -0800
Subject: [PATCH 018/367] acpt: migrate doc-add-table.feature

---
 ...dd-table.feature => doc-add-table.feature} |  8 +++----
 features/steps/api.py                         | 23 -------------------
 features/steps/document.py                    | 23 +++++++++++++++++++
 3 files changed, 27 insertions(+), 27 deletions(-)
 rename features/{api-add-table.feature => doc-add-table.feature} (76%)

diff --git a/features/api-add-table.feature b/features/doc-add-table.feature
similarity index 76%
rename from features/api-add-table.feature
rename to features/doc-add-table.feature
index 236a01db1..feec29ff2 100644
--- a/features/api-add-table.feature
+++ b/features/doc-add-table.feature
@@ -1,18 +1,18 @@
 Feature: Add a table
   In order to include tablular information in a document
-  As a programmer using the basic python-docx API
-  I need a method that adds a table at the end of the document
+  As a developer using python-docx
+  I need a way to add a table
 
 
   Scenario: Add a table specifying only row and column count
-    Given a document
+    Given a blank document
      When I add a 2 x 2 table specifying only row and column count
      Then the document contains a 2 x 2 table
       And table.style is styles['Light Shading Accent 1']
 
 
   Scenario: Add a table specifying style
-    Given a document
+    Given a blank document
      When I add a 2 x 2 table specifying style 'Table Grid'
      Then the document contains a 2 x 2 table
       And table.style is styles['Table Grid']
diff --git a/features/steps/api.py b/features/steps/api.py
index 58a00a8bf..593b8faf1 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -9,7 +9,6 @@
 import docx
 
 from docx import DocumentNew
-from docx.table import Table
 
 from helpers import test_docx
 
@@ -23,18 +22,6 @@ def given_I_have_python_docx_installed(context):
 
 # when =====================================================
 
-@when('I add a 2 x 2 table specifying only row and column count')
-def when_add_2x2_table_specifying_only_row_and_col_count(context):
-    document = context.document
-    document.add_table(rows=2, cols=2)
-
-
-@when('I add a 2 x 2 table specifying style \'{style_name}\'')
-def when_add_2x2_table_specifying_style_name(context, style_name):
-    document = context.document
-    document.add_table(rows=2, cols=2, style=style_name)
-
-
 @when('I call docx.Document() with no arguments')
 def when_I_call_docx_Document_with_no_arguments(context):
     context.document = DocumentNew()
@@ -53,16 +40,6 @@ def then_document_is_a_Document_object(context):
     assert isinstance(document, docx.document.Document)
 
 
-@then('the document contains a 2 x 2 table')
-def then_document_contains_2x2_table(context):
-    document = context.document
-    table = document.tables[-1]
-    assert isinstance(table, Table)
-    assert len(table.rows) == 2
-    assert len(table.columns) == 2
-    context.table_ = table
-
-
 @then('the last paragraph contains the text I specified')
 def then_last_p_contains_specified_text(context):
     document = context.document
diff --git a/features/steps/document.py b/features/steps/document.py
index d0ae4f585..11f476901 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -13,6 +13,7 @@
 from docx.parts.document import Sections
 from docx.section import Section
 from docx.shared import Inches
+from docx.table import Table
 
 from helpers import test_docx, test_file
 
@@ -44,6 +45,18 @@ def given_a_single_section_document_having_portrait_layout(context):
 
 # when ====================================================
 
+@when('I add a 2 x 2 table specifying only row and column count')
+def when_add_2x2_table_specifying_only_row_and_col_count(context):
+    document = context.document
+    document.add_table(rows=2, cols=2)
+
+
+@when('I add a 2 x 2 table specifying style \'{style_name}\'')
+def when_add_2x2_table_specifying_style_name(context, style_name):
+    document = context.document
+    document.add_table(rows=2, cols=2, style=style_name)
+
+
 @when('I add a heading specifying level={level}')
 def when_add_heading_specifying_level(context, level):
     context.document.add_heading(level=int(level))
@@ -158,6 +171,16 @@ def then_I_can_iterate_over_the_sections(context):
     assert actual_count == 3
 
 
+@then('the document contains a 2 x 2 table')
+def then_document_contains_2x2_table(context):
+    document = context.document
+    table = document.tables[-1]
+    assert isinstance(table, Table)
+    assert len(table.rows) == 2
+    assert len(table.columns) == 2
+    context.table_ = table
+
+
 @then('the document has two sections')
 def then_the_document_has_two_sections(context):
     assert len(context.document.sections) == 2

From b00a46bf4f9cb748b1d4bbf0be69cb07a0f8c34b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 22:54:08 -0800
Subject: [PATCH 019/367] doc: add Document.add_table()

---
 docx/document.py       | 10 ++++++++++
 tests/test_document.py | 23 +++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docx/document.py b/docx/document.py
index 4d567fb9f..e8730ca0f 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -88,6 +88,16 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         new_sectPr.start_type = start_type
         return Section(new_sectPr)
 
+    def add_table(self, rows, cols, style='Light Shading Accent 1'):
+        """
+        Add a table having row and column counts of *rows* and *cols*
+        respectively and table style of *style*. If *style* is |None|, a
+        table with no style is produced.
+        """
+        table = self._body.add_table(rows, cols)
+        table.style = style
+        return table
+
     @property
     def part(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 7838e0ca2..a570ea745 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -15,6 +15,7 @@
 from docx.enum.text import WD_BREAK
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
+from docx.table import Table
 from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
@@ -70,6 +71,13 @@ def it_can_add_a_section(self, add_section_fixture):
         Section_.assert_called_once_with(sectPr)
         assert section is section_
 
+    def it_can_add_a_table(self, add_table_fixture):
+        document, rows, cols, style, table_ = add_table_fixture
+        table = document.add_table(rows, cols, style)
+        document._body.add_table.assert_called_once_with(rows, cols)
+        assert table == table_
+        assert table.style == style
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -140,6 +148,13 @@ def add_section_fixture(self, request, Section_):
         section_ = Section_.return_value
         return document, start_type, Section_, section_, expected_xml
 
+    @pytest.fixture
+    def add_table_fixture(self, body_prop_, table_):
+        document = Document(None, None)
+        rows, cols, style = 4, 2, 'Light Shading Accent 1'
+        body_prop_.return_value.add_table.return_value = table_
+        return document, rows, cols, style, table_
+
     @pytest.fixture
     def body_fixture(self, _Body_, body_):
         document_elm = element('w:document/w:body')
@@ -167,8 +182,8 @@ def body_(self, request):
         return instance_mock(request, _Body)
 
     @pytest.fixture
-    def body_prop_(self, request):
-        return property_mock(request, Document, '_body')
+    def body_prop_(self, request, body_):
+        return property_mock(request, Document, '_body', return_value=body_)
 
     @pytest.fixture
     def document_part_(self, request):
@@ -189,3 +204,7 @@ def run_(self, request):
     @pytest.fixture
     def Section_(self, request):
         return class_mock(request, 'docx.document.Section')
+
+    @pytest.fixture
+    def table_(self, request):
+        return instance_mock(request, Table, style='UNASSIGNED')

From bd16fc7e05aad73461dcc2f1bc7f7647809ee07c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 23:03:33 -0800
Subject: [PATCH 020/367] api: remove old Document.add_table()

---
 docx/api.py                  |  9 +--------
 docx/parts/document.py       |  7 -------
 tests/parts/test_document.py | 23 ++---------------------
 tests/test_api.py            | 21 +--------------------
 4 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 7a9b9e252..ffe4ba925 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -68,14 +68,7 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         return self._document.add_section(start_type)
 
     def add_table(self, rows, cols, style='Light Shading Accent 1'):
-        """
-        Add a table having row and column counts of *rows* and *cols*
-        respectively and table style of *style*. If *style* is |None|, a
-        table with no style is produced.
-        """
-        table = self._document_part.add_table(rows, cols)
-        table.style = style
-        return table
+        return self._document.add_table(rows, cols, style)
 
     @property
     def core_properties(self):
diff --git a/docx/parts/document.py b/docx/parts/document.py
index a0733e545..891d44d46 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -24,13 +24,6 @@ class DocumentPart(XmlPart):
     """
     Main document part of a WordprocessingML (WML) package, aka a .docx file.
     """
-    def add_table(self, rows, cols):
-        """
-        Return a table having *rows* rows and *cols* columns, newly appended
-        to the main document story.
-        """
-        return self.body.add_table(rows, cols)
-
     @lazyproperty
     def body(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 8024c0004..d59f3ca50 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -68,12 +68,6 @@ def it_provides_access_to_the_inline_shapes_in_the_document(
         InlineShapes_.assert_called_once_with(body_elm, document)
         assert inline_shapes is InlineShapes_.return_value
 
-    def it_can_add_a_table(self, add_table_fixture):
-        document_part, rows, cols, body_, table_ = add_table_fixture
-        table = document_part.add_table(rows, cols)
-        body_.add_table.assert_called_once_with(rows, cols)
-        assert table is table_
-
     def it_can_add_an_image_part_to_the_document(
             self, get_or_add_image_fixture):
         (document, image_descriptor_, image_parts_, relate_to_, image_part_,
@@ -128,12 +122,6 @@ def it_creates_default_styles_part_if_not_present_to_help(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_table_fixture(self, document_part_body_, body_, table_):
-        document_part = DocumentPart(None, None, None, None)
-        rows, cols = 2, 4
-        return document_part, rows, cols, body_, table_
-
     @pytest.fixture
     def body_fixture(self, _Body_):
         document_elm = (
@@ -229,11 +217,8 @@ def _Body_(self, request):
         return class_mock(request, 'docx.parts.document._Body')
 
     @pytest.fixture
-    def body_(self, request, p_, table_):
-        body_ = instance_mock(request, _Body)
-        body_.add_paragraph.return_value = p_
-        body_.add_table.return_value = table_
-        return body_
+    def body_(self, request):
+        return instance_mock(request, _Body)
 
     @pytest.fixture
     def document_part_body_(self, request, body_):
@@ -326,10 +311,6 @@ def styles_prop_(self, request, styles_):
     def _styles_part_prop_(self, request):
         return property_mock(request, DocumentPart, '_styles_part')
 
-    @pytest.fixture
-    def table_(self, request):
-        return instance_mock(request, Table)
-
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)
diff --git a/tests/test_api.py b/tests/test_api.py
index c76d4bd10..fe8a57dc1 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -20,7 +20,6 @@
 from docx.parts.numbering import NumberingPart
 from docx.section import Section
 from docx.styles.styles import Styles
-from docx.table import Table
 from docx.text.run import Run
 
 from .unitutil.mock import (
@@ -89,13 +88,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_table(self, add_table_fixture):
-        document, rows, cols, style, table_ = add_table_fixture
-        table = document.add_table(rows, cols, style)
-        document._document_part.add_table.assert_called_once_with(rows, cols)
-        assert table.style == style
-        assert table == table_
-
     def it_provides_access_to_the_document_inline_shapes(self, document):
         body = document.inline_shapes
         assert body is document._document_part.inline_shapes
@@ -150,12 +142,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_table_fixture(self, request, document, document_part_, table_):
-        rows, cols = 4, 2
-        style = 'Light Shading Accent 1'
-        return document, rows, cols, style, table_
-
     @pytest.fixture
     def core_props_fixture(self, document, core_properties_):
         document._package.core_properties = core_properties_
@@ -210,11 +196,10 @@ def document_obj_(self, request):
         return instance_mock(request, docx.document.Document)
 
     @pytest.fixture
-    def document_part_(self, request, paragraphs_, table_, tables_):
+    def document_part_(self, request, paragraphs_, tables_):
         document_part_ = instance_mock(
             request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
         )
-        document_part_.add_table.return_value = table_
         document_part_.paragraphs = paragraphs_
         document_part_.tables = tables_
         return document_part_
@@ -276,10 +261,6 @@ def section_(self, request):
     def styles_(self, request):
         return instance_mock(request, Styles)
 
-    @pytest.fixture
-    def table_(self, request):
-        return instance_mock(request, Table, style=None)
-
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)

From e08d95cded72d1a2f8fb8298987808b7809d09cb Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 23:15:10 -0800
Subject: [PATCH 021/367] doc: add Document.core_properties

---
 docx/document.py       |  8 ++++++++
 docx/parts/document.py |  8 ++++++++
 tests/test_document.py | 16 ++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index e8730ca0f..7102debc4 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -98,6 +98,14 @@ def add_table(self, rows, cols, style='Light Shading Accent 1'):
         table.style = style
         return table
 
+    @property
+    def core_properties(self):
+        """
+        A |CoreProperties| object providing read/write access to the core
+        properties of this document.
+        """
+        return self._part.core_properties
+
     @property
     def part(self):
         """
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 891d44d46..9739aa714 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -31,6 +31,14 @@ def body(self):
         """
         return _Body(self._element.body, self)
 
+    @property
+    def core_properties(self):
+        """
+        A |CoreProperties| object providing read/write access to the core
+        properties of this document.
+        """
+        raise NotImplementedError
+
     @property
     def document(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index a570ea745..26bb76184 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -13,6 +13,7 @@
 from docx.document import _Body, Document
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
+from docx.opc.coreprops import CoreProperties
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
 from docx.table import Table
@@ -78,6 +79,11 @@ def it_can_add_a_table(self, add_table_fixture):
         assert table == table_
         assert table.style == style
 
+    def it_provides_access_to_its_core_properties(self, core_props_fixture):
+        document, core_properties_ = core_props_fixture
+        core_properties = document.core_properties
+        assert core_properties is core_properties_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -162,6 +168,12 @@ def body_fixture(self, _Body_, body_):
         document = Document(document_elm, None)
         return document, body_elm, _Body_, body_
 
+    @pytest.fixture
+    def core_props_fixture(self, document_part_, core_properties_):
+        document = Document(None, document_part_)
+        document_part_.core_properties = core_properties_
+        return document, core_properties_
+
     @pytest.fixture
     def part_fixture(self, document_part_):
         document = Document(None, document_part_)
@@ -185,6 +197,10 @@ def body_(self, request):
     def body_prop_(self, request, body_):
         return property_mock(request, Document, '_body', return_value=body_)
 
+    @pytest.fixture
+    def core_properties_(self, request):
+        return instance_mock(request, CoreProperties)
+
     @pytest.fixture
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)

From 5ff190a5fcaf65ddab72e970b65713e2d3da7721 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 23:21:49 -0800
Subject: [PATCH 022/367] doc: add DocumentPart.core_properties

---
 docx/parts/document.py       |  2 +-
 tests/parts/test_document.py | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 9739aa714..2d2ab4412 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -37,7 +37,7 @@ def core_properties(self):
         A |CoreProperties| object providing read/write access to the core
         properties of this document.
         """
-        raise NotImplementedError
+        return self.package.core_properties
 
     @property
     def document(self):
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index d59f3ca50..92def7a03 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -9,6 +9,7 @@
 import pytest
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
+from docx.opc.coreprops import CoreProperties
 from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.package import ImageParts, Package
@@ -61,6 +62,11 @@ def it_provides_access_to_the_document_styles(self, styles_fixture):
         styles = document_part.styles
         assert styles is styles_
 
+    def it_provides_access_to_its_core_properties(self, core_props_fixture):
+        document_part, core_properties_ = core_props_fixture
+        core_properties = document_part.core_properties
+        assert core_properties is core_properties_
+
     def it_provides_access_to_the_inline_shapes_in_the_document(
             self, inline_shapes_fixture):
         document, InlineShapes_, body_elm = inline_shapes_fixture
@@ -132,6 +138,12 @@ def body_fixture(self, _Body_):
         document_part = DocumentPart(None, None, document_elm, None)
         return document_part, _Body_, body_elm
 
+    @pytest.fixture
+    def core_props_fixture(self, package_, core_properties_):
+        document_part = DocumentPart(None, None, None, package_)
+        package_.core_properties = core_properties_
+        return document_part, core_properties_
+
     @pytest.fixture
     def get_style_fixture(self, styles_prop_, style_):
         document_part = DocumentPart(None, None, None, None)
@@ -220,6 +232,10 @@ def _Body_(self, request):
     def body_(self, request):
         return instance_mock(request, _Body)
 
+    @pytest.fixture
+    def core_properties_(self, request):
+        return instance_mock(request, CoreProperties)
+
     @pytest.fixture
     def document_part_body_(self, request, body_):
         return property_mock(

From f3a2f10a916ad5a840e3b5d273b63f29c9d0163a Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 14 Feb 2015 23:24:59 -0800
Subject: [PATCH 023/367] api: remove old Document.core_properties

---
 docx/api.py       |  6 +-----
 tests/test_api.py | 15 ---------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index ffe4ba925..c91c3b66a 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -72,11 +72,7 @@ def add_table(self, rows, cols, style='Light Shading Accent 1'):
 
     @property
     def core_properties(self):
-        """
-        A |CoreProperties| object providing read/write access to the core
-        properties of this document.
-        """
-        return self._package.core_properties
+        return self._document.core_properties
 
     @property
     def inline_shapes(self):
diff --git a/tests/test_api.py b/tests/test_api.py
index fe8a57dc1..cf443a5f3 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -14,7 +14,6 @@
 
 from docx.api import Document, DocumentNew
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
-from docx.opc.coreprops import CoreProperties
 from docx.package import Package
 from docx.parts.document import DocumentPart, InlineShapes
 from docx.parts.numbering import NumberingPart
@@ -112,11 +111,6 @@ def it_can_save_the_package(self, save_fixture):
         document.save(file_)
         package_.save.assert_called_once_with(file_)
 
-    def it_provides_access_to_its_core_properties(self, core_props_fixture):
-        document, core_properties_ = core_props_fixture
-        core_properties = document.core_properties
-        assert core_properties is core_properties_
-
     def it_provides_access_to_its_styles(self, styles_fixture):
         document, styles_ = styles_fixture
         styles = document.styles
@@ -142,11 +136,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def core_props_fixture(self, document, core_properties_):
-        document._package.core_properties = core_properties_
-        return document, core_properties_
-
     @pytest.fixture
     def init_fixture(self, docx_, open_):
         return docx_, open_
@@ -177,10 +166,6 @@ def tables_fixture(self, document, tables_):
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def core_properties_(self, request):
-        return instance_mock(request, CoreProperties)
-
     @pytest.fixture
     def Document_inline_shapes_(self, request, inline_shapes_):
         return property_mock(

From 2350c523de5285490dbaf2b387b547e755cdc94d Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 00:07:50 -0800
Subject: [PATCH 024/367] acpt: migrate doc-access-collections.feature

* Provide a home for testing access to the various collections in a
  document.
* Segregate access to the collection from access to individual items
  in the collection.
---
 features/doc-access-collections.feature  |  9 +++++++++
 features/shp-inline-shape-access.feature | 14 ++++++--------
 features/steps/document.py               | 14 +++++++++++++-
 features/steps/shape.py                  | 19 +++----------------
 4 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 features/doc-access-collections.feature

diff --git a/features/doc-access-collections.feature b/features/doc-access-collections.feature
new file mode 100644
index 000000000..fe2ab3912
--- /dev/null
+++ b/features/doc-access-collections.feature
@@ -0,0 +1,9 @@
+Feature: Access document collections
+  In order to operate on objects related to a document
+  As a developer using python-docx
+  I need a way to access each of the document's collections
+
+
+  Scenario: Access the inline shapes collection of a document
+     Given a document having inline shapes
+      Then I can access the inline shape collection of the document
diff --git a/features/shp-inline-shape-access.feature b/features/shp-inline-shape-access.feature
index c001ac526..390001493 100644
--- a/features/shp-inline-shape-access.feature
+++ b/features/shp-inline-shape-access.feature
@@ -1,18 +1,16 @@
-Feature: Access inline shapes in document
-  In order to query or manipulate inline shapes in a document
+Feature: Access inline shape in inline shape collection
+  In order to operate on an inline shape
   As a developer using python-docx
-  I need the ability to access the inline shapes in a document
+  I need a way to access each inline shape in the inline shape collection
 
-  Scenario: Access inline shapes collection of document
-     Given a document containing five inline shapes
-      Then I can access the inline shape collection of the document
-       And the length of the inline shape collection is 5
 
   Scenario: Access shape in inline shape collection
      Given an inline shape collection containing five shapes
-      Then I can iterate over the inline shape collection
+      Then the length of the inline shape collection is 5
+       And I can iterate over the inline shape collection
        And I can access each inline shape by index
 
+
   Scenario Outline: Identify type of inline shape
      Given an inline shape known to be <shape of type>
       Then its inline shape type is <shape type>
diff --git a/features/steps/document.py b/features/steps/document.py
index 11f476901..5da495d16 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -10,7 +10,7 @@
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
-from docx.parts.document import Sections
+from docx.parts.document import InlineShapes, Sections
 from docx.section import Section
 from docx.shared import Inches
 from docx.table import Table
@@ -25,6 +25,11 @@ def given_a_blank_document(context):
     context.document = Document()
 
 
+@given('a document having inline shapes')
+def given_a_document_having_inline_shapes(context):
+    context.document = Document(test_docx('shp-inline-shape-access'))
+
+
 @given('a document having three sections')
 def given_a_document_having_three_sections(context):
     context.document = Document(test_docx('doc-access-sections'))
@@ -154,6 +159,13 @@ def then_I_can_access_a_section_by_index(context):
         assert isinstance(section, Section)
 
 
+@then('I can access the inline shape collection of the document')
+def then_can_access_inline_shape_collection_of_document(context):
+    document = context.document
+    inline_shapes = document.inline_shapes
+    assert isinstance(inline_shapes, InlineShapes)
+
+
 @then('I can access the section collection of the document')
 def then_I_can_access_the_section_collection_of_the_document(context):
     sections = context.document.sections
diff --git a/features/steps/shape.py b/features/steps/shape.py
index 5ea4e33f8..9139ca952 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -12,7 +12,7 @@
 
 from docx import Document
 from docx.enum.shape import WD_INLINE_SHAPE
-from docx.parts.document import InlineShape, InlineShapes
+from docx.parts.document import InlineShape
 from docx.shared import Inches
 
 from helpers import test_docx, test_file
@@ -20,14 +20,8 @@
 
 # given ===================================================
 
-@given('a document containing five inline shapes')
-def given_a_document_containing_two_inline_shapes(context):
-    docx_path = test_docx('shp-inline-shape-access')
-    context.document = Document(docx_path)
-
-
 @given('an inline shape collection containing five shapes')
-def given_inline_shape_collection_containing_two_shapes(context):
+def given_an_inline_shape_collection_containing_five_shapes(context):
     docx_path = test_docx('shp-inline-shape-access')
     document = Document(docx_path)
     context.inline_shapes = document.inline_shapes
@@ -89,13 +83,6 @@ def then_can_access_each_inline_shape_by_index(context):
         assert isinstance(inline_shape, InlineShape)
 
 
-@then('I can access the inline shape collection of the document')
-def then_can_access_inline_shape_collection_of_document(context):
-    document = context.document
-    inline_shapes = document.inline_shapes
-    assert isinstance(inline_shapes, InlineShapes)
-
-
 @then('I can iterate over the inline shape collection')
 def then_can_iterate_over_inline_shape_collection(context):
     inline_shapes = context.inline_shapes
@@ -152,7 +139,7 @@ def then_the_document_contains_the_inline_picture(context):
 
 @then('the length of the inline shape collection is 5')
 def then_len_of_inline_shape_collection_is_5(context):
-    inline_shapes = context.document.inline_shapes
+    inline_shapes = context.inline_shapes
     shape_count = len(inline_shapes)
     assert shape_count == 5, 'got %s' % shape_count
 

From 026db1b24567f020707496892229cf293c6de906 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 00:18:53 -0800
Subject: [PATCH 025/367] doc: add Document.inline_shapes

---
 docx/document.py       | 10 ++++++++++
 tests/test_document.py | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/docx/document.py b/docx/document.py
index 7102debc4..52d194132 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -106,6 +106,16 @@ def core_properties(self):
         """
         return self._part.core_properties
 
+    @property
+    def inline_shapes(self):
+        """
+        An |InlineShapes| object providing access to the inline shapes in
+        this document. An inline shape is a graphical object, such as
+        a picture, contained in a run of text and behaving like a character
+        glyph, being flowed like other text in a paragraph.
+        """
+        return self._part.inline_shapes
+
     @property
     def part(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 26bb76184..018508e6b 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -14,7 +14,7 @@
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
-from docx.parts.document import DocumentPart
+from docx.parts.document import DocumentPart, InlineShapes
 from docx.shape import InlineShape
 from docx.table import Table
 from docx.text.paragraph import Paragraph
@@ -84,6 +84,11 @@ def it_provides_access_to_its_core_properties(self, core_props_fixture):
         core_properties = document.core_properties
         assert core_properties is core_properties_
 
+    def it_provides_access_to_its_inline_shapes(self, inline_shapes_fixture):
+        document, inline_shapes_ = inline_shapes_fixture
+        inline_shapes = document.inline_shapes
+        assert inline_shapes is inline_shapes_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -174,6 +179,12 @@ def core_props_fixture(self, document_part_, core_properties_):
         document_part_.core_properties = core_properties_
         return document, core_properties_
 
+    @pytest.fixture
+    def inline_shapes_fixture(self, document_part_, inline_shapes_):
+        document = Document(None, document_part_)
+        document_part_.inline_shapes = inline_shapes_
+        return document, inline_shapes_
+
     @pytest.fixture
     def part_fixture(self, document_part_):
         document = Document(None, document_part_)
@@ -205,6 +216,10 @@ def core_properties_(self, request):
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)
 
+    @pytest.fixture
+    def inline_shapes_(self, request):
+        return instance_mock(request, InlineShapes)
+
     @pytest.fixture
     def paragraph_(self, request):
         return instance_mock(request, Paragraph)

From 38272b41ee3d3cde35d162f179c3f8da8566f4f2 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 00:20:39 -0800
Subject: [PATCH 026/367] api: remove old Document.inline_shapes

---
 docx/api.py       | 5 +----
 tests/test_api.py | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index c91c3b66a..80d07edff 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -76,10 +76,7 @@ def core_properties(self):
 
     @property
     def inline_shapes(self):
-        """
-        Return a reference to the |InlineShapes| instance for this document.
-        """
-        return self._document_part.inline_shapes
+        return self._document.inline_shapes
 
     @lazyproperty
     def numbering_part(self):
diff --git a/tests/test_api.py b/tests/test_api.py
index cf443a5f3..1725e3843 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -87,10 +87,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_provides_access_to_the_document_inline_shapes(self, document):
-        body = document.inline_shapes
-        assert body is document._document_part.inline_shapes
-
     def it_provides_access_to_the_document_paragraphs(
             self, paragraphs_fixture):
         document, paragraphs_ = paragraphs_fixture

From ba7228981d000dc8bfe1dbbcb0f032f5b9aed140 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 00:34:45 -0800
Subject: [PATCH 027/367] acpt: migrate num-access-numbering-part.feature

---
 docx/api.py                                               | 4 ++++
 ...ing-part.feature => num-access-numbering-part.feature} | 8 +++++---
 features/steps/numbering.py                               | 5 ++---
 3 files changed, 11 insertions(+), 6 deletions(-)
 rename features/{num-get-numbering-part.feature => num-access-numbering-part.feature} (65%)

diff --git a/docx/api.py b/docx/api.py
index 80d07edff..37c8d0d41 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -100,6 +100,10 @@ def paragraphs(self):
         """
         return self._document_part.paragraphs
 
+    @property
+    def part(self):
+        return self._document.part
+
     def save(self, path_or_stream):
         """
         Save this document to *path_or_stream*, which can be either a path to
diff --git a/features/num-get-numbering-part.feature b/features/num-access-numbering-part.feature
similarity index 65%
rename from features/num-get-numbering-part.feature
rename to features/num-access-numbering-part.feature
index 8d6c0107a..9ec14e98b 100644
--- a/features/num-get-numbering-part.feature
+++ b/features/num-access-numbering-part.feature
@@ -1,8 +1,10 @@
-Feature: Get the document numbering part
-  In order to query and modify numbering settings
-  As a programmer using the advanced python-docx API
+Feature: Access the document numbering part
+  In order to operate on numbering settings
+  As a developer using python-docx
   I need access to the numbering part of the document
 
+
+  @wip
   Scenario: Get an existing numbering part from document
     Given a document having a numbering part
      When I get the numbering part from the document
diff --git a/features/steps/numbering.py b/features/steps/numbering.py
index f626e02a9..ea41cdeb5 100644
--- a/features/steps/numbering.py
+++ b/features/steps/numbering.py
@@ -15,8 +15,7 @@
 
 @given('a document having a numbering part')
 def given_a_document_having_a_numbering_part(context):
-    docx_path = test_docx('num-having-numbering-part')
-    context.document = Document(docx_path)
+    context.document = Document(test_docx('num-having-numbering-part'))
 
 
 # when ====================================================
@@ -24,7 +23,7 @@ def given_a_document_having_a_numbering_part(context):
 @when('I get the numbering part from the document')
 def when_get_numbering_part_from_document(context):
     document = context.document
-    context.numbering_part = document.numbering_part
+    context.numbering_part = document.part.numbering_part
 
 
 # then =====================================================

From 382073ee408e18b694cee5e7aefccb0b4a8f170c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 01:12:23 -0800
Subject: [PATCH 028/367] doc: add DocumentPart.numbering_part

---
 docx/parts/document.py                     | 15 +++++++++
 features/num-access-numbering-part.feature |  1 -
 tests/parts/test_document.py               | 38 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 2d2ab4412..7135f4ec8 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -12,6 +12,7 @@
 
 from ..blkcntnr import BlockItemContainer
 from ..document import Document
+from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
 from ..section import Section
@@ -98,6 +99,20 @@ def next_id(self):
             if n not in used_ids:
                 return n
 
+    @lazyproperty
+    def numbering_part(self):
+        """
+        A |NumberingPart| object providing access to the numbering
+        definitions for this document. Creates an empty numbering part if one
+        is not present.
+        """
+        try:
+            return self.part_related_by(RT.NUMBERING)
+        except KeyError:
+            numbering_part = NumberingPart.new()
+            self.relate_to(numbering_part, RT.NUMBERING)
+            return numbering_part
+
     @property
     def paragraphs(self):
         """
diff --git a/features/num-access-numbering-part.feature b/features/num-access-numbering-part.feature
index 9ec14e98b..02787afbe 100644
--- a/features/num-access-numbering-part.feature
+++ b/features/num-access-numbering-part.feature
@@ -4,7 +4,6 @@ Feature: Access the document numbering part
   I need access to the numbering part of the document
 
 
-  @wip
   Scenario: Get an existing numbering part from document
     Given a document having a numbering part
      When I get the numbering part from the document
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 92def7a03..178ee553a 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -15,6 +15,7 @@
 from docx.package import ImageParts, Package
 from docx.parts.document import _Body, DocumentPart, InlineShapes, Sections
 from docx.parts.image import ImagePart
+from docx.parts.numbering import NumberingPart
 from docx.parts.styles import StylesPart
 from docx.section import Section
 from docx.shape import InlineShape
@@ -74,6 +75,21 @@ def it_provides_access_to_the_inline_shapes_in_the_document(
         InlineShapes_.assert_called_once_with(body_elm, document)
         assert inline_shapes is InlineShapes_.return_value
 
+    def it_provides_access_to_the_numbering_part(self, nmprt_get_fixture):
+        document_part, numbering_part_ = nmprt_get_fixture
+        numbering_part = document_part.numbering_part
+        document_part.part_related_by.assert_called_once_with(RT.NUMBERING)
+        assert numbering_part is numbering_part_
+
+    def it_creates_numbering_part_if_not_present(self, nmprt_create_fixture):
+        document_part, NumberingPart_, numbering_part_ = nmprt_create_fixture
+        numbering_part = document_part.numbering_part
+        NumberingPart_.new.assert_called_once_with()
+        document_part.relate_to.assert_called_once_with(
+            numbering_part_, RT.NUMBERING
+        )
+        assert numbering_part is numbering_part_
+
     def it_can_add_an_image_part_to_the_document(
             self, get_or_add_image_fixture):
         (document, image_descriptor_, image_parts_, relate_to_, image_part_,
@@ -182,6 +198,20 @@ def next_id_fixture(self, request):
         document = DocumentPart(None, None, document_elm, None)
         return document, expected_id
 
+    @pytest.fixture
+    def nmprt_create_fixture(self, part_related_by_, relate_to_,
+                             NumberingPart_, numbering_part_):
+        document_part = DocumentPart(None, None, None, None)
+        part_related_by_.side_effect = KeyError
+        NumberingPart_.new.return_value = numbering_part_
+        return document_part, NumberingPart_, numbering_part_
+
+    @pytest.fixture
+    def nmprt_get_fixture(self, part_related_by_, numbering_part_):
+        document_part = DocumentPart(None, None, None, None)
+        part_related_by_.return_value = numbering_part_
+        return document_part, numbering_part_
+
     @pytest.fixture
     def paragraphs_fixture(self, document_part_body_, body_, paragraphs_):
         document_part = DocumentPart(None, None, None, None)
@@ -271,6 +301,14 @@ def image_parts_(self, request, image_part_):
     def InlineShapes_(self, request):
         return class_mock(request, 'docx.parts.document.InlineShapes')
 
+    @pytest.fixture
+    def NumberingPart_(self, request):
+        return class_mock(request, 'docx.parts.document.NumberingPart')
+
+    @pytest.fixture
+    def numbering_part_(self, request):
+        return instance_mock(request, NumberingPart)
+
     @pytest.fixture
     def p_(self, request):
         return instance_mock(request, Paragraph)

From 6b92497182b3411552d75d1b7a8554e10a6761ad Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 01:17:52 -0800
Subject: [PATCH 029/367] api: remove old Document.numbering_part

---
 docx/api.py       | 17 +----------------
 tests/test_api.py | 42 +-----------------------------------------
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 37c8d0d41..7bd5b00f3 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -11,10 +11,8 @@
 import os
 
 from docx.enum.section import WD_SECTION
-from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
-from docx.parts.numbering import NumberingPart
-from docx.shared import lazyproperty
 
 
 def DocumentNew(docx=None):
@@ -78,19 +76,6 @@ def core_properties(self):
     def inline_shapes(self):
         return self._document.inline_shapes
 
-    @lazyproperty
-    def numbering_part(self):
-        """
-        Instance of |NumberingPart| for this document. Creates an empty
-        numbering part if one is not present.
-        """
-        try:
-            return self._document_part.part_related_by(RT.NUMBERING)
-        except KeyError:
-            numbering_part = NumberingPart.new()
-            self._document_part.relate_to(numbering_part, RT.NUMBERING)
-            return numbering_part
-
     @property
     def paragraphs(self):
         """
diff --git a/tests/test_api.py b/tests/test_api.py
index 1725e3843..a07cf8cba 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -13,10 +13,9 @@
 import docx
 
 from docx.api import Document, DocumentNew
-from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
 from docx.parts.document import DocumentPart, InlineShapes
-from docx.parts.numbering import NumberingPart
 from docx.section import Section
 from docx.styles.styles import Styles
 from docx.text.run import Run
@@ -112,35 +111,12 @@ def it_provides_access_to_its_styles(self, styles_fixture):
         styles = document.styles
         assert styles is styles_
 
-    def it_provides_access_to_the_numbering_part(self, num_part_get_fixture):
-        document, document_part_, numbering_part_ = num_part_get_fixture
-        numbering_part = document.numbering_part
-        document_part_.part_related_by.assert_called_once_with(RT.NUMBERING)
-        assert numbering_part is numbering_part_
-
-    def it_creates_numbering_part_on_first_access_if_not_present(
-            self, num_part_create_fixture):
-        document, NumberingPart_, document_part_, numbering_part_ = (
-            num_part_create_fixture
-        )
-        numbering_part = document.numbering_part
-        NumberingPart_.new.assert_called_once_with()
-        document_part_.relate_to.assert_called_once_with(
-            numbering_part_, RT.NUMBERING
-        )
-        assert numbering_part is numbering_part_
-
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
     def init_fixture(self, docx_, open_):
         return docx_, open_
 
-    @pytest.fixture
-    def num_part_get_fixture(self, document, document_part_, numbering_part_):
-        document_part_.part_related_by.return_value = numbering_part_
-        return document, document_part_, numbering_part_
-
     @pytest.fixture
     def paragraphs_fixture(self, document, paragraphs_):
         return document, paragraphs_
@@ -189,22 +165,6 @@ def document_part_(self, request, paragraphs_, tables_):
     def inline_shapes_(self, request):
         return instance_mock(request, InlineShapes)
 
-    @pytest.fixture
-    def num_part_create_fixture(
-            self, document, NumberingPart_, document_part_, numbering_part_):
-        document_part_.part_related_by.side_effect = KeyError
-        return document, NumberingPart_, document_part_, numbering_part_
-
-    @pytest.fixture
-    def NumberingPart_(self, request, numbering_part_):
-        NumberingPart_ = class_mock(request, 'docx.api.NumberingPart')
-        NumberingPart_.new.return_value = numbering_part_
-        return NumberingPart_
-
-    @pytest.fixture
-    def numbering_part_(self, request):
-        return instance_mock(request, NumberingPart)
-
     @pytest.fixture
     def open_(self, request, document_obj_, document_part_, package_):
         document_part_.package = package_

From a231eb11a449ddc0789db3ec6573ee770b00657c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 01:30:31 -0800
Subject: [PATCH 030/367] acpt: add scenario for Document.paragraphs

---
 features/doc-access-collections.feature | 5 +++++
 features/steps/document.py              | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/features/doc-access-collections.feature b/features/doc-access-collections.feature
index fe2ab3912..09767d876 100644
--- a/features/doc-access-collections.feature
+++ b/features/doc-access-collections.feature
@@ -7,3 +7,8 @@ Feature: Access document collections
   Scenario: Access the inline shapes collection of a document
      Given a document having inline shapes
       Then I can access the inline shape collection of the document
+
+
+  Scenario: Access the paragraphs in the document body as a list
+     Given a document containing three paragraphs
+      Then document.paragraphs is a list containing three paragraphs
diff --git a/features/steps/document.py b/features/steps/document.py
index 5da495d16..189e3814a 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -151,6 +151,14 @@ def when_I_change_the_new_section_layout_to_landscape(context):
 
 # then ====================================================
 
+@then('document.paragraphs is a list containing three paragraphs')
+def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
+    document = context.document
+    paragraphs = document.paragraphs
+    assert isinstance(paragraphs, list)
+    assert len(paragraphs) == 3
+
+
 @then('I can access a section by index')
 def then_I_can_access_a_section_by_index(context):
     sections = context.sections

From 4188ffda3c87704305793fbf83c5c4a046b23972 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 01:40:30 -0800
Subject: [PATCH 031/367] doc: add Document.paragraphs

---
 docx/document.py       |  9 +++++++++
 tests/test_document.py | 15 +++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index 52d194132..d5385404d 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -116,6 +116,15 @@ def inline_shapes(self):
         """
         return self._part.inline_shapes
 
+    @property
+    def paragraphs(self):
+        """
+        A list of |Paragraph| instances corresponding to the paragraphs in
+        the document, in document order. Note that paragraphs within revision
+        marks such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
+        """
+        return self._body.paragraphs
+
     @property
     def part(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 018508e6b..168e27e01 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -89,6 +89,11 @@ def it_provides_access_to_its_inline_shapes(self, inline_shapes_fixture):
         inline_shapes = document.inline_shapes
         assert inline_shapes is inline_shapes_
 
+    def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
+        document, paragraphs_ = paragraphs_fixture
+        paragraphs = document.paragraphs
+        assert paragraphs is paragraphs_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -185,6 +190,12 @@ def inline_shapes_fixture(self, document_part_, inline_shapes_):
         document_part_.inline_shapes = inline_shapes_
         return document, inline_shapes_
 
+    @pytest.fixture
+    def paragraphs_fixture(self, body_prop_, paragraphs_):
+        document = Document(None, None)
+        body_prop_.return_value.paragraphs = paragraphs_
+        return document, paragraphs_
+
     @pytest.fixture
     def part_fixture(self, document_part_):
         document = Document(None, document_part_)
@@ -224,6 +235,10 @@ def inline_shapes_(self, request):
     def paragraph_(self, request):
         return instance_mock(request, Paragraph)
 
+    @pytest.fixture
+    def paragraphs_(self, request):
+        return instance_mock(request, list)
+
     @pytest.fixture
     def picture_(self, request):
         return instance_mock(request, InlineShape)

From 8e2f61ad155992d3b15ce12c13bb9640230473da Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 01:47:56 -0800
Subject: [PATCH 032/367] api: remove old Document.paragraphs

---
 docx/api.py                  |  7 +------
 docx/parts/document.py       |  9 ---------
 tests/parts/test_document.py | 16 ----------------
 tests/test_api.py            | 17 +----------------
 4 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 7bd5b00f3..3d1619ff9 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -78,12 +78,7 @@ def inline_shapes(self):
 
     @property
     def paragraphs(self):
-        """
-        A list of |Paragraph| instances corresponding to the paragraphs in
-        the document, in document order. Note that paragraphs within revision
-        marks such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
-        """
-        return self._document_part.paragraphs
+        return self._document.paragraphs
 
     @property
     def part(self):
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 7135f4ec8..0c4014b32 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -113,15 +113,6 @@ def numbering_part(self):
             self.relate_to(numbering_part, RT.NUMBERING)
             return numbering_part
 
-    @property
-    def paragraphs(self):
-        """
-        A list of |Paragraph| instances corresponding to the paragraphs in
-        the document, in document order. Note that paragraphs within revision
-        marks such as inserted or deleted do not appear in this list.
-        """
-        return self.body.paragraphs
-
     @lazyproperty
     def sections(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 178ee553a..a865b3132 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -41,12 +41,6 @@ def it_has_a_body(self, body_fixture):
         _Body_.assert_called_once_with(body_elm, document_part)
         assert _body is _Body_.return_value
 
-    def it_provides_access_to_the_document_paragraphs(
-            self, paragraphs_fixture):
-        document_part, paragraphs_ = paragraphs_fixture
-        paragraphs = document_part.paragraphs
-        assert paragraphs is paragraphs_
-
     def it_provides_access_to_the_document_sections(self, sections_fixture):
         document, document_elm, Sections_ = sections_fixture
         sections = document.sections
@@ -212,12 +206,6 @@ def nmprt_get_fixture(self, part_related_by_, numbering_part_):
         part_related_by_.return_value = numbering_part_
         return document_part, numbering_part_
 
-    @pytest.fixture
-    def paragraphs_fixture(self, document_part_body_, body_, paragraphs_):
-        document_part = DocumentPart(None, None, None, None)
-        body_.paragraphs = paragraphs_
-        return document_part, paragraphs_
-
     @pytest.fixture
     def sections_fixture(self, Sections_):
         document_elm = a_document().with_nsdecls().element
@@ -317,10 +305,6 @@ def p_(self, request):
     def package_(self, request):
         return instance_mock(request, Package)
 
-    @pytest.fixture
-    def paragraphs_(self, request):
-        return instance_mock(request, list)
-
     @pytest.fixture
     def part_related_by_(self, request):
         return method_mock(request, DocumentPart, 'part_related_by')
diff --git a/tests/test_api.py b/tests/test_api.py
index a07cf8cba..4bc76b989 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -86,12 +86,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_provides_access_to_the_document_paragraphs(
-            self, paragraphs_fixture):
-        document, paragraphs_ = paragraphs_fixture
-        paragraphs = document.paragraphs
-        assert paragraphs is paragraphs_
-
     def it_provides_access_to_the_document_sections(self, document):
         body = document.sections
         assert body is document._document_part.sections
@@ -117,10 +111,6 @@ def it_provides_access_to_its_styles(self, styles_fixture):
     def init_fixture(self, docx_, open_):
         return docx_, open_
 
-    @pytest.fixture
-    def paragraphs_fixture(self, document, paragraphs_):
-        return document, paragraphs_
-
     @pytest.fixture
     def save_fixture(self, request, open_, package_):
         file_ = instance_mock(request, str)
@@ -153,11 +143,10 @@ def document_obj_(self, request):
         return instance_mock(request, docx.document.Document)
 
     @pytest.fixture
-    def document_part_(self, request, paragraphs_, tables_):
+    def document_part_(self, request, tables_):
         document_part_ = instance_mock(
             request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
         )
-        document_part_.paragraphs = paragraphs_
         document_part_.tables = tables_
         return document_part_
 
@@ -186,10 +175,6 @@ def package_(self, request, document_part_):
         package_.main_document_part = document_part_
         return package_
 
-    @pytest.fixture
-    def paragraphs_(self, request):
-        return instance_mock(request, list)
-
     @pytest.fixture
     def run_(self, request):
         return instance_mock(request, Run)

From 60e5b53d13f667470df26658fa3e095376923b2a Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 02:08:03 -0800
Subject: [PATCH 033/367] doc: add Document.save()

---
 docx/document.py       |  7 +++++++
 docx/parts/document.py |  7 +++++++
 tests/test_document.py | 11 +++++++++++
 3 files changed, 25 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index d5385404d..b84353819 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -132,6 +132,13 @@ def part(self):
         """
         return self._part
 
+    def save(self, path_or_stream):
+        """
+        Save this document to *path_or_stream*, which can be either a path to
+        a filesystem location (a string) or a file-like object.
+        """
+        self._part.save(path_or_stream)
+
     @property
     def _body(self):
         """
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 0c4014b32..94e680eb9 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -113,6 +113,13 @@ def numbering_part(self):
             self.relate_to(numbering_part, RT.NUMBERING)
             return numbering_part
 
+    def save(self, path_or_stream):
+        """
+        Save this document to *path_or_stream*, which can be either a path to
+        a filesystem location (a string) or a file-like object.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def sections(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 168e27e01..7ef139cdf 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -79,6 +79,11 @@ def it_can_add_a_table(self, add_table_fixture):
         assert table == table_
         assert table.style == style
 
+    def it_can_save_the_document_to_a_file(self, save_fixture):
+        document, file_ = save_fixture
+        document.save(file_)
+        document._part.save.assert_called_once_with(file_)
+
     def it_provides_access_to_its_core_properties(self, core_props_fixture):
         document, core_properties_ = core_props_fixture
         core_properties = document.core_properties
@@ -201,6 +206,12 @@ def part_fixture(self, document_part_):
         document = Document(None, document_part_)
         return document, document_part_
 
+    @pytest.fixture
+    def save_fixture(self, document_part_):
+        document = Document(None, document_part_)
+        file_ = 'foobar.docx'
+        return document, file_
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture

From 6c9d5def1262d56df1be43be3bc47577ad54ed96 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 02:16:58 -0800
Subject: [PATCH 034/367] doc: add DocumentPart.save()

---
 docx/parts/document.py       |  2 +-
 tests/parts/test_document.py | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 94e680eb9..c4dd589de 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -118,7 +118,7 @@ def save(self, path_or_stream):
         Save this document to *path_or_stream*, which can be either a path to
         a filesystem location (a string) or a file-like object.
         """
-        raise NotImplementedError
+        self.package.save(path_or_stream)
 
     @lazyproperty
     def sections(self):
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index a865b3132..8e2760124 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -35,6 +35,11 @@
 
 class DescribeDocumentPart(object):
 
+    def it_can_save_the_package_to_a_file(self, save_fixture):
+        document, file_ = save_fixture
+        document.save(file_)
+        document._package.save.assert_called_once_with(file_)
+
     def it_has_a_body(self, body_fixture):
         document_part, _Body_, body_elm = body_fixture
         _body = document_part.body
@@ -206,6 +211,12 @@ def nmprt_get_fixture(self, part_related_by_, numbering_part_):
         part_related_by_.return_value = numbering_part_
         return document_part, numbering_part_
 
+    @pytest.fixture
+    def save_fixture(self, package_):
+        document_part = DocumentPart(None, None, None, package_)
+        file_ = 'foobar.docx'
+        return document_part, file_
+
     @pytest.fixture
     def sections_fixture(self, Sections_):
         document_elm = a_document().with_nsdecls().element

From e5b84e728b8c53aeb88c7e2f3fa5989b382f8580 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 02:26:29 -0800
Subject: [PATCH 035/367] api: remove old Document.save()

---
 docx/api.py       |  6 +-----
 tests/test_api.py | 31 -------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 3d1619ff9..6088f12ff 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -85,11 +85,7 @@ def part(self):
         return self._document.part
 
     def save(self, path_or_stream):
-        """
-        Save this document to *path_or_stream*, which can be either a path to
-        a filesystem location (a string) or a file-like object.
-        """
-        self._package.save(path_or_stream)
+        self._document.save(path_or_stream)
 
     @property
     def sections(self):
diff --git a/tests/test_api.py b/tests/test_api.py
index 4bc76b989..2e078a7cd 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -16,9 +16,7 @@
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
 from docx.parts.document import DocumentPart, InlineShapes
-from docx.section import Section
 from docx.styles.styles import Styles
-from docx.text.run import Run
 
 from .unitutil.mock import (
     function_mock, instance_mock, class_mock, property_mock
@@ -95,11 +93,6 @@ def it_provides_access_to_the_document_tables(self, tables_fixture):
         tables = document.tables
         assert tables is tables_
 
-    def it_can_save_the_package(self, save_fixture):
-        document, package_, file_ = save_fixture
-        document.save(file_)
-        package_.save.assert_called_once_with(file_)
-
     def it_provides_access_to_its_styles(self, styles_fixture):
         document, styles_ = styles_fixture
         styles = document.styles
@@ -107,16 +100,6 @@ def it_provides_access_to_its_styles(self, styles_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def init_fixture(self, docx_, open_):
-        return docx_, open_
-
-    @pytest.fixture
-    def save_fixture(self, request, open_, package_):
-        file_ = instance_mock(request, str)
-        document = Document()
-        return document, package_, file_
-
     @pytest.fixture
     def styles_fixture(self, document, styles_):
         document._document_part.styles = styles_
@@ -163,26 +146,12 @@ def open_(self, request, document_obj_, document_part_, package_):
             return_value=document_obj_
         )
 
-    @pytest.fixture
-    def Package_(self, request, package_):
-        Package_ = class_mock(request, 'docx.api.Package')
-        Package_.open.return_value = package_
-        return Package_
-
     @pytest.fixture
     def package_(self, request, document_part_):
         package_ = instance_mock(request, Package)
         package_.main_document_part = document_part_
         return package_
 
-    @pytest.fixture
-    def run_(self, request):
-        return instance_mock(request, Run)
-
-    @pytest.fixture
-    def section_(self, request):
-        return instance_mock(request, Section)
-
     @pytest.fixture
     def styles_(self, request):
         return instance_mock(request, Styles)

From 900807f47c41fbae1e5936c94e932d793f504e15 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 02:54:12 -0800
Subject: [PATCH 036/367] acpt: migrate scenario for Document.sections

* Migrate Document.sections access to doc-access-collections.feature
* Migrate section access steps to steps/section.py
* Revise doc-access-collections steps for uniformity
---
 features/doc-access-collections.feature |  7 ++-
 features/doc-access-sections.feature    | 15 +++----
 features/steps/document.py              | 57 ++++++-------------------
 features/steps/section.py               | 33 ++++++++++++++
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/features/doc-access-collections.feature b/features/doc-access-collections.feature
index 09767d876..dafc1d25f 100644
--- a/features/doc-access-collections.feature
+++ b/features/doc-access-collections.feature
@@ -6,9 +6,14 @@ Feature: Access document collections
 
   Scenario: Access the inline shapes collection of a document
      Given a document having inline shapes
-      Then I can access the inline shape collection of the document
+      Then document.inline_shapes is an InlineShapes object
 
 
   Scenario: Access the paragraphs in the document body as a list
      Given a document containing three paragraphs
       Then document.paragraphs is a list containing three paragraphs
+
+
+  Scenario: Access the section collection of a document
+     Given a document having sections
+      Then document.sections is a Sections object
diff --git a/features/doc-access-sections.feature b/features/doc-access-sections.feature
index 8cb836c42..ad2a58ad8 100644
--- a/features/doc-access-sections.feature
+++ b/features/doc-access-sections.feature
@@ -1,16 +1,11 @@
 Feature: Access document sections
-  In order to discover and apply section-level settings
+  In order to operate on an individual section
   As a developer using python-docx
-  I need a way to access document sections
-
-
-  Scenario: Access section collection of a document
-     Given a document having three sections
-      Then I can access the section collection of the document
-       And the length of the section collection is 3
+  I need access to each section in the section collection
 
 
   Scenario: Access section in section collection
-     Given a section collection
-      Then I can iterate over the sections
+     Given a section collection containing 3 sections
+      Then len(sections) is 3
+       And I can iterate over the sections
        And I can access a section by index
diff --git a/features/steps/document.py b/features/steps/document.py
index 189e3814a..0a5118fda 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -11,7 +11,6 @@
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import InlineShapes, Sections
-from docx.section import Section
 from docx.shared import Inches
 from docx.table import Table
 
@@ -30,17 +29,11 @@ def given_a_document_having_inline_shapes(context):
     context.document = Document(test_docx('shp-inline-shape-access'))
 
 
-@given('a document having three sections')
-def given_a_document_having_three_sections(context):
+@given('a document having sections')
+def given_a_document_having_sections(context):
     context.document = Document(test_docx('doc-access-sections'))
 
 
-@given('a section collection')
-def given_a_section_collection(context):
-    document = Document(test_docx('doc-access-sections'))
-    context.sections = document.sections
-
-
 @given('a single-section document having portrait layout')
 def given_a_single_section_document_having_portrait_layout(context):
     context.document = Document(test_docx('doc-add-section'))
@@ -151,44 +144,26 @@ def when_I_change_the_new_section_layout_to_landscape(context):
 
 # then ====================================================
 
-@then('document.paragraphs is a list containing three paragraphs')
-def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
-    document = context.document
-    paragraphs = document.paragraphs
-    assert isinstance(paragraphs, list)
-    assert len(paragraphs) == 3
-
-
-@then('I can access a section by index')
-def then_I_can_access_a_section_by_index(context):
-    sections = context.sections
-    for idx in range(3):
-        section = sections[idx]
-        assert isinstance(section, Section)
-
-
-@then('I can access the inline shape collection of the document')
-def then_can_access_inline_shape_collection_of_document(context):
+@then('document.inline_shapes is an InlineShapes object')
+def then_document_inline_shapes_is_an_InlineShapes_object(context):
     document = context.document
     inline_shapes = document.inline_shapes
     assert isinstance(inline_shapes, InlineShapes)
 
 
-@then('I can access the section collection of the document')
-def then_I_can_access_the_section_collection_of_the_document(context):
+@then('document.sections is a Sections object')
+def then_document_sections_is_a_Sections_object(context):
     sections = context.document.sections
     msg = 'document.sections not instance of Sections'
     assert isinstance(sections, Sections), msg
 
 
-@then('I can iterate over the sections')
-def then_I_can_iterate_over_the_sections(context):
-    sections = context.sections
-    actual_count = 0
-    for section in sections:
-        actual_count += 1
-        assert isinstance(section, Section)
-    assert actual_count == 3
+@then('document.paragraphs is a list containing three paragraphs')
+def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
+    document = context.document
+    paragraphs = document.paragraphs
+    assert isinstance(paragraphs, list)
+    assert len(paragraphs) == 3
 
 
 @then('the document contains a 2 x 2 table')
@@ -232,14 +207,6 @@ def then_last_p_contains_heading_text(context):
     assert paragraph.text == text
 
 
-@then('the length of the section collection is 3')
-def then_the_length_of_the_section_collection_is_3(context):
-    sections = context.document.sections
-    assert len(sections) == 3, (
-        'expected len(sections) of 2, got %s' % len(sections)
-    )
-
-
 @then('the second section is landscape')
 def then_the_second_section_is_landscape(context):
     new_section = context.document.sections[-1]
diff --git a/features/steps/section.py b/features/steps/section.py
index bf7d75cc9..496e0f17f 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -10,6 +10,7 @@
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
+from docx.section import Section
 from docx.shared import Inches
 
 from helpers import test_docx
@@ -17,6 +18,12 @@
 
 # given ====================================================
 
+@given('a section collection containing 3 sections')
+def given_a_section_collection_containing_3_sections(context):
+    document = Document(test_docx('doc-access-sections'))
+    context.sections = document.sections
+
+
 @given('a section having known page dimension')
 def given_a_section_having_known_page_dimension(context):
     document = Document(test_docx('sct-section-props'))
@@ -104,6 +111,32 @@ def when_I_set_the_section_start_type_to_start_type(context, start_type):
 
 # then =====================================================
 
+@then('I can access a section by index')
+def then_I_can_access_a_section_by_index(context):
+    sections = context.sections
+    for idx in range(3):
+        section = sections[idx]
+        assert isinstance(section, Section)
+
+
+@then('I can iterate over the sections')
+def then_I_can_iterate_over_the_sections(context):
+    sections = context.sections
+    actual_count = 0
+    for section in sections:
+        actual_count += 1
+        assert isinstance(section, Section)
+    assert actual_count == 3
+
+
+@then('len(sections) is 3')
+def then_len_sections_is_3(context):
+    sections = context.sections
+    assert len(sections) == 3, (
+        'expected len(sections) of 3, got %s' % len(sections)
+    )
+
+
 @then('the reported {margin_side} margin is {inches} inches')
 def then_the_reported_margin_is_inches(context, margin_side, inches):
     prop_name = {

From 64e1360df0e2d4df428f97ee2599f2511621b44b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 03:10:14 -0800
Subject: [PATCH 037/367] sect: migrate Sections to docx.section

---
 docx/parts/document.py       | 28 +--------------------
 docx/section.py              | 26 ++++++++++++++++++++
 tests/parts/test_document.py | 47 +-----------------------------------
 tests/test_section.py        | 46 ++++++++++++++++++++++++++++++++++-
 4 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index c4dd589de..1b18f13dd 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -8,14 +8,12 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from collections import Sequence
-
 from ..blkcntnr import BlockItemContainer
 from ..document import Document
 from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
-from ..section import Section
+from ..section import Sections
 from ..shape import InlineShape
 from ..shared import lazyproperty, Parented
 from .styles import StylesPart
@@ -221,27 +219,3 @@ def _inline_lst(self):
         body = self._body
         xpath = '//w:p/w:r/w:drawing/wp:inline'
         return body.xpath(xpath)
-
-
-class Sections(Sequence):
-    """
-    Sequence of |Section| objects corresponding to the sections in the
-    document. Supports ``len()``, iteration, and indexed access.
-    """
-    def __init__(self, document_elm):
-        super(Sections, self).__init__()
-        self._document_elm = document_elm
-
-    def __getitem__(self, key):
-        if isinstance(key, slice):
-            sectPr_lst = self._document_elm.sectPr_lst[key]
-            return [Section(sectPr) for sectPr in sectPr_lst]
-        sectPr = self._document_elm.sectPr_lst[key]
-        return Section(sectPr)
-
-    def __iter__(self):
-        for sectPr in self._document_elm.sectPr_lst:
-            yield Section(sectPr)
-
-    def __len__(self):
-        return len(self._document_elm.sectPr_lst)
diff --git a/docx/section.py b/docx/section.py
index 0bdcd17dd..16221243b 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -6,6 +6,32 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+from collections import Sequence
+
+
+class Sections(Sequence):
+    """
+    Sequence of |Section| objects corresponding to the sections in the
+    document. Supports ``len()``, iteration, and indexed access.
+    """
+    def __init__(self, document_elm):
+        super(Sections, self).__init__()
+        self._document_elm = document_elm
+
+    def __getitem__(self, key):
+        if isinstance(key, slice):
+            sectPr_lst = self._document_elm.sectPr_lst[key]
+            return [Section(sectPr) for sectPr in sectPr_lst]
+        sectPr = self._document_elm.sectPr_lst[key]
+        return Section(sectPr)
+
+    def __iter__(self):
+        for sectPr in self._document_elm.sectPr_lst:
+            yield Section(sectPr)
+
+    def __len__(self):
+        return len(self._document_elm.sectPr_lst)
+
 
 class Section(object):
     """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 8e2760124..1fcefd88e 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -13,11 +13,10 @@
 from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.package import ImageParts, Package
-from docx.parts.document import _Body, DocumentPart, InlineShapes, Sections
+from docx.parts.document import _Body, DocumentPart, InlineShapes
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.styles import StylesPart
-from docx.section import Section
 from docx.shape import InlineShape
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
@@ -579,47 +578,3 @@ def rId_(self, request):
     @pytest.fixture
     def shape_id_(self, request):
         return instance_mock(request, int)
-
-
-class DescribeSections(object):
-
-    def it_knows_how_many_sections_it_contains(self, len_fixture):
-        sections, expected_len = len_fixture
-        assert len(sections) == expected_len
-
-    def it_can_iterate_over_its_Section_instances(self, iter_fixture):
-        sections, expected_count = iter_fixture
-        section_count = 0
-        for section in sections:
-            section_count += 1
-            assert isinstance(section, Section)
-        assert section_count == expected_count
-
-    def it_can_access_its_Section_instances_by_index(self, index_fixture):
-        sections, indicies = index_fixture
-        assert len(sections[0:2]) == 2
-        for index in indicies:
-            assert isinstance(sections[index], Section)
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def index_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, [0, 1]
-
-    @pytest.fixture
-    def iter_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, 2
-
-    @pytest.fixture
-    def len_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, 2
-
-    # fixture components ---------------------------------------------
-
-    @pytest.fixture
-    def document_elm(self):
-        return element('w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)')
diff --git a/tests/test_section.py b/tests/test_section.py
index 018d51602..a497aa727 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -9,12 +9,56 @@
 import pytest
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
-from docx.section import Section
+from docx.section import Section, Sections
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
 
 
+class DescribeSections(object):
+
+    def it_knows_how_many_sections_it_contains(self, len_fixture):
+        sections, expected_len = len_fixture
+        assert len(sections) == expected_len
+
+    def it_can_iterate_over_its_Section_instances(self, iter_fixture):
+        sections, expected_count = iter_fixture
+        section_count = 0
+        for section in sections:
+            section_count += 1
+            assert isinstance(section, Section)
+        assert section_count == expected_count
+
+    def it_can_access_its_Section_instances_by_index(self, index_fixture):
+        sections, indicies = index_fixture
+        assert len(sections[0:2]) == 2
+        for index in indicies:
+            assert isinstance(sections[index], Section)
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def index_fixture(self, document_elm):
+        sections = Sections(document_elm)
+        return sections, [0, 1]
+
+    @pytest.fixture
+    def iter_fixture(self, document_elm):
+        sections = Sections(document_elm)
+        return sections, 2
+
+    @pytest.fixture
+    def len_fixture(self, document_elm):
+        sections = Sections(document_elm)
+        return sections, 2
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def document_elm(self):
+        return element('w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)')
+
+
 class DescribeSection(object):
 
     def it_knows_its_start_type(self, start_type_get_fixture):

From 118c438552704c4716416b1cd5c7d3d338f7dbfd Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 03:15:40 -0800
Subject: [PATCH 038/367] doc: add Document.sections

---
 docx/document.py       | 10 +++++++++-
 tests/test_document.py | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docx/document.py b/docx/document.py
index b84353819..c84716028 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -11,7 +11,7 @@
 from .blkcntnr import BlockItemContainer
 from .enum.section import WD_SECTION
 from .enum.text import WD_BREAK
-from .section import Section
+from .section import Section, Sections
 from .shared import ElementProxy
 
 
@@ -139,6 +139,14 @@ def save(self, path_or_stream):
         """
         self._part.save(path_or_stream)
 
+    @property
+    def sections(self):
+        """
+        A |Sections| object providing access to each section in this
+        document.
+        """
+        return Sections(self._element)
+
     @property
     def _body(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 7ef139cdf..3b7e4dd50 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -15,6 +15,7 @@
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
 from docx.parts.document import DocumentPart, InlineShapes
+from docx.section import Sections
 from docx.shape import InlineShape
 from docx.table import Table
 from docx.text.paragraph import Paragraph
@@ -99,6 +100,12 @@ def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
         paragraphs = document.paragraphs
         assert paragraphs is paragraphs_
 
+    def it_provides_access_to_its_sections(self, sections_fixture):
+        document, Sections_, sections_ = sections_fixture
+        sections = document.sections
+        Sections_.assert_called_once_with(document._element)
+        assert sections is sections_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -212,6 +219,13 @@ def save_fixture(self, document_part_):
         file_ = 'foobar.docx'
         return document, file_
 
+    @pytest.fixture
+    def sections_fixture(self, Sections_, sections_):
+        document_elm = element('w:document')
+        document = Document(document_elm, None)
+        Sections_.return_value = sections_
+        return document, Sections_, sections_
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
@@ -262,6 +276,14 @@ def run_(self, request):
     def Section_(self, request):
         return class_mock(request, 'docx.document.Section')
 
+    @pytest.fixture
+    def Sections_(self, request):
+        return class_mock(request, 'docx.document.Sections')
+
+    @pytest.fixture
+    def sections_(self, request):
+        return instance_mock(request, Sections)
+
     @pytest.fixture
     def table_(self, request):
         return instance_mock(request, Table, style='UNASSIGNED')

From 804aad19906d0f3f22b58545ec1977ee9574a0a4 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 03:22:31 -0800
Subject: [PATCH 039/367] api: remove old Document.sections

---
 docx/api.py                  |  5 +----
 docx/parts/document.py       |  8 --------
 features/steps/document.py   |  3 ++-
 tests/parts/test_document.py | 16 ----------------
 tests/test_api.py            |  4 ----
 5 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 6088f12ff..9645a2ab5 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -89,10 +89,7 @@ def save(self, path_or_stream):
 
     @property
     def sections(self):
-        """
-        Return a reference to the |Sections| instance for this document.
-        """
-        return self._document_part.sections
+        return self._document.sections
 
     @property
     def styles(self):
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 1b18f13dd..2b113f559 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -13,7 +13,6 @@
 from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
-from ..section import Sections
 from ..shape import InlineShape
 from ..shared import lazyproperty, Parented
 from .styles import StylesPart
@@ -118,13 +117,6 @@ def save(self, path_or_stream):
         """
         self.package.save(path_or_stream)
 
-    @lazyproperty
-    def sections(self):
-        """
-        The |Sections| instance organizing the sections in this document.
-        """
-        return Sections(self._element)
-
     @property
     def styles(self):
         """
diff --git a/features/steps/document.py b/features/steps/document.py
index 0a5118fda..d9cf4d8e7 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -10,8 +10,9 @@
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
-from docx.parts.document import InlineShapes, Sections
+from docx.parts.document import InlineShapes
 from docx.shared import Inches
+from docx.section import Sections
 from docx.table import Table
 
 from helpers import test_docx, test_file
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 1fcefd88e..774bc2a5b 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -45,12 +45,6 @@ def it_has_a_body(self, body_fixture):
         _Body_.assert_called_once_with(body_elm, document_part)
         assert _body is _Body_.return_value
 
-    def it_provides_access_to_the_document_sections(self, sections_fixture):
-        document, document_elm, Sections_ = sections_fixture
-        sections = document.sections
-        Sections_.assert_called_once_with(document_elm)
-        assert sections is Sections_.return_value
-
     def it_provides_access_to_the_document_tables(self, tables_fixture):
         document_part, tables_ = tables_fixture
         tables = document_part.tables
@@ -216,12 +210,6 @@ def save_fixture(self, package_):
         file_ = 'foobar.docx'
         return document_part, file_
 
-    @pytest.fixture
-    def sections_fixture(self, Sections_):
-        document_elm = a_document().with_nsdecls().element
-        document = DocumentPart(None, None, document_elm, None)
-        return document, document_elm, Sections_
-
     @pytest.fixture
     def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
         document_part = DocumentPart(None, None, None, None)
@@ -329,10 +317,6 @@ def relate_to_(self, request, rId_):
     def rId_(self, request):
         return instance_mock(request, str)
 
-    @pytest.fixture
-    def Sections_(self, request):
-        return class_mock(request, 'docx.parts.document.Sections')
-
     @pytest.fixture
     def style_(self, request):
         return instance_mock(request, BaseStyle)
diff --git a/tests/test_api.py b/tests/test_api.py
index 2e078a7cd..1f9415ea4 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -84,10 +84,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_provides_access_to_the_document_sections(self, document):
-        body = document.sections
-        assert body is document._document_part.sections
-
     def it_provides_access_to_the_document_tables(self, tables_fixture):
         document, tables_ = tables_fixture
         tables = document.tables

From 13b1e74c4c6d1c3ab35c1e3ace9bbcadffb65963 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 03:36:58 -0800
Subject: [PATCH 040/367] acpt: migrate scenario for Document.styles

---
 features/doc-access-collections.feature |  5 +++++
 features/doc-styles.feature             | 19 ++++++++-----------
 features/steps/document.py              | 24 ++++++++++++++++++------
 features/steps/styles.py                |  8 --------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/features/doc-access-collections.feature b/features/doc-access-collections.feature
index dafc1d25f..3e65a0957 100644
--- a/features/doc-access-collections.feature
+++ b/features/doc-access-collections.feature
@@ -17,3 +17,8 @@ Feature: Access document collections
   Scenario: Access the section collection of a document
      Given a document having sections
       Then document.sections is a Sections object
+
+
+  Scenario: Access the styles collection of a document
+    Given a document having styles
+     Then document.styles is a Styles object
diff --git a/features/doc-styles.feature b/features/doc-styles.feature
index dafe3bce7..f08b64209 100644
--- a/features/doc-styles.feature
+++ b/features/doc-styles.feature
@@ -1,13 +1,15 @@
-Feature: Access document styles
-  In order to discover and manipulate document styles
+Feature: Access a document style
+  In order to operate on a particular document style
   As a developer using python-docx
-  I need a way to access document styles
+  I access to each style in the document style collection
 
 
-  Scenario Outline: Access document styles collection
+  Scenario Outline: Access style in style collection
     Given a document having <styles-state>
-     Then I can access the document styles collection
-      And len(styles) is <style-count>
+     Then len(styles) is <style-count>
+      And I can iterate over its styles
+      And I can access a style by style id
+      And I can access a style by its UI name
 
     Examples: having styles or not
       | styles-state   | style-count |
@@ -15,8 +17,3 @@ Feature: Access document styles
       | no styles part |      4      |
 
 
-  Scenario: Access style in style collection
-    Given a document having a styles part
-     Then I can iterate over its styles
-      And I can access a style by style id
-      And I can access a style by its UI name
diff --git a/features/steps/document.py b/features/steps/document.py
index d9cf4d8e7..046f62c6c 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -13,6 +13,7 @@
 from docx.parts.document import InlineShapes
 from docx.shared import Inches
 from docx.section import Sections
+from docx.styles.styles import Styles
 from docx.table import Table
 
 from helpers import test_docx, test_file
@@ -35,6 +36,11 @@ def given_a_document_having_sections(context):
     context.document = Document(test_docx('doc-access-sections'))
 
 
+@given('a document having styles')
+def given_a_document_having_styles(context):
+    context.document = Document(test_docx('sty-having-styles-part'))
+
+
 @given('a single-section document having portrait layout')
 def given_a_single_section_document_having_portrait_layout(context):
     context.document = Document(test_docx('doc-add-section'))
@@ -152,6 +158,14 @@ def then_document_inline_shapes_is_an_InlineShapes_object(context):
     assert isinstance(inline_shapes, InlineShapes)
 
 
+@then('document.paragraphs is a list containing three paragraphs')
+def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
+    document = context.document
+    paragraphs = document.paragraphs
+    assert isinstance(paragraphs, list)
+    assert len(paragraphs) == 3
+
+
 @then('document.sections is a Sections object')
 def then_document_sections_is_a_Sections_object(context):
     sections = context.document.sections
@@ -159,12 +173,10 @@ def then_document_sections_is_a_Sections_object(context):
     assert isinstance(sections, Sections), msg
 
 
-@then('document.paragraphs is a list containing three paragraphs')
-def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
-    document = context.document
-    paragraphs = document.paragraphs
-    assert isinstance(paragraphs, list)
-    assert len(paragraphs) == 3
+@then('document.styles is a Styles object')
+def then_document_styles_is_a_Styles_object(context):
+    styles = context.document.styles
+    assert isinstance(styles, Styles)
 
 
 @then('the document contains a 2 x 2 table')
diff --git a/features/steps/styles.py b/features/steps/styles.py
index e435dd214..380a16b1a 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -9,7 +9,6 @@
 from docx import Document
 from docx.enum.style import WD_STYLE_TYPE
 from docx.styles.latent import _LatentStyle, LatentStyles
-from docx.styles.styles import Styles
 from docx.styles.style import BaseStyle
 from docx.text.paragraph import ParagraphFormat
 from docx.text.run import Font
@@ -331,13 +330,6 @@ def then_I_can_access_a_style_by_style_id(context):
     assert isinstance(style, BaseStyle)
 
 
-@then('I can access the document styles collection')
-def then_I_can_access_the_document_styles_collection(context):
-    document = context.document
-    styles = document.styles
-    assert isinstance(styles, Styles)
-
-
 @then('I can iterate over its styles')
 def then_I_can_iterate_over_its_styles(context):
     styles = [s for s in context.document.styles]

From 2afdf826708b966828f3488e84f67f75c703b9c0 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 03:42:28 -0800
Subject: [PATCH 041/367] doc: add Document.styles

---
 docx/document.py       |  7 +++++++
 tests/test_document.py | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/docx/document.py b/docx/document.py
index c84716028..46d2dc41d 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -147,6 +147,13 @@ def sections(self):
         """
         return Sections(self._element)
 
+    @property
+    def styles(self):
+        """
+        A |Styles| object providing access to the styles in this document.
+        """
+        return self._part.styles
+
     @property
     def _body(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 3b7e4dd50..91fcc0af2 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -17,6 +17,7 @@
 from docx.parts.document import DocumentPart, InlineShapes
 from docx.section import Sections
 from docx.shape import InlineShape
+from docx.styles.styles import Styles
 from docx.table import Table
 from docx.text.paragraph import Paragraph
 from docx.text.run import Run
@@ -92,8 +93,7 @@ def it_provides_access_to_its_core_properties(self, core_props_fixture):
 
     def it_provides_access_to_its_inline_shapes(self, inline_shapes_fixture):
         document, inline_shapes_ = inline_shapes_fixture
-        inline_shapes = document.inline_shapes
-        assert inline_shapes is inline_shapes_
+        assert document.inline_shapes is inline_shapes_
 
     def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
         document, paragraphs_ = paragraphs_fixture
@@ -106,6 +106,10 @@ def it_provides_access_to_its_sections(self, sections_fixture):
         Sections_.assert_called_once_with(document._element)
         assert sections is sections_
 
+    def it_provides_access_to_its_styles(self, styles_fixture):
+        document, styles_ = styles_fixture
+        assert document.styles is styles_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -226,6 +230,12 @@ def sections_fixture(self, Sections_, sections_):
         Sections_.return_value = sections_
         return document, Sections_, sections_
 
+    @pytest.fixture
+    def styles_fixture(self, document_part_, styles_):
+        document = Document(None, document_part_)
+        document_part_.styles = styles_
+        return document, styles_
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
@@ -284,6 +294,10 @@ def Sections_(self, request):
     def sections_(self, request):
         return instance_mock(request, Sections)
 
+    @pytest.fixture
+    def styles_(self, request):
+        return instance_mock(request, Styles)
+
     @pytest.fixture
     def table_(self, request):
         return instance_mock(request, Table, style='UNASSIGNED')

From ac61bf6e68d705b49863eb10cdeb0d14edb582d2 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 03:46:03 -0800
Subject: [PATCH 042/367] api: remove old Document.styles

---
 docx/api.py       |  5 +----
 tests/test_api.py | 31 ++-----------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index 9645a2ab5..fcfb8af11 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -93,10 +93,7 @@ def sections(self):
 
     @property
     def styles(self):
-        """
-        A |Styles| object providing access to the styles for this document.
-        """
-        return self._document_part.styles
+        return self._document.styles
 
     @property
     def tables(self):
diff --git a/tests/test_api.py b/tests/test_api.py
index 1f9415ea4..4034a2bb6 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -15,12 +15,9 @@
 from docx.api import Document, DocumentNew
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
-from docx.parts.document import DocumentPart, InlineShapes
-from docx.styles.styles import Styles
+from docx.parts.document import DocumentPart
 
-from .unitutil.mock import (
-    function_mock, instance_mock, class_mock, property_mock
-)
+from .unitutil.mock import function_mock, instance_mock, class_mock
 
 
 class DescribeDocument(object):
@@ -89,30 +86,14 @@ def it_provides_access_to_the_document_tables(self, tables_fixture):
         tables = document.tables
         assert tables is tables_
 
-    def it_provides_access_to_its_styles(self, styles_fixture):
-        document, styles_ = styles_fixture
-        styles = document.styles
-        assert styles is styles_
-
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def styles_fixture(self, document, styles_):
-        document._document_part.styles = styles_
-        return document, styles_
-
     @pytest.fixture
     def tables_fixture(self, document, tables_):
         return document, tables_
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def Document_inline_shapes_(self, request, inline_shapes_):
-        return property_mock(
-            request, Document, 'inline_shapes', return_value=inline_shapes_
-        )
-
     @pytest.fixture
     def document(self, open_):
         return Document()
@@ -129,10 +110,6 @@ def document_part_(self, request, tables_):
         document_part_.tables = tables_
         return document_part_
 
-    @pytest.fixture
-    def inline_shapes_(self, request):
-        return instance_mock(request, InlineShapes)
-
     @pytest.fixture
     def open_(self, request, document_obj_, document_part_, package_):
         document_part_.package = package_
@@ -148,10 +125,6 @@ def package_(self, request, document_part_):
         package_.main_document_part = document_part_
         return package_
 
-    @pytest.fixture
-    def styles_(self, request):
-        return instance_mock(request, Styles)
-
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)

From a9608c8edc20ec7133980d30a86b5cf183afd408 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 12:28:30 -0800
Subject: [PATCH 043/367] acpt: add scenario for Document.tables

* Improve analogous step for Document.paragraphs
---
 features/doc-access-collections.feature       |   5 +++++
 features/steps/document.py                    |  18 ++++++++++++++++++
 .../steps/test_files/tbl-having-tables.docx   | Bin 0 -> 32010 bytes
 3 files changed, 23 insertions(+)
 create mode 100644 features/steps/test_files/tbl-having-tables.docx

diff --git a/features/doc-access-collections.feature b/features/doc-access-collections.feature
index 3e65a0957..0233d5989 100644
--- a/features/doc-access-collections.feature
+++ b/features/doc-access-collections.feature
@@ -22,3 +22,8 @@ Feature: Access document collections
   Scenario: Access the styles collection of a document
     Given a document having styles
      Then document.styles is a Styles object
+
+
+  Scenario: Access the tables collection of a document
+    Given a document having three tables
+     Then document.tables is a list containing three tables
diff --git a/features/steps/document.py b/features/steps/document.py
index 046f62c6c..6208014b0 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -15,6 +15,7 @@
 from docx.section import Sections
 from docx.styles.styles import Styles
 from docx.table import Table
+from docx.text.paragraph import Paragraph
 
 from helpers import test_docx, test_file
 
@@ -41,6 +42,11 @@ def given_a_document_having_styles(context):
     context.document = Document(test_docx('sty-having-styles-part'))
 
 
+@given('a document having three tables')
+def given_a_document_having_three_tables(context):
+    context.document = Document(test_docx('tbl-having-tables'))
+
+
 @given('a single-section document having portrait layout')
 def given_a_single_section_document_having_portrait_layout(context):
     context.document = Document(test_docx('doc-add-section'))
@@ -164,6 +170,8 @@ def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
     paragraphs = document.paragraphs
     assert isinstance(paragraphs, list)
     assert len(paragraphs) == 3
+    for paragraph in paragraphs:
+        assert isinstance(paragraph, Paragraph)
 
 
 @then('document.sections is a Sections object')
@@ -179,6 +187,16 @@ def then_document_styles_is_a_Styles_object(context):
     assert isinstance(styles, Styles)
 
 
+@then('document.tables is a list containing three tables')
+def then_document_tables_is_a_list_containing_three_tables(context):
+    document = context.document
+    tables = document.tables
+    assert isinstance(tables, list)
+    assert len(tables) == 3
+    for table in tables:
+        assert isinstance(table, Table)
+
+
 @then('the document contains a 2 x 2 table')
 def then_document_contains_2x2_table(context):
     document = context.document
diff --git a/features/steps/test_files/tbl-having-tables.docx b/features/steps/test_files/tbl-having-tables.docx
new file mode 100644
index 0000000000000000000000000000000000000000..d5fa288d1ab46fc6482204999255f3f6ca20045a
GIT binary patch
literal 32010
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

literal 0
HcmV?d00001


From 8f7f4fac1949d86a4a6eabee6f5077cab743a9c3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 12:35:24 -0800
Subject: [PATCH 044/367] doc: add Document.tables

---
 docx/document.py       | 11 +++++++++++
 tests/test_document.py | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index 46d2dc41d..cc7ac4ace 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -154,6 +154,17 @@ def styles(self):
         """
         return self._part.styles
 
+    @property
+    def tables(self):
+        """
+        A list of |Table| instances corresponding to the tables in the
+        document, in document order. Note that only tables appearing at the
+        top level of the document appear in this list; a table nested inside
+        a table cell does not appear. A table within revision marks such as
+        ``<w:ins>`` or ``<w:del>`` will also not appear in the list.
+        """
+        return self._body.tables
+
     @property
     def _body(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index 91fcc0af2..e1ba3f993 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -110,6 +110,11 @@ def it_provides_access_to_its_styles(self, styles_fixture):
         document, styles_ = styles_fixture
         assert document.styles is styles_
 
+    def it_provides_access_to_its_tables(self, tables_fixture):
+        document, tables_ = tables_fixture
+        tables = document.tables
+        assert tables is tables_
+
     def it_provides_access_to_the_document_part(self, part_fixture):
         document, part_ = part_fixture
         assert document.part is part_
@@ -236,6 +241,12 @@ def styles_fixture(self, document_part_, styles_):
         document_part_.styles = styles_
         return document, styles_
 
+    @pytest.fixture
+    def tables_fixture(self, body_prop_, tables_):
+        document = Document(None, None)
+        body_prop_.return_value.tables = tables_
+        return document, tables_
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
@@ -301,3 +312,7 @@ def styles_(self, request):
     @pytest.fixture
     def table_(self, request):
         return instance_mock(request, Table, style='UNASSIGNED')
+
+    @pytest.fixture
+    def tables_(self, request):
+        return instance_mock(request, list)

From 2bad8ed7ed4848bf2b6a6d5b7f75f86bbaaa183f Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 12:48:11 -0800
Subject: [PATCH 045/367] api: remove old Document.tables

---
 docx/api.py                  |  7 +----
 docx/parts/document.py       |  9 ------
 tests/parts/test_document.py | 25 -----------------
 tests/test_api.py            | 53 ------------------------------------
 4 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/docx/api.py b/docx/api.py
index fcfb8af11..cdd50b6b7 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -97,9 +97,4 @@ def styles(self):
 
     @property
     def tables(self):
-        """
-        A list of |Table| instances corresponding to the tables in the
-        document, in document order. Note that tables within revision marks
-        such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
-        """
-        return self._document_part.tables
+        return self._document.tables
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 2b113f559..26102df08 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -125,15 +125,6 @@ def styles(self):
         """
         return self._styles_part.styles
 
-    @property
-    def tables(self):
-        """
-        A list of |Table| instances corresponding to the tables in the
-        document, in document order. Note that tables within revision marks
-        such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
-        """
-        return self.body.tables
-
     @property
     def _styles_part(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 774bc2a5b..a7619424d 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -45,11 +45,6 @@ def it_has_a_body(self, body_fixture):
         _Body_.assert_called_once_with(body_elm, document_part)
         assert _body is _Body_.return_value
 
-    def it_provides_access_to_the_document_tables(self, tables_fixture):
-        document_part, tables_ = tables_fixture
-        tables = document_part.tables
-        assert tables is tables_
-
     def it_provides_access_to_the_document_styles(self, styles_fixture):
         document_part, styles_ = styles_fixture
         styles = document_part.styles
@@ -232,32 +227,16 @@ def styles_part_get_fixture(self, part_related_by_, styles_part_):
         part_related_by_.return_value = styles_part_
         return document_part, styles_part_
 
-    @pytest.fixture
-    def tables_fixture(self, document_part_body_, body_, tables_):
-        document_part = DocumentPart(None, None, None, None)
-        body_.tables = tables_
-        return document_part, tables_
-
     # fixture components ---------------------------------------------
 
     @pytest.fixture
     def _Body_(self, request):
         return class_mock(request, 'docx.parts.document._Body')
 
-    @pytest.fixture
-    def body_(self, request):
-        return instance_mock(request, _Body)
-
     @pytest.fixture
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)
 
-    @pytest.fixture
-    def document_part_body_(self, request, body_):
-        return property_mock(
-            request, DocumentPart, 'body', return_value=body_
-        )
-
     @pytest.fixture
     def get_or_add_image_fixture(
             self, request, package_, image_descriptor_, image_parts_,
@@ -343,10 +322,6 @@ def styles_prop_(self, request, styles_):
     def _styles_part_prop_(self, request):
         return property_mock(request, DocumentPart, '_styles_part')
 
-    @pytest.fixture
-    def tables_(self, request):
-        return instance_mock(request, list)
-
 
 class Describe_Body(object):
 
diff --git a/tests/test_api.py b/tests/test_api.py
index 4034a2bb6..63f8dfc81 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -14,8 +14,6 @@
 
 from docx.api import Document, DocumentNew
 from docx.opc.constants import CONTENT_TYPE as CT
-from docx.package import Package
-from docx.parts.document import DocumentPart
 
 from .unitutil.mock import function_mock, instance_mock, class_mock
 
@@ -77,54 +75,3 @@ def document_(self, request):
     @pytest.fixture
     def Package_(self, request):
         return class_mock(request, 'docx.api.Package')
-
-
-class DescribeDocumentOld(object):
-
-    def it_provides_access_to_the_document_tables(self, tables_fixture):
-        document, tables_ = tables_fixture
-        tables = document.tables
-        assert tables is tables_
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def tables_fixture(self, document, tables_):
-        return document, tables_
-
-    # fixture components ---------------------------------------------
-
-    @pytest.fixture
-    def document(self, open_):
-        return Document()
-
-    @pytest.fixture
-    def document_obj_(self, request):
-        return instance_mock(request, docx.document.Document)
-
-    @pytest.fixture
-    def document_part_(self, request, tables_):
-        document_part_ = instance_mock(
-            request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
-        )
-        document_part_.tables = tables_
-        return document_part_
-
-    @pytest.fixture
-    def open_(self, request, document_obj_, document_part_, package_):
-        document_part_.package = package_
-        document_obj_._part = document_part_
-        return function_mock(
-            request, 'docx.api.DocumentNew',
-            return_value=document_obj_
-        )
-
-    @pytest.fixture
-    def package_(self, request, document_part_):
-        package_ = instance_mock(request, Package)
-        package_.main_document_part = document_part_
-        return package_
-
-    @pytest.fixture
-    def tables_(self, request):
-        return instance_mock(request, list)

From b36e40fbe2857112de9441ba69e18f07e5e152a4 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 12:54:13 -0800
Subject: [PATCH 046/367] doc: remove old Document shim object

---
 docx/__init__.py        |  1 -
 docx/api.py             | 65 +----------------------------------------
 features/steps/api.py   |  6 ++--
 features/steps/shape.py |  2 +-
 tests/test_api.py       |  6 ++--
 5 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/docx/__init__.py b/docx/__init__.py
index acf37b458..e37f2ab46 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 from docx.api import Document     # noqa
-from docx.api import DocumentNew  # noqa
 
 __version__ = '0.8.1'
 
diff --git a/docx/api.py b/docx/api.py
index cdd50b6b7..63e18c406 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -10,12 +10,11 @@
 
 import os
 
-from docx.enum.section import WD_SECTION
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
 
 
-def DocumentNew(docx=None):
+def Document(docx=None):
     """
     Return a |Document| object loaded from *docx*, where *docx* can be
     either a path to a ``.docx`` file (a string) or a file-like object. If
@@ -36,65 +35,3 @@ def _default_docx_path():
     """
     _thisdir = os.path.split(__file__)[0]
     return os.path.join(_thisdir, 'templates', 'default.docx')
-
-
-class Document(object):
-    """
-    Return a |Document| instance loaded from *docx*, where *docx* can be
-    either a path to a ``.docx`` file (a string) or a file-like object. If
-    *docx* is missing or ``None``, the built-in default document "template"
-    is loaded.
-    """
-    def __init__(self, docx=None):
-        self._document = document = DocumentNew(docx)
-        self._document_part = document._part
-        self._package = document._part.package
-
-    def add_heading(self, text='', level=1):
-        return self._document.add_heading(text, level)
-
-    def add_page_break(self):
-        return self._document.add_page_break()
-
-    def add_paragraph(self, text='', style=None):
-        return self._document.add_paragraph(text, style)
-
-    def add_picture(self, image_descriptor, width=None, height=None):
-        return self._document.add_picture(image_descriptor, width, height)
-
-    def add_section(self, start_type=WD_SECTION.NEW_PAGE):
-        return self._document.add_section(start_type)
-
-    def add_table(self, rows, cols, style='Light Shading Accent 1'):
-        return self._document.add_table(rows, cols, style)
-
-    @property
-    def core_properties(self):
-        return self._document.core_properties
-
-    @property
-    def inline_shapes(self):
-        return self._document.inline_shapes
-
-    @property
-    def paragraphs(self):
-        return self._document.paragraphs
-
-    @property
-    def part(self):
-        return self._document.part
-
-    def save(self, path_or_stream):
-        self._document.save(path_or_stream)
-
-    @property
-    def sections(self):
-        return self._document.sections
-
-    @property
-    def styles(self):
-        return self._document.styles
-
-    @property
-    def tables(self):
-        return self._document.tables
diff --git a/features/steps/api.py b/features/steps/api.py
index 593b8faf1..a3325567b 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -8,7 +8,7 @@
 
 import docx
 
-from docx import DocumentNew
+from docx import Document
 
 from helpers import test_docx
 
@@ -24,12 +24,12 @@ def given_I_have_python_docx_installed(context):
 
 @when('I call docx.Document() with no arguments')
 def when_I_call_docx_Document_with_no_arguments(context):
-    context.document = DocumentNew()
+    context.document = Document()
 
 
 @when('I call docx.Document() with the path of a .docx file')
 def when_I_call_docx_Document_with_the_path_of_a_docx_file(context):
-    context.document = DocumentNew(test_docx('doc-default'))
+    context.document = Document(test_docx('doc-default'))
 
 
 # then =====================================================
diff --git a/features/steps/shape.py b/features/steps/shape.py
index 9139ca952..d7756315a 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -128,7 +128,7 @@ def then_the_document_contains_the_inline_picture(context):
     picture_shape = document.inline_shapes[0]
     blip = picture_shape._inline.graphic.graphicData.pic.blipFill.blip
     rId = blip.embed
-    image_part = document._document_part.related_parts[rId]
+    image_part = document.part.related_parts[rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
     expected_sha1 = '79769f1e202add2e963158b532e36c2c0f76a70c'
     assert image_sha1 == expected_sha1, (
diff --git a/tests/test_api.py b/tests/test_api.py
index 63f8dfc81..cc3553ccf 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -12,7 +12,7 @@
 
 import docx
 
-from docx.api import Document, DocumentNew
+from docx.api import Document
 from docx.opc.constants import CONTENT_TYPE as CT
 
 from .unitutil.mock import function_mock, instance_mock, class_mock
@@ -22,13 +22,13 @@ class DescribeDocument(object):
 
     def it_opens_a_docx_file(self, open_fixture):
         docx, Package_, document_ = open_fixture
-        document = DocumentNew(docx)
+        document = Document(docx)
         Package_.open.assert_called_once_with(docx)
         assert document is document_
 
     def it_opens_the_default_docx_if_none_specified(self, default_fixture):
         docx, Package_, document_ = default_fixture
-        document = DocumentNew()
+        document = Document()
         Package_.open.assert_called_once_with(docx)
         assert document is document_
 

From 655cb5620f4f6068234e4a689ed69f55f19f0f67 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 13:11:53 -0800
Subject: [PATCH 047/367] doc: remove DocumentPart.body

---
 docx/parts/document.py       |  7 -------
 tests/parts/test_document.py | 20 --------------------
 2 files changed, 27 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 26102df08..5faab3690 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -22,13 +22,6 @@ class DocumentPart(XmlPart):
     """
     Main document part of a WordprocessingML (WML) package, aka a .docx file.
     """
-    @lazyproperty
-    def body(self):
-        """
-        The |_Body| instance containing the content for this document.
-        """
-        return _Body(self._element.body, self)
-
     @property
     def core_properties(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index a7619424d..80d44d408 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -39,12 +39,6 @@ def it_can_save_the_package_to_a_file(self, save_fixture):
         document.save(file_)
         document._package.save.assert_called_once_with(file_)
 
-    def it_has_a_body(self, body_fixture):
-        document_part, _Body_, body_elm = body_fixture
-        _body = document_part.body
-        _Body_.assert_called_once_with(body_elm, document_part)
-        assert _body is _Body_.return_value
-
     def it_provides_access_to_the_document_styles(self, styles_fixture):
         document_part, styles_ = styles_fixture
         styles = document_part.styles
@@ -131,16 +125,6 @@ def it_creates_default_styles_part_if_not_present_to_help(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def body_fixture(self, _Body_):
-        document_elm = (
-            a_document().with_nsdecls().with_child(
-                a_body())
-        ).element
-        body_elm = document_elm[0]
-        document_part = DocumentPart(None, None, document_elm, None)
-        return document_part, _Body_, body_elm
-
     @pytest.fixture
     def core_props_fixture(self, package_, core_properties_):
         document_part = DocumentPart(None, None, None, package_)
@@ -229,10 +213,6 @@ def styles_part_get_fixture(self, part_related_by_, styles_part_):
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def _Body_(self, request):
-        return class_mock(request, 'docx.parts.document._Body')
-
     @pytest.fixture
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)

From 8202bb788ba9b73fc1315baf80aaf9c39c436439 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 13:15:00 -0800
Subject: [PATCH 048/367] doc: migrate _Body to docx.document

---
 docx/document.py             |  9 ++++
 docx/parts/document.py       | 20 --------
 tests/parts/test_document.py | 91 +-----------------------------------
 tests/test_document.py       | 86 ++++++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+), 109 deletions(-)

diff --git a/docx/document.py b/docx/document.py
index cc7ac4ace..ddb0fb832 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -183,3 +183,12 @@ class _Body(BlockItemContainer):
     def __init__(self, body_elm, parent):
         super(_Body, self).__init__(body_elm, parent)
         self._body = body_elm
+
+    def clear_content(self):
+        """
+        Return this |_Body| instance after clearing it of all content.
+        Section properties for the main document story, if present, are
+        preserved.
+        """
+        self._body.clear_content()
+        return self
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 5faab3690..968b29fca 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -8,7 +8,6 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from ..blkcntnr import BlockItemContainer
 from ..document import Document
 from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
@@ -132,25 +131,6 @@ def _styles_part(self):
             return styles_part
 
 
-class _Body(BlockItemContainer):
-    """
-    Proxy for ``<w:body>`` element in this document, having primarily a
-    container role.
-    """
-    def __init__(self, body_elm, parent):
-        super(_Body, self).__init__(body_elm, parent)
-        self._body = body_elm
-
-    def clear_content(self):
-        """
-        Return this |_Body| instance after clearing it of all content.
-        Section properties for the main document story, if present, are
-        preserved.
-        """
-        self._body.clear_content()
-        return self
-
-
 class InlineShapes(Parented):
     """
     Sequence of |InlineShape| instances, supporting len(), iteration, and
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 80d44d408..ee201accb 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -13,20 +13,19 @@
 from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.package import ImageParts, Package
-from docx.parts.document import _Body, DocumentPart, InlineShapes
+from docx.parts.document import DocumentPart, InlineShapes
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.styles import StylesPart
 from docx.shape import InlineShape
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
-from docx.table import Table
 from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
 from ..oxml.parts.unitdata.document import a_body, a_document
 from ..oxml.unitdata.text import a_p
-from ..unitutil.cxml import element, xml
+from ..unitutil.cxml import element
 from ..unitutil.mock import (
     instance_mock, class_mock, loose_mock, method_mock, property_mock
 )
@@ -303,92 +302,6 @@ def _styles_part_prop_(self, request):
         return property_mock(request, DocumentPart, '_styles_part')
 
 
-class Describe_Body(object):
-
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        body, expected_xml = add_paragraph_fixture
-        p = body.add_paragraph()
-        assert body._body.xml == expected_xml
-        assert isinstance(p, Paragraph)
-
-    def it_can_add_a_table(self, add_table_fixture):
-        body, rows, cols, expected_xml = add_table_fixture
-        table = body.add_table(rows, cols)
-        assert body._element.xml == expected_xml
-        assert isinstance(table, Table)
-
-    def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
-        body, expected_xml = clear_fixture
-        _body = body.clear_content()
-        assert body._body.xml == expected_xml
-        assert _body is body
-
-    def it_provides_access_to_the_paragraphs_it_contains(
-            self, paragraphs_fixture):
-        body = paragraphs_fixture
-        paragraphs = body.paragraphs
-        assert len(paragraphs) == 2
-        for p in paragraphs:
-            assert isinstance(p, Paragraph)
-
-    def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
-        body = tables_fixture
-        tables = body.tables
-        assert len(tables) == 2
-        for table in tables:
-            assert isinstance(table, Table)
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(params=[
-        ('w:body',                 'w:body/w:p'),
-        ('w:body/w:p',             'w:body/(w:p, w:p)'),
-        ('w:body/w:sectPr',        'w:body/(w:p, w:sectPr)'),
-        ('w:body/(w:p, w:sectPr)', 'w:body/(w:p, w:p, w:sectPr)'),
-    ])
-    def add_paragraph_fixture(self, request):
-        before_cxml, after_cxml = request.param
-        body = _Body(element(before_cxml), None)
-        expected_xml = xml(after_cxml)
-        return body, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:body', 0, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid)'),
-        ('w:body', 1, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid,w:tr)'),
-        ('w:body', 0, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid/w:gridCol)'),
-        ('w:body', 1, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid/w:gridCol,w:tr/w:tc/w:p)'),
-    ])
-    def add_table_fixture(self, request):
-        body_cxml, rows, cols, after_cxml = request.param
-        body = _Body(element(body_cxml), None)
-        expected_xml = xml(after_cxml)
-        return body, rows, cols, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:body',                 'w:body'),
-        ('w:body/w:p',             'w:body'),
-        ('w:body/w:sectPr',        'w:body/w:sectPr'),
-        ('w:body/(w:p, w:sectPr)', 'w:body/w:sectPr'),
-    ])
-    def clear_fixture(self, request):
-        before_cxml, after_cxml = request.param
-        body = _Body(element(before_cxml), None)
-        expected_xml = xml(after_cxml)
-        return body, expected_xml
-
-    @pytest.fixture
-    def paragraphs_fixture(self):
-        return _Body(element('w:body/(w:p, w:p)'), None)
-
-    @pytest.fixture
-    def tables_fixture(self):
-        return _Body(element('w:body/(w:tbl, w:tbl)'), None)
-
-
 class DescribeInlineShapes(object):
 
     def it_knows_how_many_inline_shapes_it_contains(
diff --git a/tests/test_document.py b/tests/test_document.py
index e1ba3f993..5a8b06426 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -316,3 +316,89 @@ def table_(self, request):
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)
+
+
+class Describe_Body(object):
+
+    def it_can_add_a_paragraph(self, add_paragraph_fixture):
+        body, expected_xml = add_paragraph_fixture
+        p = body.add_paragraph()
+        assert body._body.xml == expected_xml
+        assert isinstance(p, Paragraph)
+
+    def it_can_add_a_table(self, add_table_fixture):
+        body, rows, cols, expected_xml = add_table_fixture
+        table = body.add_table(rows, cols)
+        assert body._element.xml == expected_xml
+        assert isinstance(table, Table)
+
+    def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
+        body, expected_xml = clear_fixture
+        _body = body.clear_content()
+        assert body._body.xml == expected_xml
+        assert _body is body
+
+    def it_provides_access_to_the_paragraphs_it_contains(
+            self, paragraphs_fixture):
+        body = paragraphs_fixture
+        paragraphs = body.paragraphs
+        assert len(paragraphs) == 2
+        for p in paragraphs:
+            assert isinstance(p, Paragraph)
+
+    def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
+        body = tables_fixture
+        tables = body.tables
+        assert len(tables) == 2
+        for table in tables:
+            assert isinstance(table, Table)
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:body',                 'w:body/w:p'),
+        ('w:body/w:p',             'w:body/(w:p, w:p)'),
+        ('w:body/w:sectPr',        'w:body/(w:p, w:sectPr)'),
+        ('w:body/(w:p, w:sectPr)', 'w:body/(w:p, w:p, w:sectPr)'),
+    ])
+    def add_paragraph_fixture(self, request):
+        before_cxml, after_cxml = request.param
+        body = _Body(element(before_cxml), None)
+        expected_xml = xml(after_cxml)
+        return body, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:body', 0, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
+         'tblGrid)'),
+        ('w:body', 1, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
+         'tblGrid,w:tr)'),
+        ('w:body', 0, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
+         'tblGrid/w:gridCol)'),
+        ('w:body', 1, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
+         'tblGrid/w:gridCol,w:tr/w:tc/w:p)'),
+    ])
+    def add_table_fixture(self, request):
+        body_cxml, rows, cols, after_cxml = request.param
+        body = _Body(element(body_cxml), None)
+        expected_xml = xml(after_cxml)
+        return body, rows, cols, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:body',                 'w:body'),
+        ('w:body/w:p',             'w:body'),
+        ('w:body/w:sectPr',        'w:body/w:sectPr'),
+        ('w:body/(w:p, w:sectPr)', 'w:body/w:sectPr'),
+    ])
+    def clear_fixture(self, request):
+        before_cxml, after_cxml = request.param
+        body = _Body(element(before_cxml), None)
+        expected_xml = xml(after_cxml)
+        return body, expected_xml
+
+    @pytest.fixture
+    def paragraphs_fixture(self):
+        return _Body(element('w:body/(w:p, w:p)'), None)
+
+    @pytest.fixture
+    def tables_fixture(self):
+        return _Body(element('w:body/(w:tbl, w:tbl)'), None)

From e648135d98f1a5940c7e7fc199fae9068a4717f5 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 13:59:39 -0800
Subject: [PATCH 049/367] shp: migrate InlineShapes to docx.shape

---
 docx/parts/document.py       |  55 ++------------
 docx/shape.py                |  47 ++++++++++++
 features/steps/document.py   |   2 +-
 features/steps/shape.py      |   2 +-
 tests/parts/test_document.py | 139 +---------------------------------
 tests/test_document.py       |   4 +-
 tests/test_shape.py          | 140 ++++++++++++++++++++++++++++++++++-
 tests/text/test_run.py       |   4 +-
 8 files changed, 200 insertions(+), 193 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 968b29fca..1d32eb91e 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -12,14 +12,19 @@
 from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
-from ..shape import InlineShape
-from ..shared import lazyproperty, Parented
+from ..shape import InlineShapes
+from ..shared import lazyproperty
 from .styles import StylesPart
 
 
 class DocumentPart(XmlPart):
     """
     Main document part of a WordprocessingML (WML) package, aka a .docx file.
+    Acts as broker to other parts such as image, core properties, and style
+    parts. It also acts as a convenient delegate when a mid-document object
+    needs a service involving a remote ancestor. The `Parented.part` property
+    inherited by many content objects provides access to this part object for
+    that purpose.
     """
     @property
     def core_properties(self):
@@ -129,49 +134,3 @@ def _styles_part(self):
             styles_part = StylesPart.default(self.package)
             self.relate_to(styles_part, RT.STYLES)
             return styles_part
-
-
-class InlineShapes(Parented):
-    """
-    Sequence of |InlineShape| instances, supporting len(), iteration, and
-    indexed access.
-    """
-    def __init__(self, body_elm, parent):
-        super(InlineShapes, self).__init__(parent)
-        self._body = body_elm
-
-    def __getitem__(self, idx):
-        """
-        Provide indexed access, e.g. 'inline_shapes[idx]'
-        """
-        try:
-            inline = self._inline_lst[idx]
-        except IndexError:
-            msg = "inline shape index [%d] out of range" % idx
-            raise IndexError(msg)
-        return InlineShape(inline)
-
-    def __iter__(self):
-        return (InlineShape(inline) for inline in self._inline_lst)
-
-    def __len__(self):
-        return len(self._inline_lst)
-
-    def add_picture(self, image_descriptor, run):
-        """
-        Return an |InlineShape| instance containing the picture identified by
-        *image_descriptor* and added to the end of *run*. The picture shape
-        has the native size of the image. *image_descriptor* can be a path (a
-        string) or a file-like object containing a binary image.
-        """
-        image_part, rId = self.part.get_or_add_image_part(image_descriptor)
-        shape_id = self.part.next_id
-        r = run._r
-        picture = InlineShape.new_picture(r, image_part, rId, shape_id)
-        return picture
-
-    @property
-    def _inline_lst(self):
-        body = self._body
-        xpath = '//w:p/w:r/w:drawing/wp:inline'
-        return body.xpath(xpath)
diff --git a/docx/shape.py b/docx/shape.py
index c1fe9742a..f90bb4769 100644
--- a/docx/shape.py
+++ b/docx/shape.py
@@ -12,6 +12,53 @@
 from .enum.shape import WD_INLINE_SHAPE
 from .oxml.shape import CT_Inline, CT_Picture
 from .oxml.ns import nsmap
+from .shared import Parented
+
+
+class InlineShapes(Parented):
+    """
+    Sequence of |InlineShape| instances, supporting len(), iteration, and
+    indexed access.
+    """
+    def __init__(self, body_elm, parent):
+        super(InlineShapes, self).__init__(parent)
+        self._body = body_elm
+
+    def __getitem__(self, idx):
+        """
+        Provide indexed access, e.g. 'inline_shapes[idx]'
+        """
+        try:
+            inline = self._inline_lst[idx]
+        except IndexError:
+            msg = "inline shape index [%d] out of range" % idx
+            raise IndexError(msg)
+        return InlineShape(inline)
+
+    def __iter__(self):
+        return (InlineShape(inline) for inline in self._inline_lst)
+
+    def __len__(self):
+        return len(self._inline_lst)
+
+    def add_picture(self, image_descriptor, run):
+        """
+        Return an |InlineShape| instance containing the picture identified by
+        *image_descriptor* and added to the end of *run*. The picture shape
+        has the native size of the image. *image_descriptor* can be a path (a
+        string) or a file-like object containing a binary image.
+        """
+        image_part, rId = self.part.get_or_add_image_part(image_descriptor)
+        shape_id = self.part.next_id
+        r = run._r
+        picture = InlineShape.new_picture(r, image_part, rId, shape_id)
+        return picture
+
+    @property
+    def _inline_lst(self):
+        body = self._body
+        xpath = '//w:p/w:r/w:drawing/wp:inline'
+        return body.xpath(xpath)
 
 
 class InlineShape(object):
diff --git a/features/steps/document.py b/features/steps/document.py
index 6208014b0..b001339f7 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -10,7 +10,7 @@
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
-from docx.parts.document import InlineShapes
+from docx.shape import InlineShapes
 from docx.shared import Inches
 from docx.section import Sections
 from docx.styles.styles import Styles
diff --git a/features/steps/shape.py b/features/steps/shape.py
index d7756315a..2a7fef2d2 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -12,7 +12,7 @@
 
 from docx import Document
 from docx.enum.shape import WD_INLINE_SHAPE
-from docx.parts.document import InlineShape
+from docx.shape import InlineShape
 from docx.shared import Inches
 
 from helpers import test_docx, test_file
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index ee201accb..90792396e 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -10,24 +10,19 @@
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
-from docx.oxml.parts.document import CT_Body
-from docx.oxml.text.run import CT_R
 from docx.package import ImageParts, Package
-from docx.parts.document import DocumentPart, InlineShapes
+from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.styles import StylesPart
-from docx.shape import InlineShape
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
 from docx.text.paragraph import Paragraph
-from docx.text.run import Run
 
 from ..oxml.parts.unitdata.document import a_body, a_document
 from ..oxml.unitdata.text import a_p
-from ..unitutil.cxml import element
 from ..unitutil.mock import (
-    instance_mock, class_mock, loose_mock, method_mock, property_mock
+    instance_mock, class_mock, method_mock, property_mock
 )
 
 
@@ -300,133 +295,3 @@ def styles_prop_(self, request, styles_):
     @pytest.fixture
     def _styles_part_prop_(self, request):
         return property_mock(request, DocumentPart, '_styles_part')
-
-
-class DescribeInlineShapes(object):
-
-    def it_knows_how_many_inline_shapes_it_contains(
-            self, inline_shapes_fixture):
-        inline_shapes, expected_count = inline_shapes_fixture
-        assert len(inline_shapes) == expected_count
-
-    def it_can_iterate_over_its_InlineShape_instances(
-            self, inline_shapes_fixture):
-        inline_shapes, inline_shape_count = inline_shapes_fixture
-        actual_count = 0
-        for inline_shape in inline_shapes:
-            assert isinstance(inline_shape, InlineShape)
-            actual_count += 1
-        assert actual_count == inline_shape_count
-
-    def it_provides_indexed_access_to_inline_shapes(
-            self, inline_shapes_fixture):
-        inline_shapes, inline_shape_count = inline_shapes_fixture
-        for idx in range(-inline_shape_count, inline_shape_count):
-            inline_shape = inline_shapes[idx]
-            assert isinstance(inline_shape, InlineShape)
-
-    def it_raises_on_indexed_access_out_of_range(
-            self, inline_shapes_fixture):
-        inline_shapes, inline_shape_count = inline_shapes_fixture
-        with pytest.raises(IndexError):
-            too_low = -1 - inline_shape_count
-            inline_shapes[too_low]
-        with pytest.raises(IndexError):
-            too_high = inline_shape_count
-            inline_shapes[too_high]
-
-    def it_can_add_an_inline_picture_to_the_document(
-            self, add_picture_fixture):
-        # fixture ----------------------
-        (inline_shapes, image_descriptor_, document_, InlineShape_,
-         run, r_, image_part_, rId_, shape_id_, new_picture_shape_
-         ) = add_picture_fixture
-        # exercise ---------------------
-        picture_shape = inline_shapes.add_picture(image_descriptor_, run)
-        # verify -----------------------
-        document_.get_or_add_image_part.assert_called_once_with(
-            image_descriptor_
-        )
-        InlineShape_.new_picture.assert_called_once_with(
-            r_, image_part_, rId_, shape_id_
-        )
-        assert picture_shape is new_picture_shape_
-
-    def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
-        inline_shapes, parent_ = inline_shapes_with_parent_
-        part = inline_shapes.part
-        assert part is parent_.part
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def add_picture_fixture(
-            self, request, body_, document_, image_descriptor_, InlineShape_,
-            r_, image_part_, rId_, shape_id_, new_picture_shape_):
-        inline_shapes = InlineShapes(body_, None)
-        property_mock(request, InlineShapes, 'part', return_value=document_)
-        run = Run(r_, None)
-        return (
-            inline_shapes, image_descriptor_, document_, InlineShape_, run,
-            r_, image_part_, rId_, shape_id_, new_picture_shape_
-        )
-
-    @pytest.fixture
-    def inline_shapes_fixture(self):
-        body = element(
-            'w:body/w:p/(w:r/w:drawing/wp:inline, w:r/w:drawing/wp:inline)'
-        )
-        inline_shapes = InlineShapes(body, None)
-        expected_count = 2
-        return inline_shapes, expected_count
-
-    # fixture components ---------------------------------------------
-
-    @pytest.fixture
-    def body_(self, request, r_):
-        body_ = instance_mock(request, CT_Body)
-        body_.add_p.return_value.add_r.return_value = r_
-        return body_
-
-    @pytest.fixture
-    def document_(self, request, rId_, image_part_, shape_id_):
-        document_ = instance_mock(request, DocumentPart, name='document_')
-        document_.get_or_add_image_part.return_value = image_part_, rId_
-        document_.next_id = shape_id_
-        return document_
-
-    @pytest.fixture
-    def image_part_(self, request):
-        return instance_mock(request, ImagePart)
-
-    @pytest.fixture
-    def image_descriptor_(self, request):
-        return instance_mock(request, str)
-
-    @pytest.fixture
-    def InlineShape_(self, request, new_picture_shape_):
-        InlineShape_ = class_mock(request, 'docx.parts.document.InlineShape')
-        InlineShape_.new_picture.return_value = new_picture_shape_
-        return InlineShape_
-
-    @pytest.fixture
-    def inline_shapes_with_parent_(self, request):
-        parent_ = loose_mock(request, name='parent_')
-        inline_shapes = InlineShapes(None, parent_)
-        return inline_shapes, parent_
-
-    @pytest.fixture
-    def new_picture_shape_(self, request):
-        return instance_mock(request, InlineShape)
-
-    @pytest.fixture
-    def r_(self, request):
-        return instance_mock(request, CT_R)
-
-    @pytest.fixture
-    def rId_(self, request):
-        return instance_mock(request, str)
-
-    @pytest.fixture
-    def shape_id_(self, request):
-        return instance_mock(request, int)
diff --git a/tests/test_document.py b/tests/test_document.py
index 5a8b06426..1d4cd70c0 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -14,9 +14,9 @@
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
-from docx.parts.document import DocumentPart, InlineShapes
+from docx.parts.document import DocumentPart
 from docx.section import Sections
-from docx.shape import InlineShape
+from docx.shape import InlineShape, InlineShapes
 from docx.styles.styles import Styles
 from docx.table import Table
 from docx.text.paragraph import Paragraph
diff --git a/tests/test_shape.py b/tests/test_shape.py
index 228768581..a0bc53292 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -10,9 +10,13 @@
 
 from docx.enum.shape import WD_INLINE_SHAPE
 from docx.oxml.ns import nsmap
+from docx.oxml.parts.document import CT_Body
+from docx.oxml.text.run import CT_R
+from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
-from docx.shape import InlineShape
+from docx.shape import InlineShape, InlineShapes
 from docx.shared import Length
+from docx.text.run import Run
 
 from .oxml.unitdata.dml import (
     a_blip, a_blipFill, a_cNvGraphicFramePr, a_cNvPr, a_cNvPicPr, a_docPr,
@@ -22,7 +26,139 @@
 )
 from .oxml.unitdata.text import an_r
 from .unitutil.cxml import element, xml
-from .unitutil.mock import instance_mock
+from .unitutil.mock import (
+    class_mock, instance_mock, loose_mock, property_mock
+)
+
+
+class DescribeInlineShapes(object):
+
+    def it_knows_how_many_inline_shapes_it_contains(
+            self, inline_shapes_fixture):
+        inline_shapes, expected_count = inline_shapes_fixture
+        assert len(inline_shapes) == expected_count
+
+    def it_can_iterate_over_its_InlineShape_instances(
+            self, inline_shapes_fixture):
+        inline_shapes, inline_shape_count = inline_shapes_fixture
+        actual_count = 0
+        for inline_shape in inline_shapes:
+            assert isinstance(inline_shape, InlineShape)
+            actual_count += 1
+        assert actual_count == inline_shape_count
+
+    def it_provides_indexed_access_to_inline_shapes(
+            self, inline_shapes_fixture):
+        inline_shapes, inline_shape_count = inline_shapes_fixture
+        for idx in range(-inline_shape_count, inline_shape_count):
+            inline_shape = inline_shapes[idx]
+            assert isinstance(inline_shape, InlineShape)
+
+    def it_raises_on_indexed_access_out_of_range(
+            self, inline_shapes_fixture):
+        inline_shapes, inline_shape_count = inline_shapes_fixture
+        with pytest.raises(IndexError):
+            too_low = -1 - inline_shape_count
+            inline_shapes[too_low]
+        with pytest.raises(IndexError):
+            too_high = inline_shape_count
+            inline_shapes[too_high]
+
+    def it_can_add_an_inline_picture_to_the_document(
+            self, add_picture_fixture):
+        # fixture ----------------------
+        (inline_shapes, image_descriptor_, document_, InlineShape_,
+         run, r_, image_part_, rId_, shape_id_, new_picture_shape_
+         ) = add_picture_fixture
+        # exercise ---------------------
+        picture_shape = inline_shapes.add_picture(image_descriptor_, run)
+        # verify -----------------------
+        document_.get_or_add_image_part.assert_called_once_with(
+            image_descriptor_
+        )
+        InlineShape_.new_picture.assert_called_once_with(
+            r_, image_part_, rId_, shape_id_
+        )
+        assert picture_shape is new_picture_shape_
+
+    def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
+        inline_shapes, parent_ = inline_shapes_with_parent_
+        part = inline_shapes.part
+        assert part is parent_.part
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def add_picture_fixture(
+            self, request, body_, document_, image_descriptor_, InlineShape_,
+            r_, image_part_, rId_, shape_id_, new_picture_shape_):
+        inline_shapes = InlineShapes(body_, None)
+        property_mock(request, InlineShapes, 'part', return_value=document_)
+        run = Run(r_, None)
+        return (
+            inline_shapes, image_descriptor_, document_, InlineShape_, run,
+            r_, image_part_, rId_, shape_id_, new_picture_shape_
+        )
+
+    @pytest.fixture
+    def inline_shapes_fixture(self):
+        body = element(
+            'w:body/w:p/(w:r/w:drawing/wp:inline, w:r/w:drawing/wp:inline)'
+        )
+        inline_shapes = InlineShapes(body, None)
+        expected_count = 2
+        return inline_shapes, expected_count
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def body_(self, request, r_):
+        body_ = instance_mock(request, CT_Body)
+        body_.add_p.return_value.add_r.return_value = r_
+        return body_
+
+    @pytest.fixture
+    def document_(self, request, rId_, image_part_, shape_id_):
+        document_ = instance_mock(request, DocumentPart, name='document_')
+        document_.get_or_add_image_part.return_value = image_part_, rId_
+        document_.next_id = shape_id_
+        return document_
+
+    @pytest.fixture
+    def image_part_(self, request):
+        return instance_mock(request, ImagePart)
+
+    @pytest.fixture
+    def image_descriptor_(self, request):
+        return instance_mock(request, str)
+
+    @pytest.fixture
+    def InlineShape_(self, request, new_picture_shape_):
+        InlineShape_ = class_mock(request, 'docx.shape.InlineShape')
+        InlineShape_.new_picture.return_value = new_picture_shape_
+        return InlineShape_
+
+    @pytest.fixture
+    def inline_shapes_with_parent_(self, request):
+        parent_ = loose_mock(request, name='parent_')
+        inline_shapes = InlineShapes(None, parent_)
+        return inline_shapes, parent_
+
+    @pytest.fixture
+    def new_picture_shape_(self, request):
+        return instance_mock(request, InlineShape)
+
+    @pytest.fixture
+    def r_(self, request):
+        return instance_mock(request, CT_R)
+
+    @pytest.fixture
+    def rId_(self, request):
+        return instance_mock(request, str)
+
+    @pytest.fixture
+    def shape_id_(self, request):
+        return instance_mock(request, int)
 
 
 class DescribeInlineShape(object):
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 1f91e45a6..75e66c75f 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -10,8 +10,8 @@
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
-from docx.parts.document import DocumentPart, InlineShapes
-from docx.shape import InlineShape
+from docx.parts.document import DocumentPart
+from docx.shape import InlineShape, InlineShapes
 from docx.shared import Pt
 from docx.text.paragraph import Paragraph
 from docx.text.run import Font, Run

From 154f1436dfc31834374c8fcdf72c44ebd146347d Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 14:16:52 -0800
Subject: [PATCH 050/367] reorg: mv oxml.parts.document oxml.document

---
 docx/oxml/__init__.py             | 8 ++++----
 docx/oxml/{parts => }/document.py | 4 ++--
 tests/test_shape.py               | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename docx/oxml/{parts => }/document.py (95%)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index f0dc840f0..dd68917d6 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -67,13 +67,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String
 
 
-from .parts.coreprops import CT_CoreProperties
-register_element_cls('cp:coreProperties', CT_CoreProperties)
-
-from .parts.document import CT_Body, CT_Document
+from .document import CT_Body, CT_Document
 register_element_cls('w:body',     CT_Body)
 register_element_cls('w:document', CT_Document)
 
+from .parts.coreprops import CT_CoreProperties
+register_element_cls('cp:coreProperties', CT_CoreProperties)
+
 from .parts.numbering import (
     CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
 )
diff --git a/docx/oxml/parts/document.py b/docx/oxml/document.py
similarity index 95%
rename from docx/oxml/parts/document.py
rename to docx/oxml/document.py
index ff5eedb91..696338314 100644
--- a/docx/oxml/parts/document.py
+++ b/docx/oxml/document.py
@@ -5,8 +5,8 @@
 <w:document>.
 """
 
-from ..table import CT_Tbl
-from ..xmlchemy import BaseOxmlElement, ZeroOrOne, ZeroOrMore
+from .table import CT_Tbl
+from .xmlchemy import BaseOxmlElement, ZeroOrOne, ZeroOrMore
 
 
 class CT_Document(BaseOxmlElement):
diff --git a/tests/test_shape.py b/tests/test_shape.py
index a0bc53292..7b7c4750e 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -9,8 +9,8 @@
 import pytest
 
 from docx.enum.shape import WD_INLINE_SHAPE
+from docx.oxml.document import CT_Body
 from docx.oxml.ns import nsmap
-from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart

From 50325934901269791190842e2fcec4fc52e6d76f Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 14:24:02 -0800
Subject: [PATCH 051/367] reorg: mv oxml.parts.coreprops oxml.coreprops

---
 docx/opc/parts/coreprops.py        | 2 +-
 docx/oxml/__init__.py              | 6 +++---
 docx/oxml/{parts => }/coreprops.py | 6 +++---
 tests/opc/parts/test_coreprops.py  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename docx/oxml/{parts => }/coreprops.py (98%)

diff --git a/docx/opc/parts/coreprops.py b/docx/opc/parts/coreprops.py
index 080e0f81f..3c692fb99 100644
--- a/docx/opc/parts/coreprops.py
+++ b/docx/opc/parts/coreprops.py
@@ -12,7 +12,7 @@
 
 from ..constants import CONTENT_TYPE as CT
 from ..coreprops import CoreProperties
-from ...oxml.parts.coreprops import CT_CoreProperties
+from ...oxml.coreprops import CT_CoreProperties
 from ..packuri import PackURI
 from ..part import XmlPart
 
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index dd68917d6..478da6cfa 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -67,13 +67,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String
 
 
+from .coreprops import CT_CoreProperties
+register_element_cls('cp:coreProperties', CT_CoreProperties)
+
 from .document import CT_Body, CT_Document
 register_element_cls('w:body',     CT_Body)
 register_element_cls('w:document', CT_Document)
 
-from .parts.coreprops import CT_CoreProperties
-register_element_cls('cp:coreProperties', CT_CoreProperties)
-
 from .parts.numbering import (
     CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
 )
diff --git a/docx/oxml/parts/coreprops.py b/docx/oxml/coreprops.py
similarity index 98%
rename from docx/oxml/parts/coreprops.py
rename to docx/oxml/coreprops.py
index fbd73cb94..b53807443 100644
--- a/docx/oxml/parts/coreprops.py
+++ b/docx/oxml/coreprops.py
@@ -12,9 +12,9 @@
 
 from datetime import datetime, timedelta
 
-from .. import parse_xml
-from ..ns import nsdecls, qn
-from ..xmlchemy import BaseOxmlElement, ZeroOrOne
+from . import parse_xml
+from .ns import nsdecls, qn
+from .xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
 class CT_CoreProperties(BaseOxmlElement):
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
index f324f15db..921a885d3 100644
--- a/tests/opc/parts/test_coreprops.py
+++ b/tests/opc/parts/test_coreprops.py
@@ -14,7 +14,7 @@
 
 from docx.opc.coreprops import CoreProperties
 from docx.opc.parts.coreprops import CorePropertiesPart
-from docx.oxml.parts.coreprops import CT_CoreProperties
+from docx.oxml.coreprops import CT_CoreProperties
 
 from ...unitutil.mock import class_mock, instance_mock
 

From e9ad89793e918afa07507dc62acec2a08875fb73 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 14:28:51 -0800
Subject: [PATCH 052/367] reorg: mv oxml.parts.numbering oxml.numbering

---
 docx/oxml/__init__.py              | 2 +-
 docx/oxml/{parts => }/numbering.py | 8 ++++----
 docx/oxml/parts/__init__.py        | 0
 tests/parts/test_numbering.py      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename docx/oxml/{parts => }/numbering.py (96%)
 delete mode 100644 docx/oxml/parts/__init__.py

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 478da6cfa..53ffd0ca7 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -74,7 +74,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:body',     CT_Body)
 register_element_cls('w:document', CT_Document)
 
-from .parts.numbering import (
+from .numbering import (
     CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
 )
 register_element_cls('w:abstractNumId', CT_DecimalNumber)
diff --git a/docx/oxml/parts/numbering.py b/docx/oxml/numbering.py
similarity index 96%
rename from docx/oxml/parts/numbering.py
rename to docx/oxml/numbering.py
index 31d97dbce..aeedfa9a0 100644
--- a/docx/oxml/parts/numbering.py
+++ b/docx/oxml/numbering.py
@@ -4,10 +4,10 @@
 Custom element classes related to the numbering part
 """
 
-from .. import OxmlElement
-from ..shared import CT_DecimalNumber
-from ..simpletypes import ST_DecimalNumber
-from ..xmlchemy import (
+from . import OxmlElement
+from .shared import CT_DecimalNumber
+from .simpletypes import ST_DecimalNumber
+from .xmlchemy import (
     BaseOxmlElement, OneAndOnlyOne, RequiredAttribute, ZeroOrMore, ZeroOrOne
 )
 
diff --git a/docx/oxml/parts/__init__.py b/docx/oxml/parts/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/parts/test_numbering.py b/tests/parts/test_numbering.py
index 24b242d5a..e5292a67c 100644
--- a/tests/parts/test_numbering.py
+++ b/tests/parts/test_numbering.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-from docx.oxml.parts.numbering import CT_Numbering
+from docx.oxml.numbering import CT_Numbering
 from docx.parts.numbering import NumberingPart, _NumberingDefinitions
 
 from ..oxml.unitdata.numbering import a_num, a_numbering

From 705391dfa5e889ecb125a342e3bcae57635b7305 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 14:43:31 -0800
Subject: [PATCH 053/367] reorg: extract docx.text.parfmt

---
 docx/styles/style.py         |   2 +-
 docx/text/paragraph.py       | 285 +------------------------
 docx/text/parfmt.py          | 293 ++++++++++++++++++++++++++
 features/steps/paragraph.py  |   2 +-
 features/steps/styles.py     |   2 +-
 tests/styles/test_style.py   |   2 +-
 tests/text/test_paragraph.py | 385 +---------------------------------
 tests/text/test_parfmt.py    | 395 +++++++++++++++++++++++++++++++++++
 8 files changed, 698 insertions(+), 668 deletions(-)
 create mode 100644 docx/text/parfmt.py
 create mode 100644 tests/text/test_parfmt.py

diff --git a/docx/styles/style.py b/docx/styles/style.py
index 3a51fed95..fedd84ecf 100644
--- a/docx/styles/style.py
+++ b/docx/styles/style.py
@@ -11,7 +11,7 @@
 from . import BabelFish
 from ..enum.style import WD_STYLE_TYPE
 from ..shared import ElementProxy
-from ..text.paragraph import ParagraphFormat
+from ..text.parfmt import ParagraphFormat
 from ..text.run import Font
 
 
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
index e17e10bab..4fb583b94 100644
--- a/docx/text/paragraph.py
+++ b/docx/text/paragraph.py
@@ -9,9 +9,9 @@
 )
 
 from ..enum.style import WD_STYLE_TYPE
-from ..enum.text import WD_LINE_SPACING
+from .parfmt import ParagraphFormat
 from .run import Run
-from ..shared import ElementProxy, Emu, Length, Parented, Pt, Twips
+from ..shared import Parented
 
 
 class Paragraph(Parented):
@@ -143,284 +143,3 @@ def _insert_paragraph_before(self):
         """
         p = self._p.add_p_before()
         return Paragraph(p, self._parent)
-
-
-class ParagraphFormat(ElementProxy):
-    """
-    Provides access to paragraph formatting such as justification,
-    indentation, line spacing, space before and after, and widow/orphan
-    control.
-    """
-
-    __slots__ = ()
-
-    @property
-    def alignment(self):
-        """
-        A member of the :ref:`WdParagraphAlignment` enumeration specifying
-        the justification setting for this paragraph. A value of |None|
-        indicates paragraph alignment is inherited from the style hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.jc_val
-
-    @alignment.setter
-    def alignment(self, value):
-        pPr = self._element.get_or_add_pPr()
-        pPr.jc_val = value
-
-    @property
-    def first_line_indent(self):
-        """
-        |Length| value specifying the relative difference in indentation for
-        the first line of the paragraph. A positive value causes the first
-        line to be indented. A negative value produces a hanging indent.
-        |None| indicates first line indentation is inherited from the style
-        hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.first_line_indent
-
-    @first_line_indent.setter
-    def first_line_indent(self, value):
-        pPr = self._element.get_or_add_pPr()
-        pPr.first_line_indent = value
-
-    @property
-    def keep_together(self):
-        """
-        |True| if the paragraph should be kept "in one piece" and not broken
-        across a page boundary when the document is rendered. |None|
-        indicates its effective value is inherited from the style hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.keepLines_val
-
-    @keep_together.setter
-    def keep_together(self, value):
-        self._element.get_or_add_pPr().keepLines_val = value
-
-    @property
-    def keep_with_next(self):
-        """
-        |True| if the paragraph should be kept on the same page as the
-        subsequent paragraph when the document is rendered. For example, this
-        property could be used to keep a section heading on the same page as
-        its first paragraph. |None| indicates its effective value is
-        inherited from the style hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.keepNext_val
-
-    @keep_with_next.setter
-    def keep_with_next(self, value):
-        self._element.get_or_add_pPr().keepNext_val = value
-
-    @property
-    def left_indent(self):
-        """
-        |Length| value specifying the space between the left margin and the
-        left side of the paragraph. |None| indicates the left indent value is
-        inherited from the style hierarchy. Use an |Inches| value object as
-        a convenient way to apply indentation in units of inches.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.ind_left
-
-    @left_indent.setter
-    def left_indent(self, value):
-        pPr = self._element.get_or_add_pPr()
-        pPr.ind_left = value
-
-    @property
-    def line_spacing(self):
-        """
-        |float| or |Length| value specifying the space between baselines in
-        successive lines of the paragraph. A value of |None| indicates line
-        spacing is inherited from the style hierarchy. A float value, e.g.
-        ``2.0`` or ``1.75``, indicates spacing is applied in multiples of
-        line heights. A |Length| value such as ``Pt(12)`` indicates spacing
-        is a fixed height. The |Pt| value class is a convenient way to apply
-        line spacing in units of points. Assigning |None| resets line spacing
-        to inherit from the style hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return self._line_spacing(pPr.spacing_line, pPr.spacing_lineRule)
-
-    @line_spacing.setter
-    def line_spacing(self, value):
-        pPr = self._element.get_or_add_pPr()
-        if value is None:
-            pPr.spacing_line = None
-            pPr.spacing_lineRule = None
-        elif isinstance(value, Length):
-            pPr.spacing_line = value
-            if pPr.spacing_lineRule != WD_LINE_SPACING.AT_LEAST:
-                pPr.spacing_lineRule = WD_LINE_SPACING.EXACTLY
-        else:
-            pPr.spacing_line = Emu(value * Twips(240))
-            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
-
-    @property
-    def line_spacing_rule(self):
-        """
-        A member of the :ref:`WdLineSpacing` enumeration indicating how the
-        value of :attr:`line_spacing` should be interpreted. Assigning any of
-        the :ref:`WdLineSpacing` members :attr:`SINGLE`, :attr:`DOUBLE`, or
-        :attr:`ONE_POINT_FIVE` will cause the value of :attr:`line_spacing`
-        to be updated to produce the corresponding line spacing.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return self._line_spacing_rule(
-            pPr.spacing_line, pPr.spacing_lineRule
-        )
-
-    @line_spacing_rule.setter
-    def line_spacing_rule(self, value):
-        pPr = self._element.get_or_add_pPr()
-        if value == WD_LINE_SPACING.SINGLE:
-            pPr.spacing_line = Twips(240)
-            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
-        elif value == WD_LINE_SPACING.ONE_POINT_FIVE:
-            pPr.spacing_line = Twips(360)
-            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
-        elif value == WD_LINE_SPACING.DOUBLE:
-            pPr.spacing_line = Twips(480)
-            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
-        else:
-            pPr.spacing_lineRule = value
-
-    @property
-    def page_break_before(self):
-        """
-        |True| if the paragraph should appear at the top of the page
-        following the prior paragraph. |None| indicates its effective value
-        is inherited from the style hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.pageBreakBefore_val
-
-    @page_break_before.setter
-    def page_break_before(self, value):
-        self._element.get_or_add_pPr().pageBreakBefore_val = value
-
-    @property
-    def right_indent(self):
-        """
-        |Length| value specifying the space between the right margin and the
-        right side of the paragraph. |None| indicates the right indent value
-        is inherited from the style hierarchy. Use a |Cm| value object as
-        a convenient way to apply indentation in units of centimeters.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.ind_right
-
-    @right_indent.setter
-    def right_indent(self, value):
-        pPr = self._element.get_or_add_pPr()
-        pPr.ind_right = value
-
-    @property
-    def space_after(self):
-        """
-        |Length| value specifying the spacing to appear between this
-        paragraph and the subsequent paragraph. |None| indicates this value
-        is inherited from the style hierarchy. |Length| objects provide
-        convenience properties, such as :attr:`~.Length.pt` and
-        :attr:`~.Length.inches`, that allow easy conversion to various length
-        units.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.spacing_after
-
-    @space_after.setter
-    def space_after(self, value):
-        self._element.get_or_add_pPr().spacing_after = value
-
-    @property
-    def space_before(self):
-        """
-        |Length| value specifying the spacing to appear between this
-        paragraph and the prior paragraph. |None| indicates this value is
-        inherited from the style hierarchy. |Length| objects provide
-        convenience properties, such as :attr:`~.Length.pt` and
-        :attr:`~.Length.cm`, that allow easy conversion to various length
-        units.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.spacing_before
-
-    @space_before.setter
-    def space_before(self, value):
-        self._element.get_or_add_pPr().spacing_before = value
-
-    @property
-    def widow_control(self):
-        """
-        |True| if the first and last lines in the paragraph remain on the
-        same page as the rest of the paragraph when Word repaginates the
-        document. |None| indicates its effective value is inherited from the
-        style hierarchy.
-        """
-        pPr = self._element.pPr
-        if pPr is None:
-            return None
-        return pPr.widowControl_val
-
-    @widow_control.setter
-    def widow_control(self, value):
-        self._element.get_or_add_pPr().widowControl_val = value
-
-    @staticmethod
-    def _line_spacing(spacing_line, spacing_lineRule):
-        """
-        Return the line spacing value calculated from the combination of
-        *spacing_line* and *spacing_lineRule*. Returns a |float| number of
-        lines when *spacing_lineRule* is ``WD_LINE_SPACING.MULTIPLE``,
-        otherwise a |Length| object of absolute line height is returned.
-        Returns |None| when *spacing_line* is |None|.
-        """
-        if spacing_line is None:
-            return None
-        if spacing_lineRule == WD_LINE_SPACING.MULTIPLE:
-            return spacing_line / Pt(12)
-        return spacing_line
-
-    @staticmethod
-    def _line_spacing_rule(line, lineRule):
-        """
-        Return the line spacing rule value calculated from the combination of
-        *line* and *lineRule*. Returns special members of the
-        :ref:`WdLineSpacing` enumeration when line spacing is single, double,
-        or 1.5 lines.
-        """
-        if lineRule == WD_LINE_SPACING.MULTIPLE:
-            if line == Twips(240):
-                return WD_LINE_SPACING.SINGLE
-            if line == Twips(360):
-                return WD_LINE_SPACING.ONE_POINT_FIVE
-            if line == Twips(480):
-                return WD_LINE_SPACING.DOUBLE
-        return lineRule
diff --git a/docx/text/parfmt.py b/docx/text/parfmt.py
new file mode 100644
index 000000000..710da9733
--- /dev/null
+++ b/docx/text/parfmt.py
@@ -0,0 +1,293 @@
+# encoding: utf-8
+
+"""
+Paragraph-related proxy types.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from ..enum.text import WD_LINE_SPACING
+from ..shared import ElementProxy, Emu, Length, Pt, Twips
+
+
+class ParagraphFormat(ElementProxy):
+    """
+    Provides access to paragraph formatting such as justification,
+    indentation, line spacing, space before and after, and widow/orphan
+    control.
+    """
+
+    __slots__ = ()
+
+    @property
+    def alignment(self):
+        """
+        A member of the :ref:`WdParagraphAlignment` enumeration specifying
+        the justification setting for this paragraph. A value of |None|
+        indicates paragraph alignment is inherited from the style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.jc_val
+
+    @alignment.setter
+    def alignment(self, value):
+        pPr = self._element.get_or_add_pPr()
+        pPr.jc_val = value
+
+    @property
+    def first_line_indent(self):
+        """
+        |Length| value specifying the relative difference in indentation for
+        the first line of the paragraph. A positive value causes the first
+        line to be indented. A negative value produces a hanging indent.
+        |None| indicates first line indentation is inherited from the style
+        hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.first_line_indent
+
+    @first_line_indent.setter
+    def first_line_indent(self, value):
+        pPr = self._element.get_or_add_pPr()
+        pPr.first_line_indent = value
+
+    @property
+    def keep_together(self):
+        """
+        |True| if the paragraph should be kept "in one piece" and not broken
+        across a page boundary when the document is rendered. |None|
+        indicates its effective value is inherited from the style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.keepLines_val
+
+    @keep_together.setter
+    def keep_together(self, value):
+        self._element.get_or_add_pPr().keepLines_val = value
+
+    @property
+    def keep_with_next(self):
+        """
+        |True| if the paragraph should be kept on the same page as the
+        subsequent paragraph when the document is rendered. For example, this
+        property could be used to keep a section heading on the same page as
+        its first paragraph. |None| indicates its effective value is
+        inherited from the style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.keepNext_val
+
+    @keep_with_next.setter
+    def keep_with_next(self, value):
+        self._element.get_or_add_pPr().keepNext_val = value
+
+    @property
+    def left_indent(self):
+        """
+        |Length| value specifying the space between the left margin and the
+        left side of the paragraph. |None| indicates the left indent value is
+        inherited from the style hierarchy. Use an |Inches| value object as
+        a convenient way to apply indentation in units of inches.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.ind_left
+
+    @left_indent.setter
+    def left_indent(self, value):
+        pPr = self._element.get_or_add_pPr()
+        pPr.ind_left = value
+
+    @property
+    def line_spacing(self):
+        """
+        |float| or |Length| value specifying the space between baselines in
+        successive lines of the paragraph. A value of |None| indicates line
+        spacing is inherited from the style hierarchy. A float value, e.g.
+        ``2.0`` or ``1.75``, indicates spacing is applied in multiples of
+        line heights. A |Length| value such as ``Pt(12)`` indicates spacing
+        is a fixed height. The |Pt| value class is a convenient way to apply
+        line spacing in units of points. Assigning |None| resets line spacing
+        to inherit from the style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return self._line_spacing(pPr.spacing_line, pPr.spacing_lineRule)
+
+    @line_spacing.setter
+    def line_spacing(self, value):
+        pPr = self._element.get_or_add_pPr()
+        if value is None:
+            pPr.spacing_line = None
+            pPr.spacing_lineRule = None
+        elif isinstance(value, Length):
+            pPr.spacing_line = value
+            if pPr.spacing_lineRule != WD_LINE_SPACING.AT_LEAST:
+                pPr.spacing_lineRule = WD_LINE_SPACING.EXACTLY
+        else:
+            pPr.spacing_line = Emu(value * Twips(240))
+            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
+
+    @property
+    def line_spacing_rule(self):
+        """
+        A member of the :ref:`WdLineSpacing` enumeration indicating how the
+        value of :attr:`line_spacing` should be interpreted. Assigning any of
+        the :ref:`WdLineSpacing` members :attr:`SINGLE`, :attr:`DOUBLE`, or
+        :attr:`ONE_POINT_FIVE` will cause the value of :attr:`line_spacing`
+        to be updated to produce the corresponding line spacing.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return self._line_spacing_rule(
+            pPr.spacing_line, pPr.spacing_lineRule
+        )
+
+    @line_spacing_rule.setter
+    def line_spacing_rule(self, value):
+        pPr = self._element.get_or_add_pPr()
+        if value == WD_LINE_SPACING.SINGLE:
+            pPr.spacing_line = Twips(240)
+            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
+        elif value == WD_LINE_SPACING.ONE_POINT_FIVE:
+            pPr.spacing_line = Twips(360)
+            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
+        elif value == WD_LINE_SPACING.DOUBLE:
+            pPr.spacing_line = Twips(480)
+            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
+        else:
+            pPr.spacing_lineRule = value
+
+    @property
+    def page_break_before(self):
+        """
+        |True| if the paragraph should appear at the top of the page
+        following the prior paragraph. |None| indicates its effective value
+        is inherited from the style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.pageBreakBefore_val
+
+    @page_break_before.setter
+    def page_break_before(self, value):
+        self._element.get_or_add_pPr().pageBreakBefore_val = value
+
+    @property
+    def right_indent(self):
+        """
+        |Length| value specifying the space between the right margin and the
+        right side of the paragraph. |None| indicates the right indent value
+        is inherited from the style hierarchy. Use a |Cm| value object as
+        a convenient way to apply indentation in units of centimeters.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.ind_right
+
+    @right_indent.setter
+    def right_indent(self, value):
+        pPr = self._element.get_or_add_pPr()
+        pPr.ind_right = value
+
+    @property
+    def space_after(self):
+        """
+        |Length| value specifying the spacing to appear between this
+        paragraph and the subsequent paragraph. |None| indicates this value
+        is inherited from the style hierarchy. |Length| objects provide
+        convenience properties, such as :attr:`~.Length.pt` and
+        :attr:`~.Length.inches`, that allow easy conversion to various length
+        units.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.spacing_after
+
+    @space_after.setter
+    def space_after(self, value):
+        self._element.get_or_add_pPr().spacing_after = value
+
+    @property
+    def space_before(self):
+        """
+        |Length| value specifying the spacing to appear between this
+        paragraph and the prior paragraph. |None| indicates this value is
+        inherited from the style hierarchy. |Length| objects provide
+        convenience properties, such as :attr:`~.Length.pt` and
+        :attr:`~.Length.cm`, that allow easy conversion to various length
+        units.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.spacing_before
+
+    @space_before.setter
+    def space_before(self, value):
+        self._element.get_or_add_pPr().spacing_before = value
+
+    @property
+    def widow_control(self):
+        """
+        |True| if the first and last lines in the paragraph remain on the
+        same page as the rest of the paragraph when Word repaginates the
+        document. |None| indicates its effective value is inherited from the
+        style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.widowControl_val
+
+    @widow_control.setter
+    def widow_control(self, value):
+        self._element.get_or_add_pPr().widowControl_val = value
+
+    @staticmethod
+    def _line_spacing(spacing_line, spacing_lineRule):
+        """
+        Return the line spacing value calculated from the combination of
+        *spacing_line* and *spacing_lineRule*. Returns a |float| number of
+        lines when *spacing_lineRule* is ``WD_LINE_SPACING.MULTIPLE``,
+        otherwise a |Length| object of absolute line height is returned.
+        Returns |None| when *spacing_line* is |None|.
+        """
+        if spacing_line is None:
+            return None
+        if spacing_lineRule == WD_LINE_SPACING.MULTIPLE:
+            return spacing_line / Pt(12)
+        return spacing_line
+
+    @staticmethod
+    def _line_spacing_rule(line, lineRule):
+        """
+        Return the line spacing rule value calculated from the combination of
+        *line* and *lineRule*. Returns special members of the
+        :ref:`WdLineSpacing` enumeration when line spacing is single, double,
+        or 1.5 lines.
+        """
+        if lineRule == WD_LINE_SPACING.MULTIPLE:
+            if line == Twips(240):
+                return WD_LINE_SPACING.SINGLE
+            if line == Twips(360):
+                return WD_LINE_SPACING.ONE_POINT_FIVE
+            if line == Twips(480):
+                return WD_LINE_SPACING.DOUBLE
+        return lineRule
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index 3db0f9713..3f47df9f1 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -8,7 +8,7 @@
 
 from docx import Document
 from docx.enum.text import WD_ALIGN_PARAGRAPH
-from docx.text.paragraph import ParagraphFormat
+from docx.text.parfmt import ParagraphFormat
 
 from helpers import saved_docx_path, test_docx, test_text
 
diff --git a/features/steps/styles.py b/features/steps/styles.py
index 380a16b1a..adc3869f9 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -10,7 +10,7 @@
 from docx.enum.style import WD_STYLE_TYPE
 from docx.styles.latent import _LatentStyle, LatentStyles
 from docx.styles.style import BaseStyle
-from docx.text.paragraph import ParagraphFormat
+from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Font
 
 from helpers import test_docx
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index 77e946b68..c5be5052b 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -15,7 +15,7 @@
     BaseStyle, _CharacterStyle, _ParagraphStyle, _NumberingStyle,
     StyleFactory, _TableStyle
 )
-from docx.text.paragraph import ParagraphFormat
+from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Font
 
 from ..unitutil.cxml import element, xml
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index 0e0662354..95f0add2b 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 """
-Test suite for the docx.text module
+Test suite for the docx.text.paragraph module
 """
 
 from __future__ import (
@@ -9,12 +9,12 @@
 )
 
 from docx.enum.style import WD_STYLE_TYPE
-from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
+from docx.enum.text import WD_ALIGN_PARAGRAPH
 from docx.oxml.text.paragraph import CT_P
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
-from docx.shared import Pt
-from docx.text.paragraph import Paragraph, ParagraphFormat
+from docx.text.paragraph import Paragraph
+from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Run
 
 import pytest
@@ -308,380 +308,3 @@ def runs_(self, request):
         run_ = instance_mock(request, Run, name='run_')
         run_2_ = instance_mock(request, Run, name='run_2_')
         return run_, run_2_
-
-
-class DescribeParagraphFormat(object):
-
-    def it_knows_its_alignment_value(self, alignment_get_fixture):
-        paragraph_format, expected_value = alignment_get_fixture
-        assert paragraph_format.alignment == expected_value
-
-    def it_can_change_its_alignment_value(self, alignment_set_fixture):
-        paragraph_format, value, expected_xml = alignment_set_fixture
-        paragraph_format.alignment = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_space_before(self, space_before_get_fixture):
-        paragraph_format, expected_value = space_before_get_fixture
-        assert paragraph_format.space_before == expected_value
-
-    def it_can_change_its_space_before(self, space_before_set_fixture):
-        paragraph_format, value, expected_xml = space_before_set_fixture
-        paragraph_format.space_before = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_space_after(self, space_after_get_fixture):
-        paragraph_format, expected_value = space_after_get_fixture
-        assert paragraph_format.space_after == expected_value
-
-    def it_can_change_its_space_after(self, space_after_set_fixture):
-        paragraph_format, value, expected_xml = space_after_set_fixture
-        paragraph_format.space_after = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_line_spacing(self, line_spacing_get_fixture):
-        paragraph_format, expected_value = line_spacing_get_fixture
-        assert paragraph_format.line_spacing == expected_value
-
-    def it_can_change_its_line_spacing(self, line_spacing_set_fixture):
-        paragraph_format, value, expected_xml = line_spacing_set_fixture
-        paragraph_format.line_spacing = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_line_spacing_rule(self, line_spacing_rule_get_fixture):
-        paragraph_format, expected_value = line_spacing_rule_get_fixture
-        assert paragraph_format.line_spacing_rule == expected_value
-
-    def it_can_change_its_line_spacing_rule(self,
-                                            line_spacing_rule_set_fixture):
-        paragraph_format, value, expected_xml = line_spacing_rule_set_fixture
-        paragraph_format.line_spacing_rule = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_first_line_indent(self, first_indent_get_fixture):
-        paragraph_format, expected_value = first_indent_get_fixture
-        assert paragraph_format.first_line_indent == expected_value
-
-    def it_can_change_its_first_line_indent(self, first_indent_set_fixture):
-        paragraph_format, value, expected_xml = first_indent_set_fixture
-        paragraph_format.first_line_indent = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_left_indent(self, left_indent_get_fixture):
-        paragraph_format, expected_value = left_indent_get_fixture
-        assert paragraph_format.left_indent == expected_value
-
-    def it_can_change_its_left_indent(self, left_indent_set_fixture):
-        paragraph_format, value, expected_xml = left_indent_set_fixture
-        paragraph_format.left_indent = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_right_indent(self, right_indent_get_fixture):
-        paragraph_format, expected_value = right_indent_get_fixture
-        assert paragraph_format.right_indent == expected_value
-
-    def it_can_change_its_right_indent(self, right_indent_set_fixture):
-        paragraph_format, value, expected_xml = right_indent_set_fixture
-        paragraph_format.right_indent = value
-        assert paragraph_format._element.xml == expected_xml
-
-    def it_knows_its_on_off_prop_values(self, on_off_get_fixture):
-        paragraph_format, prop_name, expected_value = on_off_get_fixture
-        assert getattr(paragraph_format, prop_name) == expected_value
-
-    def it_can_change_its_on_off_props(self, on_off_set_fixture):
-        paragraph_format, prop_name, value, expected_xml = on_off_set_fixture
-        setattr(paragraph_format, prop_name, value)
-        assert paragraph_format._element.xml == expected_xml
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(params=[
-        ('w:p',                          None),
-        ('w:p/w:pPr',                    None),
-        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.CENTER),
-    ])
-    def alignment_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p',                          WD_ALIGN_PARAGRAPH.LEFT,
-         'w:p/w:pPr/w:jc{w:val=left}'),
-        ('w:p/w:pPr',                    WD_ALIGN_PARAGRAPH.CENTER,
-         'w:p/w:pPr/w:jc{w:val=center}'),
-        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.RIGHT,
-         'w:p/w:pPr/w:jc{w:val=right}'),
-        ('w:p/w:pPr/w:jc{w:val=right}',  None,
-         'w:p/w:pPr'),
-        ('w:p',                          None,
-         'w:p/w:pPr'),
-    ])
-    def alignment_set_fixture(self, request):
-        p_cxml, value, expected_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                              None),
-        ('w:p/w:pPr',                        None),
-        ('w:p/w:pPr/w:ind',                  None),
-        ('w:p/w:pPr/w:ind{w:firstLine=240}', Pt(12)),
-        ('w:p/w:pPr/w:ind{w:hanging=240}',   Pt(-12)),
-    ])
-    def first_indent_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p', Pt(36),  'w:p/w:pPr/w:ind{w:firstLine=720}'),
-        ('w:p', Pt(-36), 'w:p/w:pPr/w:ind{w:hanging=720}'),
-        ('w:p', 0,       'w:p/w:pPr/w:ind{w:firstLine=0}'),
-        ('w:p', None,    'w:p/w:pPr'),
-        ('w:p/w:pPr/w:ind{w:firstLine=240}', None,
-         'w:p/w:pPr/w:ind'),
-        ('w:p/w:pPr/w:ind{w:firstLine=240}', Pt(-18),
-         'w:p/w:pPr/w:ind{w:hanging=360}'),
-        ('w:p/w:pPr/w:ind{w:hanging=240}',   Pt(18),
-         'w:p/w:pPr/w:ind{w:firstLine=360}'),
-    ])
-    def first_indent_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                             None),
-        ('w:p/w:pPr',                       None),
-        ('w:p/w:pPr/w:ind',                 None),
-        ('w:p/w:pPr/w:ind{w:left=120}',     Pt(6)),
-        ('w:p/w:pPr/w:ind{w:left=-06.3pt}', Pt(-6.3)),
-    ])
-    def left_indent_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p', Pt(36), 'w:p/w:pPr/w:ind{w:left=720}'),
-        ('w:p', Pt(-3), 'w:p/w:pPr/w:ind{w:left=-60}'),
-        ('w:p', 0,      'w:p/w:pPr/w:ind{w:left=0}'),
-        ('w:p', None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:ind{w:left=240}', None, 'w:p/w:pPr/w:ind'),
-    ])
-    def left_indent_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                                                None),
-        ('w:p/w:pPr',                                          None),
-        ('w:p/w:pPr/w:spacing',                                None),
-        ('w:p/w:pPr/w:spacing{w:line=420}',                    1.75),
-        ('w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}',   Pt(42)),
-        ('w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}', Pt(42)),
-    ])
-    def line_spacing_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p', 1,      'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
-        ('w:p', 2.0,    'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
-        ('w:p', Pt(42), 'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}'),
-        ('w:p/w:pPr',                                          2,
-         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
-        ('w:p/w:pPr/w:spacing{w:line=360}',                    1,
-         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
-        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   1.75,
-         'w:p/w:pPr/w:spacing{w:line=420,w:lineRule=auto}'),
-        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=atLeast}', Pt(42),
-         'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}'),
-        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   None,
-         'w:p/w:pPr/w:spacing'),
-        ('w:p/w:pPr',                                          None,
-         'w:p/w:pPr'),
-    ])
-    def line_spacing_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                             None),
-        ('w:p/w:pPr',                       None),
-        ('w:p/w:pPr/w:spacing',             None),
-        ('w:p/w:pPr/w:spacing{w:line=240}', WD_LINE_SPACING.SINGLE),
-        ('w:p/w:pPr/w:spacing{w:line=360}', WD_LINE_SPACING.ONE_POINT_FIVE),
-        ('w:p/w:pPr/w:spacing{w:line=480}', WD_LINE_SPACING.DOUBLE),
-        ('w:p/w:pPr/w:spacing{w:line=420}', WD_LINE_SPACING.MULTIPLE),
-        ('w:p/w:pPr/w:spacing{w:lineRule=auto}',
-         WD_LINE_SPACING.MULTIPLE),
-        ('w:p/w:pPr/w:spacing{w:lineRule=exact}',
-         WD_LINE_SPACING.EXACTLY),
-        ('w:p/w:pPr/w:spacing{w:lineRule=atLeast}',
-         WD_LINE_SPACING.AT_LEAST),
-    ])
-    def line_spacing_rule_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p', WD_LINE_SPACING.SINGLE,
-         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.ONE_POINT_FIVE,
-         'w:p/w:pPr/w:spacing{w:line=360,w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.DOUBLE,
-         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.MULTIPLE,
-         'w:p/w:pPr/w:spacing{w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.EXACTLY,
-         'w:p/w:pPr/w:spacing{w:lineRule=exact}'),
-        ('w:p/w:pPr/w:spacing{w:line=280,w:lineRule=exact}',
-         WD_LINE_SPACING.AT_LEAST,
-         'w:p/w:pPr/w:spacing{w:line=280,w:lineRule=atLeast}'),
-    ])
-    def line_spacing_rule_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                                  'keep_together',     None),
-        ('w:p/w:pPr/w:keepLines{w:val=on}',      'keep_together',     True),
-        ('w:p/w:pPr/w:keepLines{w:val=0}',       'keep_together',     False),
-        ('w:p',                                  'keep_with_next',    None),
-        ('w:p/w:pPr/w:keepNext{w:val=1}',        'keep_with_next',    True),
-        ('w:p/w:pPr/w:keepNext{w:val=false}',    'keep_with_next',    False),
-        ('w:p',                                  'page_break_before', None),
-        ('w:p/w:pPr/w:pageBreakBefore',          'page_break_before', True),
-        ('w:p/w:pPr/w:pageBreakBefore{w:val=0}', 'page_break_before', False),
-        ('w:p',                                  'widow_control',     None),
-        ('w:p/w:pPr/w:widowControl{w:val=true}', 'widow_control',     True),
-        ('w:p/w:pPr/w:widowControl{w:val=off}',  'widow_control',     False),
-    ])
-    def on_off_get_fixture(self, request):
-        p_cxml, prop_name, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, prop_name, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p', 'keep_together',     True,  'w:p/w:pPr/w:keepLines'),
-        ('w:p', 'keep_with_next',    True,  'w:p/w:pPr/w:keepNext'),
-        ('w:p', 'page_break_before', True,  'w:p/w:pPr/w:pageBreakBefore'),
-        ('w:p', 'widow_control',     True,  'w:p/w:pPr/w:widowControl'),
-        ('w:p/w:pPr/w:keepLines',                 'keep_together',     False,
-         'w:p/w:pPr/w:keepLines{w:val=0}'),
-        ('w:p/w:pPr/w:keepNext',                  'keep_with_next',    False,
-         'w:p/w:pPr/w:keepNext{w:val=0}'),
-        ('w:p/w:pPr/w:pageBreakBefore',           'page_break_before', False,
-         'w:p/w:pPr/w:pageBreakBefore{w:val=0}'),
-        ('w:p/w:pPr/w:widowControl',              'widow_control',     False,
-         'w:p/w:pPr/w:widowControl{w:val=0}'),
-        ('w:p/w:pPr/w:keepLines{w:val=0}',        'keep_together',     None,
-         'w:p/w:pPr'),
-        ('w:p/w:pPr/w:keepNext{w:val=0}',         'keep_with_next',    None,
-         'w:p/w:pPr'),
-        ('w:p/w:pPr/w:pageBreakBefore{w:val=0}',  'page_break_before', None,
-         'w:p/w:pPr'),
-        ('w:p/w:pPr/w:widowControl{w:val=0}',     'widow_control',     None,
-         'w:p/w:pPr'),
-    ])
-    def on_off_set_fixture(self, request):
-        p_cxml, prop_name, value, expected_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_cxml)
-        return paragraph_format, prop_name, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                             None),
-        ('w:p/w:pPr',                       None),
-        ('w:p/w:pPr/w:ind',                 None),
-        ('w:p/w:pPr/w:ind{w:right=160}',    Pt(8)),
-        ('w:p/w:pPr/w:ind{w:right=-4.2pt}', Pt(-4.2)),
-    ])
-    def right_indent_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p', Pt(36), 'w:p/w:pPr/w:ind{w:right=720}'),
-        ('w:p', Pt(-3), 'w:p/w:pPr/w:ind{w:right=-60}'),
-        ('w:p', 0,      'w:p/w:pPr/w:ind{w:right=0}'),
-        ('w:p', None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:ind{w:right=240}', None, 'w:p/w:pPr/w:ind'),
-    ])
-    def right_indent_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                              None),
-        ('w:p/w:pPr',                        None),
-        ('w:p/w:pPr/w:spacing',              None),
-        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(12)),
-    ])
-    def space_after_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p',                 Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
-        ('w:p',                 None,   'w:p/w:pPr'),
-        ('w:p/w:pPr',           Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
-        ('w:p/w:pPr',           None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:spacing', Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
-        ('w:p/w:pPr/w:spacing', None,   'w:p/w:pPr/w:spacing'),
-        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(42),
-         'w:p/w:pPr/w:spacing{w:after=840}'),
-        ('w:p/w:pPr/w:spacing{w:after=840}', None,
-         'w:p/w:pPr/w:spacing'),
-    ])
-    def space_after_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:p',                               None),
-        ('w:p/w:pPr',                         None),
-        ('w:p/w:pPr/w:spacing',               None),
-        ('w:p/w:pPr/w:spacing{w:before=420}', Pt(21)),
-    ])
-    def space_before_get_fixture(self, request):
-        p_cxml, expected_value = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        return paragraph_format, expected_value
-
-    @pytest.fixture(params=[
-        ('w:p',                 Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
-        ('w:p',                 None,   'w:p/w:pPr'),
-        ('w:p/w:pPr',           Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
-        ('w:p/w:pPr',           None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:spacing', Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
-        ('w:p/w:pPr/w:spacing', None,   'w:p/w:pPr/w:spacing'),
-        ('w:p/w:pPr/w:spacing{w:before=240}', Pt(42),
-         'w:p/w:pPr/w:spacing{w:before=840}'),
-        ('w:p/w:pPr/w:spacing{w:before=840}', None,
-         'w:p/w:pPr/w:spacing'),
-    ])
-    def space_before_set_fixture(self, request):
-        p_cxml, value, expected_p_cxml = request.param
-        paragraph_format = ParagraphFormat(element(p_cxml))
-        expected_xml = xml(expected_p_cxml)
-        return paragraph_format, value, expected_xml
diff --git a/tests/text/test_parfmt.py b/tests/text/test_parfmt.py
new file mode 100644
index 000000000..e64fd68a6
--- /dev/null
+++ b/tests/text/test_parfmt.py
@@ -0,0 +1,395 @@
+# encoding: utf-8
+
+"""
+Test suite for the docx.text.parfmt module, containing the ParagraphFormat
+object.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
+from docx.shared import Pt
+from docx.text.parfmt import ParagraphFormat
+
+import pytest
+
+from ..unitutil.cxml import element, xml
+
+
+class DescribeParagraphFormat(object):
+
+    def it_knows_its_alignment_value(self, alignment_get_fixture):
+        paragraph_format, expected_value = alignment_get_fixture
+        assert paragraph_format.alignment == expected_value
+
+    def it_can_change_its_alignment_value(self, alignment_set_fixture):
+        paragraph_format, value, expected_xml = alignment_set_fixture
+        paragraph_format.alignment = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_space_before(self, space_before_get_fixture):
+        paragraph_format, expected_value = space_before_get_fixture
+        assert paragraph_format.space_before == expected_value
+
+    def it_can_change_its_space_before(self, space_before_set_fixture):
+        paragraph_format, value, expected_xml = space_before_set_fixture
+        paragraph_format.space_before = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_space_after(self, space_after_get_fixture):
+        paragraph_format, expected_value = space_after_get_fixture
+        assert paragraph_format.space_after == expected_value
+
+    def it_can_change_its_space_after(self, space_after_set_fixture):
+        paragraph_format, value, expected_xml = space_after_set_fixture
+        paragraph_format.space_after = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_line_spacing(self, line_spacing_get_fixture):
+        paragraph_format, expected_value = line_spacing_get_fixture
+        assert paragraph_format.line_spacing == expected_value
+
+    def it_can_change_its_line_spacing(self, line_spacing_set_fixture):
+        paragraph_format, value, expected_xml = line_spacing_set_fixture
+        paragraph_format.line_spacing = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_line_spacing_rule(self, line_spacing_rule_get_fixture):
+        paragraph_format, expected_value = line_spacing_rule_get_fixture
+        assert paragraph_format.line_spacing_rule == expected_value
+
+    def it_can_change_its_line_spacing_rule(self,
+                                            line_spacing_rule_set_fixture):
+        paragraph_format, value, expected_xml = line_spacing_rule_set_fixture
+        paragraph_format.line_spacing_rule = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_first_line_indent(self, first_indent_get_fixture):
+        paragraph_format, expected_value = first_indent_get_fixture
+        assert paragraph_format.first_line_indent == expected_value
+
+    def it_can_change_its_first_line_indent(self, first_indent_set_fixture):
+        paragraph_format, value, expected_xml = first_indent_set_fixture
+        paragraph_format.first_line_indent = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_left_indent(self, left_indent_get_fixture):
+        paragraph_format, expected_value = left_indent_get_fixture
+        assert paragraph_format.left_indent == expected_value
+
+    def it_can_change_its_left_indent(self, left_indent_set_fixture):
+        paragraph_format, value, expected_xml = left_indent_set_fixture
+        paragraph_format.left_indent = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_right_indent(self, right_indent_get_fixture):
+        paragraph_format, expected_value = right_indent_get_fixture
+        assert paragraph_format.right_indent == expected_value
+
+    def it_can_change_its_right_indent(self, right_indent_set_fixture):
+        paragraph_format, value, expected_xml = right_indent_set_fixture
+        paragraph_format.right_indent = value
+        assert paragraph_format._element.xml == expected_xml
+
+    def it_knows_its_on_off_prop_values(self, on_off_get_fixture):
+        paragraph_format, prop_name, expected_value = on_off_get_fixture
+        assert getattr(paragraph_format, prop_name) == expected_value
+
+    def it_can_change_its_on_off_props(self, on_off_set_fixture):
+        paragraph_format, prop_name, value, expected_xml = on_off_set_fixture
+        setattr(paragraph_format, prop_name, value)
+        assert paragraph_format._element.xml == expected_xml
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:p',                          None),
+        ('w:p/w:pPr',                    None),
+        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.CENTER),
+    ])
+    def alignment_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p',                          WD_ALIGN_PARAGRAPH.LEFT,
+         'w:p/w:pPr/w:jc{w:val=left}'),
+        ('w:p/w:pPr',                    WD_ALIGN_PARAGRAPH.CENTER,
+         'w:p/w:pPr/w:jc{w:val=center}'),
+        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.RIGHT,
+         'w:p/w:pPr/w:jc{w:val=right}'),
+        ('w:p/w:pPr/w:jc{w:val=right}',  None,
+         'w:p/w:pPr'),
+        ('w:p',                          None,
+         'w:p/w:pPr'),
+    ])
+    def alignment_set_fixture(self, request):
+        p_cxml, value, expected_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                              None),
+        ('w:p/w:pPr',                        None),
+        ('w:p/w:pPr/w:ind',                  None),
+        ('w:p/w:pPr/w:ind{w:firstLine=240}', Pt(12)),
+        ('w:p/w:pPr/w:ind{w:hanging=240}',   Pt(-12)),
+    ])
+    def first_indent_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p', Pt(36),  'w:p/w:pPr/w:ind{w:firstLine=720}'),
+        ('w:p', Pt(-36), 'w:p/w:pPr/w:ind{w:hanging=720}'),
+        ('w:p', 0,       'w:p/w:pPr/w:ind{w:firstLine=0}'),
+        ('w:p', None,    'w:p/w:pPr'),
+        ('w:p/w:pPr/w:ind{w:firstLine=240}', None,
+         'w:p/w:pPr/w:ind'),
+        ('w:p/w:pPr/w:ind{w:firstLine=240}', Pt(-18),
+         'w:p/w:pPr/w:ind{w:hanging=360}'),
+        ('w:p/w:pPr/w:ind{w:hanging=240}',   Pt(18),
+         'w:p/w:pPr/w:ind{w:firstLine=360}'),
+    ])
+    def first_indent_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                             None),
+        ('w:p/w:pPr',                       None),
+        ('w:p/w:pPr/w:ind',                 None),
+        ('w:p/w:pPr/w:ind{w:left=120}',     Pt(6)),
+        ('w:p/w:pPr/w:ind{w:left=-06.3pt}', Pt(-6.3)),
+    ])
+    def left_indent_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p', Pt(36), 'w:p/w:pPr/w:ind{w:left=720}'),
+        ('w:p', Pt(-3), 'w:p/w:pPr/w:ind{w:left=-60}'),
+        ('w:p', 0,      'w:p/w:pPr/w:ind{w:left=0}'),
+        ('w:p', None,   'w:p/w:pPr'),
+        ('w:p/w:pPr/w:ind{w:left=240}', None, 'w:p/w:pPr/w:ind'),
+    ])
+    def left_indent_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                                                None),
+        ('w:p/w:pPr',                                          None),
+        ('w:p/w:pPr/w:spacing',                                None),
+        ('w:p/w:pPr/w:spacing{w:line=420}',                    1.75),
+        ('w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}',   Pt(42)),
+        ('w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}', Pt(42)),
+    ])
+    def line_spacing_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p', 1,      'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
+        ('w:p', 2.0,    'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
+        ('w:p', Pt(42), 'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}'),
+        ('w:p/w:pPr',                                          2,
+         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
+        ('w:p/w:pPr/w:spacing{w:line=360}',                    1,
+         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
+        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   1.75,
+         'w:p/w:pPr/w:spacing{w:line=420,w:lineRule=auto}'),
+        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=atLeast}', Pt(42),
+         'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}'),
+        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   None,
+         'w:p/w:pPr/w:spacing'),
+        ('w:p/w:pPr',                                          None,
+         'w:p/w:pPr'),
+    ])
+    def line_spacing_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                             None),
+        ('w:p/w:pPr',                       None),
+        ('w:p/w:pPr/w:spacing',             None),
+        ('w:p/w:pPr/w:spacing{w:line=240}', WD_LINE_SPACING.SINGLE),
+        ('w:p/w:pPr/w:spacing{w:line=360}', WD_LINE_SPACING.ONE_POINT_FIVE),
+        ('w:p/w:pPr/w:spacing{w:line=480}', WD_LINE_SPACING.DOUBLE),
+        ('w:p/w:pPr/w:spacing{w:line=420}', WD_LINE_SPACING.MULTIPLE),
+        ('w:p/w:pPr/w:spacing{w:lineRule=auto}',
+         WD_LINE_SPACING.MULTIPLE),
+        ('w:p/w:pPr/w:spacing{w:lineRule=exact}',
+         WD_LINE_SPACING.EXACTLY),
+        ('w:p/w:pPr/w:spacing{w:lineRule=atLeast}',
+         WD_LINE_SPACING.AT_LEAST),
+    ])
+    def line_spacing_rule_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p', WD_LINE_SPACING.SINGLE,
+         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
+        ('w:p', WD_LINE_SPACING.ONE_POINT_FIVE,
+         'w:p/w:pPr/w:spacing{w:line=360,w:lineRule=auto}'),
+        ('w:p', WD_LINE_SPACING.DOUBLE,
+         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
+        ('w:p', WD_LINE_SPACING.MULTIPLE,
+         'w:p/w:pPr/w:spacing{w:lineRule=auto}'),
+        ('w:p', WD_LINE_SPACING.EXACTLY,
+         'w:p/w:pPr/w:spacing{w:lineRule=exact}'),
+        ('w:p/w:pPr/w:spacing{w:line=280,w:lineRule=exact}',
+         WD_LINE_SPACING.AT_LEAST,
+         'w:p/w:pPr/w:spacing{w:line=280,w:lineRule=atLeast}'),
+    ])
+    def line_spacing_rule_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                                  'keep_together',     None),
+        ('w:p/w:pPr/w:keepLines{w:val=on}',      'keep_together',     True),
+        ('w:p/w:pPr/w:keepLines{w:val=0}',       'keep_together',     False),
+        ('w:p',                                  'keep_with_next',    None),
+        ('w:p/w:pPr/w:keepNext{w:val=1}',        'keep_with_next',    True),
+        ('w:p/w:pPr/w:keepNext{w:val=false}',    'keep_with_next',    False),
+        ('w:p',                                  'page_break_before', None),
+        ('w:p/w:pPr/w:pageBreakBefore',          'page_break_before', True),
+        ('w:p/w:pPr/w:pageBreakBefore{w:val=0}', 'page_break_before', False),
+        ('w:p',                                  'widow_control',     None),
+        ('w:p/w:pPr/w:widowControl{w:val=true}', 'widow_control',     True),
+        ('w:p/w:pPr/w:widowControl{w:val=off}',  'widow_control',     False),
+    ])
+    def on_off_get_fixture(self, request):
+        p_cxml, prop_name, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, prop_name, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p', 'keep_together',     True,  'w:p/w:pPr/w:keepLines'),
+        ('w:p', 'keep_with_next',    True,  'w:p/w:pPr/w:keepNext'),
+        ('w:p', 'page_break_before', True,  'w:p/w:pPr/w:pageBreakBefore'),
+        ('w:p', 'widow_control',     True,  'w:p/w:pPr/w:widowControl'),
+        ('w:p/w:pPr/w:keepLines',                 'keep_together',     False,
+         'w:p/w:pPr/w:keepLines{w:val=0}'),
+        ('w:p/w:pPr/w:keepNext',                  'keep_with_next',    False,
+         'w:p/w:pPr/w:keepNext{w:val=0}'),
+        ('w:p/w:pPr/w:pageBreakBefore',           'page_break_before', False,
+         'w:p/w:pPr/w:pageBreakBefore{w:val=0}'),
+        ('w:p/w:pPr/w:widowControl',              'widow_control',     False,
+         'w:p/w:pPr/w:widowControl{w:val=0}'),
+        ('w:p/w:pPr/w:keepLines{w:val=0}',        'keep_together',     None,
+         'w:p/w:pPr'),
+        ('w:p/w:pPr/w:keepNext{w:val=0}',         'keep_with_next',    None,
+         'w:p/w:pPr'),
+        ('w:p/w:pPr/w:pageBreakBefore{w:val=0}',  'page_break_before', None,
+         'w:p/w:pPr'),
+        ('w:p/w:pPr/w:widowControl{w:val=0}',     'widow_control',     None,
+         'w:p/w:pPr'),
+    ])
+    def on_off_set_fixture(self, request):
+        p_cxml, prop_name, value, expected_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_cxml)
+        return paragraph_format, prop_name, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                             None),
+        ('w:p/w:pPr',                       None),
+        ('w:p/w:pPr/w:ind',                 None),
+        ('w:p/w:pPr/w:ind{w:right=160}',    Pt(8)),
+        ('w:p/w:pPr/w:ind{w:right=-4.2pt}', Pt(-4.2)),
+    ])
+    def right_indent_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p', Pt(36), 'w:p/w:pPr/w:ind{w:right=720}'),
+        ('w:p', Pt(-3), 'w:p/w:pPr/w:ind{w:right=-60}'),
+        ('w:p', 0,      'w:p/w:pPr/w:ind{w:right=0}'),
+        ('w:p', None,   'w:p/w:pPr'),
+        ('w:p/w:pPr/w:ind{w:right=240}', None, 'w:p/w:pPr/w:ind'),
+    ])
+    def right_indent_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                              None),
+        ('w:p/w:pPr',                        None),
+        ('w:p/w:pPr/w:spacing',              None),
+        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(12)),
+    ])
+    def space_after_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p',                 Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
+        ('w:p',                 None,   'w:p/w:pPr'),
+        ('w:p/w:pPr',           Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
+        ('w:p/w:pPr',           None,   'w:p/w:pPr'),
+        ('w:p/w:pPr/w:spacing', Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
+        ('w:p/w:pPr/w:spacing', None,   'w:p/w:pPr/w:spacing'),
+        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(42),
+         'w:p/w:pPr/w:spacing{w:after=840}'),
+        ('w:p/w:pPr/w:spacing{w:after=840}', None,
+         'w:p/w:pPr/w:spacing'),
+    ])
+    def space_after_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:p',                               None),
+        ('w:p/w:pPr',                         None),
+        ('w:p/w:pPr/w:spacing',               None),
+        ('w:p/w:pPr/w:spacing{w:before=420}', Pt(21)),
+    ])
+    def space_before_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
+    @pytest.fixture(params=[
+        ('w:p',                 Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
+        ('w:p',                 None,   'w:p/w:pPr'),
+        ('w:p/w:pPr',           Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
+        ('w:p/w:pPr',           None,   'w:p/w:pPr'),
+        ('w:p/w:pPr/w:spacing', Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
+        ('w:p/w:pPr/w:spacing', None,   'w:p/w:pPr/w:spacing'),
+        ('w:p/w:pPr/w:spacing{w:before=240}', Pt(42),
+         'w:p/w:pPr/w:spacing{w:before=840}'),
+        ('w:p/w:pPr/w:spacing{w:before=840}', None,
+         'w:p/w:pPr/w:spacing'),
+    ])
+    def space_before_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml

From 026009d6838fbbd1109da6c4206921265eabbe1b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Feb 2015 18:24:15 -0800
Subject: [PATCH 054/367] docs: adjust API docs to reflect relocations

---
 docs/api/document.rst | 21 ++++++---------------
 docs/api/section.rst  |  7 +++++++
 docs/api/shape.rst    |  6 ++----
 docs/api/text.rst     | 16 ++++------------
 docs/conf.py          |  2 ++
 docx/document.py      |  3 ++-
 6 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/docs/api/document.rst b/docs/api/document.rst
index 6fae9ea26..8ab9ecfe4 100644
--- a/docs/api/document.rst
+++ b/docs/api/document.rst
@@ -7,27 +7,18 @@ Document objects
 The main Document and related objects.
 
 
-.. currentmodule:: docx.api
+|Document| constructor
+----------------------
 
+.. autofunction:: docx.Document
 
-|Document| objects
-------------------
-
-
-.. autoclass:: Document
-   :members:
-   :exclude-members: numbering_part, styles_part
 
-
-.. currentmodule:: docx.parts.document
-
-
-|Sections| objects
+|Document| objects
 ------------------
 
-
-.. autoclass:: Sections
+.. autoclass:: docx.document.Document()
    :members:
+   :exclude-members: styles_part
 
 
 |CoreProperties| objects
diff --git a/docs/api/section.rst b/docs/api/section.rst
index 478f80423..9aeb6ca1a 100644
--- a/docs/api/section.rst
+++ b/docs/api/section.rst
@@ -1,14 +1,21 @@
 
 .. _section_api:
 
+
 Section objects
 ===============
 
 Provides access to section properties such as margins and page orientation.
 
 
+|Sections| objects
+------------------
+
 .. currentmodule:: docx.section
 
+.. autoclass:: Sections
+   :members:
+
 
 |Section| objects
 -----------------
diff --git a/docs/api/shape.rst b/docs/api/shape.rst
index 0ce406b3d..200b34977 100644
--- a/docs/api/shape.rst
+++ b/docs/api/shape.rst
@@ -4,7 +4,7 @@
 Shape-related objects
 =====================
 
-.. currentmodule:: docx.parts.document
+.. currentmodule:: docx.shape
 
 
 |InlineShapes| objects
@@ -12,9 +12,7 @@ Shape-related objects
 
 .. autoclass:: InlineShapes
    :members:
-
-
-.. currentmodule:: docx.shape
+   :exclude-members: add_picture
 
 
 |InlineShape| objects
diff --git a/docs/api/text.rst b/docs/api/text.rst
index a7c06cb41..180701bb4 100644
--- a/docs/api/text.rst
+++ b/docs/api/text.rst
@@ -8,34 +8,26 @@ Text-related objects
 |Paragraph| objects
 -------------------
 
-.. currentmodule:: docx.text.paragraph
-
-.. autoclass:: Paragraph
+.. autoclass:: docx.text.paragraph.Paragraph()
    :members:
 
 
 |ParagraphFormat| objects
 -------------------------
 
-.. currentmodule:: docx.text.paragraph
-
-.. autoclass:: ParagraphFormat
+.. autoclass:: docx.text.parfmt.ParagraphFormat()
    :members:
 
 
 |Run| objects
 -------------
 
-.. currentmodule:: docx.text.run
-
-.. autoclass:: Run
+.. autoclass:: docx.text.run.Run()
    :members:
 
 
 |Font| objects
 --------------
 
-.. currentmodule:: docx.text.run
-
-.. autoclass:: Font
+.. autoclass:: docx.text.run.Font()
    :members:
diff --git a/docs/conf.py b/docs/conf.py
index 094161bc9..58628134f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -91,6 +91,8 @@
 
 .. |Document| replace:: :class:`.Document`
 
+.. |DocumentPart| replace:: :class:`.DocumentPart`
+
 .. |docx| replace:: ``python-docx``
 
 .. |Emu| replace:: :class:`.Emu`
diff --git a/docx/document.py b/docx/document.py
index ddb0fb832..91e6f9ddf 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -17,7 +17,8 @@
 
 class Document(ElementProxy):
     """
-    WordprocessingML (WML) document.
+    WordprocessingML (WML) document. Not intended to be constructed directly.
+    Use :func:`docx.Document` to open or create a document.
     """
 
     __slots__ = ('_part', '__body')

From 71c657db4bbac62be6a39aad37888d451dc8155e Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 00:47:26 -0800
Subject: [PATCH 055/367] run: remove prior Run.add_picture() Implementation

In preparation for a complete rewrite.
---
 docx/shape.py                           |  30 -----
 docx/text/run.py                        |  18 +--
 features/doc-add-picture.feature        |   4 +
 features/run-add-picture.feature        |   3 +
 features/shp-add-inline-picture.feature |  16 ---
 features/steps/shape.py                 |  19 +--
 tests/test_shape.py                     | 152 +-----------------------
 tests/text/test_run.py                  |  45 -------
 8 files changed, 11 insertions(+), 276 deletions(-)
 delete mode 100644 features/shp-add-inline-picture.feature

diff --git a/docx/shape.py b/docx/shape.py
index f90bb4769..3b2d384d2 100644
--- a/docx/shape.py
+++ b/docx/shape.py
@@ -10,7 +10,6 @@
 )
 
 from .enum.shape import WD_INLINE_SHAPE
-from .oxml.shape import CT_Inline, CT_Picture
 from .oxml.ns import nsmap
 from .shared import Parented
 
@@ -41,19 +40,6 @@ def __iter__(self):
     def __len__(self):
         return len(self._inline_lst)
 
-    def add_picture(self, image_descriptor, run):
-        """
-        Return an |InlineShape| instance containing the picture identified by
-        *image_descriptor* and added to the end of *run*. The picture shape
-        has the native size of the image. *image_descriptor* can be a path (a
-        string) or a file-like object containing a binary image.
-        """
-        image_part, rId = self.part.get_or_add_image_part(image_descriptor)
-        shape_id = self.part.next_id
-        r = run._r
-        picture = InlineShape.new_picture(r, image_part, rId, shape_id)
-        return picture
-
     @property
     def _inline_lst(self):
         body = self._body
@@ -84,22 +70,6 @@ def height(self, cy):
         assert 0 < cy
         self._inline.extent.cy = cy
 
-    @classmethod
-    def new_picture(cls, r, image_part, rId, shape_id):
-        """
-        Return a new |InlineShape| instance containing an inline picture
-        placement of *image_part* appended to run *r* and uniquely identified
-        by *shape_id*.
-        """
-        cx, cy, filename = (
-            image_part.default_cx, image_part.default_cy, image_part.filename
-        )
-        pic_id = 0
-        pic = CT_Picture.new(pic_id, filename, rId, cx, cy)
-        inline = CT_Inline.new(cx, cy, shape_id, pic)
-        r.add_drawing(inline)
-        return cls(inline)
-
     @property
     def type(self):
         """
diff --git a/docx/text/run.py b/docx/text/run.py
index c67fd65be..725954832 100644
--- a/docx/text/run.py
+++ b/docx/text/run.py
@@ -57,23 +57,7 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         (dpi) value specified in the image file, defaulting to 72 dpi if no
         value is specified, as is often the case.
         """
-        inline_shapes = self.part.inline_shapes
-        picture = inline_shapes.add_picture(image_path_or_stream, self)
-
-        # scale picture dimensions if width and/or height provided
-        if width is not None or height is not None:
-            native_width, native_height = picture.width, picture.height
-            if width is None:
-                scaling_factor = float(height) / float(native_height)
-                width = int(round(native_width * scaling_factor))
-            elif height is None:
-                scaling_factor = float(width) / float(native_width)
-                height = int(round(native_height * scaling_factor))
-            # set picture to scaled dimensions
-            picture.width = width
-            picture.height = height
-
-        return picture
+        raise NotImplementedError
 
     def add_tab(self):
         """
diff --git a/features/doc-add-picture.feature b/features/doc-add-picture.feature
index 51f35f161..885b58660 100644
--- a/features/doc-add-picture.feature
+++ b/features/doc-add-picture.feature
@@ -4,6 +4,7 @@ Feature: Append an inline picture in its own paragraph
   I need a way to add a picture in its own paragraph
 
 
+  @wip
   Scenario: Add a picture at native size
     Given a blank document
      When I add a picture specifying only the image file
@@ -11,6 +12,7 @@ Feature: Append an inline picture in its own paragraph
       And the picture has its native width and height
 
 
+  @wip
   Scenario: Add a picture specifying both width and height
     Given a blank document
      When I add a picture specifying 1.75" width and 2.5" height
@@ -18,12 +20,14 @@ Feature: Append an inline picture in its own paragraph
       And picture.height is 2.5 inches
 
 
+  @wip
   Scenario: Add a picture specifying only width
     Given a blank document
      When I add a picture specifying a width of 1.5 inches
      Then picture.height is 2.14 inches
 
 
+  @wip
   Scenario: Add a picture specifying only height
     Given a blank document
      When I add a picture specifying a height of 1.5 inches
diff --git a/features/run-add-picture.feature b/features/run-add-picture.feature
index d0c592d3b..bf8460225 100644
--- a/features/run-add-picture.feature
+++ b/features/run-add-picture.feature
@@ -3,6 +3,8 @@ Feature: Add picture to a run
   As a developer using python-docx
   I need a way to add a picture to a run
 
+
+  @wip
   Scenario: Add a picture to a body paragraph run
     Given a run
      When I add a picture to the run
@@ -10,6 +12,7 @@ Feature: Add picture to a run
       And the document contains the inline picture
 
 
+  @wip
   Scenario Outline: Add a picture to a run in a table cell
     Given a run inside a table cell retrieved from <cell-source>
      When I add a picture to the run
diff --git a/features/shp-add-inline-picture.feature b/features/shp-add-inline-picture.feature
deleted file mode 100644
index 32cb3487c..000000000
--- a/features/shp-add-inline-picture.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-Feature: Add inline picture
-  In order to generate a document containing an image
-  As a python-docx developer
-  I need the ability to add an inline picture to a document
-
-  Scenario: Add inline picture to document
-    Given a document
-     When I add an inline picture to the document
-     Then its inline shape type is WD_INLINE_SHAPE.PICTURE
-      And the document contains the inline picture
-
-  Scenario: Add inline picture from stream
-    Given a document
-     When I add an inline picture from a file-like object
-     Then its inline shape type is WD_INLINE_SHAPE.PICTURE
-      And the document contains the inline picture
diff --git a/features/steps/shape.py b/features/steps/shape.py
index 2a7fef2d2..1a8d0c60c 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -15,7 +15,7 @@
 from docx.shape import InlineShape
 from docx.shared import Inches
 
-from helpers import test_docx, test_file
+from helpers import test_docx
 
 
 # given ===================================================
@@ -49,23 +49,6 @@ def given_inline_shape_known_to_be_shape_of_type(context, shp_of_type):
 
 # when =====================================================
 
-@when('I add an inline picture from a file-like object')
-def when_add_inline_picture_from_file_like_object(context):
-    document = context.document
-    run = document.add_paragraph().add_run()
-    with open(test_file('monty-truth.png'), 'rb') as f:
-        context.inline_shape = document.inline_shapes.add_picture(f, run)
-
-
-@when('I add an inline picture to the document')
-def when_add_inline_picture_to_document(context):
-    document = context.document
-    run = document.add_paragraph().add_run()
-    context.inline_shape = (document.inline_shapes.add_picture(
-        test_file('monty-truth.png'), run
-    ))
-
-
 @when('I change the dimensions of the inline shape')
 def when_change_dimensions_of_inline_shape(context):
     inline_shape = context.inline_shape
diff --git a/tests/test_shape.py b/tests/test_shape.py
index 7b7c4750e..7ee35da64 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -9,26 +9,15 @@
 import pytest
 
 from docx.enum.shape import WD_INLINE_SHAPE
-from docx.oxml.document import CT_Body
 from docx.oxml.ns import nsmap
-from docx.oxml.text.run import CT_R
-from docx.parts.document import DocumentPart
-from docx.parts.image import ImagePart
 from docx.shape import InlineShape, InlineShapes
 from docx.shared import Length
-from docx.text.run import Run
 
 from .oxml.unitdata.dml import (
-    a_blip, a_blipFill, a_cNvGraphicFramePr, a_cNvPr, a_cNvPicPr, a_docPr,
-    a_fillRect, a_graphic, a_graphicData, a_graphicFrameLocks, a_pic,
-    a_prstGeom, a_stretch, an_ext, an_extent, an_inline, an_nvPicPr, an_off,
-    an_spPr, an_xfrm
+    a_blip, a_blipFill, a_graphic, a_graphicData, a_pic, an_inline,
 )
-from .oxml.unitdata.text import an_r
 from .unitutil.cxml import element, xml
-from .unitutil.mock import (
-    class_mock, instance_mock, loose_mock, property_mock
-)
+from .unitutil.mock import loose_mock
 
 
 class DescribeInlineShapes(object):
@@ -64,23 +53,6 @@ def it_raises_on_indexed_access_out_of_range(
             too_high = inline_shape_count
             inline_shapes[too_high]
 
-    def it_can_add_an_inline_picture_to_the_document(
-            self, add_picture_fixture):
-        # fixture ----------------------
-        (inline_shapes, image_descriptor_, document_, InlineShape_,
-         run, r_, image_part_, rId_, shape_id_, new_picture_shape_
-         ) = add_picture_fixture
-        # exercise ---------------------
-        picture_shape = inline_shapes.add_picture(image_descriptor_, run)
-        # verify -----------------------
-        document_.get_or_add_image_part.assert_called_once_with(
-            image_descriptor_
-        )
-        InlineShape_.new_picture.assert_called_once_with(
-            r_, image_part_, rId_, shape_id_
-        )
-        assert picture_shape is new_picture_shape_
-
     def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
         inline_shapes, parent_ = inline_shapes_with_parent_
         part = inline_shapes.part
@@ -88,18 +60,6 @@ def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_picture_fixture(
-            self, request, body_, document_, image_descriptor_, InlineShape_,
-            r_, image_part_, rId_, shape_id_, new_picture_shape_):
-        inline_shapes = InlineShapes(body_, None)
-        property_mock(request, InlineShapes, 'part', return_value=document_)
-        run = Run(r_, None)
-        return (
-            inline_shapes, image_descriptor_, document_, InlineShape_, run,
-            r_, image_part_, rId_, shape_id_, new_picture_shape_
-        )
-
     @pytest.fixture
     def inline_shapes_fixture(self):
         body = element(
@@ -111,55 +71,12 @@ def inline_shapes_fixture(self):
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def body_(self, request, r_):
-        body_ = instance_mock(request, CT_Body)
-        body_.add_p.return_value.add_r.return_value = r_
-        return body_
-
-    @pytest.fixture
-    def document_(self, request, rId_, image_part_, shape_id_):
-        document_ = instance_mock(request, DocumentPart, name='document_')
-        document_.get_or_add_image_part.return_value = image_part_, rId_
-        document_.next_id = shape_id_
-        return document_
-
-    @pytest.fixture
-    def image_part_(self, request):
-        return instance_mock(request, ImagePart)
-
-    @pytest.fixture
-    def image_descriptor_(self, request):
-        return instance_mock(request, str)
-
-    @pytest.fixture
-    def InlineShape_(self, request, new_picture_shape_):
-        InlineShape_ = class_mock(request, 'docx.shape.InlineShape')
-        InlineShape_.new_picture.return_value = new_picture_shape_
-        return InlineShape_
-
     @pytest.fixture
     def inline_shapes_with_parent_(self, request):
         parent_ = loose_mock(request, name='parent_')
         inline_shapes = InlineShapes(None, parent_)
         return inline_shapes, parent_
 
-    @pytest.fixture
-    def new_picture_shape_(self, request):
-        return instance_mock(request, InlineShape)
-
-    @pytest.fixture
-    def r_(self, request):
-        return instance_mock(request, CT_R)
-
-    @pytest.fixture
-    def rId_(self, request):
-        return instance_mock(request, str)
-
-    @pytest.fixture
-    def shape_id_(self, request):
-        return instance_mock(request, int)
-
 
 class DescribeInlineShape(object):
 
@@ -167,15 +84,6 @@ def it_knows_what_type_of_shape_it_is(self, shape_type_fixture):
         inline_shape, inline_shape_type = shape_type_fixture
         assert inline_shape.type == inline_shape_type
 
-    def it_can_contruct_a_new_inline_picture_shape(
-            self, new_picture_fixture):
-        inline_shape, r, image_part_, rId, shape_id, expected_inline_xml = (
-            new_picture_fixture
-        )
-        picture = inline_shape.new_picture(r, image_part_, rId, shape_id)
-        assert picture._inline.xml == expected_inline_xml
-        assert r[0][0] is picture._inline
-
     def it_knows_its_display_dimensions(self, dimensions_get_fixture):
         inline_shape, cx, cy = dimensions_get_fixture
         width = inline_shape.width
@@ -211,29 +119,6 @@ def dimensions_set_fixture(self):
         expected_xml = xml(expected_cxml)
         return inline_shape, new_cx, new_cy, expected_xml
 
-    @pytest.fixture
-    def new_picture_fixture(self, request, image_part_, image_params):
-        filename, rId, cx, cy = image_params
-        inline_shape = InlineShape(None)
-        r = an_r().with_nsdecls().element
-        shape_id = 7
-        name = 'Picture %d' % shape_id
-        uri = nsmap['pic']
-        expected_inline = (
-            an_inline().with_nsdecls('wp', 'a', 'pic', 'r', 'w').with_child(
-                an_extent().with_cx(cx).with_cy(cy)).with_child(
-                a_docPr().with_id(shape_id).with_name(name)).with_child(
-                a_cNvGraphicFramePr().with_child(
-                    a_graphicFrameLocks().with_noChangeAspect(1))).with_child(
-                a_graphic().with_child(
-                    a_graphicData().with_uri(uri).with_child(
-                        self._pic_bldr(filename, rId, cx, cy))))
-        ).element
-        expected_inline_xml = expected_inline.xml
-        return (
-            inline_shape, r, image_part_, rId, shape_id, expected_inline_xml
-        )
-
     @pytest.fixture(params=[
         'embed pic', 'link pic', 'link+embed pic', 'chart', 'smart art',
         'not implemented'
@@ -267,22 +152,6 @@ def shape_type_fixture(self, request):
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def image_params(self):
-        filename = 'foobar.garf'
-        rId = 'rId42'
-        cx, cy = 914422, 223344
-        return filename, rId, cx, cy
-
-    @pytest.fixture
-    def image_part_(self, request, image_params):
-        filename, rId, cx, cy = image_params
-        image_part_ = instance_mock(request, ImagePart)
-        image_part_.default_cx = cx
-        image_part_.default_cy = cy
-        image_part_.filename = filename
-        return image_part_
-
     def _inline_with_picture(self, embed=False, link=False):
         picture_ns = nsmap['pic']
 
@@ -309,20 +178,3 @@ def _inline_with_uri(self, uri):
                     a_graphicData().with_uri(uri)))
         ).element
         return inline
-
-    def _pic_bldr(self, name, rId, cx, cy):
-        return (
-            a_pic().with_child(
-                an_nvPicPr().with_child(
-                    a_cNvPr().with_id(0).with_name(name)).with_child(
-                    a_cNvPicPr())).with_child(
-                a_blipFill().with_child(
-                    a_blip().with_embed(rId)).with_child(
-                    a_stretch().with_child(
-                        a_fillRect()))).with_child(
-                an_spPr().with_child(
-                    an_xfrm().with_child(
-                        an_off().with_x(0).with_y(0)).with_child(
-                        an_ext().with_cx(cx).with_cy(cy))).with_child(
-                    a_prstGeom().with_prst('rect')))
-        )
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 75e66c75f..80983959e 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -11,9 +11,7 @@
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.parts.document import DocumentPart
-from docx.shape import InlineShape, InlineShapes
 from docx.shared import Pt
-from docx.text.paragraph import Paragraph
 from docx.text.run import Font, Run
 
 import pytest
@@ -86,17 +84,6 @@ def it_can_add_a_tab(self, add_tab_fixture):
         run.add_tab()
         assert run._r.xml == expected_xml
 
-    def it_can_add_a_picture(self, add_picture_fixture):
-        (run, image_descriptor_, width, height, inline_shapes_,
-         expected_width, expected_height, picture_) = add_picture_fixture
-        picture = run.add_picture(image_descriptor_, width, height)
-        inline_shapes_.add_picture.assert_called_once_with(
-            image_descriptor_, run
-        )
-        assert picture is picture_
-        assert picture.width == expected_width
-        assert picture.height == expected_height
-
     def it_can_remove_its_content_but_keep_formatting(self, clear_fixture):
         run, expected_xml = clear_fixture
         _run = run.clear()
@@ -131,24 +118,6 @@ def add_break_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, break_type, expected_xml
 
-    @pytest.fixture(params=[
-        (None, None,  200,  100),
-        (1000, 500,  1000,  500),
-        (2000, None, 2000, 1000),
-        (None, 2000, 4000, 2000),
-    ])
-    def add_picture_fixture(
-            self, request, paragraph_, inline_shapes_, picture_):
-        width, height, expected_width, expected_height = request.param
-        paragraph_.part.inline_shapes = inline_shapes_
-        run = Run(None, paragraph_)
-        image_descriptor_ = 'image_descriptor_'
-        picture_.width, picture_.height = 200, 100
-        return (
-            run, image_descriptor_, width, height, inline_shapes_,
-            expected_width, expected_height, picture_
-        )
-
     @pytest.fixture(params=[
         ('w:r/w:t"foo"', 'w:r/(w:t"foo", w:tab)'),
     ])
@@ -335,26 +304,12 @@ def Font_(self, request, font_):
     def font_(self, request):
         return instance_mock(request, Font)
 
-    @pytest.fixture
-    def inline_shapes_(self, request, picture_):
-        inline_shapes_ = instance_mock(request, InlineShapes)
-        inline_shapes_.add_picture.return_value = picture_
-        return inline_shapes_
-
-    @pytest.fixture
-    def paragraph_(self, request):
-        return instance_mock(request, Paragraph)
-
     @pytest.fixture
     def part_prop_(self, request, document_part_):
         return property_mock(
             request, Run, 'part', return_value=document_part_
         )
 
-    @pytest.fixture
-    def picture_(self, request):
-        return instance_mock(request, InlineShape)
-
     @pytest.fixture
     def Text_(self, request):
         return class_mock(request, 'docx.text.run._Text')

From e7553c2ba3bfa4d34f45f437dc4f836ea052e09b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 00:48:11 -0800
Subject: [PATCH 056/367] run: rewrite Run.add_picture()

---
 docx/parts/document.py |  8 ++++++++
 docx/text/run.py       |  5 ++++-
 tests/text/test_run.py | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 1d32eb91e..462f86542 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -80,6 +80,14 @@ def inline_shapes(self):
         """
         return InlineShapes(self._element.body, self)
 
+    def new_pic_inline(self, image_descriptor, width, height):
+        """
+        Return a newly-created `w:inline` element containing the image
+        specified by *image_descriptor* and scaled based on the values of
+        *width* and *height*.
+        """
+        raise NotImplementedError
+
     @property
     def next_id(self):
         """
diff --git a/docx/text/run.py b/docx/text/run.py
index 725954832..cac839b95 100644
--- a/docx/text/run.py
+++ b/docx/text/run.py
@@ -8,6 +8,7 @@
 
 from ..enum.style import WD_STYLE_TYPE
 from ..enum.text import WD_BREAK
+from ..shape import InlineShape
 from ..shared import ElementProxy, Parented
 
 
@@ -57,7 +58,9 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         (dpi) value specified in the image file, defaulting to 72 dpi if no
         value is specified, as is often the case.
         """
-        raise NotImplementedError
+        inline = self.part.new_pic_inline(image_path_or_stream, width, height)
+        self._r.add_drawing(inline)
+        return InlineShape(inline)
 
     def add_tab(self):
         """
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 80983959e..7bb07b413 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -11,6 +11,7 @@
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.parts.document import DocumentPart
+from docx.shape import InlineShape
 from docx.shared import Pt
 from docx.text.run import Font, Run
 
@@ -84,6 +85,17 @@ def it_can_add_a_tab(self, add_tab_fixture):
         run.add_tab()
         assert run._r.xml == expected_xml
 
+    def it_can_add_a_picture(self, add_picture_fixture):
+        run, image, width, height, inline = add_picture_fixture[:5]
+        expected_xml, InlineShape_, picture_ = add_picture_fixture[5:]
+
+        picture = run.add_picture(image, width, height)
+
+        run.part.new_pic_inline.assert_called_once_with(image, width, height)
+        assert run._r.xml == expected_xml
+        InlineShape_.assert_called_once_with(inline)
+        assert picture is picture_
+
     def it_can_remove_its_content_but_keep_formatting(self, clear_fixture):
         run, expected_xml = clear_fixture
         _run = run.clear()
@@ -118,6 +130,20 @@ def add_break_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, break_type, expected_xml
 
+    @pytest.fixture
+    def add_picture_fixture(self, part_prop_, document_part_, InlineShape_,
+                            picture_):
+        run = Run(element('w:r/wp:x'), None)
+        image = 'foobar.png'
+        width, height, inline = 1111, 2222, element('wp:inline{id=42}')
+        expected_xml = xml('w:r/(wp:x,w:drawing/wp:inline{id=42})')
+        document_part_.new_pic_inline.return_value = inline
+        InlineShape_.return_value = picture_
+        return (
+            run, image, width, height, inline, expected_xml, InlineShape_,
+            picture_
+        )
+
     @pytest.fixture(params=[
         ('w:r/w:t"foo"', 'w:r/(w:t"foo", w:tab)'),
     ])
@@ -304,12 +330,20 @@ def Font_(self, request, font_):
     def font_(self, request):
         return instance_mock(request, Font)
 
+    @pytest.fixture
+    def InlineShape_(self, request):
+        return class_mock(request, 'docx.text.run.InlineShape')
+
     @pytest.fixture
     def part_prop_(self, request, document_part_):
         return property_mock(
             request, Run, 'part', return_value=document_part_
         )
 
+    @pytest.fixture
+    def picture_(self, request):
+        return instance_mock(request, InlineShape)
+
     @pytest.fixture
     def Text_(self, request):
         return class_mock(request, 'docx.text.run._Text')

From f1368d2114e008ad5945ebebb8b74b299821293e Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 02:10:46 -0800
Subject: [PATCH 057/367] doc: add DocumentPart.new_pic_inline()

---
 docx/image/image.py                  | 16 ++++++++++++
 docx/oxml/shape.py                   | 12 +++++++++
 docx/parts/document.py               | 16 +++++++++++-
 tests/parts/test_document.py         | 37 ++++++++++++++++++++++++++++
 tests/test_files/snippets/inline.txt | 30 ++++++++++++++++++++++
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_files/snippets/inline.txt

diff --git a/docx/image/image.py b/docx/image/image.py
index 692ea5860..f0b984885 100644
--- a/docx/image/image.py
+++ b/docx/image/image.py
@@ -117,6 +117,22 @@ def vert_dpi(self):
         """
         return self._image_header.vert_dpi
 
+    def scaled_dimensions(self, width, height):
+        """
+        Return a (cx, cy) 2-tuple representing the native dimensions of this
+        image scaled by applying the following rules to *width* and *height*.
+        If both *width* and *height* are specified, the return value is
+        (*width*, *height*); no scaling is performed. If only one is
+        specified, it is used to compute a scaling factor that is then
+        applied to the unspecified dimension, preserving the aspect ratio of
+        the image. If both *width* and *height* are |None|, the native
+        dimensions are returned. The native dimensions are calculated using
+        the dots-per-inch (dpi) value embedded in the image, defaulting to 72
+        dpi if no value is specified, as is often the case. The returned
+        values are both |Length| objects.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def sha1(self):
         """
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
index ae58dd59d..77ca7db8a 100644
--- a/docx/oxml/shape.py
+++ b/docx/oxml/shape.py
@@ -74,6 +74,18 @@ def new(cls, cx, cy, shape_id, pic):
         inline.graphic.graphicData._insert_pic(pic)
         return inline
 
+    @classmethod
+    def new_pic_inline(cls, shape_id, rId, filename, cx, cy):
+        """
+        Return a new `wp:inline` element containing the `pic:pic` element
+        specified by the argument values.
+        """
+        pic_id = 0  # Word doesn't seem to use this, but does not omit it
+        pic = CT_Picture.new(pic_id, filename, rId, cx, cy)
+        inline = cls.new(cx, cy, shape_id, pic)
+        inline.graphic.graphicData._insert_pic(pic)
+        return inline
+
     @classmethod
     def _inline_xml(cls):
         return (
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 462f86542..5f75c67bc 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -12,6 +12,7 @@
 from .numbering import NumberingPart
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.part import XmlPart
+from ..oxml.shape import CT_Inline
 from ..shape import InlineShapes
 from ..shared import lazyproperty
 from .styles import StylesPart
@@ -41,6 +42,16 @@ def document(self):
         """
         return Document(self._element, self)
 
+    def get_or_add_image(self, image_descriptor):
+        """
+        Return an (rId, image) 2-tuple for the image identified by
+        *image_descriptor*. *image* is an |Image| instance providing access
+        to the properties of the image, such as dimensions and image type.
+        *rId* is the key for the relationship between this document part and
+        the image part, reused if already present, newly created if not.
+        """
+        raise NotImplementedError
+
     def get_or_add_image_part(self, image_descriptor):
         """
         Return an ``(image_part, rId)`` 2-tuple for the image identified by
@@ -86,7 +97,10 @@ def new_pic_inline(self, image_descriptor, width, height):
         specified by *image_descriptor* and scaled based on the values of
         *width* and *height*.
         """
-        raise NotImplementedError
+        rId, image = self.get_or_add_image(image_descriptor)
+        cx, cy = image.scaled_dimensions(width, height)
+        shape_id, filename = self.next_id, image.filename
+        return CT_Inline.new_pic_inline(shape_id, rId, filename, cx, cy)
 
     @property
     def next_id(self):
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 90792396e..7aaddb363 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -8,6 +8,7 @@
 
 import pytest
 
+from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
 from docx.package import ImageParts, Package
@@ -21,6 +22,7 @@
 
 from ..oxml.parts.unitdata.document import a_body, a_document
 from ..oxml.unitdata.text import a_p
+from ..unitutil.file import snippet_text
 from ..unitutil.mock import (
     instance_mock, class_mock, method_mock, property_mock
 )
@@ -81,6 +83,16 @@ def it_knows_the_next_available_xml_id(self, next_id_fixture):
         document, expected_id = next_id_fixture
         assert document.next_id == expected_id
 
+    def it_can_create_a_new_pic_inline(self, new_pic_fixture):
+        document_part, path, width, height = new_pic_fixture[:4]
+        image_, expected_xml = new_pic_fixture[4:]
+
+        inline = document_part.new_pic_inline(path, width, height)
+
+        document_part.get_or_add_image.assert_called_once_with(path)
+        image_.scaled_dimensions.assert_called_once_with(width, height)
+        assert inline.xml == expected_xml
+
     def it_can_get_a_style_by_id(self, get_style_fixture):
         document_part, style_id, style_type, style_ = get_style_fixture
         style = document_part.get_style(style_id, style_type)
@@ -163,6 +175,19 @@ def next_id_fixture(self, request):
         document = DocumentPart(None, None, document_elm, None)
         return document, expected_id
 
+    @pytest.fixture
+    def new_pic_fixture(self, image_, get_or_add_image_, next_id_prop_):
+        document_part = DocumentPart(None, None, None, None)
+        path, width, height, rId = 'foo/bar.png', 111, 222, 'rId42'
+        expected_xml = snippet_text('inline')
+
+        get_or_add_image_.return_value = rId, image_
+        image_.scaled_dimensions.return_value = 444, 888
+        image_.filename = 'bar.png'
+        next_id_prop_.return_value = 24
+
+        return document_part, path, width, height, image_, expected_xml
+
     @pytest.fixture
     def nmprt_create_fixture(self, part_related_by_, relate_to_,
                              NumberingPart_, numbering_part_):
@@ -222,6 +247,14 @@ def get_or_add_image_fixture(
             image_part_, rId_
         )
 
+    @pytest.fixture
+    def get_or_add_image_(self, request):
+        return method_mock(request, DocumentPart, 'get_or_add_image')
+
+    @pytest.fixture
+    def image_(self, request):
+        return instance_mock(request, Image)
+
     @pytest.fixture
     def image_descriptor_(self, request):
         return instance_mock(request, str)
@@ -240,6 +273,10 @@ def image_parts_(self, request, image_part_):
     def InlineShapes_(self, request):
         return class_mock(request, 'docx.parts.document.InlineShapes')
 
+    @pytest.fixture
+    def next_id_prop_(self, request):
+        return property_mock(request, DocumentPart, 'next_id')
+
     @pytest.fixture
     def NumberingPart_(self, request):
         return class_mock(request, 'docx.parts.document.NumberingPart')
diff --git a/tests/test_files/snippets/inline.txt b/tests/test_files/snippets/inline.txt
new file mode 100644
index 000000000..3b0d58148
--- /dev/null
+++ b/tests/test_files/snippets/inline.txt
@@ -0,0 +1,30 @@
+<wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+  <wp:extent cx="444" cy="888"/>
+  <wp:docPr id="24" name="Picture 24"/>
+  <wp:cNvGraphicFramePr>
+    <a:graphicFrameLocks noChangeAspect="1"/>
+  </wp:cNvGraphicFramePr>
+  <a:graphic>
+    <a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">
+      <pic:pic>
+        <pic:nvPicPr>
+          <pic:cNvPr id="0" name="bar.png"/>
+          <pic:cNvPicPr/>
+        </pic:nvPicPr>
+        <pic:blipFill>
+          <a:blip r:embed="rId42"/>
+          <a:stretch>
+            <a:fillRect/>
+          </a:stretch>
+        </pic:blipFill>
+        <pic:spPr>
+          <a:xfrm>
+            <a:off x="0" y="0"/>
+            <a:ext cx="444" cy="888"/>
+          </a:xfrm>
+          <a:prstGeom prst="rect"/>
+        </pic:spPr>
+      </pic:pic>
+    </a:graphicData>
+  </a:graphic>
+</wp:inline>

From c96e946aa6728de9e770f6404e522c13e3c146f6 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 02:44:32 -0800
Subject: [PATCH 058/367] doc: rewrite DocumentPart.get_or_add_image()

Was get_or_add_image_part(). Return value changed.
---
 docx/parts/document.py       | 17 +++-------
 tests/parts/test_document.py | 66 +++++++++++++-----------------------
 2 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 5f75c67bc..2225da130 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -50,20 +50,11 @@ def get_or_add_image(self, image_descriptor):
         *rId* is the key for the relationship between this document part and
         the image part, reused if already present, newly created if not.
         """
-        raise NotImplementedError
-
-    def get_or_add_image_part(self, image_descriptor):
-        """
-        Return an ``(image_part, rId)`` 2-tuple for the image identified by
-        *image_descriptor*. *image_part* is an |Image| instance corresponding
-        to the image, newly created if no matching image part is found. *rId*
-        is the key for the relationship between this document part and the
-        image part, reused if already present, newly created if not.
-        """
-        image_parts = self._package.image_parts
-        image_part = image_parts.get_or_add_image_part(image_descriptor)
+        image_part = self._package.image_parts.get_or_add_image_part(
+            image_descriptor
+        )
         rId = self.relate_to(image_part, RT.IMAGE)
-        return (image_part, rId)
+        return rId, image_part.image
 
     def get_style(self, style_id, style_type):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 7aaddb363..01b9b3699 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -11,7 +11,7 @@
 from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
-from docx.package import ImageParts, Package
+from docx.package import Package
 from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
@@ -35,6 +35,16 @@ def it_can_save_the_package_to_a_file(self, save_fixture):
         document.save(file_)
         document._package.save.assert_called_once_with(file_)
 
+    def it_can_get_or_add_an_image(self, get_image_fixture):
+        document_part, path, image_part_, rId_, image_ = get_image_fixture
+
+        rId, image = document_part.get_or_add_image(path)
+
+        image_parts = document_part._package.image_parts
+        image_parts.get_or_add_image_part.assert_called_once_with(path)
+        document_part.relate_to.assert_called_once_with(image_part_, RT.IMAGE)
+        assert (rId, image) == (rId_, image_)
+
     def it_provides_access_to_the_document_styles(self, styles_fixture):
         document_part, styles_ = styles_fixture
         styles = document_part.styles
@@ -67,18 +77,6 @@ def it_creates_numbering_part_if_not_present(self, nmprt_create_fixture):
         )
         assert numbering_part is numbering_part_
 
-    def it_can_add_an_image_part_to_the_document(
-            self, get_or_add_image_fixture):
-        (document, image_descriptor_, image_parts_, relate_to_, image_part_,
-         rId_) = get_or_add_image_fixture
-        image_part, rId = document.get_or_add_image_part(image_descriptor_)
-        image_parts_.get_or_add_image_part.assert_called_once_with(
-            image_descriptor_
-        )
-        relate_to_.assert_called_once_with(image_part_, RT.IMAGE)
-        assert image_part is image_part_
-        assert rId == rId_
-
     def it_knows_the_next_available_xml_id(self, next_id_fixture):
         document, expected_id = next_id_fixture
         assert document.next_id == expected_id
@@ -137,6 +135,17 @@ def core_props_fixture(self, package_, core_properties_):
         package_.core_properties = core_properties_
         return document_part, core_properties_
 
+    @pytest.fixture
+    def get_image_fixture(self, package_, image_part_, image_, relate_to_):
+        document_part = DocumentPart(None, None, None, package_)
+        path, rId_ = 'foobar.png', 'rId42'
+
+        package_.image_parts.get_or_add_image_part.return_value = image_part_
+        relate_to_.return_value = rId_
+        image_part_.image = image_
+
+        return document_part, path, image_part_, rId_, image_
+
     @pytest.fixture
     def get_style_fixture(self, styles_prop_, style_):
         document_part = DocumentPart(None, None, None, None)
@@ -236,17 +245,6 @@ def styles_part_get_fixture(self, part_related_by_, styles_part_):
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)
 
-    @pytest.fixture
-    def get_or_add_image_fixture(
-            self, request, package_, image_descriptor_, image_parts_,
-            relate_to_, image_part_, rId_):
-        package_.image_parts = image_parts_
-        document = DocumentPart(None, None, None, package_)
-        return (
-            document, image_descriptor_, image_parts_, relate_to_,
-            image_part_, rId_
-        )
-
     @pytest.fixture
     def get_or_add_image_(self, request):
         return method_mock(request, DocumentPart, 'get_or_add_image')
@@ -255,20 +253,10 @@ def get_or_add_image_(self, request):
     def image_(self, request):
         return instance_mock(request, Image)
 
-    @pytest.fixture
-    def image_descriptor_(self, request):
-        return instance_mock(request, str)
-
     @pytest.fixture
     def image_part_(self, request):
         return instance_mock(request, ImagePart)
 
-    @pytest.fixture
-    def image_parts_(self, request, image_part_):
-        image_parts_ = instance_mock(request, ImageParts)
-        image_parts_.get_or_add_image_part.return_value = image_part_
-        return image_parts_
-
     @pytest.fixture
     def InlineShapes_(self, request):
         return class_mock(request, 'docx.parts.document.InlineShapes')
@@ -298,14 +286,8 @@ def part_related_by_(self, request):
         return method_mock(request, DocumentPart, 'part_related_by')
 
     @pytest.fixture
-    def relate_to_(self, request, rId_):
-        relate_to_ = method_mock(request, DocumentPart, 'relate_to')
-        relate_to_.return_value = rId_
-        return relate_to_
-
-    @pytest.fixture
-    def rId_(self, request):
-        return instance_mock(request, str)
+    def relate_to_(self, request):
+        return method_mock(request, DocumentPart, 'relate_to')
 
     @pytest.fixture
     def style_(self, request):

From 0d63564689d5aa560e5b3f72c32d3b84016de465 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 03:00:23 -0800
Subject: [PATCH 059/367] reorg: reorder test_image.py fixtures

---
 tests/image/test_image.py | 76 ++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index ed47eb465..7999b017f 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -77,6 +77,12 @@ def it_knows_the_image_dimensions(self, dimensions_fixture):
         assert image.px_width == px_width
         assert image.px_height == px_height
 
+    def it_knows_the_horz_and_vert_dpi_of_the_image(self, dpi_fixture):
+        image_header_, horz_dpi, vert_dpi = dpi_fixture
+        image = Image(None, None, image_header_)
+        assert image.horz_dpi == horz_dpi
+        assert image.vert_dpi == vert_dpi
+
     def it_knows_the_image_filename(self):
         filename = 'foobar.png'
         image = Image(None, filename, None)
@@ -86,12 +92,6 @@ def it_knows_the_image_filename_extension(self):
         image = Image(None, 'foobar.png', None)
         assert image.ext == 'png'
 
-    def it_knows_the_horz_and_vert_dpi_of_the_image(self, dpi_fixture):
-        image_header_, horz_dpi, vert_dpi = dpi_fixture
-        image = Image(None, None, image_header_)
-        assert image.horz_dpi == horz_dpi
-        assert image.vert_dpi == vert_dpi
-
     def it_knows_the_sha1_of_its_image(self):
         blob = b'fO0Bar'
         image = Image(blob, None, None)
@@ -113,16 +113,6 @@ def it_correctly_characterizes_known_images(self, known_image_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def blob_(self, request):
-        return instance_mock(request, bytes)
-
-    @pytest.fixture
-    def BytesIO_(self, request, stream_):
-        return class_mock(
-            request, 'docx.image.image.BytesIO', return_value=stream_
-        )
-
     @pytest.fixture
     def content_type_fixture(self, image_header_):
         content_type = 'image/foobar'
@@ -143,10 +133,6 @@ def dpi_fixture(self, image_header_):
         image_header_.vert_dpi = vert_dpi
         return image_header_, horz_dpi, vert_dpi
 
-    @pytest.fixture
-    def filename_(self, request):
-        return instance_mock(request, str)
-
     @pytest.fixture
     def from_blob_fixture(
             self, blob_, BytesIO_, _from_stream_, stream_, image_):
@@ -179,6 +165,39 @@ def from_stream_fixture(
             Image__init_, filename_out
         )
 
+    @pytest.fixture(params=[0, 1, 2, 3, 4, 5, 6, 7, 8])
+    def known_image_fixture(self, request):
+        cases = (
+            ('python.bmp',       ('bmp',  CT.BMP,   211,   71,  96,  96)),
+            ('sonic.gif',        ('gif',  CT.GIF,   290,  360,  72,  72)),
+            ('python-icon.jpeg', ('jpg',  CT.JPEG,  204,  204,  72,  72)),
+            ('300-dpi.jpg',      ('jpg',  CT.JPEG, 1504, 1936, 300, 300)),
+            ('monty-truth.png',  ('png',  CT.PNG,   150,  214,  72,  72)),
+            ('150-dpi.png',      ('png',  CT.PNG,   901, 1350, 150, 150)),
+            ('300-dpi.png',      ('png',  CT.PNG,   860,  579, 300, 300)),
+            ('72-dpi.tiff',      ('tiff', CT.TIFF,   48,   48,  72,  72)),
+            ('300-dpi.TIF',      ('tiff', CT.TIFF, 2464, 3248, 300, 300)),
+            # ('CVS_LOGO.WMF',     ('wmf',  CT.X_WMF, 149,   59,  72,  72)),
+        )
+        image_filename, characteristics = cases[request.param]
+        return image_filename, characteristics
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def blob_(self, request):
+        return instance_mock(request, bytes)
+
+    @pytest.fixture
+    def BytesIO_(self, request, stream_):
+        return class_mock(
+            request, 'docx.image.image.BytesIO', return_value=stream_
+        )
+
+    @pytest.fixture
+    def filename_(self, request):
+        return instance_mock(request, str)
+
     @pytest.fixture
     def _from_stream_(self, request, image_):
         return method_mock(
@@ -204,23 +223,6 @@ def image_header_(self, request):
     def Image__init_(self, request):
         return initializer_mock(request, Image)
 
-    @pytest.fixture(params=[0, 1, 2, 3, 4, 5, 6, 7, 8])
-    def known_image_fixture(self, request):
-        cases = (
-            ('python.bmp',       ('bmp',  CT.BMP,   211,   71,  96,  96)),
-            ('sonic.gif',        ('gif',  CT.GIF,   290,  360,  72,  72)),
-            ('python-icon.jpeg', ('jpg',  CT.JPEG,  204,  204,  72,  72)),
-            ('300-dpi.jpg',      ('jpg',  CT.JPEG, 1504, 1936, 300, 300)),
-            ('monty-truth.png',  ('png',  CT.PNG,   150,  214,  72,  72)),
-            ('150-dpi.png',      ('png',  CT.PNG,   901, 1350, 150, 150)),
-            ('300-dpi.png',      ('png',  CT.PNG,   860,  579, 300, 300)),
-            ('72-dpi.tiff',      ('tiff', CT.TIFF,   48,   48,  72,  72)),
-            ('300-dpi.TIF',      ('tiff', CT.TIFF, 2464, 3248, 300, 300)),
-            # ('CVS_LOGO.WMF',     ('wmf',  CT.X_WMF, 149,   59,  72,  72)),
-        )
-        image_filename, characteristics = cases[request.param]
-        return image_filename, characteristics
-
     @pytest.fixture
     def stream_(self, request):
         return instance_mock(request, BytesIO)

From 66fedd43444f68679ca454285de03a4cda79301c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 03:15:37 -0800
Subject: [PATCH 060/367] img: add Image.width and .height

---
 docx/image/image.py       | 18 +++++++++++++++++-
 tests/image/test_image.py | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docx/image/image.py b/docx/image/image.py
index f0b984885..c327c7cc2 100644
--- a/docx/image/image.py
+++ b/docx/image/image.py
@@ -11,8 +11,8 @@
 import os
 
 from ..compat import BytesIO, is_string
-from ..shared import lazyproperty
 from .exceptions import UnrecognizedImageError
+from ..shared import Inches, lazyproperty
 
 
 class Image(object):
@@ -117,6 +117,22 @@ def vert_dpi(self):
         """
         return self._image_header.vert_dpi
 
+    @property
+    def width(self):
+        """
+        A |Length| value representing the native width of the image,
+        calculated from the values of `px_width` and `horz_dpi`.
+        """
+        return Inches(self.px_width / self.horz_dpi)
+
+    @property
+    def height(self):
+        """
+        A |Length| value representing the native height of the image,
+        calculated from the values of `px_height` and `vert_dpi`.
+        """
+        return Inches(self.px_height / self.vert_dpi)
+
     def scaled_dimensions(self, width, height):
         """
         Return a (cx, cy) 2-tuple representing the native dimensions of this
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index 7999b017f..37109638e 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -17,6 +17,7 @@
 from docx.image.png import Png
 from docx.image.tiff import Tiff
 from docx.opc.constants import CONTENT_TYPE as CT
+from docx.shared import Length
 
 from ..unitutil.file import test_file
 from ..unitutil.mock import (
@@ -71,7 +72,7 @@ def it_knows_the_image_content_type(self, content_type_fixture):
         image = Image(None, None, image_header_)
         assert image.content_type == content_type
 
-    def it_knows_the_image_dimensions(self, dimensions_fixture):
+    def it_knows_the_image_px_dimensions(self, dimensions_fixture):
         image_header_, px_width, px_height = dimensions_fixture
         image = Image(None, None, image_header_)
         assert image.px_width == px_width
@@ -83,6 +84,12 @@ def it_knows_the_horz_and_vert_dpi_of_the_image(self, dpi_fixture):
         assert image.horz_dpi == horz_dpi
         assert image.vert_dpi == vert_dpi
 
+    def it_knows_the_image_native_size(self, size_fixture):
+        image, width, height = size_fixture
+        assert (image.width, image.height) == (width, height)
+        assert isinstance(image.width, Length)
+        assert isinstance(image.height, Length)
+
     def it_knows_the_image_filename(self):
         filename = 'foobar.png'
         image = Image(None, filename, None)
@@ -182,6 +189,13 @@ def known_image_fixture(self, request):
         image_filename, characteristics = cases[request.param]
         return image_filename, characteristics
 
+    @pytest.fixture
+    def size_fixture(self, image_header_):
+        image_header_.px_width, image_header_.px_height = 150, 75
+        image_header_.horz_dpi, image_header_.vert_dpi = 72, 200
+        image = Image(None, None, image_header_)
+        return image, 1905000, 342900
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture

From 4008ab22ccfb17732f85524b8ff4992014acb1bb Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 03:38:28 -0800
Subject: [PATCH 061/367] img: add Image.scaled_dimensions()

---
 docx/image/image.py              | 17 +++++++++++++---
 features/doc-add-picture.feature |  4 ----
 features/run-add-picture.feature |  2 --
 tests/image/test_image.py        | 35 ++++++++++++++++++++++++++++++--
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/docx/image/image.py b/docx/image/image.py
index c327c7cc2..ba2158e72 100644
--- a/docx/image/image.py
+++ b/docx/image/image.py
@@ -12,7 +12,7 @@
 
 from ..compat import BytesIO, is_string
 from .exceptions import UnrecognizedImageError
-from ..shared import Inches, lazyproperty
+from ..shared import Emu, Inches, lazyproperty
 
 
 class Image(object):
@@ -133,7 +133,7 @@ def height(self):
         """
         return Inches(self.px_height / self.vert_dpi)
 
-    def scaled_dimensions(self, width, height):
+    def scaled_dimensions(self, width=None, height=None):
         """
         Return a (cx, cy) 2-tuple representing the native dimensions of this
         image scaled by applying the following rules to *width* and *height*.
@@ -147,7 +147,18 @@ def scaled_dimensions(self, width, height):
         dpi if no value is specified, as is often the case. The returned
         values are both |Length| objects.
         """
-        raise NotImplementedError
+        if width is None and height is None:
+            return self.width, self.height
+
+        if width is None:
+            scaling_factor = float(height) / float(self.height)
+            width = round(self.width * scaling_factor)
+
+        if height is None:
+            scaling_factor = float(width) / float(self.width)
+            height = round(self.height * scaling_factor)
+
+        return Emu(width), Emu(height)
 
     @lazyproperty
     def sha1(self):
diff --git a/features/doc-add-picture.feature b/features/doc-add-picture.feature
index 885b58660..51f35f161 100644
--- a/features/doc-add-picture.feature
+++ b/features/doc-add-picture.feature
@@ -4,7 +4,6 @@ Feature: Append an inline picture in its own paragraph
   I need a way to add a picture in its own paragraph
 
 
-  @wip
   Scenario: Add a picture at native size
     Given a blank document
      When I add a picture specifying only the image file
@@ -12,7 +11,6 @@ Feature: Append an inline picture in its own paragraph
       And the picture has its native width and height
 
 
-  @wip
   Scenario: Add a picture specifying both width and height
     Given a blank document
      When I add a picture specifying 1.75" width and 2.5" height
@@ -20,14 +18,12 @@ Feature: Append an inline picture in its own paragraph
       And picture.height is 2.5 inches
 
 
-  @wip
   Scenario: Add a picture specifying only width
     Given a blank document
      When I add a picture specifying a width of 1.5 inches
      Then picture.height is 2.14 inches
 
 
-  @wip
   Scenario: Add a picture specifying only height
     Given a blank document
      When I add a picture specifying a height of 1.5 inches
diff --git a/features/run-add-picture.feature b/features/run-add-picture.feature
index bf8460225..0a8d4d81f 100644
--- a/features/run-add-picture.feature
+++ b/features/run-add-picture.feature
@@ -4,7 +4,6 @@ Feature: Add picture to a run
   I need a way to add a picture to a run
 
 
-  @wip
   Scenario: Add a picture to a body paragraph run
     Given a run
      When I add a picture to the run
@@ -12,7 +11,6 @@ Feature: Add picture to a run
       And the document contains the inline picture
 
 
-  @wip
   Scenario Outline: Add a picture to a run in a table cell
     Given a run inside a table cell retrieved from <cell-source>
      When I add a picture to the run
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index 37109638e..a70f76564 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -17,11 +17,12 @@
 from docx.image.png import Png
 from docx.image.tiff import Tiff
 from docx.opc.constants import CONTENT_TYPE as CT
-from docx.shared import Length
+from docx.shared import Emu, Length
 
 from ..unitutil.file import test_file
 from ..unitutil.mock import (
-    function_mock, class_mock, initializer_mock, instance_mock, method_mock
+    function_mock, class_mock, initializer_mock, instance_mock, method_mock,
+    property_mock
 )
 
 
@@ -90,6 +91,15 @@ def it_knows_the_image_native_size(self, size_fixture):
         assert isinstance(image.width, Length)
         assert isinstance(image.height, Length)
 
+    def it_can_scale_its_dimensions(self, scale_fixture):
+        image, width, height, expected_value = scale_fixture
+
+        scaled_width, scaled_height = image.scaled_dimensions(width, height)
+
+        assert (scaled_width, scaled_height) == expected_value
+        assert isinstance(scaled_width, Length)
+        assert isinstance(scaled_height, Length)
+
     def it_knows_the_image_filename(self):
         filename = 'foobar.png'
         image = Image(None, filename, None)
@@ -189,6 +199,19 @@ def known_image_fixture(self, request):
         image_filename, characteristics = cases[request.param]
         return image_filename, characteristics
 
+    @pytest.fixture(params=[
+        (None, None, 1000, 2000),
+        (100,  None,  100,  200),
+        (None,  500,  250,  500),
+        (1500, 1500, 1500, 1500),
+    ])
+    def scale_fixture(self, request, width_prop_, height_prop_):
+        width, height, scaled_width, scaled_height = request.param
+        width_prop_.return_value = Emu(1000)
+        height_prop_.return_value = Emu(2000)
+        image = Image(None, None, None)
+        return image, width, height, (scaled_width, scaled_height)
+
     @pytest.fixture
     def size_fixture(self, image_header_):
         image_header_.px_width, image_header_.px_height = 150, 75
@@ -218,6 +241,10 @@ def _from_stream_(self, request, image_):
             request, Image, '_from_stream', return_value=image_
         )
 
+    @pytest.fixture
+    def height_prop_(self, request):
+        return property_mock(request, Image, 'height')
+
     @pytest.fixture
     def image_(self, request):
         return instance_mock(request, Image)
@@ -241,6 +268,10 @@ def Image__init_(self, request):
     def stream_(self, request):
         return instance_mock(request, BytesIO)
 
+    @pytest.fixture
+    def width_prop_(self, request):
+        return property_mock(request, Image, 'width')
+
 
 class Describe_ImageHeaderFactory(object):
 

From 395b48f0c8665ca7c075d3603ebed18a1e361948 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 03:51:20 -0800
Subject: [PATCH 062/367] shp: fix #94 picture prints at wrong size

---
 docx/shape.py       | 6 ++----
 tests/test_shape.py | 7 +++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docx/shape.py b/docx/shape.py
index 3b2d384d2..e4f885d73 100644
--- a/docx/shape.py
+++ b/docx/shape.py
@@ -66,9 +66,8 @@ def height(self):
 
     @height.setter
     def height(self, cy):
-        assert isinstance(cy, int)
-        assert 0 < cy
         self._inline.extent.cy = cy
+        self._inline.graphic.graphicData.pic.spPr.cy = cy
 
     @property
     def type(self):
@@ -100,6 +99,5 @@ def width(self):
 
     @width.setter
     def width(self, cx):
-        assert isinstance(cx, int)
-        assert 0 < cx
         self._inline.extent.cx = cx
+        self._inline.graphic.graphicData.pic.spPr.cx = cx
diff --git a/tests/test_shape.py b/tests/test_shape.py
index 7ee35da64..105d2fa40 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -112,8 +112,11 @@ def dimensions_get_fixture(self):
     @pytest.fixture
     def dimensions_set_fixture(self):
         inline_cxml, new_cx, new_cy, expected_cxml = (
-            'wp:inline/wp:extent{cx=333, cy=666}', 444, 888,
-            'wp:inline/wp:extent{cx=444, cy=888}'
+            'wp:inline/(wp:extent{cx=333,cy=666},a:graphic/a:graphicData/'
+            'pic:pic/pic:spPr/a:xfrm/a:ext{cx=333,cy=666})',
+            444, 888,
+            'wp:inline/(wp:extent{cx=444,cy=888},a:graphic/a:graphicData/'
+            'pic:pic/pic:spPr/a:xfrm/a:ext{cx=444,cy=888})'
         )
         inline_shape = InlineShape(element(inline_cxml))
         expected_xml = xml(expected_cxml)

From 1d4f9bcb60fc391a6f2bce2e2ad5c8a3b615b366 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Mon, 16 Feb 2015 14:51:37 -0800
Subject: [PATCH 063/367] release: prepare v0.8.2 release

---
 HISTORY.rst      | 18 ++++++++++++++++++
 docx/__init__.py |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 294d03a09..98dd9f5dd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,24 @@
 Release History
 ---------------
 
+0.8.2 (2015-02-16)
+++++++++++++++++++
+
+- Fix #94: picture prints at wrong size when scaled
+- Extract `docx.document.Document` object from `DocumentPart`
+
+  Refactor `docx.Document` from an object into a factory function for new
+  `docx.document.Document object`. Extract methods from prior `docx.Document`
+  and `docx.parts.document.DocumentPart` to form the new API class and retire
+  `docx.Document` class.
+
+- Migrate `Document.numbering_part` to `DocumentPart.numbering_part`. The
+  `numbering_part` property is not part of the published API and is an
+  interim internal feature to be replaced in a future release, perhaps with
+  something like `Document.numbering_definitions`. In the meantime, it can
+  now be accessed using ``Document.part.numbering_part``.
+
+
 0.8.1 (2015-02-10)
 ++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index e37f2ab46..d2eef61fe 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document     # noqa
 
-__version__ = '0.8.1'
+__version__ = '0.8.2'
 
 
 # register custom Part classes with opc package reader

From d7e5c9b27e76cd90ecf1ddd3628f0dfb6b4548cb Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 11:12:49 -0800
Subject: [PATCH 064/367] docs: document analysis for Font.color

---
 docs/api/enum/MsoColorType.rst                |  23 ++
 docs/api/enum/MsoThemeColorIndex.rst          |  71 +++++
 docs/api/enum/index.rst                       |   2 +
 docs/conf.py                                  |   2 +
 .../dev/analysis/features/text/font-color.rst | 288 ++++++++++++++++++
 docs/dev/analysis/features/text/index.rst     |   1 +
 docx/enum/dml.py                              | 124 ++++++++
 7 files changed, 511 insertions(+)
 create mode 100644 docs/api/enum/MsoColorType.rst
 create mode 100644 docs/api/enum/MsoThemeColorIndex.rst
 create mode 100644 docs/dev/analysis/features/text/font-color.rst
 create mode 100644 docx/enum/dml.py

diff --git a/docs/api/enum/MsoColorType.rst b/docs/api/enum/MsoColorType.rst
new file mode 100644
index 000000000..62a94d6aa
--- /dev/null
+++ b/docs/api/enum/MsoColorType.rst
@@ -0,0 +1,23 @@
+.. _MsoColorType:
+
+``MSO_COLOR_TYPE``
+==================
+
+Specifies the color specification scheme
+
+Example::
+
+    from docx.enum.dml import MSO_COLOR_TYPE
+
+    assert font.color.type == MSO_COLOR_TYPE.THEME
+
+----
+
+RGB
+    Color is specified by an |RGBColor| value.
+
+THEME
+    Color is one of the preset theme colors.
+
+AUTO
+    Color is determined automatically be the application.
diff --git a/docs/api/enum/MsoThemeColorIndex.rst b/docs/api/enum/MsoThemeColorIndex.rst
new file mode 100644
index 000000000..02436f2c1
--- /dev/null
+++ b/docs/api/enum/MsoThemeColorIndex.rst
@@ -0,0 +1,71 @@
+.. _MsoThemeColorIndex:
+
+``MSO_THEME_COLOR_INDEX``
+=========================
+
+Indicates the Office theme color, one of those shown in the color gallery on
+the formatting ribbon.
+
+Alias: ``MSO_THEME_COLOR``
+
+Example::
+
+    from docx.enum.dml import MSO_THEME_COLOR
+
+    font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
+
+----
+
+NOT_THEME_COLOR
+    Indicates the color is not a theme color.
+
+ACCENT_1
+    Specifies the Accent 1 theme color.
+
+ACCENT_2
+    Specifies the Accent 2 theme color.
+
+ACCENT_3
+    Specifies the Accent 3 theme color.
+
+ACCENT_4
+    Specifies the Accent 4 theme color.
+
+ACCENT_5
+    Specifies the Accent 5 theme color.
+
+ACCENT_6
+    Specifies the Accent 6 theme color.
+
+BACKGROUND_1
+    Specifies the Background 1 theme color.
+
+BACKGROUND_2
+    Specifies the Background 2 theme color.
+
+DARK_1
+    Specifies the Dark 1 theme color.
+
+DARK_2
+    Specifies the Dark 2 theme color.
+
+FOLLOWED_HYPERLINK
+    Specifies the theme color for a clicked hyperlink.
+
+HYPERLINK
+    Specifies the theme color for a hyperlink.
+
+LIGHT_1
+    Specifies the Light 1 theme color.
+
+LIGHT_2
+    Specifies the Light 2 theme color.
+
+TEXT_1
+    Specifies the Text 1 theme color.
+
+TEXT_2
+    Specifies the Text 2 theme color.
+
+MIXED
+    Indicates multiple theme colors are used.
diff --git a/docs/api/enum/index.rst b/docs/api/enum/index.rst
index a7b26730a..9deecb2f3 100644
--- a/docs/api/enum/index.rst
+++ b/docs/api/enum/index.rst
@@ -8,6 +8,8 @@ can be found here:
 .. toctree::
    :titlesonly:
 
+   MsoColorType
+   MsoThemeColorIndex
    WdAlignParagraph
    WdBuiltinStyle
    WdLineSpacing
diff --git a/docs/conf.py b/docs/conf.py
index 58628134f..5afaf24de 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -141,6 +141,8 @@
 
 .. |Relationships| replace:: :class:`._Relationships`
 
+.. |RGBColor| replace:: :class:`.RGBColor`
+
 .. |_Row| replace:: :class:`._Row`
 
 .. |_Rows| replace:: :class:`._Rows`
diff --git a/docs/dev/analysis/features/text/font-color.rst b/docs/dev/analysis/features/text/font-color.rst
new file mode 100644
index 000000000..443bc3af0
--- /dev/null
+++ b/docs/dev/analysis/features/text/font-color.rst
@@ -0,0 +1,288 @@
+
+Font Color
+==========
+
+Color, as a topic, extends beyond the |Font| object; font color is just the
+first place it's come up. Accordingly, it bears a little deeper thought than
+usual since we'll want to reuse the same objects and protocol to specify
+color in the other contexts; it makes sense to craft a general solution that
+will bear the expected reuse.
+
+There are three historical sources to draw from for this API.
+
+1. The `w:rPr/w:color` element. This is used by default when applying color
+   directly to text or when setting the text color of a style. This
+   corresponds to the `Font.Color` property (undocumented, unfortunately).
+   This element supports RGB colors, theme colors, and a tint or shade of
+   a theme color.
+
+2. The `w:rPr/w14:textFill` element. This is used by Word for fancy text like
+   gradient and shadow effects. This corresponds to the `Font.Fill` property.
+
+3. The PowerPoint font color UI. This seems like a reasonable compromise
+   between the prior two, allowing direct-ish access to common color options
+   while holding the door open for the `Font.fill` operations to be added
+   later if required.
+
+Candidate Protocol
+~~~~~~~~~~~~~~~~~~
+
+:class:`docx.text.run.Run` has a font property::
+
+    >>> from docx import Document
+    >>> from docx.text.run import Font, Run
+    >>> run = Document().add_paragraph().add_run()
+    >>> isinstance(run, Run)
+    True
+    >>> font = run.font
+    >>> isinstance(font, Font)
+    True
+
+:class:`docx.text.run.Font` has a read-only color property, returning
+a :class:`docx.dml.color.ColorFormat` object::
+
+    >>> from docx.dml.color import ColorFormat
+    >>> color = font.color
+    >>> isinstance(font.color, ColorFormat)
+    True
+    >>> font.color = 'anything'
+    AttributeError: can't set attribute
+
+
+:class:`docx.dml.color.ColorFormat` has a read-only :attr:`type` property and
+read/write :attr:`rgb`, :attr:`theme_color`, and :attr:`brightness`
+properties.
+
+:attr:`ColorFormat.type` returns one of `MSO_COLOR_TYPE.RGB`,
+`MSO_COLOR_TYPE.THEME`, `MSO_COLOR_TYPE.AUTO`, or |None|, the latter
+indicating font has no directly-applied color::
+
+    >>> font.color.type
+    None
+
+:attr:`ColorFormat.rgb` returns an |RGBColor| object when `type` is
+`MSO_COLOR_TYPE.RGB`. It may also report an RGBColor value when `type` is
+`MSO_COLOR_TYPE.THEME`, since an RGB color may also be present in that case.
+According to the spec, the RGB color value is ignored when a theme color is
+specified, but Word writes the current RGB value of the theme color along
+with the theme color name (e.g. 'accent1') when assigning a theme color;
+perhaps as a convenient value for a file browser to use. The value of `.type`
+must be consulted to determine whether the RGB value is operative or
+a "best-guess"::
+
+    >>> font.color.type
+    RGB (1)
+    >>> font.color.rgb
+    RGBColor(0x3f, 0x2c, 0x36)
+
+Assigning an |RGBColor| value to :attr:`ColorFormat.rgb` causes
+:attr:`ColorFormat.type` to become `MSO_COLOR_TYPE.RGB`::
+
+    >>> font.color.type
+    None
+    >>> font.color.rgb = RGBColor(0x3f, 0x2c, 0x36)
+    >>> font.color.type
+    RGB (1)
+    >>> font.color.rgb
+    RGBColor(0x3f, 0x2c, 0x36)
+
+:attr:`ColorFormat.theme_color` returns a member of :ref:`MsoThemeColorIndex`
+when `type` is `MSO_COLOR_TYPE.THEME`::
+
+    >>> font.color.type
+    THEME (2)
+    >>> font.color.theme_color
+    ACCENT_1 (5)
+
+Assigning a member of :ref:`MsoThemeColorIndex` to
+:attr:`ColorFormat.theme_color` causes :attr:`ColorFormat.type` to become
+`MSO_COLOR_TYPE.THEME`::
+
+    >>> font.color.type
+    RGB (1)
+    >>> font.color.theme_color = MSO_THEME_COLOR.ACCENT_2
+    >>> font.color.type
+    THEME (2)
+    >>> font.color.theme_color
+    ACCENT_2 (6)
+
+The :attr:`ColorFormat.brightness` attribute can be used to select a tint or
+shade of a theme color. Assigning the value 0.1 produces a color 10% brighter
+(a tint); assigning -0.1 produces a color 10% darker (a shade)::
+
+    >>> font.color.type
+    None
+    >>> font.color.brightness
+    0.0
+    >>> font.color.brightness = 0.4
+    ValueError: not a theme color
+
+    >>> font.color.theme_color = MSO_THEME_COLOR.TEXT_1
+    >>> font.color.brightness = 0.4
+    >>> font.color.brightness
+    0.4
+
+
+Specimen XML
+------------
+
+.. highlight:: xml
+
+Baseline paragraph with no font color::
+
+    <w:p>
+      <w:r>
+        <w:t>Text with no color.</w:t>
+      </w:r>
+    </w:p>
+
+Paragraph with directly-applied RGB color::
+
+    <w:p>
+      <w:pPr>
+        <w:rPr>
+          <w:color w:val="0000FF"/>
+        </w:rPr>
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:color w:val="0000FF"/>
+        </w:rPr>
+        <w:t>Directly-applied color Blue.</w:t>
+      </w:r>
+    </w:p>
+
+Run with directly-applied theme color::
+
+    <w:r>
+      <w:rPr>
+        <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      </w:rPr>
+      <w:t>Theme color Accent 1.</w:t>
+    </w:r>
+
+Run with 40% tint of Text 2 theme color::
+
+    <w:r>
+      <w:rPr>
+        <w:color w:val="548DD4" w:themeColor="text2" w:themeTint="99"/>
+      </w:rPr>
+      <w:t>Theme color with 40% tint.</w:t>
+    </w:r>
+
+Run with 25% shade of Accent 2 theme color::
+
+    <w:r>
+      <w:rPr>
+        <w:color w:val="943634" w:themeColor="accent2" w:themeShade="BF"/>
+      </w:rPr>
+      <w:t>Theme color with 25% shade.</w:t>
+    </w:r>
+
+
+Schema excerpt
+--------------
+
+.. highlight:: xml
+
+::
+
+  <xsd:complexType name="CT_RPr">  <!-- denormalized -->
+    <xsd:sequence>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="rStyle"          type="CT_String"/>
+        <xsd:element name="rFonts"          type="CT_Fonts"/>
+        <xsd:element name="b"               type="CT_OnOff"/>
+        <xsd:element name="bCs"             type="CT_OnOff"/>
+        <xsd:element name="i"               type="CT_OnOff"/>
+        <xsd:element name="iCs"             type="CT_OnOff"/>
+        <xsd:element name="caps"            type="CT_OnOff"/>
+        <xsd:element name="smallCaps"       type="CT_OnOff"/>
+        <xsd:element name="strike"          type="CT_OnOff"/>
+        <xsd:element name="dstrike"         type="CT_OnOff"/>
+        <xsd:element name="outline"         type="CT_OnOff"/>
+        <xsd:element name="shadow"          type="CT_OnOff"/>
+        <xsd:element name="emboss"          type="CT_OnOff"/>
+        <xsd:element name="imprint"         type="CT_OnOff"/>
+        <xsd:element name="noProof"         type="CT_OnOff"/>
+        <xsd:element name="snapToGrid"      type="CT_OnOff"/>
+        <xsd:element name="vanish"          type="CT_OnOff"/>
+        <xsd:element name="webHidden"       type="CT_OnOff"/>
+        <xsd:element name="color"           type="CT_Color"/>
+        <xsd:element name="spacing"         type="CT_SignedTwipsMeasure"/>
+        <xsd:element name="w"               type="CT_TextScale"/>
+        <xsd:element name="kern"            type="CT_HpsMeasure"/>
+        <xsd:element name="position"        type="CT_SignedHpsMeasure"/>
+        <xsd:element name="sz"              type="CT_HpsMeasure"/>
+        <xsd:element name="szCs"            type="CT_HpsMeasure"/>
+        <xsd:element name="highlight"       type="CT_Highlight"/>
+        <xsd:element name="u"               type="CT_Underline"/>
+        <xsd:element name="effect"          type="CT_TextEffect"/>
+        <xsd:element name="bdr"             type="CT_Border"/>
+        <xsd:element name="shd"             type="CT_Shd"/>
+        <xsd:element name="fitText"         type="CT_FitText"/>
+        <xsd:element name="vertAlign"       type="CT_VerticalAlignRun"/>
+        <xsd:element name="rtl"             type="CT_OnOff"/>
+        <xsd:element name="cs"              type="CT_OnOff"/>
+        <xsd:element name="em"              type="CT_Em"/>
+        <xsd:element name="lang"            type="CT_Language"/>
+        <xsd:element name="eastAsianLayout" type="CT_EastAsianLayout"/>
+        <xsd:element name="specVanish"      type="CT_OnOff"/>
+        <xsd:element name="oMath"           type="CT_OnOff"/>
+      </xsd:choice>
+      <xsd:element name="rPrChange" type="CT_RPrChange" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:complexType name="CT_Color">
+    <xsd:attribute name="val"        type="ST_HexColor" use="required"/>
+    <xsd:attribute name="themeColor" type="ST_ThemeColor"/>
+    <xsd:attribute name="themeTint"  type="ST_UcharHexNumber"/>
+    <xsd:attribute name="themeShade" type="ST_UcharHexNumber"/>
+  </xsd:complexType>
+
+  <!-- simple types -->
+
+  <xsd:simpleType name="ST_HexColor">
+    <xsd:union memberTypes="ST_HexColorAuto s:ST_HexColorRGB"/>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_HexColorAuto">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="auto"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_HexColorRGB">
+    <xsd:restriction base="xsd:hexBinary">
+      <xsd:length value="3" fixed="true"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_ThemeColor">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="dark1"/>
+      <xsd:enumeration value="light1"/>
+      <xsd:enumeration value="dark2"/>
+      <xsd:enumeration value="light2"/>
+      <xsd:enumeration value="accent1"/>
+      <xsd:enumeration value="accent2"/>
+      <xsd:enumeration value="accent3"/>
+      <xsd:enumeration value="accent4"/>
+      <xsd:enumeration value="accent5"/>
+      <xsd:enumeration value="accent6"/>
+      <xsd:enumeration value="hyperlink"/>
+      <xsd:enumeration value="followedHyperlink"/>
+      <xsd:enumeration value="none"/>
+      <xsd:enumeration value="background1"/>
+      <xsd:enumeration value="text1"/>
+      <xsd:enumeration value="background2"/>
+      <xsd:enumeration value="text2"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_UcharHexNumber">
+    <xsd:restriction base="xsd:hexBinary">
+      <xsd:length value="1"/>
+    </xsd:restriction>
+  </xsd:simpleType>
diff --git a/docs/dev/analysis/features/text/index.rst b/docs/dev/analysis/features/text/index.rst
index e56b86202..1c22dde66 100644
--- a/docs/dev/analysis/features/text/index.rst
+++ b/docs/dev/analysis/features/text/index.rst
@@ -7,6 +7,7 @@ Text
 
    paragraph-format
    font
+   font-color
    underline
    run-content
    breaks
diff --git a/docx/enum/dml.py b/docx/enum/dml.py
new file mode 100644
index 000000000..1ad0eaa87
--- /dev/null
+++ b/docx/enum/dml.py
@@ -0,0 +1,124 @@
+# encoding: utf-8
+
+"""
+Enumerations used by DrawingML objects
+"""
+
+from __future__ import absolute_import
+
+from .base import (
+    alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
+)
+
+
+class MSO_COLOR_TYPE(Enumeration):
+    """
+    Specifies the color specification scheme
+
+    Example::
+
+        from docx.enum.dml import MSO_COLOR_TYPE
+
+        assert font.color.type == MSO_COLOR_TYPE.SCHEME
+    """
+
+    __ms_name__ = 'MsoColorType'
+
+    __url__ = (
+        'http://msdn.microsoft.com/en-us/library/office/ff864912(v=office.15'
+        ').aspx'
+    )
+
+    __members__ = (
+        EnumMember(
+            'RGB', 1, 'Color is specified by an |RGBColor| value.'
+        ),
+        EnumMember(
+            'THEME', 2, 'Color is one of the preset theme colors.'
+        ),
+        EnumMember(
+            'AUTO', 101, 'Color is determined automatically by the '
+            'application.'
+        ),
+    )
+
+
+@alias('MSO_THEME_COLOR')
+class MSO_THEME_COLOR_INDEX(XmlEnumeration):
+    """
+    Indicates the Office theme color, one of those shown in the color gallery
+    on the formatting ribbon.
+
+    Alias: ``MSO_THEME_COLOR``
+
+    Example::
+
+        from docx.enum.dml import MSO_THEME_COLOR
+
+        font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
+    """
+
+    __ms_name__ = 'MsoThemeColorIndex'
+
+    __url__ = (
+        'http://msdn.microsoft.com/en-us/library/office/ff860782(v=office.15'
+        ').aspx'
+    )
+
+    __members__ = (
+        EnumMember(
+            'NOT_THEME_COLOR', 0, 'Indicates the color is not a theme color.'
+        ),
+        XmlMappedEnumMember(
+            'ACCENT_1', 5, 'accent1', 'Specifies the Accent 1 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'ACCENT_2', 6, 'accent2', 'Specifies the Accent 2 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'ACCENT_3', 7, 'accent3', 'Specifies the Accent 3 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'ACCENT_4', 8, 'accent4', 'Specifies the Accent 4 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'ACCENT_5', 9, 'accent5', 'Specifies the Accent 5 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'ACCENT_6', 10, 'accent6', 'Specifies the Accent 6 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'BACKGROUND_1', 14, 'background1', 'Specifies the Background 1 '
+            'theme color.'
+        ),
+        XmlMappedEnumMember(
+            'BACKGROUND_2', 16, 'background2', 'Specifies the Background 2 '
+            'theme color.'
+        ),
+        XmlMappedEnumMember(
+            'DARK_1', 1, 'dark1', 'Specifies the Dark 1 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'DARK_2', 3, 'dark2', 'Specifies the Dark 2 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'FOLLOWED_HYPERLINK', 12, 'followedHyperlink', 'Specifies the '
+            'theme color for a clicked hyperlink.'
+        ),
+        XmlMappedEnumMember(
+            'HYPERLINK', 11, 'hyperlink', 'Specifies the theme color for a '
+            'hyperlink.'
+        ),
+        XmlMappedEnumMember(
+            'LIGHT_1', 2, 'light1', 'Specifies the Light 1 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'LIGHT_2', 4, 'light2', 'Specifies the Light 2 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'TEXT_1', 13, 'text1', 'Specifies the Text 1 theme color.'
+        ),
+        XmlMappedEnumMember(
+            'TEXT_2', 15, 'text2', 'Specifies the Text 2 theme color.'
+        ),
+    )

From 49f935f469de266cb2471935717e9251ad29cc16 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 17:37:39 -0800
Subject: [PATCH 065/367] reorg: extract font-related behave steps

features/steps/text.py was getting large and font is far enough along to
warrant its own steps file.
---
 features/steps/font.py | 151 +++++++++++++++++++++++++++++++++++++++++
 features/steps/text.py | 128 ----------------------------------
 2 files changed, 151 insertions(+), 128 deletions(-)
 create mode 100644 features/steps/font.py

diff --git a/features/steps/font.py b/features/steps/font.py
new file mode 100644
index 000000000..9e95663c8
--- /dev/null
+++ b/features/steps/font.py
@@ -0,0 +1,151 @@
+# encoding: utf-8
+
+"""
+Step implementations for font-related features.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from behave import given, then, when
+
+from docx import Document
+from docx.enum.text import WD_UNDERLINE
+
+from helpers import test_docx
+
+
+# given ===================================================
+
+@given('a font having typeface name {name}')
+def given_a_font_having_typeface_name(context, name):
+    document = Document(test_docx('txt-font-props'))
+    style_name = {
+        'not specified': 'Normal',
+        'Avenir Black':  'Having Typeface',
+    }[name]
+    context.font = document.styles[style_name].font
+
+
+@given('a font having {underline_type} underline')
+def given_a_font_having_type_underline(context, underline_type):
+    style_name = {
+        'inherited': 'Normal',
+        'no':        'None Underlined',
+        'single':    'Underlined',
+        'double':    'Double Underlined',
+    }[underline_type]
+    document = Document(test_docx('txt-font-props'))
+    context.font = document.styles[style_name].font
+
+
+@given('a font having {vertAlign_state} vertical alignment')
+def given_a_font_having_vertAlign_state(context, vertAlign_state):
+    style_name = {
+        'inherited':   'Normal',
+        'subscript':   'Subscript',
+        'superscript': 'Superscript',
+    }[vertAlign_state]
+    document = Document(test_docx('txt-font-props'))
+    context.font = document.styles[style_name].font
+
+
+@given('a font of size {size}')
+def given_a_font_of_size(context, size):
+    document = Document(test_docx('txt-font-props'))
+    style_name = {
+        'unspecified': 'Normal',
+        '14 pt':       'Having Typeface',
+        '18 pt':       'Large Size',
+    }[size]
+    context.font = document.styles[style_name].font
+
+
+# when ====================================================
+
+@when('I assign {value} to font.name')
+def when_I_assign_value_to_font_name(context, value):
+    font = context.font
+    value = None if value == 'None' else value
+    font.name = value
+
+
+@when('I assign {value} to font.size')
+def when_I_assign_value_str_to_font_size(context, value):
+    value = None if value == 'None' else int(value)
+    font = context.font
+    font.size = value
+
+
+@when('I assign {value} to font.underline')
+def when_I_assign_value_to_font_underline(context, value):
+    new_value = {
+        'True':                True,
+        'False':               False,
+        'None':                None,
+        'WD_UNDERLINE.SINGLE': WD_UNDERLINE.SINGLE,
+        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
+    }[value]
+    font = context.font
+    font.underline = new_value
+
+
+@when('I assign {value} to font.{sub_super}script')
+def when_I_assign_value_to_font_sub_super(context, value, sub_super):
+    font = context.font
+    name = {
+        'sub':   'subscript',
+        'super': 'superscript',
+    }[sub_super]
+    new_value = {
+        'None':  None,
+        'True':  True,
+        'False': False,
+    }[value]
+
+    setattr(font, name, new_value)
+
+
+# then =====================================================
+
+@then('font.name is {value}')
+def then_font_name_is_value(context, value):
+    font = context.font
+    value = None if value == 'None' else value
+    assert font.name == value
+
+
+@then('font.size is {value}')
+def then_font_size_is_value(context, value):
+    value = None if value == 'None' else int(value)
+    font = context.font
+    assert font.size == value
+
+
+@then('font.underline is {value}')
+def then_font_underline_is_value(context, value):
+    expected_value = {
+        'None':                None,
+        'True':                True,
+        'False':               False,
+        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
+    }[value]
+    font = context.font
+    assert font.underline == expected_value
+
+
+@then('font.{sub_super}script is {value}')
+def then_font_sub_super_is_value(context, sub_super, value):
+    name = {
+        'sub':   'subscript',
+        'super': 'superscript',
+    }[sub_super]
+    expected_value = {
+        'None':  None,
+        'True':  True,
+        'False': False,
+    }[value]
+    font = context.font
+    actual_value = getattr(font, name)
+    assert actual_value == expected_value
diff --git a/features/steps/text.py b/features/steps/text.py
index f89cd9143..10240fe74 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -24,50 +24,6 @@
 
 # given ===================================================
 
-@given('a font having typeface name {name}')
-def given_a_font_having_typeface_name(context, name):
-    document = Document(test_docx('txt-font-props'))
-    style_name = {
-        'not specified': 'Normal',
-        'Avenir Black':  'Having Typeface',
-    }[name]
-    context.font = document.styles[style_name].font
-
-
-@given('a font having {underline_type} underline')
-def given_a_font_having_type_underline(context, underline_type):
-    style_name = {
-        'inherited': 'Normal',
-        'no':        'None Underlined',
-        'single':    'Underlined',
-        'double':    'Double Underlined',
-    }[underline_type]
-    document = Document(test_docx('txt-font-props'))
-    context.font = document.styles[style_name].font
-
-
-@given('a font having {vertAlign_state} vertical alignment')
-def given_a_font_having_vertAlign_state(context, vertAlign_state):
-    style_name = {
-        'inherited':   'Normal',
-        'subscript':   'Subscript',
-        'superscript': 'Superscript',
-    }[vertAlign_state]
-    document = Document(test_docx('txt-font-props'))
-    context.font = document.styles[style_name].font
-
-
-@given('a font of size {size}')
-def given_a_font_of_size(context, size):
-    document = Document(test_docx('txt-font-props'))
-    style_name = {
-        'unspecified': 'Normal',
-        '14 pt':       'Having Typeface',
-        '18 pt':       'Large Size',
-    }[size]
-    context.font = document.styles[style_name].font
-
-
 @given('a paragraph format having {prop_name} set {setting}')
 def given_a_paragraph_format_having_prop_set(context, prop_name, setting):
     style_name = {
@@ -250,33 +206,6 @@ def when_I_assign_mixed_text_to_the_text_property(context):
     context.run.text = 'abc\tdef\nghi\rjkl'
 
 
-@when('I assign {value} to font.name')
-def when_I_assign_value_to_font_name(context, value):
-    font = context.font
-    value = None if value == 'None' else value
-    font.name = value
-
-
-@when('I assign {value} to font.size')
-def when_I_assign_value_str_to_font_size(context, value):
-    value = None if value == 'None' else int(value)
-    font = context.font
-    font.size = value
-
-
-@when('I assign {value_key} to font.underline')
-def when_I_assign_value_to_font_underline(context, value_key):
-    value = {
-        'True':                True,
-        'False':               False,
-        'None':                None,
-        'WD_UNDERLINE.SINGLE': WD_UNDERLINE.SINGLE,
-        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
-    }[value_key]
-    font = context.font
-    font.underline = value
-
-
 @when('I assign {value_key} to paragraph_format.line_spacing')
 def when_I_assign_value_to_paragraph_format_line_spacing(context, value_key):
     value = {
@@ -302,22 +231,6 @@ def when_I_assign_value_to_paragraph_format_line_rule(context, value_key):
     paragraph_format.line_spacing_rule = value
 
 
-@when('I assign {value_key} to font.{sub_super}script')
-def when_I_assign_value_to_font_sub_super(context, value_key, sub_super):
-    font = context.font
-    name = {
-        'sub':   'subscript',
-        'super': 'superscript',
-    }[sub_super]
-    value = {
-        'None':  None,
-        'True':  True,
-        'False': False,
-    }[value_key]
-
-    setattr(font, name, value)
-
-
 @when('I assign {value_key} to paragraph_format.alignment')
 def when_I_assign_value_to_paragraph_format_alignment(context, value_key):
     value = {
@@ -392,47 +305,6 @@ def when_I_set_the_run_underline_to_value(context, underline_value):
 
 # then =====================================================
 
-@then('font.name is {value}')
-def then_font_name_is_value(context, value):
-    font = context.font
-    value = None if value == 'None' else value
-    assert font.name == value
-
-
-@then('font.size is {value}')
-def then_font_size_is_value(context, value):
-    value = None if value == 'None' else int(value)
-    font = context.font
-    assert font.size == value
-
-
-@then('font.underline is {value_key}')
-def then_font_underline_is_value(context, value_key):
-    value = {
-        'None':                None,
-        'True':                True,
-        'False':               False,
-        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
-    }[value_key]
-    font = context.font
-    assert font.underline == value
-
-
-@then('font.{sub_super}script is {value_key}')
-def then_font_sub_super_is_value(context, sub_super, value_key):
-    name = {
-        'sub':   'subscript',
-        'super': 'superscript',
-    }[sub_super]
-    expected_value = {
-        'None':  None,
-        'True':  True,
-        'False': False,
-    }[value_key]
-    font = context.font
-    actual_value = getattr(font, name)
-    assert actual_value == expected_value
-
 
 @then('it is a column break')
 def then_type_is_column_break(context):

From 0f5ad58a86580ecaa1aeeb5a14d84833371833c6 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 18:04:08 -0800
Subject: [PATCH 066/367] reorg: extract parfmt-related behave steps

---
 features/steps/parfmt.py | 207 +++++++++++++++++++++++++++++++++++++++
 features/steps/text.py   | 190 +----------------------------------
 2 files changed, 208 insertions(+), 189 deletions(-)
 create mode 100644 features/steps/parfmt.py

diff --git a/features/steps/parfmt.py b/features/steps/parfmt.py
new file mode 100644
index 000000000..ea695ca99
--- /dev/null
+++ b/features/steps/parfmt.py
@@ -0,0 +1,207 @@
+# encoding: utf-8
+
+"""
+Step implementations for paragraph format-related features.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from behave import given, then, when
+
+from docx import Document
+from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
+from docx.shared import Pt
+
+from helpers import test_docx
+
+
+# given ===================================================
+
+@given('a paragraph format having {prop_name} set {setting}')
+def given_a_paragraph_format_having_prop_set(context, prop_name, setting):
+    style_name = {
+        'to inherit': 'Normal',
+        'On':         'Base',
+        'Off':        'Citation',
+    }[setting]
+    document = Document(test_docx('sty-known-styles'))
+    context.paragraph_format = document.styles[style_name].paragraph_format
+
+
+@given('a paragraph format having {setting} line spacing')
+def given_a_paragraph_format_having_setting_line_spacing(context, setting):
+    style_name = {
+        'inherited': 'Normal',
+        '14 pt':     'Base',
+        'double':    'Citation',
+    }[setting]
+    document = Document(test_docx('sty-known-styles'))
+    context.paragraph_format = document.styles[style_name].paragraph_format
+
+
+@given('a paragraph format having {setting} space {side}')
+def given_a_paragraph_format_having_setting_spacing(context, setting, side):
+    style_name = 'Normal' if setting == 'inherited' else 'Base'
+    document = Document(test_docx('sty-known-styles'))
+    context.paragraph_format = document.styles[style_name].paragraph_format
+
+
+@given('a paragraph format having {type} alignment')
+def given_a_paragraph_format_having_align_type_alignment(context, type):
+    style_name = {
+        'inherited': 'Normal',
+        'center':    'Base',
+        'right':     'Citation',
+    }[type]
+    document = Document(test_docx('sty-known-styles'))
+    context.paragraph_format = document.styles[style_name].paragraph_format
+
+
+@given('a paragraph format having {type} indent of {value}')
+def given_a_paragraph_format_having_type_indent_value(context, type, value):
+    style_name = {
+        'inherit':  'Normal',
+        '18 pt':    'Base',
+        '17.3 pt':  'Base',
+        '-17.3 pt': 'Citation',
+        '46.1 pt':  'Citation',
+    }[value]
+    document = Document(test_docx('sty-known-styles'))
+    context.paragraph_format = document.styles[style_name].paragraph_format
+
+
+# when ====================================================
+
+@when('I assign {value} to paragraph_format.line_spacing')
+def when_I_assign_value_to_paragraph_format_line_spacing(context, value):
+    new_value = {
+        'Pt(14)': Pt(14),
+        '2':      2,
+    }.get(value)
+    new_value = float(value) if new_value is None else new_value
+    context.paragraph_format.line_spacing = new_value
+
+
+@when('I assign {value} to paragraph_format.line_spacing_rule')
+def when_I_assign_value_to_paragraph_format_line_rule(context, value):
+    new_value = {
+        'None':                           None,
+        'WD_LINE_SPACING.EXACTLY':        WD_LINE_SPACING.EXACTLY,
+        'WD_LINE_SPACING.MULTIPLE':       WD_LINE_SPACING.MULTIPLE,
+        'WD_LINE_SPACING.SINGLE':         WD_LINE_SPACING.SINGLE,
+        'WD_LINE_SPACING.DOUBLE':         WD_LINE_SPACING.DOUBLE,
+        'WD_LINE_SPACING.AT_LEAST':       WD_LINE_SPACING.AT_LEAST,
+        'WD_LINE_SPACING.ONE_POINT_FIVE': WD_LINE_SPACING.ONE_POINT_FIVE,
+    }[value]
+    paragraph_format = context.paragraph_format
+    paragraph_format.line_spacing_rule = new_value
+
+
+@when('I assign {value} to paragraph_format.alignment')
+def when_I_assign_value_to_paragraph_format_alignment(context, value):
+    new_value = {
+        'None':                      None,
+        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
+        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
+    }[value]
+    paragraph_format = context.paragraph_format
+    paragraph_format.alignment = new_value
+
+
+@when('I assign {value} to paragraph_format.space_{side}')
+def when_I_assign_value_to_paragraph_format_space(context, value, side):
+    paragraph_format = context.paragraph_format
+    prop_name = 'space_%s' % side
+    new_value = {
+        'None':   None,
+        'Pt(12)': Pt(12),
+        'Pt(18)': Pt(18),
+    }[value]
+    setattr(paragraph_format, prop_name, new_value)
+
+
+@when('I assign {value} to paragraph_format.{type_}_indent')
+def when_I_assign_value_to_paragraph_format_indent(context, value, type_):
+    paragraph_format = context.paragraph_format
+    prop_name = '%s_indent' % type_
+    value = None if value == 'None' else Pt(float(value.split()[0]))
+    setattr(paragraph_format, prop_name, value)
+
+
+@when('I assign {value} to paragraph_format.{prop_name}')
+def when_I_assign_value_to_paragraph_format_prop(context, value, prop_name):
+    paragraph_format = context.paragraph_format
+    value = {'None': None, 'True': True, 'False': False}[value]
+    setattr(paragraph_format, prop_name, value)
+
+
+# then =====================================================
+
+@then('paragraph_format.alignment is {value}')
+def then_paragraph_format_alignment_is_value(context, value):
+    expected_value = {
+        'None':                      None,
+        'WD_ALIGN_PARAGRAPH.LEFT':   WD_ALIGN_PARAGRAPH.LEFT,
+        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
+        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
+    }[value]
+    paragraph_format = context.paragraph_format
+    assert paragraph_format.alignment == expected_value
+
+
+@then('paragraph_format.line_spacing is {value}')
+def then_paragraph_format_line_spacing_is_value(context, value):
+    expected_value = (
+        None if value == 'None' else
+        float(value) if '.' in value else
+        int(value)
+    )
+    paragraph_format = context.paragraph_format
+
+    if expected_value is None or isinstance(expected_value, int):
+        assert paragraph_format.line_spacing == expected_value
+    else:
+        assert abs(paragraph_format.line_spacing - expected_value) < 0.001
+
+
+@then('paragraph_format.line_spacing_rule is {value}')
+def then_paragraph_format_line_spacing_rule_is_value(context, value):
+    expected_value = {
+        'None':                           None,
+        'WD_LINE_SPACING.EXACTLY':        WD_LINE_SPACING.EXACTLY,
+        'WD_LINE_SPACING.MULTIPLE':       WD_LINE_SPACING.MULTIPLE,
+        'WD_LINE_SPACING.SINGLE':         WD_LINE_SPACING.SINGLE,
+        'WD_LINE_SPACING.DOUBLE':         WD_LINE_SPACING.DOUBLE,
+        'WD_LINE_SPACING.AT_LEAST':       WD_LINE_SPACING.AT_LEAST,
+        'WD_LINE_SPACING.ONE_POINT_FIVE': WD_LINE_SPACING.ONE_POINT_FIVE,
+    }[value]
+    paragraph_format = context.paragraph_format
+    assert paragraph_format.line_spacing_rule == expected_value
+
+
+@then('paragraph_format.space_{side} is {value}')
+def then_paragraph_format_space_side_is_value(context, side, value):
+    expected_value = None if value == 'None' else int(value)
+    prop_name = 'space_%s' % side
+    paragraph_format = context.paragraph_format
+    actual_value = getattr(paragraph_format, prop_name)
+    assert actual_value == expected_value
+
+
+@then('paragraph_format.{type_}_indent is {value}')
+def then_paragraph_format_type_indent_is_value(context, type_, value):
+    expected_value = None if value == 'None' else int(value)
+    prop_name = '%s_indent' % type_
+    paragraph_format = context.paragraph_format
+    actual_value = getattr(paragraph_format, prop_name)
+    assert actual_value == expected_value
+
+
+@then('paragraph_format.{prop_name} is {value}')
+def then_paragraph_format_prop_name_is_value(context, prop_name, value):
+    expected_value = {'None': None, 'True': True, 'False': False}[value]
+    paragraph_format = context.paragraph_format
+    actual_value = getattr(paragraph_format, prop_name)
+    assert actual_value == expected_value
diff --git a/features/steps/text.py b/features/steps/text.py
index 10240fe74..f255ec094 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -11,12 +11,9 @@
 from behave import given, then, when
 
 from docx import Document
-from docx.enum.text import (
-    WD_ALIGN_PARAGRAPH, WD_BREAK, WD_LINE_SPACING, WD_UNDERLINE
-)
+from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
-from docx.shared import Pt
 from docx.text.run import Font, Run
 
 from helpers import test_docx, test_file, test_text
@@ -24,59 +21,6 @@
 
 # given ===================================================
 
-@given('a paragraph format having {prop_name} set {setting}')
-def given_a_paragraph_format_having_prop_set(context, prop_name, setting):
-    style_name = {
-        'to inherit': 'Normal',
-        'On':         'Base',
-        'Off':        'Citation',
-    }[setting]
-    document = Document(test_docx('sty-known-styles'))
-    context.paragraph_format = document.styles[style_name].paragraph_format
-
-
-@given('a paragraph format having {setting} line spacing')
-def given_a_paragraph_format_having_setting_line_spacing(context, setting):
-    style_name = {
-        'inherited': 'Normal',
-        '14 pt':     'Base',
-        'double':    'Citation',
-    }[setting]
-    document = Document(test_docx('sty-known-styles'))
-    context.paragraph_format = document.styles[style_name].paragraph_format
-
-
-@given('a paragraph format having {setting} space {side}')
-def given_a_paragraph_format_having_setting_spacing(context, setting, side):
-    style_name = 'Normal' if setting == 'inherited' else 'Base'
-    document = Document(test_docx('sty-known-styles'))
-    context.paragraph_format = document.styles[style_name].paragraph_format
-
-
-@given('a paragraph format having {type} alignment')
-def given_a_paragraph_format_having_align_type_alignment(context, type):
-    style_name = {
-        'inherited': 'Normal',
-        'center':    'Base',
-        'right':     'Citation',
-    }[type]
-    document = Document(test_docx('sty-known-styles'))
-    context.paragraph_format = document.styles[style_name].paragraph_format
-
-
-@given('a paragraph format having {type} indent of {value}')
-def given_a_paragraph_format_having_type_indent_value(context, type, value):
-    style_name = {
-        'inherit':  'Normal',
-        '18 pt':    'Base',
-        '17.3 pt':  'Base',
-        '-17.3 pt': 'Citation',
-        '46.1 pt':  'Citation',
-    }[value]
-    document = Document(test_docx('sty-known-styles'))
-    context.paragraph_format = document.styles[style_name].paragraph_format
-
-
 @given('a run')
 def given_a_run(context):
     document = Document()
@@ -206,69 +150,6 @@ def when_I_assign_mixed_text_to_the_text_property(context):
     context.run.text = 'abc\tdef\nghi\rjkl'
 
 
-@when('I assign {value_key} to paragraph_format.line_spacing')
-def when_I_assign_value_to_paragraph_format_line_spacing(context, value_key):
-    value = {
-        'Pt(14)': Pt(14),
-        '2':      2,
-    }.get(value_key)
-    value = float(value_key) if value is None else value
-    context.paragraph_format.line_spacing = value
-
-
-@when('I assign {value_key} to paragraph_format.line_spacing_rule')
-def when_I_assign_value_to_paragraph_format_line_rule(context, value_key):
-    value = {
-        'None':                           None,
-        'WD_LINE_SPACING.EXACTLY':        WD_LINE_SPACING.EXACTLY,
-        'WD_LINE_SPACING.MULTIPLE':       WD_LINE_SPACING.MULTIPLE,
-        'WD_LINE_SPACING.SINGLE':         WD_LINE_SPACING.SINGLE,
-        'WD_LINE_SPACING.DOUBLE':         WD_LINE_SPACING.DOUBLE,
-        'WD_LINE_SPACING.AT_LEAST':       WD_LINE_SPACING.AT_LEAST,
-        'WD_LINE_SPACING.ONE_POINT_FIVE': WD_LINE_SPACING.ONE_POINT_FIVE,
-    }[value_key]
-    paragraph_format = context.paragraph_format
-    paragraph_format.line_spacing_rule = value
-
-
-@when('I assign {value_key} to paragraph_format.alignment')
-def when_I_assign_value_to_paragraph_format_alignment(context, value_key):
-    value = {
-        'None':                      None,
-        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
-        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
-    }[value_key]
-    paragraph_format = context.paragraph_format
-    paragraph_format.alignment = value
-
-
-@when('I assign {value_key} to paragraph_format.space_{side}')
-def when_I_assign_value_to_paragraph_format_space(context, value_key, side):
-    paragraph_format = context.paragraph_format
-    prop_name = 'space_%s' % side
-    value = {
-        'None':   None,
-        'Pt(12)': Pt(12),
-        'Pt(18)': Pt(18),
-    }[value_key]
-    setattr(paragraph_format, prop_name, value)
-
-
-@when('I assign {value} to paragraph_format.{type_}_indent')
-def when_I_assign_value_to_paragraph_format_indent(context, value, type_):
-    paragraph_format = context.paragraph_format
-    prop_name = '%s_indent' % type_
-    value = None if value == 'None' else Pt(float(value.split()[0]))
-    setattr(paragraph_format, prop_name, value)
-
-
-@when('I assign {value} to paragraph_format.{prop_name}')
-def when_I_assign_value_to_paragraph_format_prop(context, value, prop_name):
-    paragraph_format = context.paragraph_format
-    value = {'None': None, 'True': True, 'False': False}[value]
-    setattr(paragraph_format, prop_name, value)
-
-
 @when('I assign {value_str} to its {bool_prop_name} property')
 def when_assign_true_to_bool_run_prop(context, value_str, bool_prop_name):
     value = {'True': True, 'False': False, 'None': None}[value_str]
@@ -305,7 +186,6 @@ def when_I_set_the_run_underline_to_value(context, underline_value):
 
 # then =====================================================
 
-
 @then('it is a column break')
 def then_type_is_column_break(context):
     attrib = context.last_child.attrib
@@ -324,74 +204,6 @@ def then_type_is_page_break(context):
     assert attrib == {qn('w:type'): 'page'}
 
 
-@then('paragraph_format.alignment is {value_key}')
-def then_paragraph_format_alignment_is_value(context, value_key):
-    value = {
-        'None':                      None,
-        'WD_ALIGN_PARAGRAPH.LEFT':   WD_ALIGN_PARAGRAPH.LEFT,
-        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
-        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
-    }[value_key]
-    paragraph_format = context.paragraph_format
-    assert paragraph_format.alignment == value
-
-
-@then('paragraph_format.line_spacing is {value}')
-def then_paragraph_format_line_spacing_is_value(context, value):
-    value = (
-        None if value == 'None' else
-        float(value) if '.' in value else
-        int(value)
-    )
-    paragraph_format = context.paragraph_format
-
-    if value is None or isinstance(value, int):
-        assert paragraph_format.line_spacing == value
-    else:
-        assert abs(paragraph_format.line_spacing - value) < 0.001
-
-
-@then('paragraph_format.line_spacing_rule is {value_key}')
-def then_paragraph_format_line_spacing_rule_is_value(context, value_key):
-    value = {
-        'None':                           None,
-        'WD_LINE_SPACING.EXACTLY':        WD_LINE_SPACING.EXACTLY,
-        'WD_LINE_SPACING.MULTIPLE':       WD_LINE_SPACING.MULTIPLE,
-        'WD_LINE_SPACING.SINGLE':         WD_LINE_SPACING.SINGLE,
-        'WD_LINE_SPACING.DOUBLE':         WD_LINE_SPACING.DOUBLE,
-        'WD_LINE_SPACING.AT_LEAST':       WD_LINE_SPACING.AT_LEAST,
-        'WD_LINE_SPACING.ONE_POINT_FIVE': WD_LINE_SPACING.ONE_POINT_FIVE,
-    }[value_key]
-    paragraph_format = context.paragraph_format
-    assert paragraph_format.line_spacing_rule == value
-
-
-@then('paragraph_format.space_{side} is {value}')
-def then_paragraph_format_space_side_is_value(context, side, value):
-    expected_value = None if value == 'None' else int(value)
-    prop_name = 'space_%s' % side
-    paragraph_format = context.paragraph_format
-    actual_value = getattr(paragraph_format, prop_name)
-    assert actual_value == expected_value
-
-
-@then('paragraph_format.{type_}_indent is {value}')
-def then_paragraph_format_type_indent_is_value(context, type_, value):
-    expected_value = None if value == 'None' else int(value)
-    prop_name = '%s_indent' % type_
-    paragraph_format = context.paragraph_format
-    actual_value = getattr(paragraph_format, prop_name)
-    assert actual_value == expected_value
-
-
-@then('paragraph_format.{prop_name} is {value}')
-def then_paragraph_format_prop_name_is_value(context, prop_name, value):
-    expected_value = {'None': None, 'True': True, 'False': False}[value]
-    paragraph_format = context.paragraph_format
-    actual_value = getattr(paragraph_format, prop_name)
-    assert actual_value == expected_value
-
-
 @then('run.font is the Font object for the run')
 def then_run_font_is_the_Font_object_for_the_run(context):
     run, font = context.run, context.run.font

From f54ccd757c149ad1dcad1f5b65fad8ca60782255 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 18:18:19 -0800
Subject: [PATCH 067/367] reorg: extract docx.text.font

---
 docx/styles/style.py       |   2 +-
 docx/text/font.py          | 386 +++++++++++++++++++++++++++++++++++++
 docx/text/run.py           | 378 +-----------------------------------
 features/steps/styles.py   |   2 +-
 features/steps/text.py     |   3 +-
 tests/styles/test_style.py |   2 +-
 tests/text/test_font.py    | 327 +++++++++++++++++++++++++++++++
 tests/text/test_run.py     | 314 +-----------------------------
 8 files changed, 722 insertions(+), 692 deletions(-)
 create mode 100644 docx/text/font.py
 create mode 100644 tests/text/test_font.py

diff --git a/docx/styles/style.py b/docx/styles/style.py
index fedd84ecf..24371b231 100644
--- a/docx/styles/style.py
+++ b/docx/styles/style.py
@@ -11,8 +11,8 @@
 from . import BabelFish
 from ..enum.style import WD_STYLE_TYPE
 from ..shared import ElementProxy
+from ..text.font import Font
 from ..text.parfmt import ParagraphFormat
-from ..text.run import Font
 
 
 def StyleFactory(style_elm):
diff --git a/docx/text/font.py b/docx/text/font.py
new file mode 100644
index 000000000..39c946181
--- /dev/null
+++ b/docx/text/font.py
@@ -0,0 +1,386 @@
+# encoding: utf-8
+
+"""
+Font-related proxy objects.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from ..shared import ElementProxy
+
+
+class Font(ElementProxy):
+    """
+    Proxy object wrapping the parent of a ``<w:rPr>`` element and providing
+    access to character properties such as font name, font size, bold, and
+    subscript.
+    """
+
+    __slots__ = ()
+
+    @property
+    def all_caps(self):
+        """
+        Read/write. Causes text in this font to appear in capital letters.
+        """
+        return self._get_bool_prop('caps')
+
+    @all_caps.setter
+    def all_caps(self, value):
+        self._set_bool_prop('caps', value)
+
+    @property
+    def bold(self):
+        """
+        Read/write. Causes text in this font to appear in bold.
+        """
+        return self._get_bool_prop('b')
+
+    @bold.setter
+    def bold(self, value):
+        self._set_bool_prop('b', value)
+
+    @property
+    def complex_script(self):
+        """
+        Read/write tri-state value. When |True|, causes the characters in the
+        run to be treated as complex script regardless of their Unicode
+        values.
+        """
+        return self._get_bool_prop('cs')
+
+    @complex_script.setter
+    def complex_script(self, value):
+        self._set_bool_prop('cs', value)
+
+    @property
+    def cs_bold(self):
+        """
+        Read/write tri-state value. When |True|, causes the complex script
+        characters in the run to be displayed in bold typeface.
+        """
+        return self._get_bool_prop('bCs')
+
+    @cs_bold.setter
+    def cs_bold(self, value):
+        self._set_bool_prop('bCs', value)
+
+    @property
+    def cs_italic(self):
+        """
+        Read/write tri-state value. When |True|, causes the complex script
+        characters in the run to be displayed in italic typeface.
+        """
+        return self._get_bool_prop('iCs')
+
+    @cs_italic.setter
+    def cs_italic(self, value):
+        self._set_bool_prop('iCs', value)
+
+    @property
+    def double_strike(self):
+        """
+        Read/write tri-state value. When |True|, causes the text in the run
+        to appear with double strikethrough.
+        """
+        return self._get_bool_prop('dstrike')
+
+    @double_strike.setter
+    def double_strike(self, value):
+        self._set_bool_prop('dstrike', value)
+
+    @property
+    def emboss(self):
+        """
+        Read/write tri-state value. When |True|, causes the text in the run
+        to appear as if raised off the page in relief.
+        """
+        return self._get_bool_prop('emboss')
+
+    @emboss.setter
+    def emboss(self, value):
+        self._set_bool_prop('emboss', value)
+
+    @property
+    def hidden(self):
+        """
+        Read/write tri-state value. When |True|, causes the text in the run
+        to be hidden from display, unless applications settings force hidden
+        text to be shown.
+        """
+        return self._get_bool_prop('vanish')
+
+    @hidden.setter
+    def hidden(self, value):
+        self._set_bool_prop('vanish', value)
+
+    @property
+    def italic(self):
+        """
+        Read/write tri-state value. When |True|, causes the text of the run
+        to appear in italics. |None| indicates the effective value is
+        inherited from the style hierarchy.
+        """
+        return self._get_bool_prop('i')
+
+    @italic.setter
+    def italic(self, value):
+        self._set_bool_prop('i', value)
+
+    @property
+    def imprint(self):
+        """
+        Read/write tri-state value. When |True|, causes the text in the run
+        to appear as if pressed into the page.
+        """
+        return self._get_bool_prop('imprint')
+
+    @imprint.setter
+    def imprint(self, value):
+        self._set_bool_prop('imprint', value)
+
+    @property
+    def math(self):
+        """
+        Read/write tri-state value. When |True|, specifies this run contains
+        WML that should be handled as though it was Office Open XML Math.
+        """
+        return self._get_bool_prop('oMath')
+
+    @math.setter
+    def math(self, value):
+        self._set_bool_prop('oMath', value)
+
+    @property
+    def name(self):
+        """
+        Get or set the typeface name for this |Font| instance, causing the
+        text it controls to appear in the named font, if a matching font is
+        found. |None| indicates the typeface is inherited from the style
+        hierarchy.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.rFonts_ascii
+
+    @name.setter
+    def name(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.rFonts_ascii = value
+        rPr.rFonts_hAnsi = value
+
+    @property
+    def no_proof(self):
+        """
+        Read/write tri-state value. When |True|, specifies that the contents
+        of this run should not report any errors when the document is scanned
+        for spelling and grammar.
+        """
+        return self._get_bool_prop('noProof')
+
+    @no_proof.setter
+    def no_proof(self, value):
+        self._set_bool_prop('noProof', value)
+
+    @property
+    def outline(self):
+        """
+        Read/write tri-state value. When |True| causes the characters in the
+        run to appear as if they have an outline, by drawing a one pixel wide
+        border around the inside and outside borders of each character glyph.
+        """
+        return self._get_bool_prop('outline')
+
+    @outline.setter
+    def outline(self, value):
+        self._set_bool_prop('outline', value)
+
+    @property
+    def rtl(self):
+        """
+        Read/write tri-state value. When |True| causes the text in the run
+        to have right-to-left characteristics.
+        """
+        return self._get_bool_prop('rtl')
+
+    @rtl.setter
+    def rtl(self, value):
+        self._set_bool_prop('rtl', value)
+
+    @property
+    def shadow(self):
+        """
+        Read/write tri-state value. When |True| causes the text in the run
+        to appear as if each character has a shadow.
+        """
+        return self._get_bool_prop('shadow')
+
+    @shadow.setter
+    def shadow(self, value):
+        self._set_bool_prop('shadow', value)
+
+    @property
+    def size(self):
+        """
+        Read/write |Length| value or |None|, indicating the font height in
+        English Metric Units (EMU). |None| indicates the font size should be
+        inherited from the style hierarchy. |Length| is a subclass of |int|
+        having properties for convenient conversion into points or other
+        length units. The :class:`docx.shared.Pt` class allows convenient
+        specification of point values::
+
+            >> font.size = Pt(24)
+            >> font.size
+            304800
+            >> font.size.pt
+            24.0
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.sz_val
+
+    @size.setter
+    def size(self, emu):
+        rPr = self._element.get_or_add_rPr()
+        rPr.sz_val = emu
+
+    @property
+    def small_caps(self):
+        """
+        Read/write tri-state value. When |True| causes the lowercase
+        characters in the run to appear as capital letters two points smaller
+        than the font size specified for the run.
+        """
+        return self._get_bool_prop('smallCaps')
+
+    @small_caps.setter
+    def small_caps(self, value):
+        self._set_bool_prop('smallCaps', value)
+
+    @property
+    def snap_to_grid(self):
+        """
+        Read/write tri-state value. When |True| causes the run to use the
+        document grid characters per line settings defined in the docGrid
+        element when laying out the characters in this run.
+        """
+        return self._get_bool_prop('snapToGrid')
+
+    @snap_to_grid.setter
+    def snap_to_grid(self, value):
+        self._set_bool_prop('snapToGrid', value)
+
+    @property
+    def spec_vanish(self):
+        """
+        Read/write tri-state value. When |True|, specifies that the given run
+        shall always behave as if it is hidden, even when hidden text is
+        being displayed in the current document. The property has a very
+        narrow, specialized use related to the table of contents. Consult the
+        spec (§17.3.2.36) for more details.
+        """
+        return self._get_bool_prop('specVanish')
+
+    @spec_vanish.setter
+    def spec_vanish(self, value):
+        self._set_bool_prop('specVanish', value)
+
+    @property
+    def strike(self):
+        """
+        Read/write tri-state value. When |True| causes the text in the run
+        to appear with a single horizontal line through the center of the
+        line.
+        """
+        return self._get_bool_prop('strike')
+
+    @strike.setter
+    def strike(self, value):
+        self._set_bool_prop('strike', value)
+
+    @property
+    def subscript(self):
+        """
+        Boolean indicating whether the characters in this |Font| appear as
+        subscript. |None| indicates the subscript/subscript value is
+        inherited from the style hierarchy.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.subscript
+
+    @subscript.setter
+    def subscript(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.subscript = value
+
+    @property
+    def superscript(self):
+        """
+        Boolean indicating whether the characters in this |Font| appear as
+        superscript. |None| indicates the subscript/superscript value is
+        inherited from the style hierarchy.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.superscript
+
+    @superscript.setter
+    def superscript(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.superscript = value
+
+    @property
+    def underline(self):
+        """
+        The underline style for this |Font|, one of |None|, |True|, |False|,
+        or a value from :ref:`WdUnderline`. |None| indicates the font
+        inherits its underline value from the style hierarchy. |False|
+        indicates no underline. |True| indicates single underline. The values
+        from :ref:`WdUnderline` are used to specify other outline styles such
+        as double, wavy, and dotted.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.u_val
+
+    @underline.setter
+    def underline(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.u_val = value
+
+    @property
+    def web_hidden(self):
+        """
+        Read/write tri-state value. When |True|, specifies that the contents
+        of this run shall be hidden when the document is displayed in web
+        page view.
+        """
+        return self._get_bool_prop('webHidden')
+
+    @web_hidden.setter
+    def web_hidden(self, value):
+        self._set_bool_prop('webHidden', value)
+
+    def _get_bool_prop(self, name):
+        """
+        Return the value of boolean child of `w:rPr` having *name*.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr._get_bool_val(name)
+
+    def _set_bool_prop(self, name, value):
+        """
+        Assign *value* to the boolean child *name* of `w:rPr`.
+        """
+        rPr = self._element.get_or_add_rPr()
+        rPr._set_bool_val(name, value)
diff --git a/docx/text/run.py b/docx/text/run.py
index cac839b95..97d6da7db 100644
--- a/docx/text/run.py
+++ b/docx/text/run.py
@@ -8,8 +8,9 @@
 
 from ..enum.style import WD_STYLE_TYPE
 from ..enum.text import WD_BREAK
+from .font import Font
 from ..shape import InlineShape
-from ..shared import ElementProxy, Parented
+from ..shared import Parented
 
 
 class Run(Parented):
@@ -181,381 +182,6 @@ def underline(self, value):
         self.font.underline = value
 
 
-class Font(ElementProxy):
-    """
-    Proxy object wrapping the parent of a ``<w:rPr>`` element and providing
-    access to character properties such as font name, font size, bold, and
-    subscript.
-    """
-
-    __slots__ = ()
-
-    @property
-    def all_caps(self):
-        """
-        Read/write. Causes text in this font to appear in capital letters.
-        """
-        return self._get_bool_prop('caps')
-
-    @all_caps.setter
-    def all_caps(self, value):
-        self._set_bool_prop('caps', value)
-
-    @property
-    def bold(self):
-        """
-        Read/write. Causes text in this font to appear in bold.
-        """
-        return self._get_bool_prop('b')
-
-    @bold.setter
-    def bold(self, value):
-        self._set_bool_prop('b', value)
-
-    @property
-    def complex_script(self):
-        """
-        Read/write tri-state value. When |True|, causes the characters in the
-        run to be treated as complex script regardless of their Unicode
-        values.
-        """
-        return self._get_bool_prop('cs')
-
-    @complex_script.setter
-    def complex_script(self, value):
-        self._set_bool_prop('cs', value)
-
-    @property
-    def cs_bold(self):
-        """
-        Read/write tri-state value. When |True|, causes the complex script
-        characters in the run to be displayed in bold typeface.
-        """
-        return self._get_bool_prop('bCs')
-
-    @cs_bold.setter
-    def cs_bold(self, value):
-        self._set_bool_prop('bCs', value)
-
-    @property
-    def cs_italic(self):
-        """
-        Read/write tri-state value. When |True|, causes the complex script
-        characters in the run to be displayed in italic typeface.
-        """
-        return self._get_bool_prop('iCs')
-
-    @cs_italic.setter
-    def cs_italic(self, value):
-        self._set_bool_prop('iCs', value)
-
-    @property
-    def double_strike(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to appear with double strikethrough.
-        """
-        return self._get_bool_prop('dstrike')
-
-    @double_strike.setter
-    def double_strike(self, value):
-        self._set_bool_prop('dstrike', value)
-
-    @property
-    def emboss(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to appear as if raised off the page in relief.
-        """
-        return self._get_bool_prop('emboss')
-
-    @emboss.setter
-    def emboss(self, value):
-        self._set_bool_prop('emboss', value)
-
-    @property
-    def hidden(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to be hidden from display, unless applications settings force hidden
-        text to be shown.
-        """
-        return self._get_bool_prop('vanish')
-
-    @hidden.setter
-    def hidden(self, value):
-        self._set_bool_prop('vanish', value)
-
-    @property
-    def italic(self):
-        """
-        Read/write tri-state value. When |True|, causes the text of the run
-        to appear in italics. |None| indicates the effective value is
-        inherited from the style hierarchy.
-        """
-        return self._get_bool_prop('i')
-
-    @italic.setter
-    def italic(self, value):
-        self._set_bool_prop('i', value)
-
-    @property
-    def imprint(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to appear as if pressed into the page.
-        """
-        return self._get_bool_prop('imprint')
-
-    @imprint.setter
-    def imprint(self, value):
-        self._set_bool_prop('imprint', value)
-
-    @property
-    def math(self):
-        """
-        Read/write tri-state value. When |True|, specifies this run contains
-        WML that should be handled as though it was Office Open XML Math.
-        """
-        return self._get_bool_prop('oMath')
-
-    @math.setter
-    def math(self, value):
-        self._set_bool_prop('oMath', value)
-
-    @property
-    def name(self):
-        """
-        Get or set the typeface name for this |Font| instance, causing the
-        text it controls to appear in the named font, if a matching font is
-        found. |None| indicates the typeface is inherited from the style
-        hierarchy.
-        """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        return rPr.rFonts_ascii
-
-    @name.setter
-    def name(self, value):
-        rPr = self._element.get_or_add_rPr()
-        rPr.rFonts_ascii = value
-        rPr.rFonts_hAnsi = value
-
-    @property
-    def no_proof(self):
-        """
-        Read/write tri-state value. When |True|, specifies that the contents
-        of this run should not report any errors when the document is scanned
-        for spelling and grammar.
-        """
-        return self._get_bool_prop('noProof')
-
-    @no_proof.setter
-    def no_proof(self, value):
-        self._set_bool_prop('noProof', value)
-
-    @property
-    def outline(self):
-        """
-        Read/write tri-state value. When |True| causes the characters in the
-        run to appear as if they have an outline, by drawing a one pixel wide
-        border around the inside and outside borders of each character glyph.
-        """
-        return self._get_bool_prop('outline')
-
-    @outline.setter
-    def outline(self, value):
-        self._set_bool_prop('outline', value)
-
-    @property
-    def rtl(self):
-        """
-        Read/write tri-state value. When |True| causes the text in the run
-        to have right-to-left characteristics.
-        """
-        return self._get_bool_prop('rtl')
-
-    @rtl.setter
-    def rtl(self, value):
-        self._set_bool_prop('rtl', value)
-
-    @property
-    def shadow(self):
-        """
-        Read/write tri-state value. When |True| causes the text in the run
-        to appear as if each character has a shadow.
-        """
-        return self._get_bool_prop('shadow')
-
-    @shadow.setter
-    def shadow(self, value):
-        self._set_bool_prop('shadow', value)
-
-    @property
-    def size(self):
-        """
-        Read/write |Length| value or |None|, indicating the font height in
-        English Metric Units (EMU). |None| indicates the font size should be
-        inherited from the style hierarchy. |Length| is a subclass of |int|
-        having properties for convenient conversion into points or other
-        length units. The :class:`docx.shared.Pt` class allows convenient
-        specification of point values::
-
-            >> font.size = Pt(24)
-            >> font.size
-            304800
-            >> font.size.pt
-            24.0
-        """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        return rPr.sz_val
-
-    @size.setter
-    def size(self, emu):
-        rPr = self._element.get_or_add_rPr()
-        rPr.sz_val = emu
-
-    @property
-    def small_caps(self):
-        """
-        Read/write tri-state value. When |True| causes the lowercase
-        characters in the run to appear as capital letters two points smaller
-        than the font size specified for the run.
-        """
-        return self._get_bool_prop('smallCaps')
-
-    @small_caps.setter
-    def small_caps(self, value):
-        self._set_bool_prop('smallCaps', value)
-
-    @property
-    def snap_to_grid(self):
-        """
-        Read/write tri-state value. When |True| causes the run to use the
-        document grid characters per line settings defined in the docGrid
-        element when laying out the characters in this run.
-        """
-        return self._get_bool_prop('snapToGrid')
-
-    @snap_to_grid.setter
-    def snap_to_grid(self, value):
-        self._set_bool_prop('snapToGrid', value)
-
-    @property
-    def spec_vanish(self):
-        """
-        Read/write tri-state value. When |True|, specifies that the given run
-        shall always behave as if it is hidden, even when hidden text is
-        being displayed in the current document. The property has a very
-        narrow, specialized use related to the table of contents. Consult the
-        spec (§17.3.2.36) for more details.
-        """
-        return self._get_bool_prop('specVanish')
-
-    @spec_vanish.setter
-    def spec_vanish(self, value):
-        self._set_bool_prop('specVanish', value)
-
-    @property
-    def strike(self):
-        """
-        Read/write tri-state value. When |True| causes the text in the run
-        to appear with a single horizontal line through the center of the
-        line.
-        """
-        return self._get_bool_prop('strike')
-
-    @strike.setter
-    def strike(self, value):
-        self._set_bool_prop('strike', value)
-
-    @property
-    def subscript(self):
-        """
-        Boolean indicating whether the characters in this |Font| appear as
-        subscript. |None| indicates the subscript/subscript value is
-        inherited from the style hierarchy.
-        """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        return rPr.subscript
-
-    @subscript.setter
-    def subscript(self, value):
-        rPr = self._element.get_or_add_rPr()
-        rPr.subscript = value
-
-    @property
-    def superscript(self):
-        """
-        Boolean indicating whether the characters in this |Font| appear as
-        superscript. |None| indicates the subscript/superscript value is
-        inherited from the style hierarchy.
-        """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        return rPr.superscript
-
-    @superscript.setter
-    def superscript(self, value):
-        rPr = self._element.get_or_add_rPr()
-        rPr.superscript = value
-
-    @property
-    def underline(self):
-        """
-        The underline style for this |Font|, one of |None|, |True|, |False|,
-        or a value from :ref:`WdUnderline`. |None| indicates the font
-        inherits its underline value from the style hierarchy. |False|
-        indicates no underline. |True| indicates single underline. The values
-        from :ref:`WdUnderline` are used to specify other outline styles such
-        as double, wavy, and dotted.
-        """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        return rPr.u_val
-
-    @underline.setter
-    def underline(self, value):
-        rPr = self._element.get_or_add_rPr()
-        rPr.u_val = value
-
-    @property
-    def web_hidden(self):
-        """
-        Read/write tri-state value. When |True|, specifies that the contents
-        of this run shall be hidden when the document is displayed in web
-        page view.
-        """
-        return self._get_bool_prop('webHidden')
-
-    @web_hidden.setter
-    def web_hidden(self, value):
-        self._set_bool_prop('webHidden', value)
-
-    def _get_bool_prop(self, name):
-        """
-        Return the value of boolean child of `w:rPr` having *name*.
-        """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        return rPr._get_bool_val(name)
-
-    def _set_bool_prop(self, name, value):
-        """
-        Assign *value* to the boolean child *name* of `w:rPr`.
-        """
-        rPr = self._element.get_or_add_rPr()
-        rPr._set_bool_val(name, value)
-
-
 class _Text(object):
     """
     Proxy object wrapping ``<w:t>`` element.
diff --git a/features/steps/styles.py b/features/steps/styles.py
index adc3869f9..3c7049072 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -10,8 +10,8 @@
 from docx.enum.style import WD_STYLE_TYPE
 from docx.styles.latent import _LatentStyle, LatentStyles
 from docx.styles.style import BaseStyle
+from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
-from docx.text.run import Font
 
 from helpers import test_docx
 
diff --git a/features/steps/text.py b/features/steps/text.py
index f255ec094..cc56c930c 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -14,7 +14,8 @@
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
-from docx.text.run import Font, Run
+from docx.text.font import Font
+from docx.text.run import Run
 
 from helpers import test_docx, test_file, test_text
 
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index c5be5052b..437e390e1 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -15,8 +15,8 @@
     BaseStyle, _CharacterStyle, _ParagraphStyle, _NumberingStyle,
     StyleFactory, _TableStyle
 )
+from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
-from docx.text.run import Font
 
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import call, class_mock, function_mock, instance_mock
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
new file mode 100644
index 000000000..c74371720
--- /dev/null
+++ b/tests/text/test_font.py
@@ -0,0 +1,327 @@
+# encoding: utf-8
+
+"""
+Test suite for the docx.text.run module
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from docx.enum.text import WD_UNDERLINE
+from docx.shared import Pt
+from docx.text.font import Font
+
+import pytest
+
+from ..unitutil.cxml import element, xml
+
+
+class DescribeFont(object):
+
+    def it_knows_its_typeface_name(self, name_get_fixture):
+        font, expected_value = name_get_fixture
+        assert font.name == expected_value
+
+    def it_can_change_its_typeface_name(self, name_set_fixture):
+        font, value, expected_xml = name_set_fixture
+        font.name = value
+        assert font._element.xml == expected_xml
+
+    def it_knows_its_size(self, size_get_fixture):
+        font, expected_value = size_get_fixture
+        assert font.size == expected_value
+
+    def it_can_change_its_size(self, size_set_fixture):
+        font, value, expected_xml = size_set_fixture
+        font.size = value
+        assert font._element.xml == expected_xml
+
+    def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
+        font, prop_name, expected_state = bool_prop_get_fixture
+        assert getattr(font, prop_name) == expected_state
+
+    def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
+        font, prop_name, value, expected_xml = bool_prop_set_fixture
+        setattr(font, prop_name, value)
+        assert font._element.xml == expected_xml
+
+    def it_knows_whether_it_is_subscript(self, subscript_get_fixture):
+        font, expected_value = subscript_get_fixture
+        assert font.subscript == expected_value
+
+    def it_can_change_whether_it_is_subscript(self, subscript_set_fixture):
+        font, value, expected_xml = subscript_set_fixture
+        font.subscript = value
+        assert font._element.xml == expected_xml
+
+    def it_knows_whether_it_is_superscript(self, superscript_get_fixture):
+        font, expected_value = superscript_get_fixture
+        assert font.superscript == expected_value
+
+    def it_can_change_whether_it_is_superscript(self, superscript_set_fixture):
+        font, value, expected_xml = superscript_set_fixture
+        font.superscript = value
+        assert font._element.xml == expected_xml
+
+    def it_knows_its_underline_type(self, underline_get_fixture):
+        font, expected_value = underline_get_fixture
+        assert font.underline is expected_value
+
+    def it_can_change_its_underline_type(self, underline_set_fixture):
+        font, underline, expected_xml = underline_set_fixture
+        font.underline = underline
+        assert font._element.xml == expected_xml
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:r/w:rPr',                          'all_caps',       None),
+        ('w:r/w:rPr/w:caps',                   'all_caps',       True),
+        ('w:r/w:rPr/w:caps{w:val=on}',         'all_caps',       True),
+        ('w:r/w:rPr/w:caps{w:val=off}',        'all_caps',       False),
+        ('w:r/w:rPr/w:b{w:val=1}',             'bold',           True),
+        ('w:r/w:rPr/w:i{w:val=0}',             'italic',         False),
+        ('w:r/w:rPr/w:cs{w:val=true}',         'complex_script', True),
+        ('w:r/w:rPr/w:bCs{w:val=false}',       'cs_bold',        False),
+        ('w:r/w:rPr/w:iCs{w:val=on}',          'cs_italic',      True),
+        ('w:r/w:rPr/w:dstrike{w:val=off}',     'double_strike',  False),
+        ('w:r/w:rPr/w:emboss{w:val=1}',        'emboss',         True),
+        ('w:r/w:rPr/w:vanish{w:val=0}',        'hidden',         False),
+        ('w:r/w:rPr/w:i{w:val=true}',          'italic',         True),
+        ('w:r/w:rPr/w:imprint{w:val=false}',   'imprint',        False),
+        ('w:r/w:rPr/w:oMath{w:val=on}',        'math',           True),
+        ('w:r/w:rPr/w:noProof{w:val=off}',     'no_proof',       False),
+        ('w:r/w:rPr/w:outline{w:val=1}',       'outline',        True),
+        ('w:r/w:rPr/w:rtl{w:val=0}',           'rtl',            False),
+        ('w:r/w:rPr/w:shadow{w:val=true}',     'shadow',         True),
+        ('w:r/w:rPr/w:smallCaps{w:val=false}', 'small_caps',     False),
+        ('w:r/w:rPr/w:snapToGrid{w:val=on}',   'snap_to_grid',   True),
+        ('w:r/w:rPr/w:specVanish{w:val=off}',  'spec_vanish',    False),
+        ('w:r/w:rPr/w:strike{w:val=1}',        'strike',         True),
+        ('w:r/w:rPr/w:webHidden{w:val=0}',     'web_hidden',     False),
+    ])
+    def bool_prop_get_fixture(self, request):
+        r_cxml, bool_prop_name, expected_value = request.param
+        font = Font(element(r_cxml))
+        return font, bool_prop_name, expected_value
+
+    @pytest.fixture(params=[
+        # nothing to True, False, and None ---------------------------
+        ('w:r',                             'all_caps',       True,
+         'w:r/w:rPr/w:caps'),
+        ('w:r',                             'bold',           False,
+         'w:r/w:rPr/w:b{w:val=0}'),
+        ('w:r',                             'italic',         None,
+         'w:r/w:rPr'),
+        # default to True, False, and None ---------------------------
+        ('w:r/w:rPr/w:cs',                  'complex_script', True,
+         'w:r/w:rPr/w:cs'),
+        ('w:r/w:rPr/w:bCs',                 'cs_bold',        False,
+         'w:r/w:rPr/w:bCs{w:val=0}'),
+        ('w:r/w:rPr/w:iCs',                 'cs_italic',      None,
+         'w:r/w:rPr'),
+        # True to True, False, and None ------------------------------
+        ('w:r/w:rPr/w:dstrike{w:val=1}',    'double_strike',  True,
+         'w:r/w:rPr/w:dstrike'),
+        ('w:r/w:rPr/w:emboss{w:val=on}',    'emboss',         False,
+         'w:r/w:rPr/w:emboss{w:val=0}'),
+        ('w:r/w:rPr/w:vanish{w:val=1}',     'hidden',         None,
+         'w:r/w:rPr'),
+        # False to True, False, and None -----------------------------
+        ('w:r/w:rPr/w:i{w:val=false}',      'italic',         True,
+         'w:r/w:rPr/w:i'),
+        ('w:r/w:rPr/w:imprint{w:val=0}',    'imprint',        False,
+         'w:r/w:rPr/w:imprint{w:val=0}'),
+        ('w:r/w:rPr/w:oMath{w:val=off}',    'math',           None,
+         'w:r/w:rPr'),
+        # random mix -------------------------------------------------
+        ('w:r/w:rPr/w:noProof{w:val=1}',    'no_proof',       False,
+         'w:r/w:rPr/w:noProof{w:val=0}'),
+        ('w:r/w:rPr',                       'outline',        True,
+         'w:r/w:rPr/w:outline'),
+        ('w:r/w:rPr/w:rtl{w:val=true}',     'rtl',            False,
+         'w:r/w:rPr/w:rtl{w:val=0}'),
+        ('w:r/w:rPr/w:shadow{w:val=on}',    'shadow',         True,
+         'w:r/w:rPr/w:shadow'),
+        ('w:r/w:rPr/w:smallCaps',           'small_caps',     False,
+         'w:r/w:rPr/w:smallCaps{w:val=0}'),
+        ('w:r/w:rPr/w:snapToGrid',          'snap_to_grid',   True,
+         'w:r/w:rPr/w:snapToGrid'),
+        ('w:r/w:rPr/w:specVanish',          'spec_vanish',    None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:strike{w:val=foo}',   'strike',         True,
+         'w:r/w:rPr/w:strike'),
+        ('w:r/w:rPr/w:webHidden',           'web_hidden',     False,
+         'w:r/w:rPr/w:webHidden{w:val=0}'),
+    ])
+    def bool_prop_set_fixture(self, request):
+        r_cxml, prop_name, value, expected_cxml = request.param
+        font = Font(element(r_cxml))
+        expected_xml = xml(expected_cxml)
+        return font, prop_name, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:r',                               None),
+        ('w:r/w:rPr',                         None),
+        ('w:r/w:rPr/w:rFonts',                None),
+        ('w:r/w:rPr/w:rFonts{w:ascii=Arial}', 'Arial'),
+    ])
+    def name_get_fixture(self, request):
+        r_cxml, expected_value = request.param
+        font = Font(element(r_cxml))
+        return font, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r',                                          'Foo',
+         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
+        ('w:r/w:rPr',                                    'Foo',
+         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
+        ('w:r/w:rPr/w:rFonts{w:hAnsi=Foo}',              'Bar',
+         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
+        ('w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}',  'Bar',
+         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
+    ])
+    def name_set_fixture(self, request):
+        r_cxml, value, expected_r_cxml = request.param
+        font = Font(element(r_cxml))
+        expected_xml = xml(expected_r_cxml)
+        return font, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:r',                      None),
+        ('w:r/w:rPr',                None),
+        ('w:r/w:rPr/w:sz{w:val=28}', Pt(14)),
+    ])
+    def size_get_fixture(self, request):
+        r_cxml, expected_value = request.param
+        font = Font(element(r_cxml))
+        return font, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r',                      Pt(12), 'w:r/w:rPr/w:sz{w:val=24}'),
+        ('w:r/w:rPr',                Pt(12), 'w:r/w:rPr/w:sz{w:val=24}'),
+        ('w:r/w:rPr/w:sz{w:val=24}', Pt(18), 'w:r/w:rPr/w:sz{w:val=36}'),
+        ('w:r/w:rPr/w:sz{w:val=36}', None,   'w:r/w:rPr'),
+    ])
+    def size_set_fixture(self, request):
+        r_cxml, value, expected_r_cxml = request.param
+        font = Font(element(r_cxml))
+        expected_xml = xml(expected_r_cxml)
+        return font, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:r',                                      None),
+        ('w:r/w:rPr',                                None),
+        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    False),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   True),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', False),
+    ])
+    def subscript_get_fixture(self, request):
+        r_cxml, expected_value = request.param
+        font = Font(element(r_cxml))
+        return font, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r',                                      True,
+         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
+        ('w:r',                                      False,
+         'w:r/w:rPr'),
+        ('w:r',                                      None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   True,
+         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   False,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', True,
+         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', False,
+         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    True,
+         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
+    ])
+    def subscript_set_fixture(self, request):
+        r_cxml, value, expected_r_cxml = request.param
+        font = Font(element(r_cxml))
+        expected_xml = xml(expected_r_cxml)
+        return font, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:r',                                      None),
+        ('w:r/w:rPr',                                None),
+        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    False),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   False),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', True),
+    ])
+    def superscript_get_fixture(self, request):
+        r_cxml, expected_value = request.param
+        font = Font(element(r_cxml))
+        return font, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r',                                       True,
+         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
+        ('w:r',                                       False,
+         'w:r/w:rPr'),
+        ('w:r',                                       None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  True,
+         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  False,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    True,
+         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    False,
+         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
+        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',     True,
+         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
+    ])
+    def superscript_set_fixture(self, request):
+        r_cxml, value, expected_r_cxml = request.param
+        font = Font(element(r_cxml))
+        expected_xml = xml(expected_r_cxml)
+        return font, value, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:r',                         None),
+        ('w:r/w:rPr/w:u',               None),
+        ('w:r/w:rPr/w:u{w:val=single}', True),
+        ('w:r/w:rPr/w:u{w:val=none}',   False),
+        ('w:r/w:rPr/w:u{w:val=double}', WD_UNDERLINE.DOUBLE),
+        ('w:r/w:rPr/w:u{w:val=wave}',   WD_UNDERLINE.WAVY),
+    ])
+    def underline_get_fixture(self, request):
+        r_cxml, expected_value = request.param
+        run = Font(element(r_cxml), None)
+        return run, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r', True,                'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r', False,               'w:r/w:rPr/w:u{w:val=none}'),
+        ('w:r', None,                'w:r/w:rPr'),
+        ('w:r', WD_UNDERLINE.SINGLE, 'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r', WD_UNDERLINE.THICK,  'w:r/w:rPr/w:u{w:val=thick}'),
+        ('w:r/w:rPr/w:u{w:val=single}', True,
+         'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r/w:rPr/w:u{w:val=single}', False,
+         'w:r/w:rPr/w:u{w:val=none}'),
+        ('w:r/w:rPr/w:u{w:val=single}', None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.SINGLE,
+         'w:r/w:rPr/w:u{w:val=single}'),
+        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.DOTTED,
+         'w:r/w:rPr/w:u{w:val=dotted}'),
+    ])
+    def underline_set_fixture(self, request):
+        initial_r_cxml, value, expected_cxml = request.param
+        run = Font(element(initial_r_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return run, value, expected_xml
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 7bb07b413..f8e88dd48 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -12,8 +12,8 @@
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
-from docx.shared import Pt
-from docx.text.run import Font, Run
+from docx.text.font import Font
+from docx.text.run import Run
 
 import pytest
 
@@ -347,313 +347,3 @@ def picture_(self, request):
     @pytest.fixture
     def Text_(self, request):
         return class_mock(request, 'docx.text.run._Text')
-
-
-class DescribeFont(object):
-
-    def it_knows_its_typeface_name(self, name_get_fixture):
-        font, expected_value = name_get_fixture
-        assert font.name == expected_value
-
-    def it_can_change_its_typeface_name(self, name_set_fixture):
-        font, value, expected_xml = name_set_fixture
-        font.name = value
-        assert font._element.xml == expected_xml
-
-    def it_knows_its_size(self, size_get_fixture):
-        font, expected_value = size_get_fixture
-        assert font.size == expected_value
-
-    def it_can_change_its_size(self, size_set_fixture):
-        font, value, expected_xml = size_set_fixture
-        font.size = value
-        assert font._element.xml == expected_xml
-
-    def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
-        font, prop_name, expected_state = bool_prop_get_fixture
-        assert getattr(font, prop_name) == expected_state
-
-    def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
-        font, prop_name, value, expected_xml = bool_prop_set_fixture
-        setattr(font, prop_name, value)
-        assert font._element.xml == expected_xml
-
-    def it_knows_whether_it_is_subscript(self, subscript_get_fixture):
-        font, expected_value = subscript_get_fixture
-        assert font.subscript == expected_value
-
-    def it_can_change_whether_it_is_subscript(self, subscript_set_fixture):
-        font, value, expected_xml = subscript_set_fixture
-        font.subscript = value
-        assert font._element.xml == expected_xml
-
-    def it_knows_whether_it_is_superscript(self, superscript_get_fixture):
-        font, expected_value = superscript_get_fixture
-        assert font.superscript == expected_value
-
-    def it_can_change_whether_it_is_superscript(self, superscript_set_fixture):
-        font, value, expected_xml = superscript_set_fixture
-        font.superscript = value
-        assert font._element.xml == expected_xml
-
-    def it_knows_its_underline_type(self, underline_get_fixture):
-        font, expected_value = underline_get_fixture
-        assert font.underline is expected_value
-
-    def it_can_change_its_underline_type(self, underline_set_fixture):
-        font, underline, expected_xml = underline_set_fixture
-        font.underline = underline
-        assert font._element.xml == expected_xml
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(params=[
-        ('w:r/w:rPr',                          'all_caps',       None),
-        ('w:r/w:rPr/w:caps',                   'all_caps',       True),
-        ('w:r/w:rPr/w:caps{w:val=on}',         'all_caps',       True),
-        ('w:r/w:rPr/w:caps{w:val=off}',        'all_caps',       False),
-        ('w:r/w:rPr/w:b{w:val=1}',             'bold',           True),
-        ('w:r/w:rPr/w:i{w:val=0}',             'italic',         False),
-        ('w:r/w:rPr/w:cs{w:val=true}',         'complex_script', True),
-        ('w:r/w:rPr/w:bCs{w:val=false}',       'cs_bold',        False),
-        ('w:r/w:rPr/w:iCs{w:val=on}',          'cs_italic',      True),
-        ('w:r/w:rPr/w:dstrike{w:val=off}',     'double_strike',  False),
-        ('w:r/w:rPr/w:emboss{w:val=1}',        'emboss',         True),
-        ('w:r/w:rPr/w:vanish{w:val=0}',        'hidden',         False),
-        ('w:r/w:rPr/w:i{w:val=true}',          'italic',         True),
-        ('w:r/w:rPr/w:imprint{w:val=false}',   'imprint',        False),
-        ('w:r/w:rPr/w:oMath{w:val=on}',        'math',           True),
-        ('w:r/w:rPr/w:noProof{w:val=off}',     'no_proof',       False),
-        ('w:r/w:rPr/w:outline{w:val=1}',       'outline',        True),
-        ('w:r/w:rPr/w:rtl{w:val=0}',           'rtl',            False),
-        ('w:r/w:rPr/w:shadow{w:val=true}',     'shadow',         True),
-        ('w:r/w:rPr/w:smallCaps{w:val=false}', 'small_caps',     False),
-        ('w:r/w:rPr/w:snapToGrid{w:val=on}',   'snap_to_grid',   True),
-        ('w:r/w:rPr/w:specVanish{w:val=off}',  'spec_vanish',    False),
-        ('w:r/w:rPr/w:strike{w:val=1}',        'strike',         True),
-        ('w:r/w:rPr/w:webHidden{w:val=0}',     'web_hidden',     False),
-    ])
-    def bool_prop_get_fixture(self, request):
-        r_cxml, bool_prop_name, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, bool_prop_name, expected_value
-
-    @pytest.fixture(params=[
-        # nothing to True, False, and None ---------------------------
-        ('w:r',                             'all_caps',       True,
-         'w:r/w:rPr/w:caps'),
-        ('w:r',                             'bold',           False,
-         'w:r/w:rPr/w:b{w:val=0}'),
-        ('w:r',                             'italic',         None,
-         'w:r/w:rPr'),
-        # default to True, False, and None ---------------------------
-        ('w:r/w:rPr/w:cs',                  'complex_script', True,
-         'w:r/w:rPr/w:cs'),
-        ('w:r/w:rPr/w:bCs',                 'cs_bold',        False,
-         'w:r/w:rPr/w:bCs{w:val=0}'),
-        ('w:r/w:rPr/w:iCs',                 'cs_italic',      None,
-         'w:r/w:rPr'),
-        # True to True, False, and None ------------------------------
-        ('w:r/w:rPr/w:dstrike{w:val=1}',    'double_strike',  True,
-         'w:r/w:rPr/w:dstrike'),
-        ('w:r/w:rPr/w:emboss{w:val=on}',    'emboss',         False,
-         'w:r/w:rPr/w:emboss{w:val=0}'),
-        ('w:r/w:rPr/w:vanish{w:val=1}',     'hidden',         None,
-         'w:r/w:rPr'),
-        # False to True, False, and None -----------------------------
-        ('w:r/w:rPr/w:i{w:val=false}',      'italic',         True,
-         'w:r/w:rPr/w:i'),
-        ('w:r/w:rPr/w:imprint{w:val=0}',    'imprint',        False,
-         'w:r/w:rPr/w:imprint{w:val=0}'),
-        ('w:r/w:rPr/w:oMath{w:val=off}',    'math',           None,
-         'w:r/w:rPr'),
-        # random mix -------------------------------------------------
-        ('w:r/w:rPr/w:noProof{w:val=1}',    'no_proof',       False,
-         'w:r/w:rPr/w:noProof{w:val=0}'),
-        ('w:r/w:rPr',                       'outline',        True,
-         'w:r/w:rPr/w:outline'),
-        ('w:r/w:rPr/w:rtl{w:val=true}',     'rtl',            False,
-         'w:r/w:rPr/w:rtl{w:val=0}'),
-        ('w:r/w:rPr/w:shadow{w:val=on}',    'shadow',         True,
-         'w:r/w:rPr/w:shadow'),
-        ('w:r/w:rPr/w:smallCaps',           'small_caps',     False,
-         'w:r/w:rPr/w:smallCaps{w:val=0}'),
-        ('w:r/w:rPr/w:snapToGrid',          'snap_to_grid',   True,
-         'w:r/w:rPr/w:snapToGrid'),
-        ('w:r/w:rPr/w:specVanish',          'spec_vanish',    None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:strike{w:val=foo}',   'strike',         True,
-         'w:r/w:rPr/w:strike'),
-        ('w:r/w:rPr/w:webHidden',           'web_hidden',     False,
-         'w:r/w:rPr/w:webHidden{w:val=0}'),
-    ])
-    def bool_prop_set_fixture(self, request):
-        r_cxml, prop_name, value, expected_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_cxml)
-        return font, prop_name, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:r',                               None),
-        ('w:r/w:rPr',                         None),
-        ('w:r/w:rPr/w:rFonts',                None),
-        ('w:r/w:rPr/w:rFonts{w:ascii=Arial}', 'Arial'),
-    ])
-    def name_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
-
-    @pytest.fixture(params=[
-        ('w:r',                                          'Foo',
-         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
-        ('w:r/w:rPr',                                    'Foo',
-         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
-        ('w:r/w:rPr/w:rFonts{w:hAnsi=Foo}',              'Bar',
-         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
-        ('w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}',  'Bar',
-         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
-    ])
-    def name_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:r',                      None),
-        ('w:r/w:rPr',                None),
-        ('w:r/w:rPr/w:sz{w:val=28}', Pt(14)),
-    ])
-    def size_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
-
-    @pytest.fixture(params=[
-        ('w:r',                      Pt(12), 'w:r/w:rPr/w:sz{w:val=24}'),
-        ('w:r/w:rPr',                Pt(12), 'w:r/w:rPr/w:sz{w:val=24}'),
-        ('w:r/w:rPr/w:sz{w:val=24}', Pt(18), 'w:r/w:rPr/w:sz{w:val=36}'),
-        ('w:r/w:rPr/w:sz{w:val=36}', None,   'w:r/w:rPr'),
-    ])
-    def size_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:r',                                      None),
-        ('w:r/w:rPr',                                None),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    False),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   True),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', False),
-    ])
-    def subscript_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
-
-    @pytest.fixture(params=[
-        ('w:r',                                      True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r',                                      False,
-         'w:r/w:rPr'),
-        ('w:r',                                      None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   False,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', False,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-    ])
-    def subscript_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:r',                                      None),
-        ('w:r/w:rPr',                                None),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    False),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   False),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', True),
-    ])
-    def superscript_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
-
-    @pytest.fixture(params=[
-        ('w:r',                                       True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r',                                       False,
-         'w:r/w:rPr'),
-        ('w:r',                                       None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  False,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    False,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',     True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-    ])
-    def superscript_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:r',                         None),
-        ('w:r/w:rPr/w:u',               None),
-        ('w:r/w:rPr/w:u{w:val=single}', True),
-        ('w:r/w:rPr/w:u{w:val=none}',   False),
-        ('w:r/w:rPr/w:u{w:val=double}', WD_UNDERLINE.DOUBLE),
-        ('w:r/w:rPr/w:u{w:val=wave}',   WD_UNDERLINE.WAVY),
-    ])
-    def underline_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        run = Font(element(r_cxml), None)
-        return run, expected_value
-
-    @pytest.fixture(params=[
-        ('w:r', True,                'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r', False,               'w:r/w:rPr/w:u{w:val=none}'),
-        ('w:r', None,                'w:r/w:rPr'),
-        ('w:r', WD_UNDERLINE.SINGLE, 'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r', WD_UNDERLINE.THICK,  'w:r/w:rPr/w:u{w:val=thick}'),
-        ('w:r/w:rPr/w:u{w:val=single}', True,
-         'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r/w:rPr/w:u{w:val=single}', False,
-         'w:r/w:rPr/w:u{w:val=none}'),
-        ('w:r/w:rPr/w:u{w:val=single}', None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.SINGLE,
-         'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.DOTTED,
-         'w:r/w:rPr/w:u{w:val=dotted}'),
-    ])
-    def underline_set_fixture(self, request):
-        initial_r_cxml, value, expected_cxml = request.param
-        run = Font(element(initial_r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, value, expected_xml

From 83cf975bee0cc36027942be680d0e5fb03e55a5f Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 18 Feb 2015 19:58:03 -0800
Subject: [PATCH 068/367] reorg: extract docx.oxml.text.font

---
 docx/oxml/__init__.py  |  37 +++---
 docx/oxml/text/font.py | 272 +++++++++++++++++++++++++++++++++++++++++
 docx/oxml/text/run.py  | 268 +---------------------------------------
 3 files changed, 293 insertions(+), 284 deletions(-)
 create mode 100644 docx/oxml/text/font.py

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 53ffd0ca7..1a98cf17c 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -144,25 +144,11 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:tr',        CT_Row)
 register_element_cls('w:vMerge',    CT_VMerge)
 
-from .text.paragraph import CT_Ind, CT_Jc, CT_P, CT_PPr, CT_Spacing
-register_element_cls('w:ind',             CT_Ind)
-register_element_cls('w:jc',              CT_Jc)
-register_element_cls('w:keepLines',       CT_OnOff)
-register_element_cls('w:keepNext',        CT_OnOff)
-register_element_cls('w:p',               CT_P)
-register_element_cls('w:pageBreakBefore', CT_OnOff)
-register_element_cls('w:pPr',             CT_PPr)
-register_element_cls('w:pStyle',          CT_String)
-register_element_cls('w:spacing',         CT_Spacing)
-register_element_cls('w:widowControl',    CT_OnOff)
-
-from .text.run import (
-    CT_Br, CT_Fonts, CT_HpsMeasure, CT_R, CT_RPr, CT_Text, CT_Underline,
-    CT_VerticalAlignRun
+from .text.font import (
+    CT_Fonts, CT_HpsMeasure, CT_RPr, CT_Underline, CT_VerticalAlignRun
 )
 register_element_cls('w:b',          CT_OnOff)
 register_element_cls('w:bCs',        CT_OnOff)
-register_element_cls('w:br',         CT_Br)
 register_element_cls('w:caps',       CT_OnOff)
 register_element_cls('w:cs',         CT_OnOff)
 register_element_cls('w:dstrike',    CT_OnOff)
@@ -173,7 +159,6 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:noProof',    CT_OnOff)
 register_element_cls('w:oMath',      CT_OnOff)
 register_element_cls('w:outline',    CT_OnOff)
-register_element_cls('w:r',          CT_R)
 register_element_cls('w:rFonts',     CT_Fonts)
 register_element_cls('w:rPr',        CT_RPr)
 register_element_cls('w:rStyle',     CT_String)
@@ -184,8 +169,24 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:specVanish', CT_OnOff)
 register_element_cls('w:strike',     CT_OnOff)
 register_element_cls('w:sz',         CT_HpsMeasure)
-register_element_cls('w:t',          CT_Text)
 register_element_cls('w:u',          CT_Underline)
 register_element_cls('w:vanish',     CT_OnOff)
 register_element_cls('w:vertAlign',  CT_VerticalAlignRun)
 register_element_cls('w:webHidden',  CT_OnOff)
+
+from .text.paragraph import CT_Ind, CT_Jc, CT_P, CT_PPr, CT_Spacing
+register_element_cls('w:ind',             CT_Ind)
+register_element_cls('w:jc',              CT_Jc)
+register_element_cls('w:keepLines',       CT_OnOff)
+register_element_cls('w:keepNext',        CT_OnOff)
+register_element_cls('w:p',               CT_P)
+register_element_cls('w:pageBreakBefore', CT_OnOff)
+register_element_cls('w:pPr',             CT_PPr)
+register_element_cls('w:pStyle',          CT_String)
+register_element_cls('w:spacing',         CT_Spacing)
+register_element_cls('w:widowControl',    CT_OnOff)
+
+from .text.run import CT_Br, CT_R, CT_Text
+register_element_cls('w:br', CT_Br)
+register_element_cls('w:r',  CT_R)
+register_element_cls('w:t',  CT_Text)
diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
new file mode 100644
index 000000000..bd13dfba4
--- /dev/null
+++ b/docx/oxml/text/font.py
@@ -0,0 +1,272 @@
+# encoding: utf-8
+
+"""
+Custom element classes related to run properties (font).
+"""
+
+from ...enum.text import WD_UNDERLINE
+from ..ns import qn
+from ..simpletypes import ST_HpsMeasure, ST_String, ST_VerticalAlignRun
+from ..xmlchemy import (
+    BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
+)
+
+
+class CT_Fonts(BaseOxmlElement):
+    """
+    ``<w:rFonts>`` element, specifying typeface name for the various language
+    types.
+    """
+    ascii = OptionalAttribute('w:ascii', ST_String)
+    hAnsi = OptionalAttribute('w:hAnsi', ST_String)
+
+
+class CT_HpsMeasure(BaseOxmlElement):
+    """
+    Used for ``<w:sz>`` element and others, specifying font size in
+    half-points.
+    """
+    val = RequiredAttribute('w:val', ST_HpsMeasure)
+
+
+class CT_RPr(BaseOxmlElement):
+    """
+    ``<w:rPr>`` element, containing the properties for a run.
+    """
+    _tag_seq = (
+        'w:rStyle', 'w:rFonts', 'w:b', 'w:bCs', 'w:i', 'w:iCs', 'w:caps',
+        'w:smallCaps', 'w:strike', 'w:dstrike', 'w:outline', 'w:shadow',
+        'w:emboss', 'w:imprint', 'w:noProof', 'w:snapToGrid', 'w:vanish',
+        'w:webHidden', 'w:color', 'w:spacing', 'w:w', 'w:kern', 'w:position',
+        'w:sz', 'w:szCs', 'w:highlight', 'w:u', 'w:effect', 'w:bdr', 'w:shd',
+        'w:fitText', 'w:vertAlign', 'w:rtl', 'w:cs', 'w:em', 'w:lang',
+        'w:eastAsianLayout', 'w:specVanish', 'w:oMath'
+    )
+    rStyle = ZeroOrOne('w:rStyle', successors=_tag_seq[1:])
+    rFonts = ZeroOrOne('w:rFonts', successors=_tag_seq[2:])
+    b = ZeroOrOne('w:b', successors=_tag_seq[3:])
+    bCs = ZeroOrOne('w:bCs', successors=_tag_seq[4:])
+    i = ZeroOrOne('w:i', successors=_tag_seq[5:])
+    iCs = ZeroOrOne('w:iCs', successors=_tag_seq[6:])
+    caps = ZeroOrOne('w:caps', successors=_tag_seq[7:])
+    smallCaps = ZeroOrOne('w:smallCaps', successors=_tag_seq[8:])
+    strike = ZeroOrOne('w:strike', successors=_tag_seq[9:])
+    dstrike = ZeroOrOne('w:dstrike', successors=_tag_seq[10:])
+    outline = ZeroOrOne('w:outline', successors=_tag_seq[11:])
+    shadow = ZeroOrOne('w:shadow', successors=_tag_seq[12:])
+    emboss = ZeroOrOne('w:emboss', successors=_tag_seq[13:])
+    imprint = ZeroOrOne('w:imprint', successors=_tag_seq[14:])
+    noProof = ZeroOrOne('w:noProof', successors=_tag_seq[15:])
+    snapToGrid = ZeroOrOne('w:snapToGrid', successors=_tag_seq[16:])
+    vanish = ZeroOrOne('w:vanish', successors=_tag_seq[17:])
+    webHidden = ZeroOrOne('w:webHidden', successors=_tag_seq[18:])
+    sz = ZeroOrOne('w:sz', successors=_tag_seq[24:])
+    u = ZeroOrOne('w:u', successors=_tag_seq[27:])
+    vertAlign = ZeroOrOne('w:vertAlign', successors=_tag_seq[32:])
+    rtl = ZeroOrOne('w:rtl', successors=_tag_seq[33:])
+    cs = ZeroOrOne('w:cs', successors=_tag_seq[34:])
+    specVanish = ZeroOrOne('w:specVanish', successors=_tag_seq[38:])
+    oMath = ZeroOrOne('w:oMath', successors=_tag_seq[39:])
+    del _tag_seq
+
+    @property
+    def rFonts_ascii(self):
+        """
+        The value of `w:rFonts/@w:ascii` or |None| if not present. Represents
+        the assigned typeface name. The rFonts element also specifies other
+        special-case typeface names; this method handles the case where just
+        the common name is required.
+        """
+        rFonts = self.rFonts
+        if rFonts is None:
+            return None
+        return rFonts.ascii
+
+    @rFonts_ascii.setter
+    def rFonts_ascii(self, value):
+        if value is None:
+            self._remove_rFonts()
+            return
+        rFonts = self.get_or_add_rFonts()
+        rFonts.ascii = value
+
+    @property
+    def rFonts_hAnsi(self):
+        """
+        The value of `w:rFonts/@w:hAnsi` or |None| if not present.
+        """
+        rFonts = self.rFonts
+        if rFonts is None:
+            return None
+        return rFonts.hAnsi
+
+    @rFonts_hAnsi.setter
+    def rFonts_hAnsi(self, value):
+        if value is None and self.rFonts is None:
+            return
+        rFonts = self.get_or_add_rFonts()
+        rFonts.hAnsi = value
+
+    @property
+    def style(self):
+        """
+        String contained in <w:rStyle> child, or None if that element is not
+        present.
+        """
+        rStyle = self.rStyle
+        if rStyle is None:
+            return None
+        return rStyle.val
+
+    @style.setter
+    def style(self, style):
+        """
+        Set val attribute of <w:rStyle> child element to *style*, adding a
+        new element if necessary. If *style* is |None|, remove the <w:rStyle>
+        element if present.
+        """
+        if style is None:
+            self._remove_rStyle()
+        elif self.rStyle is None:
+            self._add_rStyle(val=style)
+        else:
+            self.rStyle.val = style
+
+    @property
+    def subscript(self):
+        """
+        |True| if `w:vertAlign/@w:val` is 'subscript'. |False| if
+        `w:vertAlign/@w:val` contains any other value. |None| if
+        `w:vertAlign` is not present.
+        """
+        vertAlign = self.vertAlign
+        if vertAlign is None:
+            return None
+        if vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
+            return True
+        return False
+
+    @subscript.setter
+    def subscript(self, value):
+        if value is None:
+            self._remove_vertAlign()
+        elif bool(value) is True:
+            self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUBSCRIPT
+        elif self.vertAlign is None:
+            return
+        elif self.vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
+            self._remove_vertAlign()
+
+    @property
+    def superscript(self):
+        """
+        |True| if `w:vertAlign/@w:val` is 'superscript'. |False| if
+        `w:vertAlign/@w:val` contains any other value. |None| if
+        `w:vertAlign` is not present.
+        """
+        vertAlign = self.vertAlign
+        if vertAlign is None:
+            return None
+        if vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
+            return True
+        return False
+
+    @superscript.setter
+    def superscript(self, value):
+        if value is None:
+            self._remove_vertAlign()
+        elif bool(value) is True:
+            self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUPERSCRIPT
+        elif self.vertAlign is None:
+            return
+        elif self.vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
+            self._remove_vertAlign()
+
+    @property
+    def sz_val(self):
+        """
+        The value of `w:sz/@w:val` or |None| if not present.
+        """
+        sz = self.sz
+        if sz is None:
+            return None
+        return sz.val
+
+    @sz_val.setter
+    def sz_val(self, value):
+        if value is None:
+            self._remove_sz()
+            return
+        sz = self.get_or_add_sz()
+        sz.val = value
+
+    @property
+    def u_val(self):
+        """
+        Value of `w:u/@val`, or None if not present.
+        """
+        u = self.u
+        if u is None:
+            return None
+        return u.val
+
+    @u_val.setter
+    def u_val(self, value):
+        self._remove_u()
+        if value is not None:
+            self._add_u().val = value
+
+    def _get_bool_val(self, name):
+        """
+        Return the value of the boolean child element having *name*, e.g.
+        'b', 'i', and 'smallCaps'.
+        """
+        element = getattr(self, name)
+        if element is None:
+            return None
+        return element.val
+
+    def _set_bool_val(self, name, value):
+        if value is None:
+            getattr(self, '_remove_%s' % name)()
+            return
+        element = getattr(self, 'get_or_add_%s' % name)()
+        element.val = value
+
+
+class CT_Underline(BaseOxmlElement):
+    """
+    ``<w:u>`` element, specifying the underlining style for a run.
+    """
+    @property
+    def val(self):
+        """
+        The underline type corresponding to the ``w:val`` attribute value.
+        """
+        val = self.get(qn('w:val'))
+        underline = WD_UNDERLINE.from_xml(val)
+        if underline == WD_UNDERLINE.SINGLE:
+            return True
+        if underline == WD_UNDERLINE.NONE:
+            return False
+        return underline
+
+    @val.setter
+    def val(self, value):
+        # works fine without these two mappings, but only because True == 1
+        # and False == 0, which happen to match the mapping for WD_UNDERLINE
+        # .SINGLE and .NONE respectively.
+        if value is True:
+            value = WD_UNDERLINE.SINGLE
+        elif value is False:
+            value = WD_UNDERLINE.NONE
+
+        val = WD_UNDERLINE.to_xml(value)
+        self.set(qn('w:val'), val)
+
+
+class CT_VerticalAlignRun(BaseOxmlElement):
+    """
+    ``<w:vertAlign>`` element, specifying subscript or superscript.
+    """
+    val = RequiredAttribute('w:val', ST_VerticalAlignRun)
diff --git a/docx/oxml/text/run.py b/docx/oxml/text/run.py
index a4cd6387f..8f0a62e82 100644
--- a/docx/oxml/text/run.py
+++ b/docx/oxml/text/run.py
@@ -4,14 +4,10 @@
 Custom element classes related to text runs (CT_R).
 """
 
-from ...enum.text import WD_UNDERLINE
 from ..ns import qn
-from ..simpletypes import (
-    ST_BrClear, ST_BrType, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
-)
+from ..simpletypes import ST_BrClear, ST_BrType
 from ..xmlchemy import (
-    BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrMore,
-    ZeroOrOne
+    BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
 )
 
 
@@ -23,23 +19,6 @@ class CT_Br(BaseOxmlElement):
     clear = OptionalAttribute('w:clear', ST_BrClear)
 
 
-class CT_Fonts(BaseOxmlElement):
-    """
-    ``<w:rFonts>`` element, specifying typeface name for the various language
-    types.
-    """
-    ascii = OptionalAttribute('w:ascii', ST_String)
-    hAnsi = OptionalAttribute('w:hAnsi', ST_String)
-
-
-class CT_HpsMeasure(BaseOxmlElement):
-    """
-    Used for ``<w:sz>`` element and others, specifying font size in
-    half-points.
-    """
-    val = RequiredAttribute('w:val', ST_HpsMeasure)
-
-
 class CT_R(BaseOxmlElement):
     """
     ``<w:r>`` element, containing the properties and text for a run.
@@ -125,255 +104,12 @@ def text(self, text):
         _RunContentAppender.append_to_run_from_text(self, text)
 
 
-class CT_RPr(BaseOxmlElement):
-    """
-    ``<w:rPr>`` element, containing the properties for a run.
-    """
-    _tag_seq = (
-        'w:rStyle', 'w:rFonts', 'w:b', 'w:bCs', 'w:i', 'w:iCs', 'w:caps',
-        'w:smallCaps', 'w:strike', 'w:dstrike', 'w:outline', 'w:shadow',
-        'w:emboss', 'w:imprint', 'w:noProof', 'w:snapToGrid', 'w:vanish',
-        'w:webHidden', 'w:color', 'w:spacing', 'w:w', 'w:kern', 'w:position',
-        'w:sz', 'w:szCs', 'w:highlight', 'w:u', 'w:effect', 'w:bdr', 'w:shd',
-        'w:fitText', 'w:vertAlign', 'w:rtl', 'w:cs', 'w:em', 'w:lang',
-        'w:eastAsianLayout', 'w:specVanish', 'w:oMath'
-    )
-    rStyle = ZeroOrOne('w:rStyle', successors=_tag_seq[1:])
-    rFonts = ZeroOrOne('w:rFonts', successors=_tag_seq[2:])
-    b = ZeroOrOne('w:b', successors=_tag_seq[3:])
-    bCs = ZeroOrOne('w:bCs', successors=_tag_seq[4:])
-    i = ZeroOrOne('w:i', successors=_tag_seq[5:])
-    iCs = ZeroOrOne('w:iCs', successors=_tag_seq[6:])
-    caps = ZeroOrOne('w:caps', successors=_tag_seq[7:])
-    smallCaps = ZeroOrOne('w:smallCaps', successors=_tag_seq[8:])
-    strike = ZeroOrOne('w:strike', successors=_tag_seq[9:])
-    dstrike = ZeroOrOne('w:dstrike', successors=_tag_seq[10:])
-    outline = ZeroOrOne('w:outline', successors=_tag_seq[11:])
-    shadow = ZeroOrOne('w:shadow', successors=_tag_seq[12:])
-    emboss = ZeroOrOne('w:emboss', successors=_tag_seq[13:])
-    imprint = ZeroOrOne('w:imprint', successors=_tag_seq[14:])
-    noProof = ZeroOrOne('w:noProof', successors=_tag_seq[15:])
-    snapToGrid = ZeroOrOne('w:snapToGrid', successors=_tag_seq[16:])
-    vanish = ZeroOrOne('w:vanish', successors=_tag_seq[17:])
-    webHidden = ZeroOrOne('w:webHidden', successors=_tag_seq[18:])
-    sz = ZeroOrOne('w:sz', successors=_tag_seq[24:])
-    u = ZeroOrOne('w:u', successors=_tag_seq[27:])
-    vertAlign = ZeroOrOne('w:vertAlign', successors=_tag_seq[32:])
-    rtl = ZeroOrOne('w:rtl', successors=_tag_seq[33:])
-    cs = ZeroOrOne('w:cs', successors=_tag_seq[34:])
-    specVanish = ZeroOrOne('w:specVanish', successors=_tag_seq[38:])
-    oMath = ZeroOrOne('w:oMath', successors=_tag_seq[39:])
-    del _tag_seq
-
-    @property
-    def rFonts_ascii(self):
-        """
-        The value of `w:rFonts/@w:ascii` or |None| if not present. Represents
-        the assigned typeface name. The rFonts element also specifies other
-        special-case typeface names; this method handles the case where just
-        the common name is required.
-        """
-        rFonts = self.rFonts
-        if rFonts is None:
-            return None
-        return rFonts.ascii
-
-    @rFonts_ascii.setter
-    def rFonts_ascii(self, value):
-        if value is None:
-            self._remove_rFonts()
-            return
-        rFonts = self.get_or_add_rFonts()
-        rFonts.ascii = value
-
-    @property
-    def rFonts_hAnsi(self):
-        """
-        The value of `w:rFonts/@w:hAnsi` or |None| if not present.
-        """
-        rFonts = self.rFonts
-        if rFonts is None:
-            return None
-        return rFonts.hAnsi
-
-    @rFonts_hAnsi.setter
-    def rFonts_hAnsi(self, value):
-        if value is None and self.rFonts is None:
-            return
-        rFonts = self.get_or_add_rFonts()
-        rFonts.hAnsi = value
-
-    @property
-    def style(self):
-        """
-        String contained in <w:rStyle> child, or None if that element is not
-        present.
-        """
-        rStyle = self.rStyle
-        if rStyle is None:
-            return None
-        return rStyle.val
-
-    @style.setter
-    def style(self, style):
-        """
-        Set val attribute of <w:rStyle> child element to *style*, adding a
-        new element if necessary. If *style* is |None|, remove the <w:rStyle>
-        element if present.
-        """
-        if style is None:
-            self._remove_rStyle()
-        elif self.rStyle is None:
-            self._add_rStyle(val=style)
-        else:
-            self.rStyle.val = style
-
-    @property
-    def subscript(self):
-        """
-        |True| if `w:vertAlign/@w:val` is 'subscript'. |False| if
-        `w:vertAlign/@w:val` contains any other value. |None| if
-        `w:vertAlign` is not present.
-        """
-        vertAlign = self.vertAlign
-        if vertAlign is None:
-            return None
-        if vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
-            return True
-        return False
-
-    @subscript.setter
-    def subscript(self, value):
-        if value is None:
-            self._remove_vertAlign()
-        elif bool(value) is True:
-            self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUBSCRIPT
-        elif self.vertAlign is None:
-            return
-        elif self.vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
-            self._remove_vertAlign()
-
-    @property
-    def superscript(self):
-        """
-        |True| if `w:vertAlign/@w:val` is 'superscript'. |False| if
-        `w:vertAlign/@w:val` contains any other value. |None| if
-        `w:vertAlign` is not present.
-        """
-        vertAlign = self.vertAlign
-        if vertAlign is None:
-            return None
-        if vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
-            return True
-        return False
-
-    @superscript.setter
-    def superscript(self, value):
-        if value is None:
-            self._remove_vertAlign()
-        elif bool(value) is True:
-            self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUPERSCRIPT
-        elif self.vertAlign is None:
-            return
-        elif self.vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
-            self._remove_vertAlign()
-
-    @property
-    def sz_val(self):
-        """
-        The value of `w:sz/@w:val` or |None| if not present.
-        """
-        sz = self.sz
-        if sz is None:
-            return None
-        return sz.val
-
-    @sz_val.setter
-    def sz_val(self, value):
-        if value is None:
-            self._remove_sz()
-            return
-        sz = self.get_or_add_sz()
-        sz.val = value
-
-    @property
-    def u_val(self):
-        """
-        Value of `w:u/@val`, or None if not present.
-        """
-        u = self.u
-        if u is None:
-            return None
-        return u.val
-
-    @u_val.setter
-    def u_val(self, value):
-        self._remove_u()
-        if value is not None:
-            self._add_u().val = value
-
-    def _get_bool_val(self, name):
-        """
-        Return the value of the boolean child element having *name*, e.g.
-        'b', 'i', and 'smallCaps'.
-        """
-        element = getattr(self, name)
-        if element is None:
-            return None
-        return element.val
-
-    def _set_bool_val(self, name, value):
-        if value is None:
-            getattr(self, '_remove_%s' % name)()
-            return
-        element = getattr(self, 'get_or_add_%s' % name)()
-        element.val = value
-
-
 class CT_Text(BaseOxmlElement):
     """
     ``<w:t>`` element, containing a sequence of characters within a run.
     """
 
 
-class CT_Underline(BaseOxmlElement):
-    """
-    ``<w:u>`` element, specifying the underlining style for a run.
-    """
-    @property
-    def val(self):
-        """
-        The underline type corresponding to the ``w:val`` attribute value.
-        """
-        val = self.get(qn('w:val'))
-        underline = WD_UNDERLINE.from_xml(val)
-        if underline == WD_UNDERLINE.SINGLE:
-            return True
-        if underline == WD_UNDERLINE.NONE:
-            return False
-        return underline
-
-    @val.setter
-    def val(self, value):
-        # works fine without these two mappings, but only because True == 1
-        # and False == 0, which happen to match the mapping for WD_UNDERLINE
-        # .SINGLE and .NONE respectively.
-        if value is True:
-            value = WD_UNDERLINE.SINGLE
-        elif value is False:
-            value = WD_UNDERLINE.NONE
-
-        val = WD_UNDERLINE.to_xml(value)
-        self.set(qn('w:val'), val)
-
-
-class CT_VerticalAlignRun(BaseOxmlElement):
-    """
-    ``<w:vertAlign>`` element, specifying subscript or superscript.
-    """
-    val = RequiredAttribute('w:val', ST_VerticalAlignRun)
-
-
 class _RunContentAppender(object):
     """
     Service object that knows how to translate a Python string into run

From 5e9c9558e7f3e31f9caf206e2d72c08bf294c79b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 18 Feb 2015 20:10:06 -0800
Subject: [PATCH 069/367] reorg: extract docx.oxml.text.parfmt

---
 docx/oxml/__init__.py       |   6 +-
 docx/oxml/text/paragraph.py | 309 +----------------------------------
 docx/oxml/text/parfmt.py    | 313 ++++++++++++++++++++++++++++++++++++
 3 files changed, 318 insertions(+), 310 deletions(-)
 create mode 100644 docx/oxml/text/parfmt.py

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 1a98cf17c..d5f07bdcb 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -174,12 +174,14 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vertAlign',  CT_VerticalAlignRun)
 register_element_cls('w:webHidden',  CT_OnOff)
 
-from .text.paragraph import CT_Ind, CT_Jc, CT_P, CT_PPr, CT_Spacing
+from .text.paragraph import CT_P
+register_element_cls('w:p', CT_P)
+
+from .text.parfmt import CT_Ind, CT_Jc, CT_PPr, CT_Spacing
 register_element_cls('w:ind',             CT_Ind)
 register_element_cls('w:jc',              CT_Jc)
 register_element_cls('w:keepLines',       CT_OnOff)
 register_element_cls('w:keepNext',        CT_OnOff)
-register_element_cls('w:p',               CT_P)
 register_element_cls('w:pageBreakBefore', CT_OnOff)
 register_element_cls('w:pPr',             CT_PPr)
 register_element_cls('w:pStyle',          CT_String)
diff --git a/docx/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
index a95ea21a6..5e4213776 100644
--- a/docx/oxml/text/paragraph.py
+++ b/docx/oxml/text/paragraph.py
@@ -4,31 +4,8 @@
 Custom element classes related to paragraphs (CT_P).
 """
 
-from ...enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
 from ..ns import qn
-from ...shared import Length
-from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
-from ..xmlchemy import (
-    BaseOxmlElement, OptionalAttribute, OxmlElement, RequiredAttribute,
-    ZeroOrMore, ZeroOrOne
-)
-
-
-class CT_Ind(BaseOxmlElement):
-    """
-    ``<w:ind>`` element, specifying paragraph indentation.
-    """
-    left = OptionalAttribute('w:left', ST_SignedTwipsMeasure)
-    right = OptionalAttribute('w:right', ST_SignedTwipsMeasure)
-    firstLine = OptionalAttribute('w:firstLine', ST_TwipsMeasure)
-    hanging = OptionalAttribute('w:hanging', ST_TwipsMeasure)
-
-
-class CT_Jc(BaseOxmlElement):
-    """
-    ``<w:jc>`` element, specifying paragraph justification.
-    """
-    val = RequiredAttribute('w:val', WD_ALIGN_PARAGRAPH)
+from ..xmlchemy import BaseOxmlElement, OxmlElement, ZeroOrMore, ZeroOrOne
 
 
 class CT_P(BaseOxmlElement):
@@ -99,287 +76,3 @@ def style(self):
     def style(self, style):
         pPr = self.get_or_add_pPr()
         pPr.style = style
-
-
-class CT_PPr(BaseOxmlElement):
-    """
-    ``<w:pPr>`` element, containing the properties for a paragraph.
-    """
-    _tag_seq = (
-        'w:pStyle', 'w:keepNext', 'w:keepLines', 'w:pageBreakBefore',
-        'w:framePr', 'w:widowControl', 'w:numPr', 'w:suppressLineNumbers',
-        'w:pBdr', 'w:shd', 'w:tabs', 'w:suppressAutoHyphens', 'w:kinsoku',
-        'w:wordWrap', 'w:overflowPunct', 'w:topLinePunct', 'w:autoSpaceDE',
-        'w:autoSpaceDN', 'w:bidi', 'w:adjustRightInd', 'w:snapToGrid',
-        'w:spacing', 'w:ind', 'w:contextualSpacing', 'w:mirrorIndents',
-        'w:suppressOverlap', 'w:jc', 'w:textDirection', 'w:textAlignment',
-        'w:textboxTightWrap', 'w:outlineLvl', 'w:divId', 'w:cnfStyle',
-        'w:rPr', 'w:sectPr', 'w:pPrChange'
-    )
-    pStyle = ZeroOrOne('w:pStyle', successors=_tag_seq[1:])
-    keepNext = ZeroOrOne('w:keepNext', successors=_tag_seq[2:])
-    keepLines = ZeroOrOne('w:keepLines', successors=_tag_seq[3:])
-    pageBreakBefore = ZeroOrOne('w:pageBreakBefore', successors=_tag_seq[4:])
-    widowControl = ZeroOrOne('w:widowControl', successors=_tag_seq[6:])
-    numPr = ZeroOrOne('w:numPr', successors=_tag_seq[7:])
-    spacing = ZeroOrOne('w:spacing', successors=_tag_seq[22:])
-    ind = ZeroOrOne('w:ind', successors=_tag_seq[23:])
-    jc = ZeroOrOne('w:jc', successors=_tag_seq[27:])
-    sectPr = ZeroOrOne('w:sectPr', successors=_tag_seq[35:])
-    del _tag_seq
-
-    @property
-    def first_line_indent(self):
-        """
-        A |Length| value calculated from the values of `w:ind/@w:firstLine`
-        and `w:ind/@w:hanging`. Returns |None| if the `w:ind` child is not
-        present.
-        """
-        ind = self.ind
-        if ind is None:
-            return None
-        hanging = ind.hanging
-        if hanging is not None:
-            return Length(-hanging)
-        firstLine = ind.firstLine
-        if firstLine is None:
-            return None
-        return firstLine
-
-    @first_line_indent.setter
-    def first_line_indent(self, value):
-        if self.ind is None and value is None:
-            return
-        ind = self.get_or_add_ind()
-        ind.firstLine = ind.hanging = None
-        if value is None:
-            return
-        elif value < 0:
-            ind.hanging = -value
-        else:
-            ind.firstLine = value
-
-    @property
-    def ind_left(self):
-        """
-        The value of `w:ind/@w:left` or |None| if not present.
-        """
-        ind = self.ind
-        if ind is None:
-            return None
-        return ind.left
-
-    @ind_left.setter
-    def ind_left(self, value):
-        if value is None and self.ind is None:
-            return
-        ind = self.get_or_add_ind()
-        ind.left = value
-
-    @property
-    def ind_right(self):
-        """
-        The value of `w:ind/@w:right` or |None| if not present.
-        """
-        ind = self.ind
-        if ind is None:
-            return None
-        return ind.right
-
-    @ind_right.setter
-    def ind_right(self, value):
-        if value is None and self.ind is None:
-            return
-        ind = self.get_or_add_ind()
-        ind.right = value
-
-    @property
-    def jc_val(self):
-        """
-        The value of the ``<w:jc>`` child element or |None| if not present.
-        """
-        jc = self.jc
-        if jc is None:
-            return None
-        return jc.val
-
-    @jc_val.setter
-    def jc_val(self, value):
-        if value is None:
-            self._remove_jc()
-            return
-        self.get_or_add_jc().val = value
-
-    @property
-    def keepLines_val(self):
-        """
-        The value of `keepLines/@val` or |None| if not present.
-        """
-        keepLines = self.keepLines
-        if keepLines is None:
-            return None
-        return keepLines.val
-
-    @keepLines_val.setter
-    def keepLines_val(self, value):
-        if value is None:
-            self._remove_keepLines()
-        else:
-            self.get_or_add_keepLines().val = value
-
-    @property
-    def keepNext_val(self):
-        """
-        The value of `keepNext/@val` or |None| if not present.
-        """
-        keepNext = self.keepNext
-        if keepNext is None:
-            return None
-        return keepNext.val
-
-    @keepNext_val.setter
-    def keepNext_val(self, value):
-        if value is None:
-            self._remove_keepNext()
-        else:
-            self.get_or_add_keepNext().val = value
-
-    @property
-    def pageBreakBefore_val(self):
-        """
-        The value of `pageBreakBefore/@val` or |None| if not present.
-        """
-        pageBreakBefore = self.pageBreakBefore
-        if pageBreakBefore is None:
-            return None
-        return pageBreakBefore.val
-
-    @pageBreakBefore_val.setter
-    def pageBreakBefore_val(self, value):
-        if value is None:
-            self._remove_pageBreakBefore()
-        else:
-            self.get_or_add_pageBreakBefore().val = value
-
-    @property
-    def spacing_after(self):
-        """
-        The value of `w:spacing/@w:after` or |None| if not present.
-        """
-        spacing = self.spacing
-        if spacing is None:
-            return None
-        return spacing.after
-
-    @spacing_after.setter
-    def spacing_after(self, value):
-        if value is None and self.spacing is None:
-            return
-        self.get_or_add_spacing().after = value
-
-    @property
-    def spacing_before(self):
-        """
-        The value of `w:spacing/@w:before` or |None| if not present.
-        """
-        spacing = self.spacing
-        if spacing is None:
-            return None
-        return spacing.before
-
-    @spacing_before.setter
-    def spacing_before(self, value):
-        if value is None and self.spacing is None:
-            return
-        self.get_or_add_spacing().before = value
-
-    @property
-    def spacing_line(self):
-        """
-        The value of `w:spacing/@w:line` or |None| if not present.
-        """
-        spacing = self.spacing
-        if spacing is None:
-            return None
-        return spacing.line
-
-    @spacing_line.setter
-    def spacing_line(self, value):
-        if value is None and self.spacing is None:
-            return
-        self.get_or_add_spacing().line = value
-
-    @property
-    def spacing_lineRule(self):
-        """
-        The value of `w:spacing/@w:lineRule` as a member of the
-        :ref:`WdLineSpacing` enumeration. Only the `MULTIPLE`, `EXACTLY`, and
-        `AT_LEAST` members are used. It is the responsibility of the client
-        to calculate the use of `SINGLE`, `DOUBLE`, and `MULTIPLE` based on
-        the value of `w:spacing/@w:line` if that behavior is desired.
-        """
-        spacing = self.spacing
-        if spacing is None:
-            return None
-        lineRule = spacing.lineRule
-        if lineRule is None and spacing.line is not None:
-            return WD_LINE_SPACING.MULTIPLE
-        return lineRule
-
-    @spacing_lineRule.setter
-    def spacing_lineRule(self, value):
-        if value is None and self.spacing is None:
-            return
-        self.get_or_add_spacing().lineRule = value
-
-    @property
-    def style(self):
-        """
-        String contained in <w:pStyle> child, or None if that element is not
-        present.
-        """
-        pStyle = self.pStyle
-        if pStyle is None:
-            return None
-        return pStyle.val
-
-    @style.setter
-    def style(self, style):
-        """
-        Set val attribute of <w:pStyle> child element to *style*, adding a
-        new element if necessary. If *style* is |None|, remove the <w:pStyle>
-        element if present.
-        """
-        if style is None:
-            self._remove_pStyle()
-            return
-        pStyle = self.get_or_add_pStyle()
-        pStyle.val = style
-
-    @property
-    def widowControl_val(self):
-        """
-        The value of `widowControl/@val` or |None| if not present.
-        """
-        widowControl = self.widowControl
-        if widowControl is None:
-            return None
-        return widowControl.val
-
-    @widowControl_val.setter
-    def widowControl_val(self, value):
-        if value is None:
-            self._remove_widowControl()
-        else:
-            self.get_or_add_widowControl().val = value
-
-
-class CT_Spacing(BaseOxmlElement):
-    """
-    ``<w:spacing>`` element, specifying paragraph spacing attributes such as
-    space before and line spacing.
-    """
-    after = OptionalAttribute('w:after', ST_TwipsMeasure)
-    before = OptionalAttribute('w:before', ST_TwipsMeasure)
-    line = OptionalAttribute('w:line', ST_SignedTwipsMeasure)
-    lineRule = OptionalAttribute('w:lineRule', WD_LINE_SPACING)
diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
new file mode 100644
index 000000000..f34cb0e5d
--- /dev/null
+++ b/docx/oxml/text/parfmt.py
@@ -0,0 +1,313 @@
+# encoding: utf-8
+
+"""
+Custom element classes related to paragraph properties (CT_PPr).
+"""
+
+from ...enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
+from ...shared import Length
+from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
+from ..xmlchemy import (
+    BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
+)
+
+
+class CT_Ind(BaseOxmlElement):
+    """
+    ``<w:ind>`` element, specifying paragraph indentation.
+    """
+    left = OptionalAttribute('w:left', ST_SignedTwipsMeasure)
+    right = OptionalAttribute('w:right', ST_SignedTwipsMeasure)
+    firstLine = OptionalAttribute('w:firstLine', ST_TwipsMeasure)
+    hanging = OptionalAttribute('w:hanging', ST_TwipsMeasure)
+
+
+class CT_Jc(BaseOxmlElement):
+    """
+    ``<w:jc>`` element, specifying paragraph justification.
+    """
+    val = RequiredAttribute('w:val', WD_ALIGN_PARAGRAPH)
+
+
+class CT_PPr(BaseOxmlElement):
+    """
+    ``<w:pPr>`` element, containing the properties for a paragraph.
+    """
+    _tag_seq = (
+        'w:pStyle', 'w:keepNext', 'w:keepLines', 'w:pageBreakBefore',
+        'w:framePr', 'w:widowControl', 'w:numPr', 'w:suppressLineNumbers',
+        'w:pBdr', 'w:shd', 'w:tabs', 'w:suppressAutoHyphens', 'w:kinsoku',
+        'w:wordWrap', 'w:overflowPunct', 'w:topLinePunct', 'w:autoSpaceDE',
+        'w:autoSpaceDN', 'w:bidi', 'w:adjustRightInd', 'w:snapToGrid',
+        'w:spacing', 'w:ind', 'w:contextualSpacing', 'w:mirrorIndents',
+        'w:suppressOverlap', 'w:jc', 'w:textDirection', 'w:textAlignment',
+        'w:textboxTightWrap', 'w:outlineLvl', 'w:divId', 'w:cnfStyle',
+        'w:rPr', 'w:sectPr', 'w:pPrChange'
+    )
+    pStyle = ZeroOrOne('w:pStyle', successors=_tag_seq[1:])
+    keepNext = ZeroOrOne('w:keepNext', successors=_tag_seq[2:])
+    keepLines = ZeroOrOne('w:keepLines', successors=_tag_seq[3:])
+    pageBreakBefore = ZeroOrOne('w:pageBreakBefore', successors=_tag_seq[4:])
+    widowControl = ZeroOrOne('w:widowControl', successors=_tag_seq[6:])
+    numPr = ZeroOrOne('w:numPr', successors=_tag_seq[7:])
+    spacing = ZeroOrOne('w:spacing', successors=_tag_seq[22:])
+    ind = ZeroOrOne('w:ind', successors=_tag_seq[23:])
+    jc = ZeroOrOne('w:jc', successors=_tag_seq[27:])
+    sectPr = ZeroOrOne('w:sectPr', successors=_tag_seq[35:])
+    del _tag_seq
+
+    @property
+    def first_line_indent(self):
+        """
+        A |Length| value calculated from the values of `w:ind/@w:firstLine`
+        and `w:ind/@w:hanging`. Returns |None| if the `w:ind` child is not
+        present.
+        """
+        ind = self.ind
+        if ind is None:
+            return None
+        hanging = ind.hanging
+        if hanging is not None:
+            return Length(-hanging)
+        firstLine = ind.firstLine
+        if firstLine is None:
+            return None
+        return firstLine
+
+    @first_line_indent.setter
+    def first_line_indent(self, value):
+        if self.ind is None and value is None:
+            return
+        ind = self.get_or_add_ind()
+        ind.firstLine = ind.hanging = None
+        if value is None:
+            return
+        elif value < 0:
+            ind.hanging = -value
+        else:
+            ind.firstLine = value
+
+    @property
+    def ind_left(self):
+        """
+        The value of `w:ind/@w:left` or |None| if not present.
+        """
+        ind = self.ind
+        if ind is None:
+            return None
+        return ind.left
+
+    @ind_left.setter
+    def ind_left(self, value):
+        if value is None and self.ind is None:
+            return
+        ind = self.get_or_add_ind()
+        ind.left = value
+
+    @property
+    def ind_right(self):
+        """
+        The value of `w:ind/@w:right` or |None| if not present.
+        """
+        ind = self.ind
+        if ind is None:
+            return None
+        return ind.right
+
+    @ind_right.setter
+    def ind_right(self, value):
+        if value is None and self.ind is None:
+            return
+        ind = self.get_or_add_ind()
+        ind.right = value
+
+    @property
+    def jc_val(self):
+        """
+        The value of the ``<w:jc>`` child element or |None| if not present.
+        """
+        jc = self.jc
+        if jc is None:
+            return None
+        return jc.val
+
+    @jc_val.setter
+    def jc_val(self, value):
+        if value is None:
+            self._remove_jc()
+            return
+        self.get_or_add_jc().val = value
+
+    @property
+    def keepLines_val(self):
+        """
+        The value of `keepLines/@val` or |None| if not present.
+        """
+        keepLines = self.keepLines
+        if keepLines is None:
+            return None
+        return keepLines.val
+
+    @keepLines_val.setter
+    def keepLines_val(self, value):
+        if value is None:
+            self._remove_keepLines()
+        else:
+            self.get_or_add_keepLines().val = value
+
+    @property
+    def keepNext_val(self):
+        """
+        The value of `keepNext/@val` or |None| if not present.
+        """
+        keepNext = self.keepNext
+        if keepNext is None:
+            return None
+        return keepNext.val
+
+    @keepNext_val.setter
+    def keepNext_val(self, value):
+        if value is None:
+            self._remove_keepNext()
+        else:
+            self.get_or_add_keepNext().val = value
+
+    @property
+    def pageBreakBefore_val(self):
+        """
+        The value of `pageBreakBefore/@val` or |None| if not present.
+        """
+        pageBreakBefore = self.pageBreakBefore
+        if pageBreakBefore is None:
+            return None
+        return pageBreakBefore.val
+
+    @pageBreakBefore_val.setter
+    def pageBreakBefore_val(self, value):
+        if value is None:
+            self._remove_pageBreakBefore()
+        else:
+            self.get_or_add_pageBreakBefore().val = value
+
+    @property
+    def spacing_after(self):
+        """
+        The value of `w:spacing/@w:after` or |None| if not present.
+        """
+        spacing = self.spacing
+        if spacing is None:
+            return None
+        return spacing.after
+
+    @spacing_after.setter
+    def spacing_after(self, value):
+        if value is None and self.spacing is None:
+            return
+        self.get_or_add_spacing().after = value
+
+    @property
+    def spacing_before(self):
+        """
+        The value of `w:spacing/@w:before` or |None| if not present.
+        """
+        spacing = self.spacing
+        if spacing is None:
+            return None
+        return spacing.before
+
+    @spacing_before.setter
+    def spacing_before(self, value):
+        if value is None and self.spacing is None:
+            return
+        self.get_or_add_spacing().before = value
+
+    @property
+    def spacing_line(self):
+        """
+        The value of `w:spacing/@w:line` or |None| if not present.
+        """
+        spacing = self.spacing
+        if spacing is None:
+            return None
+        return spacing.line
+
+    @spacing_line.setter
+    def spacing_line(self, value):
+        if value is None and self.spacing is None:
+            return
+        self.get_or_add_spacing().line = value
+
+    @property
+    def spacing_lineRule(self):
+        """
+        The value of `w:spacing/@w:lineRule` as a member of the
+        :ref:`WdLineSpacing` enumeration. Only the `MULTIPLE`, `EXACTLY`, and
+        `AT_LEAST` members are used. It is the responsibility of the client
+        to calculate the use of `SINGLE`, `DOUBLE`, and `MULTIPLE` based on
+        the value of `w:spacing/@w:line` if that behavior is desired.
+        """
+        spacing = self.spacing
+        if spacing is None:
+            return None
+        lineRule = spacing.lineRule
+        if lineRule is None and spacing.line is not None:
+            return WD_LINE_SPACING.MULTIPLE
+        return lineRule
+
+    @spacing_lineRule.setter
+    def spacing_lineRule(self, value):
+        if value is None and self.spacing is None:
+            return
+        self.get_or_add_spacing().lineRule = value
+
+    @property
+    def style(self):
+        """
+        String contained in <w:pStyle> child, or None if that element is not
+        present.
+        """
+        pStyle = self.pStyle
+        if pStyle is None:
+            return None
+        return pStyle.val
+
+    @style.setter
+    def style(self, style):
+        """
+        Set val attribute of <w:pStyle> child element to *style*, adding a
+        new element if necessary. If *style* is |None|, remove the <w:pStyle>
+        element if present.
+        """
+        if style is None:
+            self._remove_pStyle()
+            return
+        pStyle = self.get_or_add_pStyle()
+        pStyle.val = style
+
+    @property
+    def widowControl_val(self):
+        """
+        The value of `widowControl/@val` or |None| if not present.
+        """
+        widowControl = self.widowControl
+        if widowControl is None:
+            return None
+        return widowControl.val
+
+    @widowControl_val.setter
+    def widowControl_val(self, value):
+        if value is None:
+            self._remove_widowControl()
+        else:
+            self.get_or_add_widowControl().val = value
+
+
+class CT_Spacing(BaseOxmlElement):
+    """
+    ``<w:spacing>`` element, specifying paragraph spacing attributes such as
+    space before and line spacing.
+    """
+    after = OptionalAttribute('w:after', ST_TwipsMeasure)
+    before = OptionalAttribute('w:before', ST_TwipsMeasure)
+    line = OptionalAttribute('w:line', ST_SignedTwipsMeasure)
+    lineRule = OptionalAttribute('w:lineRule', WD_LINE_SPACING)

From 946864fdafdc9eef865e1c37282a5114208c013c Mon Sep 17 00:00:00 2001
From: Viraj Kanwade <viraj.kanwade@snstech.com>
Date: Tue, 17 Feb 2015 17:50:48 -0800
Subject: [PATCH 070/367] acpt: add scenario for Font.color

---
 docx/dml/__init__.py            |  0
 docx/dml/color.py               | 23 +++++++++++++++++++++++
 features/steps/font.py          | 13 +++++++++++++
 features/txt-font-props.feature |  6 ++++++
 4 files changed, 42 insertions(+)
 create mode 100644 docx/dml/__init__.py
 create mode 100644 docx/dml/color.py

diff --git a/docx/dml/__init__.py b/docx/dml/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/docx/dml/color.py b/docx/dml/color.py
new file mode 100644
index 000000000..96be82129
--- /dev/null
+++ b/docx/dml/color.py
@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+"""
+DrawingML objects related to color, ColorFormat being the most prominent.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from ..shared import ElementProxy
+
+
+class ColorFormat(ElementProxy):
+    """
+    Provides access to color settings such as RGB color, theme color, and
+    luminance adjustments.
+    """
+
+    __slots__ = ()
+
+    def __init__(self, rPr_parent):
+        super(ColorFormat, self).__init__(rPr_parent)
diff --git a/features/steps/font.py b/features/steps/font.py
index 9e95663c8..4af38c02c 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -11,6 +11,7 @@
 from behave import given, then, when
 
 from docx import Document
+from docx.dml.color import ColorFormat
 from docx.enum.text import WD_UNDERLINE
 
 from helpers import test_docx
@@ -18,6 +19,12 @@
 
 # given ===================================================
 
+@given('a font')
+def given_a_font(context):
+    document = Document(test_docx('txt-font-props'))
+    context.font = document.paragraphs[0].runs[0].font
+
+
 @given('a font having typeface name {name}')
 def given_a_font_having_typeface_name(context, name):
     document = Document(test_docx('txt-font-props'))
@@ -109,6 +116,12 @@ def when_I_assign_value_to_font_sub_super(context, value, sub_super):
 
 # then =====================================================
 
+@then('font.color is a ColorFormat object')
+def then_font_color_is_a_ColorFormat_object(context):
+    font = context.font
+    assert isinstance(font.color, ColorFormat)
+
+
 @then('font.name is {value}')
 def then_font_name_is_value(context, value):
     font = context.font
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
index 7f396ceed..9cee6003d 100644
--- a/features/txt-font-props.feature
+++ b/features/txt-font-props.feature
@@ -48,6 +48,12 @@ Feature: Get or set font properties
       | 18 pt       | None   |
 
 
+  @wip
+  Scenario: Get font color object
+    Given a font
+     Then font.color is a ColorFormat object
+
+
   Scenario Outline: Get font underline value
     Given a font having <underline-type> underline
      Then font.underline is <value>

From f2a3d7c0ff21a748e31d3b0d49bed9841cddc2e3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 18:45:13 -0800
Subject: [PATCH 071/367] font: add Font.color

---
 docs/conf.py                    |  2 ++
 docx/text/font.py               |  9 +++++++++
 features/txt-font-props.feature |  1 -
 tests/text/test_font.py         | 25 +++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 5afaf24de..496120816 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,6 +81,8 @@
 
 .. |Cm| replace:: :class:`.Cm`
 
+.. |ColorFormat| replace:: :class:`.ColorFormat`
+
 .. |_Column| replace:: :class:`._Column`
 
 .. |_Columns| replace:: :class:`._Columns`
diff --git a/docx/text/font.py b/docx/text/font.py
index 39c946181..d6dbe2927 100644
--- a/docx/text/font.py
+++ b/docx/text/font.py
@@ -8,6 +8,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from ..dml.color import ColorFormat
 from ..shared import ElementProxy
 
 
@@ -42,6 +43,14 @@ def bold(self):
     def bold(self, value):
         self._set_bool_prop('b', value)
 
+    @property
+    def color(self):
+        """
+        A |ColorFormat| object providing a way to get and set the text color
+        for this font.
+        """
+        return ColorFormat(self._element)
+
     @property
     def complex_script(self):
         """
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
index 9cee6003d..32ef19f74 100644
--- a/features/txt-font-props.feature
+++ b/features/txt-font-props.feature
@@ -48,7 +48,6 @@ Feature: Get or set font properties
       | 18 pt       | None   |
 
 
-  @wip
   Scenario: Get font color object
     Given a font
      Then font.color is a ColorFormat object
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index c74371720..b0d0ccac1 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -8,6 +8,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.dml.color import ColorFormat
 from docx.enum.text import WD_UNDERLINE
 from docx.shared import Pt
 from docx.text.font import Font
@@ -15,10 +16,17 @@
 import pytest
 
 from ..unitutil.cxml import element, xml
+from ..unitutil.mock import class_mock, instance_mock
 
 
 class DescribeFont(object):
 
+    def it_provides_access_to_its_color_object(self, color_fixture):
+        font, color_, ColorFormat_ = color_fixture
+        color = font.color
+        ColorFormat_.assert_called_once_with(font.element)
+        assert color is color_
+
     def it_knows_its_typeface_name(self, name_get_fixture):
         font, expected_value = name_get_fixture
         assert font.name == expected_value
@@ -161,6 +169,11 @@ def bool_prop_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return font, prop_name, value, expected_xml
 
+    @pytest.fixture
+    def color_fixture(self, ColorFormat_, color_):
+        font = Font(element('w:r'))
+        return font, color_, ColorFormat_
+
     @pytest.fixture(params=[
         ('w:r',                               None),
         ('w:r/w:rPr',                         None),
@@ -325,3 +338,15 @@ def underline_set_fixture(self, request):
         run = Font(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, value, expected_xml
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def color_(self, request):
+        return instance_mock(request, ColorFormat)
+
+    @pytest.fixture
+    def ColorFormat_(self, request, color_):
+        return class_mock(
+            request, 'docx.text.font.ColorFormat', return_value=color_
+        )

From 397cef4dfc3cbb57312ea6aff5755d9c1a4815d5 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 20:59:51 -0800
Subject: [PATCH 072/367] acpt: add scenarios for ColorFormat.type

---
 features/steps/font.py                   |  17 +++++++++++++++++
 features/steps/test_files/fnt-color.docx | Bin 0 -> 15846 bytes
 features/txt-font-color.feature          |  17 +++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 features/steps/test_files/fnt-color.docx
 create mode 100644 features/txt-font-color.feature

diff --git a/features/steps/font.py b/features/steps/font.py
index 4af38c02c..59a5bc663 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -12,6 +12,7 @@
 
 from docx import Document
 from docx.dml.color import ColorFormat
+from docx.enum.dml import MSO_COLOR_TYPE
 from docx.enum.text import WD_UNDERLINE
 
 from helpers import test_docx
@@ -25,6 +26,13 @@ def given_a_font(context):
     context.font = document.paragraphs[0].runs[0].font
 
 
+@given('a font having {type} color')
+def given_a_font_having_type_color(context, type):
+    run_idx = ['no', 'auto', 'an RGB', 'a theme'].index(type)
+    document = Document(test_docx('fnt-color'))
+    context.font = document.paragraphs[0].runs[run_idx].font
+
+
 @given('a font having typeface name {name}')
 def given_a_font_having_typeface_name(context, name):
     document = Document(test_docx('txt-font-props'))
@@ -122,6 +130,15 @@ def then_font_color_is_a_ColorFormat_object(context):
     assert isinstance(font.color, ColorFormat)
 
 
+@then('font.color.type is {value}')
+def then_font_color_type_is_value(context, value):
+    font = context.font
+    expected_value = (
+        None if value == 'None' else getattr(MSO_COLOR_TYPE, value)
+    )
+    assert font.color.type == expected_value
+
+
 @then('font.name is {value}')
 def then_font_name_is_value(context, value):
     font = context.font
diff --git a/features/steps/test_files/fnt-color.docx b/features/steps/test_files/fnt-color.docx
new file mode 100644
index 0000000000000000000000000000000000000000..6741175d1c745befe9a1d82623486d96edec03ed
GIT binary patch
literal 15846
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

literal 0
HcmV?d00001

diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
new file mode 100644
index 000000000..5b551fbc4
--- /dev/null
+++ b/features/txt-font-color.feature
@@ -0,0 +1,17 @@
+Feature: Get and set font color
+  In order to work with the color of text
+  As a developer using python-docx
+  I need a way to get and set the text color
+
+
+  @wip
+  Scenario Outline: Get font color type
+    Given a font having <type> color
+     Then font.color.type is <value>
+
+    Examples: Color type settings
+      | type    | value |
+      | no      | None  |
+      | auto    | AUTO  |
+      | an RGB  | RGB   |
+      | a theme | THEME |

From 3c839ee4963a7c7f9baddd09321d6b2dc1b28c78 Mon Sep 17 00:00:00 2001
From: Viraj Kanwade <viraj.kanwade@snstech.com>
Date: Tue, 17 Feb 2015 23:44:48 -0800
Subject: [PATCH 073/367] shr: transplant RGBColor

---
 docx/shared.py       | 31 +++++++++++++++++++++++++++++++
 tests/test_shared.py | 27 ++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/docx/shared.py b/docx/shared.py
index e7ade75c2..919964325 100644
--- a/docx/shared.py
+++ b/docx/shared.py
@@ -124,6 +124,37 @@ def __new__(cls, twips):
         return Length.__new__(cls, emu)
 
 
+class RGBColor(tuple):
+    """
+    Immutable value object defining a particular RGB color.
+    """
+    def __new__(cls, r, g, b):
+        msg = 'RGBColor() takes three integer values 0-255'
+        for val in (r, g, b):
+            if not isinstance(val, int) or val < 0 or val > 255:
+                raise ValueError(msg)
+        return super(RGBColor, cls).__new__(cls, (r, g, b))
+
+    def __repr__(self):
+        return 'RGBColor(0x%02x, 0x%02x, 0x%02x)' % self
+
+    def __str__(self):
+        """
+        Return a hex string rgb value, like '3C2F80'
+        """
+        return '%02X%02X%02X' % self
+
+    @classmethod
+    def from_string(cls, rgb_hex_str):
+        """
+        Return a new instance from an RGB color hex string like ``'3C2F80'``.
+        """
+        r = int(rgb_hex_str[:2], 16)
+        g = int(rgb_hex_str[2:4], 16)
+        b = int(rgb_hex_str[4:], 16)
+        return cls(r, g, b)
+
+
 def lazyproperty(f):
     """
     @lazyprop decorator. Decorated method will be called only on first access
diff --git a/tests/test_shared.py b/tests/test_shared.py
index 1dfb64e21..102a661ea 100644
--- a/tests/test_shared.py
+++ b/tests/test_shared.py
@@ -11,7 +11,9 @@
 import pytest
 
 from docx.opc.part import XmlPart
-from docx.shared import ElementProxy, Length, Cm, Emu, Inches, Mm, Pt, Twips
+from docx.shared import (
+    ElementProxy, Length, Cm, Emu, Inches, Mm, Pt, RGBColor, Twips
+)
 
 from .unitutil.cxml import element
 from .unitutil.mock import instance_mock
@@ -113,3 +115,26 @@ def construct_fixture(self, request):
     def units_fixture(self, request):
         emu, units_prop_name, expected_length_in_units, type_ = request.param
         return emu, units_prop_name, expected_length_in_units, type_
+
+
+class DescribeRGBColor(object):
+
+    def it_is_natively_constructed_using_three_ints_0_to_255(self):
+        RGBColor(0x12, 0x34, 0x56)
+        with pytest.raises(ValueError):
+            RGBColor('12', '34', '56')
+        with pytest.raises(ValueError):
+            RGBColor(-1, 34, 56)
+        with pytest.raises(ValueError):
+            RGBColor(12, 256, 56)
+
+    def it_can_construct_from_a_hex_string_rgb_value(self):
+        rgb = RGBColor.from_string('123456')
+        assert rgb == RGBColor(0x12, 0x34, 0x56)
+
+    def it_can_provide_a_hex_string_rgb_value(self):
+        assert str(RGBColor(0x12, 0x34, 0x56)) == '123456'
+
+    def it_has_a_custom_repr(self):
+        rgb_color = RGBColor(0x42, 0xF0, 0xBA)
+        assert repr(rgb_color) == 'RGBColor(0x42, 0xf0, 0xba)'

From 96273f27c91bf184575cf99ae1c5e4427073c916 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 17 Feb 2015 23:08:55 -0800
Subject: [PATCH 074/367] dml: add ColorFormat.type

---
 docx/dml/color.py               | 22 +++++++++++++++++++
 docx/oxml/__init__.py           |  4 +++-
 docx/oxml/simpletypes.py        | 37 ++++++++++++++++++++++++++++++-
 docx/oxml/text/font.py          | 15 ++++++++++++-
 features/txt-font-color.feature |  1 -
 tests/dml/__init__.py           |  0
 tests/dml/test_color.py         | 39 +++++++++++++++++++++++++++++++++
 7 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 tests/dml/__init__.py
 create mode 100644 tests/dml/test_color.py

diff --git a/docx/dml/color.py b/docx/dml/color.py
index 96be82129..73349ecf2 100644
--- a/docx/dml/color.py
+++ b/docx/dml/color.py
@@ -8,6 +8,8 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from ..enum.dml import MSO_COLOR_TYPE
+from ..oxml.simpletypes import ST_HexColorAuto
 from ..shared import ElementProxy
 
 
@@ -21,3 +23,23 @@ class ColorFormat(ElementProxy):
 
     def __init__(self, rPr_parent):
         super(ColorFormat, self).__init__(rPr_parent)
+
+    @property
+    def type(self):
+        """
+        Read-only. A member of :ref:`MsoColorType`, one of RGB, THEME, or
+        AUTO, corresponding to the way this color is defined. Its value is
+        |None| if no color is applied at this level, which causes the
+        effective color to be inherited from the style hierarchy.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        color = rPr.color
+        if color is None:
+            return None
+        if color.themeColor is not None:
+            return MSO_COLOR_TYPE.THEME
+        if color.val == ST_HexColorAuto.AUTO:
+            return MSO_COLOR_TYPE.AUTO
+        return MSO_COLOR_TYPE.RGB
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index d5f07bdcb..4ac0fe8d7 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -145,11 +145,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vMerge',    CT_VMerge)
 
 from .text.font import (
-    CT_Fonts, CT_HpsMeasure, CT_RPr, CT_Underline, CT_VerticalAlignRun
+    CT_Color, CT_Fonts, CT_HpsMeasure, CT_RPr, CT_Underline,
+    CT_VerticalAlignRun
 )
 register_element_cls('w:b',          CT_OnOff)
 register_element_cls('w:bCs',        CT_OnOff)
 register_element_cls('w:caps',       CT_OnOff)
+register_element_cls('w:color',      CT_Color)
 register_element_cls('w:cs',         CT_OnOff)
 register_element_cls('w:dstrike',    CT_OnOff)
 register_element_cls('w:emboss',     CT_OnOff)
diff --git a/docx/oxml/simpletypes.py b/docx/oxml/simpletypes.py
index 0c72e9287..400a23700 100644
--- a/docx/oxml/simpletypes.py
+++ b/docx/oxml/simpletypes.py
@@ -11,7 +11,7 @@
 )
 
 from ..exceptions import InvalidXmlError
-from ..shared import Emu, Pt, Twips
+from ..shared import Emu, Pt, RGBColor, Twips
 
 
 class BaseSimpleType(object):
@@ -237,6 +237,41 @@ class ST_DrawingElementId(XsdUnsignedInt):
     pass
 
 
+class ST_HexColor(BaseStringType):
+
+    @classmethod
+    def convert_from_xml(cls, str_value):
+        if str_value == 'auto':
+            return ST_HexColorAuto.AUTO
+        return RGBColor.from_string(str_value)
+
+    @classmethod
+    def convert_to_xml(cls, value):
+        """
+        Keep alpha hex numerals all uppercase just for consistency.
+        """
+        # expecting 3-tuple of ints in range 0-255
+        return '%02X%02X%02X' % value
+
+    @classmethod
+    def validate(cls, value):
+        # must be an RGBColor object ---
+        if not isinstance(value, RGBColor):
+            raise ValueError(
+                "rgb color value must be RGBColor object, got %s %s"
+                % (type(value), value)
+            )
+
+
+class ST_HexColorAuto(XsdStringEnumeration):
+    """
+    Value for `w:color/[@val="auto"] attribute setting
+    """
+    AUTO = 'auto'
+
+    _members = (AUTO,)
+
+
 class ST_HpsMeasure(XsdUnsignedLong):
     """
     Half-point measure, e.g. 24.0 represents 12.0 points.
diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
index bd13dfba4..804e236d3 100644
--- a/docx/oxml/text/font.py
+++ b/docx/oxml/text/font.py
@@ -4,14 +4,26 @@
 Custom element classes related to run properties (font).
 """
 
+from ...enum.dml import MSO_THEME_COLOR
 from ...enum.text import WD_UNDERLINE
 from ..ns import qn
-from ..simpletypes import ST_HpsMeasure, ST_String, ST_VerticalAlignRun
+from ..simpletypes import (
+    ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
+)
 from ..xmlchemy import (
     BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
 )
 
 
+class CT_Color(BaseOxmlElement):
+    """
+    `w:color` element, specifying the color of a font and perhaps other
+    objects.
+    """
+    val = RequiredAttribute('w:val', ST_HexColor)
+    themeColor = OptionalAttribute('w:themeColor', MSO_THEME_COLOR)
+
+
 class CT_Fonts(BaseOxmlElement):
     """
     ``<w:rFonts>`` element, specifying typeface name for the various language
@@ -60,6 +72,7 @@ class CT_RPr(BaseOxmlElement):
     snapToGrid = ZeroOrOne('w:snapToGrid', successors=_tag_seq[16:])
     vanish = ZeroOrOne('w:vanish', successors=_tag_seq[17:])
     webHidden = ZeroOrOne('w:webHidden', successors=_tag_seq[18:])
+    color = ZeroOrOne('w:color', successors=_tag_seq[19:])
     sz = ZeroOrOne('w:sz', successors=_tag_seq[24:])
     u = ZeroOrOne('w:u', successors=_tag_seq[27:])
     vertAlign = ZeroOrOne('w:vertAlign', successors=_tag_seq[32:])
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index 5b551fbc4..86aa07678 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -4,7 +4,6 @@ Feature: Get and set font color
   I need a way to get and set the text color
 
 
-  @wip
   Scenario Outline: Get font color type
     Given a font having <type> color
      Then font.color.type is <value>
diff --git a/tests/dml/__init__.py b/tests/dml/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
new file mode 100644
index 000000000..364ac6bcf
--- /dev/null
+++ b/tests/dml/test_color.py
@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+"""
+Test suite for docx.dml.color module.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from docx.enum.dml import MSO_COLOR_TYPE
+from docx.dml.color import ColorFormat
+
+from ..unitutil.cxml import element
+
+import pytest
+
+
+class DescribeColorFormat(object):
+
+    def it_knows_its_color_type(self, type_fixture):
+        color_format, expected_value = type_fixture
+        assert color_format.type == expected_value
+
+    # fixtures ---------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:r',                                   None),
+        ('w:r/w:rPr',                             None),
+        ('w:r/w:rPr/w:color{w:val=auto}',         MSO_COLOR_TYPE.AUTO),
+        ('w:r/w:rPr/w:color{w:val=4224FF}',       MSO_COLOR_TYPE.RGB),
+        ('w:r/w:rPr/w:color{w:themeColor=dark1}', MSO_COLOR_TYPE.THEME),
+        ('w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}',
+         MSO_COLOR_TYPE.THEME),
+    ])
+    def type_fixture(self, request):
+        r_cxml, expected_value = request.param
+        color_format = ColorFormat(element(r_cxml))
+        return color_format, expected_value

From 478c68b5f72251894f5a2631e2dec71daa6a1158 Mon Sep 17 00:00:00 2001
From: Viraj Kanwade <viraj.kanwade@snstech.com>
Date: Wed, 18 Feb 2015 20:40:39 -0800
Subject: [PATCH 075/367] acpt: add scenarios for ColorFormat.rgb

---
 features/steps/font.py          | 15 +++++++++++++++
 features/txt-font-color.feature | 30 ++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/features/steps/font.py b/features/steps/font.py
index 59a5bc663..da24ff684 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -14,6 +14,7 @@
 from docx.dml.color import ColorFormat
 from docx.enum.dml import MSO_COLOR_TYPE
 from docx.enum.text import WD_UNDERLINE
+from docx.shared import RGBColor
 
 from helpers import test_docx
 
@@ -79,6 +80,13 @@ def given_a_font_of_size(context, size):
 
 # when ====================================================
 
+@when('I assign {value} to font.color.rgb')
+def when_I_assign_value_to_font_color_rgb(context, value):
+    font = context.font
+    new_value = None if value == 'None' else RGBColor.from_string(value)
+    font.color.rgb = new_value
+
+
 @when('I assign {value} to font.name')
 def when_I_assign_value_to_font_name(context, value):
     font = context.font
@@ -130,6 +138,13 @@ def then_font_color_is_a_ColorFormat_object(context):
     assert isinstance(font.color, ColorFormat)
 
 
+@then('font.color.rgb is {value}')
+def then_font_color_rgb_is_value(context, value):
+    font = context.font
+    expected_value = None if value == 'None' else RGBColor.from_string(value)
+    assert font.color.rgb == expected_value
+
+
 @then('font.color.type is {value}')
 def then_font_color_type_is_value(context, value):
     font = context.font
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index 86aa07678..d10cd2f4d 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -14,3 +14,33 @@ Feature: Get and set font color
       | auto    | AUTO  |
       | an RGB  | RGB   |
       | a theme | THEME |
+
+
+  @wip
+  Scenario Outline: Get font RGB color
+    Given a font having <type> color
+     Then font.color.rgb is <value>
+
+    Examples: Color type settings
+      | type    | value  |
+      | no      | None   |
+      | auto    | None   |
+      | an RGB  | 008000 |
+      | a theme | 4f81bd |
+
+
+  @wip
+  Scenario Outline: Set font RGB color
+    Given a font having <type> color
+     When I assign <value> to font.color.rgb
+     Then font.color.type is <type-value>
+     Then font.color.rgb is <rgb-value>
+
+    Examples: Color type settings
+      | type    | value  | type-value | rgb-value |
+      | no      | f00ba5 | RGB        | f00ba5    |
+      | auto    | 2468ac | RGB        | 2468ac    |
+      | an RGB  | feeb1e | RGB        | feeb1e    |
+      | a theme | 987bac | RGB        | 987bac    |
+      | an RGB  | None   | None       | None      |
+      | a theme | None   | None       | None      |

From 1fd60776f7cbbe807d807b06c354a0b0ce4033f8 Mon Sep 17 00:00:00 2001
From: Viraj Kanwade <viraj.kanwade@snstech.com>
Date: Wed, 18 Feb 2015 21:18:09 -0800
Subject: [PATCH 076/367] dml: add ColorFormat.rgb getter

---
 docx/dml/color.py               | 42 +++++++++++++++++++++++++++++----
 features/txt-font-color.feature |  1 -
 tests/dml/test_color.py         | 19 +++++++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/docx/dml/color.py b/docx/dml/color.py
index 73349ecf2..912a37d49 100644
--- a/docx/dml/color.py
+++ b/docx/dml/color.py
@@ -24,6 +24,32 @@ class ColorFormat(ElementProxy):
     def __init__(self, rPr_parent):
         super(ColorFormat, self).__init__(rPr_parent)
 
+    @property
+    def rgb(self):
+        """
+        An |RGBColor| value or |None| if no RGB color is specified.
+
+        When :attr:`type` is `MSO_COLOR_TYPE.RGB`, the value of this property
+        will always be an |RGBColor| value. It may also be an |RGBColor|
+        value if :attr:`type` is `MSO_COLOR_TYPE.THEME`, as Word writes the
+        current value of a theme color when one is assigned. In that case,
+        the RGB value should be interpreted as no more than a good guess
+        however, as the theme color takes precedence at rendering time. Its
+        value is |None| whenever :attr:`type` is either |None| or
+        `MSO_COLOR_TYPE.AUTO`.
+
+        Assigning an |RGBColor| value causes :attr:`type` to become
+        `MSO_COLOR_TYPE.RGB` and any theme color is removed. Assigning |None|
+        causes any color to be removed such that the effective color is
+        inherited from the style hierarchy.
+        """
+        color = self._color
+        if color is None:
+            return None
+        if color.val == ST_HexColorAuto.AUTO:
+            return None
+        return color.val
+
     @property
     def type(self):
         """
@@ -32,10 +58,7 @@ def type(self):
         |None| if no color is applied at this level, which causes the
         effective color to be inherited from the style hierarchy.
         """
-        rPr = self._element.rPr
-        if rPr is None:
-            return None
-        color = rPr.color
+        color = self._color
         if color is None:
             return None
         if color.themeColor is not None:
@@ -43,3 +66,14 @@ def type(self):
         if color.val == ST_HexColorAuto.AUTO:
             return MSO_COLOR_TYPE.AUTO
         return MSO_COLOR_TYPE.RGB
+
+    @property
+    def _color(self):
+        """
+        Return `w:rPr/w:color` or |None| if not present. Helper to factor out
+        repetitive element access.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.color
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index d10cd2f4d..e13d6231a 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -16,7 +16,6 @@ Feature: Get and set font color
       | a theme | THEME |
 
 
-  @wip
   Scenario Outline: Get font RGB color
     Given a font having <type> color
      Then font.color.rgb is <value>
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index 364ac6bcf..63697a95e 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -10,6 +10,7 @@
 
 from docx.enum.dml import MSO_COLOR_TYPE
 from docx.dml.color import ColorFormat
+from docx.shared import RGBColor
 
 from ..unitutil.cxml import element
 
@@ -22,8 +23,26 @@ def it_knows_its_color_type(self, type_fixture):
         color_format, expected_value = type_fixture
         assert color_format.type == expected_value
 
+    def it_knows_its_RGB_value(self, rgb_get_fixture):
+        color_format, expected_value = rgb_get_fixture
+        assert color_format.rgb == expected_value
+
     # fixtures ---------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:r',                                                  None),
+        ('w:r/w:rPr',                                            None),
+        ('w:r/w:rPr/w:color{w:val=auto}',                        None),
+        ('w:r/w:rPr/w:color{w:val=4224FF}',                      '4224ff'),
+        ('w:r/w:rPr/w:color{w:val=auto,w:themeColor=accent1}',   None),
+        ('w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}', 'f00ba9'),
+    ])
+    def rgb_get_fixture(self, request):
+        r_cxml, rgb = request.param
+        color_format = ColorFormat(element(r_cxml))
+        expected_value = None if rgb is None else RGBColor.from_string(rgb)
+        return color_format, expected_value
+
     @pytest.fixture(params=[
         ('w:r',                                   None),
         ('w:r/w:rPr',                             None),

From cabb7275bbc1c8cb6d701667aeaf3ddc84a257a3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 18 Feb 2015 22:33:29 -0800
Subject: [PATCH 077/367] dml: add ColorFormat.rgb setter

---
 docx/dml/color.py               |  9 +++++++++
 features/txt-font-color.feature |  1 -
 tests/dml/test_color.py         | 26 +++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/docx/dml/color.py b/docx/dml/color.py
index 912a37d49..da70ff8ef 100644
--- a/docx/dml/color.py
+++ b/docx/dml/color.py
@@ -50,6 +50,15 @@ def rgb(self):
             return None
         return color.val
 
+    @rgb.setter
+    def rgb(self, value):
+        if value is None and self._color is None:
+            return
+        rPr = self._element.get_or_add_rPr()
+        rPr._remove_color()
+        if value is not None:
+            rPr.get_or_add_color().val = value
+
     @property
     def type(self):
         """
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index e13d6231a..0cf56e5f4 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -28,7 +28,6 @@ Feature: Get and set font color
       | a theme | 4f81bd |
 
 
-  @wip
   Scenario Outline: Set font RGB color
     Given a font having <type> color
      When I assign <value> to font.color.rgb
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index 63697a95e..5d2903ea7 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -12,7 +12,7 @@
 from docx.dml.color import ColorFormat
 from docx.shared import RGBColor
 
-from ..unitutil.cxml import element
+from ..unitutil.cxml import element, xml
 
 import pytest
 
@@ -27,6 +27,11 @@ def it_knows_its_RGB_value(self, rgb_get_fixture):
         color_format, expected_value = rgb_get_fixture
         assert color_format.rgb == expected_value
 
+    def it_can_change_its_RGB_value(self, rgb_set_fixture):
+        color_format, new_value, expected_xml = rgb_set_fixture
+        color_format.rgb = new_value
+        assert color_format._element.xml == expected_xml
+
     # fixtures ---------------------------------------------
 
     @pytest.fixture(params=[
@@ -43,6 +48,25 @@ def rgb_get_fixture(self, request):
         expected_value = None if rgb is None else RGBColor.from_string(rgb)
         return color_format, expected_value
 
+    @pytest.fixture(params=[
+        ('w:r', RGBColor(10, 20, 30), 'w:r/w:rPr/w:color{w:val=0A141E}'),
+        ('w:r/w:rPr', RGBColor(1, 2, 3), 'w:r/w:rPr/w:color{w:val=010203}'),
+        ('w:r/w:rPr/w:color{w:val=123abc}', RGBColor(42, 24, 99),
+         'w:r/w:rPr/w:color{w:val=2A1863}'),
+        ('w:r/w:rPr/w:color{w:val=auto}', RGBColor(16, 17, 18),
+         'w:r/w:rPr/w:color{w:val=101112}'),
+        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}',
+         RGBColor(24, 42, 99), 'w:r/w:rPr/w:color{w:val=182A63}'),
+        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}',
+         None, 'w:r/w:rPr'),
+        ('w:r', None, 'w:r'),
+    ])
+    def rgb_set_fixture(self, request):
+        r_cxml, new_value, expected_cxml = request.param
+        color_format = ColorFormat(element(r_cxml))
+        expected_xml = xml(expected_cxml)
+        return color_format, new_value, expected_xml
+
     @pytest.fixture(params=[
         ('w:r',                                   None),
         ('w:r/w:rPr',                             None),

From 426cad4d78bb4ae97be8ea615d54e0b5539d80c6 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 18 Feb 2015 22:54:24 -0800
Subject: [PATCH 078/367] acpt: add scenarios for ColorFormat.theme

---
 features/steps/font.py          | 18 +++++++++++++++++-
 features/txt-font-color.feature | 30 ++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/features/steps/font.py b/features/steps/font.py
index da24ff684..98e01bf69 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -12,7 +12,7 @@
 
 from docx import Document
 from docx.dml.color import ColorFormat
-from docx.enum.dml import MSO_COLOR_TYPE
+from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
 from docx.enum.text import WD_UNDERLINE
 from docx.shared import RGBColor
 
@@ -87,6 +87,13 @@ def when_I_assign_value_to_font_color_rgb(context, value):
     font.color.rgb = new_value
 
 
+@when('I assign {value} to font.color.theme_color')
+def when_I_assign_value_to_font_color_theme_color(context, value):
+    font = context.font
+    new_value = None if value == 'None' else getattr(MSO_THEME_COLOR, value)
+    font.color.theme_color = new_value
+
+
 @when('I assign {value} to font.name')
 def when_I_assign_value_to_font_name(context, value):
     font = context.font
@@ -145,6 +152,15 @@ def then_font_color_rgb_is_value(context, value):
     assert font.color.rgb == expected_value
 
 
+@then('font.color.theme_color is {value}')
+def then_font_color_theme_color_is_value(context, value):
+    font = context.font
+    expected_value = (
+        None if value == 'None' else getattr(MSO_THEME_COLOR, value)
+    )
+    assert font.color.theme_color == expected_value
+
+
 @then('font.color.type is {value}')
 def then_font_color_type_is_value(context, value):
     font = context.font
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index 0cf56e5f4..8700d0b1e 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -42,3 +42,33 @@ Feature: Get and set font color
       | a theme | 987bac | RGB        | 987bac    |
       | an RGB  | None   | None       | None      |
       | a theme | None   | None       | None      |
+
+
+  @wip
+  Scenario Outline: Get font theme color
+    Given a font having <type> color
+     Then font.color.theme_color is <value>
+
+    Examples: Color type settings
+      | type    | value    |
+      | no      | None     |
+      | auto    | None     |
+      | an RGB  | None     |
+      | a theme | ACCENT_1 |
+
+
+  @wip
+  Scenario Outline: Set font theme color
+    Given a font having <type> color
+     When I assign <value> to font.color.theme_color
+     Then font.color.type is <type-value>
+     Then font.color.theme_color is <theme-value>
+
+    Examples: Color type settings
+      | type    | value    | type-value | theme-value |
+      | no      | ACCENT_2 | THEME      | ACCENT_2    |
+      | auto    | DARK_1   | THEME      | DARK_1      |
+      | an RGB  | TEXT_1   | THEME      | TEXT_1      |
+      | a theme | LIGHT_2  | THEME      | LIGHT_2     |
+      | a theme | None     | None       | None        |
+      | an RGB  | None     | None       | None        |

From 063396b3636833ee12d49ed1191431ead11cf708 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 18 Feb 2015 23:28:23 -0800
Subject: [PATCH 079/367] dml: add ColorFormat.theme_color getter

---
 docx/dml/color.py               | 20 ++++++++++++++++++++
 features/txt-font-color.feature |  1 -
 tests/dml/test_color.py         | 22 +++++++++++++++++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/docx/dml/color.py b/docx/dml/color.py
index da70ff8ef..f5dd4be38 100644
--- a/docx/dml/color.py
+++ b/docx/dml/color.py
@@ -59,6 +59,26 @@ def rgb(self, value):
         if value is not None:
             rPr.get_or_add_color().val = value
 
+    @property
+    def theme_color(self):
+        """
+        A member of :ref:`MsoThemeColorIndex` or |None| if no theme color is
+        specified. When :attr:`type` is `MSO_COLOR_TYPE.THEME`, the value of
+        this property will always be a member of :ref:`MsoThemeColorIndex`.
+        When :attr:`type` has any other value, the value of this property is
+        |None|.
+
+        Assigning a member of :ref:`MsoThemeColorIndex` causes :attr:`type`
+        to become `MSO_COLOR_TYPE.THEME`. Any existing RGB value is retained
+        but ignored by Word. Assigning |None| causes any color specification
+        to be removed such that the effective color is inherited from the
+        style hierarchy.
+        """
+        color = self._color
+        if color is None or color.themeColor is None:
+            return None
+        return color.themeColor
+
     @property
     def type(self):
         """
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index 8700d0b1e..6eb6e1c38 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -44,7 +44,6 @@ Feature: Get and set font color
       | a theme | None   | None       | None      |
 
 
-  @wip
   Scenario Outline: Get font theme color
     Given a font having <type> color
      Then font.color.theme_color is <value>
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index 5d2903ea7..e1c37c20e 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -8,7 +8,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from docx.enum.dml import MSO_COLOR_TYPE
+from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
 from docx.dml.color import ColorFormat
 from docx.shared import RGBColor
 
@@ -32,6 +32,10 @@ def it_can_change_its_RGB_value(self, rgb_set_fixture):
         color_format.rgb = new_value
         assert color_format._element.xml == expected_xml
 
+    def it_knows_its_theme_color(self, theme_color_get_fixture):
+        color_format, expected_value = theme_color_get_fixture
+        assert color_format.theme_color == expected_value
+
     # fixtures ---------------------------------------------
 
     @pytest.fixture(params=[
@@ -67,6 +71,22 @@ def rgb_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return color_format, new_value, expected_xml
 
+    @pytest.fixture(params=[
+        ('w:r',                                                None),
+        ('w:r/w:rPr',                                          None),
+        ('w:r/w:rPr/w:color{w:val=auto}',                      None),
+        ('w:r/w:rPr/w:color{w:val=4224FF}',                    None),
+        ('w:r/w:rPr/w:color{w:themeColor=accent1}',            'ACCENT_1'),
+        ('w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=dark1}', 'DARK_1'),
+    ])
+    def theme_color_get_fixture(self, request):
+        r_cxml, value = request.param
+        color_format = ColorFormat(element(r_cxml))
+        expected_value = (
+            None if value is None else getattr(MSO_THEME_COLOR, value)
+        )
+        return color_format, expected_value
+
     @pytest.fixture(params=[
         ('w:r',                                   None),
         ('w:r/w:rPr',                             None),

From a51022b4c28a6605d764a3dbe86bc30df353b3a3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 19 Feb 2015 00:28:25 -0800
Subject: [PATCH 080/367] dml: add ColorFormat.theme_color setter

---
 docx/dml/color.py               |  8 ++++++++
 docx/oxml/text/font.py          | 10 +++++++++-
 features/txt-font-color.feature |  1 -
 tests/dml/test_color.py         | 27 +++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/docx/dml/color.py b/docx/dml/color.py
index f5dd4be38..2f2f25cb2 100644
--- a/docx/dml/color.py
+++ b/docx/dml/color.py
@@ -79,6 +79,14 @@ def theme_color(self):
             return None
         return color.themeColor
 
+    @theme_color.setter
+    def theme_color(self, value):
+        if value is None:
+            if self._color is not None:
+                self._element.rPr._remove_color()
+            return
+        self._element.get_or_add_rPr().get_or_add_color().themeColor = value
+
     @property
     def type(self):
         """
diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
index 804e236d3..f92ad0426 100644
--- a/docx/oxml/text/font.py
+++ b/docx/oxml/text/font.py
@@ -4,9 +4,10 @@
 Custom element classes related to run properties (font).
 """
 
+from .. import parse_xml
 from ...enum.dml import MSO_THEME_COLOR
 from ...enum.text import WD_UNDERLINE
-from ..ns import qn
+from ..ns import nsdecls, qn
 from ..simpletypes import (
     ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
 )
@@ -82,6 +83,13 @@ class CT_RPr(BaseOxmlElement):
     oMath = ZeroOrOne('w:oMath', successors=_tag_seq[39:])
     del _tag_seq
 
+    def _new_color(self):
+        """
+        Override metaclass method to set `w:color/@val` to RGB black on
+        create.
+        """
+        return parse_xml('<w:color %s w:val="000000"/>' % nsdecls('w'))
+
     @property
     def rFonts_ascii(self):
         """
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
index 6eb6e1c38..6fc973d84 100644
--- a/features/txt-font-color.feature
+++ b/features/txt-font-color.feature
@@ -56,7 +56,6 @@ Feature: Get and set font color
       | a theme | ACCENT_1 |
 
 
-  @wip
   Scenario Outline: Set font theme color
     Given a font having <type> color
      When I assign <value> to font.color.theme_color
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index e1c37c20e..32091daba 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -36,6 +36,11 @@ def it_knows_its_theme_color(self, theme_color_get_fixture):
         color_format, expected_value = theme_color_get_fixture
         assert color_format.theme_color == expected_value
 
+    def it_can_change_its_theme_color(self, theme_color_set_fixture):
+        color_format, new_value, expected_xml = theme_color_set_fixture
+        color_format.theme_color = new_value
+        assert color_format._element.xml == expected_xml
+
     # fixtures ---------------------------------------------
 
     @pytest.fixture(params=[
@@ -87,6 +92,28 @@ def theme_color_get_fixture(self, request):
         )
         return color_format, expected_value
 
+    @pytest.fixture(params=[
+        ('w:r', 'ACCENT_1',
+         'w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent1}'),
+        ('w:r/w:rPr', 'ACCENT_2',
+         'w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent2}'),
+        ('w:r/w:rPr/w:color{w:val=101112}', 'ACCENT_3',
+         'w:r/w:rPr/w:color{w:val=101112,w:themeColor=accent3}'),
+        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}', 'LIGHT_2',
+         'w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=light2}'),
+        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}', None,
+         'w:r/w:rPr'),
+        ('w:r', None, 'w:r'),
+    ])
+    def theme_color_set_fixture(self, request):
+        r_cxml, member, expected_cxml = request.param
+        color_format = ColorFormat(element(r_cxml))
+        new_value = (
+            None if member is None else getattr(MSO_THEME_COLOR, member)
+        )
+        expected_xml = xml(expected_cxml)
+        return color_format, new_value, expected_xml
+
     @pytest.fixture(params=[
         ('w:r',                                   None),
         ('w:r/w:rPr',                             None),

From dd44e1fd601f33ed67b37addf0fb58c94cd7a388 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 19 Feb 2015 19:58:19 -0800
Subject: [PATCH 081/367] docs: add API docs for ColorFormat

---
 docs/api/dml.rst    | 16 ++++++++++++++++
 docs/api/shared.rst | 14 ++++++++++++++
 docs/index.rst      |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 docs/api/dml.rst

diff --git a/docs/api/dml.rst b/docs/api/dml.rst
new file mode 100644
index 000000000..79b314844
--- /dev/null
+++ b/docs/api/dml.rst
@@ -0,0 +1,16 @@
+
+.. _dml_api:
+
+DrawingML objects
+=================
+
+Low-level drawing elements like color that appear in various document
+contexts.
+
+
+|ColorFormat| objects
+---------------------
+
+.. autoclass:: docx.dml.color.ColorFormat()
+   :members:
+   :undoc-members:
diff --git a/docs/api/shared.rst b/docs/api/shared.rst
index 0c027a8f2..215e5338c 100644
--- a/docs/api/shared.rst
+++ b/docs/api/shared.rst
@@ -43,3 +43,17 @@ allowing values to be expressed in the units most appropriate to the context.
 
 .. autoclass:: Emu
    :members:
+
+
+|RGBColor| objects
+------------------
+
+.. autoclass:: RGBColor(r, g, b)
+   :members:
+   :undoc-members:
+
+   *r*, *g*, and *b* are each an integer in the range 0-255 inclusive. Using
+   the hexidecimal integer notation, e.g. `0x42` may enhance readability
+   where hex RGB values are in use::
+
+       >>> lavender = RGBColor(0xff, 0x99, 0xcc)
diff --git a/docs/index.rst b/docs/index.rst
index 0af59b1a7..eb922f510 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -88,6 +88,7 @@ API Documentation
    api/table
    api/section
    api/shape
+   api/dml
    api/shared
    api/enum/index
 

From b28327b8a812114f0e869c5052aa58f1424c459c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 19 Feb 2015 21:01:05 -0800
Subject: [PATCH 082/367] docs: add user docs for Font.color

---
 docs/user/text.rst | 112 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/docs/user/text.rst b/docs/user/text.rst
index bb43b2166..113501fa4 100644
--- a/docs/user/text.rst
+++ b/docs/user/text.rst
@@ -228,3 +228,115 @@ from the style hierarchy. |True| means "on" and |False| means "off"::
     >>> paragraph_format.page_break_before = False
     >>> paragraph_format.page_break_before
     False
+
+
+Apply character formatting
+--------------------------
+
+Character formatting is applied at the Run level. Examples include font
+typeface and size, bold, italic, and underline.
+
+A |Run| object has a read-only :attr:`~.Run.font` property providing access
+to a |Font| object. A run's |Font| object provides properties for getting
+and setting the character formatting for that run.
+
+Several examples are provided here. For a complete set of the available
+properties, see the |Font| API documentation.
+
+The font for a run can be accessed like this::
+
+    >>> from docx import Document
+    >>> document = Document()
+    >>> run = document.add_paragraph().add_run()
+    >>> font = run.font
+
+Typeface and size are set like this::
+
+    >>> from docx.shared import Pt
+    >>> font.name = 'Calibri'
+    >>> font.size = Pt(12)
+
+Many font properties are *tri-state*, meaning they can take the values
+|True|, |False|, and |None|. |True| means the property is "on", |False| means
+it is "off". Conceptually, the |None| value means "inherit". A run exists in
+the style inheritance hierarchy and by default inherits its character
+formatting from that hierarchy. Any character formatting directly applied
+using the |Font| object overrides the inherited values.
+
+Bold and italic are tri-state properties, as are all-caps, strikethrough,
+superscript, and many others. See the |Font| API documentation for a full
+list::
+
+    >>> font.bold, font.italic
+    (None, None)
+    >>> font.italic = True
+    >>> font.italic
+    True
+    >>> font.italic = False
+    >>> font.italic
+    False
+    >>> font.italic = None
+    >>> font.italic
+    None
+
+Underline is a bit of a special case. It is a hybrid of a tri-state property
+and an enumerated value property. |True| means single underline, by far the
+most common. |False| means no underline, but more often |None| is the right
+choice if no underlining is wanted. The other forms of underlining, such as
+double or dashed, are specified with a member of the :ref:`WdUnderline`
+enumeration::
+
+    >>> font.underline
+    None
+    >>> font.underline = True
+    >>> # or perhaps
+    >>> font.underline = WD_UNDERLINE.DOT_DASH
+
+Font color
+~~~~~~~~~~
+
+Each |Font| object has a |ColorFormat| object that provides access to its
+color, accessed via its read-only :attr:`~.Font.color` property.
+
+Apply a specific RGB color to a font::
+
+    >>> from docx.shared import RGBColor
+    >>> font.color.rgb = RGBColor(0x42, 0x24, 0xE9)
+
+A font can also be set to a theme color by assigning a member of the
+:ref:`MsoThemeColorIndex` enumeration::
+
+    >>> from docx.enum.dml import MSO_THEME_COLOR
+    >>> font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
+
+A font's color can be restored to its default (inherited) value by assigning
+|None| to either the :attr:`~.ColorFormat.rgb` or
+:attr:`~.ColorFormat.theme_color` attribute of |ColorFormat|::
+
+    >>> font.color.rgb = None
+
+Determining the color of a font begins with determining its color type::
+
+    >>> font.color.type
+    RGB (1)
+
+The value of the :attr:`~.ColorFormat.type` property can be a member of the
+:ref:`MsoColorType` enumeration or None. `MSO_COLOR_TYPE.RGB` indicates it is
+an RGB color. `MSO_COLOR_TYPE.THEME` indicates a theme color.
+`MSO_COLOR_TYPE.AUTO` indicates its value is determined automatically by the
+application, usually set to black. (This value is relatively rare.) |None|
+indicates no color is applied and the color is inherited from the style
+hierarchy; this is the most common case.
+
+When the color type is `MSO_COLOR_TYPE.RGB`, the :attr:`~.ColorFormat.rgb`
+property will be an |RGBColor| value indicating the RGB color::
+
+    >>> font.color.rgb
+    RGBColor(0x42, 0x24, 0xe9)
+
+When the color type is `MSO_COLOR_TYPE.THEME`, the
+:attr:`~.ColorFormat.theme_color` property will be a member of
+:ref:`MsoThemeColorIndex` indicating the theme color::
+
+    >>> font.color.theme_color
+    ACCENT_1 (5)

From 1a7358e5716b1c66dd6464ca2946f2b98e4fa081 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Thu, 19 Feb 2015 21:28:59 -0800
Subject: [PATCH 083/367] release: prepare 0.8.3 release

---
 HISTORY.rst      | 6 ++++++
 docx/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 98dd9f5dd..80254b711 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+0.8.3 (2015-02-19)
+++++++++++++++++++
+
+- Add #121, #135, #139: feature: Font.color
+
+
 0.8.2 (2015-02-16)
 ++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index d2eef61fe..22014a29f 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document     # noqa
 
-__version__ = '0.8.2'
+__version__ = '0.8.3'
 
 
 # register custom Part classes with opc package reader

From ffdb139c0cfcc15431c0f9a6de27880d6e30c4c0 Mon Sep 17 00:00:00 2001
From: Colin McDonald <cmcdonald@mcw.com>
Date: Thu, 19 Feb 2015 22:54:37 -0800
Subject: [PATCH 084/367] img: #124 default to inches on no TIFF res unit

---
 HISTORY.rst              |  6 ++++++
 docx/image/tiff.py       | 14 +++++++++++---
 tests/image/test_tiff.py | 13 ++++++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 80254b711..2eb9a73e9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+NEXT
+++++++++++++++++++
+
+- Fix #124: default to inches on no TIFF resolution unit
+
+
 0.8.3 (2015-02-19)
 ++++++++++++++++++
 
diff --git a/docx/image/tiff.py b/docx/image/tiff.py
index d6561eca8..c38242360 100644
--- a/docx/image/tiff.py
+++ b/docx/image/tiff.py
@@ -116,14 +116,22 @@ def _dpi(self, resolution_tag):
         calculation is based on the values of both that tag and the
         TIFF_TAG.RESOLUTION_UNIT tag in this parser's |_IfdEntries| instance.
         """
-        if resolution_tag not in self._ifd_entries:
+        ifd_entries = self._ifd_entries
+
+        if resolution_tag not in ifd_entries:
             return 72
-        resolution_unit = self._ifd_entries[TIFF_TAG.RESOLUTION_UNIT]
+
+        # resolution unit defaults to inches (2)
+        resolution_unit = (
+            ifd_entries[TIFF_TAG.RESOLUTION_UNIT]
+            if TIFF_TAG.RESOLUTION_UNIT in ifd_entries else 2
+        )
+
         if resolution_unit == 1:  # aspect ratio only
             return 72
         # resolution_unit == 2 for inches, 3 for centimeters
         units_per_inch = 1 if resolution_unit == 2 else 2.54
-        dots_per_unit = self._ifd_entries[resolution_tag]
+        dots_per_unit = ifd_entries[resolution_tag]
         return int(round(dots_per_unit * units_per_inch))
 
     @classmethod
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index 3e47d89c4..3d6ea5971 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -116,16 +116,19 @@ def it_knows_the_horz_and_vert_dpi_after_parsing(self, dpi_fixture):
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
-        (1,  150,  240,  72,  72),
-        (2,   42,   24,  42,  24),
-        (3,  100,  200, 254, 508),
-        (6, None, None,  72,  72),
+        (1,     150,  240,  72,  72),
+        (2,      42,   24,  42,  24),
+        (3,     100,  200, 254, 508),
+        (2,    None, None,  72,  72),
+        (None,   96,  100,  96, 100),
     ])
     def dpi_fixture(self, request):
         resolution_unit, x_resolution, y_resolution = request.param[:3]
         expected_horz_dpi, expected_vert_dpi = request.param[3:]
 
-        entries = {TIFF_TAG.RESOLUTION_UNIT: resolution_unit}
+        entries = {}
+        if resolution_unit is not None:
+            entries[TIFF_TAG.RESOLUTION_UNIT] = resolution_unit
         if x_resolution is not None:
             entries[TIFF_TAG.X_RESOLUTION] = x_resolution
         if y_resolution is not None:

From 3603b5e2769d26143814c18c2c81c1e3554837cc Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 19:35:27 -0800
Subject: [PATCH 085/367] fix: #151 tests won't run on PyPI distribution

The tests/ directory was only partially included in the source
distribution uploaded to PyPI, such that the test suite could not be run
from that distribution. Modify MANIFEST.in to include all .py files in
the tests/ directory.
---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2c4f97c0d..6419bc8a0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include HISTORY.rst LICENSE README.rst tox.ini
-include tests/*.py
+recursive-include tests *.py
 recursive-include features *
 recursive-include docx/templates *
 recursive-include tests/test_files *

From 5a012fed60646be23e7729e4543f2deaa2a60206 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 20:01:47 -0800
Subject: [PATCH 086/367] release: prepare v0.8.4 release

---
 HISTORY.rst      | 3 ++-
 docx/__init__.py | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 2eb9a73e9..4bf6b0dc3 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,9 +3,10 @@
 Release History
 ---------------
 
-NEXT
+0.8.4 (2015-02-20)
 ++++++++++++++++++
 
+- Fix #151: tests won't run on PyPI distribution
 - Fix #124: default to inches on no TIFF resolution unit
 
 
diff --git a/docx/__init__.py b/docx/__init__.py
index 22014a29f..ab6a8de81 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-from docx.api import Document     # noqa
+from docx.api import Document  # noqa
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 
 
 # register custom Part classes with opc package reader

From 5309b41a2232e2eed7ed6fe8c80e13644255c0ac Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 22:09:03 -0800
Subject: [PATCH 087/367] acpt: groom some existing acceptance tests

* add specific Given for a document having the built-in styles
* constrain 'Given a blank document' to not have the built-in styles
* revise some steps to make them more concise
* extract bool_vals and tri_state_vals to helpers
---
 features/doc-add-heading.feature                |   4 ++--
 features/doc-add-table.feature                  |   4 ++--
 features/steps/block.py                         |   3 +--
 features/steps/document.py                      |  10 +++++++---
 features/steps/helpers.py                       |  11 +++++++++++
 features/steps/styles.py                        |  13 +------------
 .../test_files/doc-word-default-blank.docx      | Bin 0 -> 21309 bytes
 7 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 features/steps/test_files/doc-word-default-blank.docx

diff --git a/features/doc-add-heading.feature b/features/doc-add-heading.feature
index 33b975d55..8c23137b7 100644
--- a/features/doc-add-heading.feature
+++ b/features/doc-add-heading.feature
@@ -5,14 +5,14 @@ Feature: Add a heading paragraph
 
 
   Scenario: Add a heading specifying only its text
-    Given a blank document
+    Given a document having built-in styles
      When I add a heading specifying only its text
      Then the style of the last paragraph is 'Heading 1'
       And the last paragraph contains the heading text
 
 
   Scenario Outline: Add a heading specifying level
-    Given a blank document
+    Given a document having built-in styles
      When I add a heading specifying level=<level>
      Then the style of the last paragraph is '<style>'
 
diff --git a/features/doc-add-table.feature b/features/doc-add-table.feature
index feec29ff2..f5610b371 100644
--- a/features/doc-add-table.feature
+++ b/features/doc-add-table.feature
@@ -5,14 +5,14 @@ Feature: Add a table
 
 
   Scenario: Add a table specifying only row and column count
-    Given a blank document
+    Given a document having built-in styles
      When I add a 2 x 2 table specifying only row and column count
      Then the document contains a 2 x 2 table
       And table.style is styles['Light Shading Accent 1']
 
 
   Scenario: Add a table specifying style
-    Given a blank document
+    Given a document having built-in styles
      When I add a 2 x 2 table specifying style 'Table Grid'
      Then the document contains a 2 x 2 table
       And table.style is styles['Table Grid']
diff --git a/features/steps/block.py b/features/steps/block.py
index a98aa1cfc..1eee70cd2 100644
--- a/features/steps/block.py
+++ b/features/steps/block.py
@@ -16,8 +16,7 @@
 
 @given('a document containing a table')
 def given_a_document_containing_a_table(context):
-    docx_path = test_docx('blk-containing-table')
-    context.document = Document(docx_path)
+    context.document = Document(test_docx('blk-containing-table'))
 
 
 @given('a paragraph')
diff --git a/features/steps/document.py b/features/steps/document.py
index b001339f7..2827d8582 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -24,6 +24,11 @@
 
 @given('a blank document')
 def given_a_blank_document(context):
+    context.document = Document(test_docx('doc-word-default-blank'))
+
+
+@given('a document having built-in styles')
+def given_a_document_having_builtin_styles(context):
     context.document = Document()
 
 
@@ -198,9 +203,8 @@ def then_document_tables_is_a_list_containing_three_tables(context):
 
 
 @then('the document contains a 2 x 2 table')
-def then_document_contains_2x2_table(context):
-    document = context.document
-    table = document.tables[-1]
+def then_the_document_contains_a_2x2_table(context):
+    table = context.document.tables[-1]
     assert isinstance(table, Table)
     assert len(table.rows) == 2
     assert len(table.columns) == 2
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
index 44bfec5ba..24ce059fe 100644
--- a/features/steps/helpers.py
+++ b/features/steps/helpers.py
@@ -16,8 +16,19 @@ def absjoin(*paths):
 # scratch output docx file -------------
 saved_docx_path = absjoin(scratch_dir, 'test_out.docx')
 
+bool_vals = {
+    'True':  True,
+    'False': False
+}
+
 test_text = 'python-docx was here!'
 
+tri_state_vals = {
+    'True':  True,
+    'False': False,
+    'None':  None,
+}
+
 
 def test_docx(name):
     """
diff --git a/features/steps/styles.py b/features/steps/styles.py
index 3c7049072..01927bcd7 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -13,12 +13,7 @@
 from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
 
-from helpers import test_docx
-
-bool_vals = {
-    'True':  True,
-    'False': False
-}
+from helpers import bool_vals, test_docx, tri_state_vals
 
 style_types = {
     'WD_STYLE_TYPE.CHARACTER': WD_STYLE_TYPE.CHARACTER,
@@ -27,12 +22,6 @@
     'WD_STYLE_TYPE.TABLE':     WD_STYLE_TYPE.TABLE,
 }
 
-tri_state_vals = {
-    'True':  True,
-    'False': False,
-    'None':  None,
-}
-
 
 # given ===================================================
 
diff --git a/features/steps/test_files/doc-word-default-blank.docx b/features/steps/test_files/doc-word-default-blank.docx
new file mode 100644
index 0000000000000000000000000000000000000000..e55a8a6fbd3e4f49b1dd3abe0e6ec16a1673c1a3
GIT binary patch
literal 21309
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%0DtdH|=bcV0D4|!eg2_UFrz(gl;-p
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

literal 0
HcmV?d00001


From 280d46ab4f00877beb3b35f078711b98d25fbb90 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 22:39:43 -0800
Subject: [PATCH 088/367] fix: #149 KeyError on Document.add_table()

---
 HISTORY.rst                    | 6 ++++++
 docx/document.py               | 7 ++++---
 features/doc-add-table.feature | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 4bf6b0dc3..72463681e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+NEXT
+++++++++++++++++++
+
+- Fix #149: KeyError on Document.add_table()
+
+
 0.8.4 (2015-02-20)
 ++++++++++++++++++
 
diff --git a/docx/document.py b/docx/document.py
index 91e6f9ddf..40f59bc9a 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -89,11 +89,12 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         new_sectPr.start_type = start_type
         return Section(new_sectPr)
 
-    def add_table(self, rows, cols, style='Light Shading Accent 1'):
+    def add_table(self, rows, cols, style=None):
         """
         Add a table having row and column counts of *rows* and *cols*
-        respectively and table style of *style*. If *style* is |None|, a
-        table with no style is produced.
+        respectively and table style of *style*. *style* may be a paragraph
+        style object or a paragraph style name. If *style* is |None|, the
+        table inherits the default table style of the document.
         """
         table = self._body.add_table(rows, cols)
         table.style = style
diff --git a/features/doc-add-table.feature b/features/doc-add-table.feature
index f5610b371..3960c2b34 100644
--- a/features/doc-add-table.feature
+++ b/features/doc-add-table.feature
@@ -5,10 +5,10 @@ Feature: Add a table
 
 
   Scenario: Add a table specifying only row and column count
-    Given a document having built-in styles
+    Given a blank document
      When I add a 2 x 2 table specifying only row and column count
      Then the document contains a 2 x 2 table
-      And table.style is styles['Light Shading Accent 1']
+      And table.style is styles['Normal Table']
 
 
   Scenario: Add a table specifying style

From 74931e2c9ba940d55c3d11848da8188557518f43 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 21:27:27 -0800
Subject: [PATCH 089/367] acpt: rewrite scenario for Document.add_table()

Add steps to check column and cell width are properly applied to a new
table.
---
 features/doc-add-table.feature |  3 +++
 features/steps/table.py        | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/features/doc-add-table.feature b/features/doc-add-table.feature
index 3960c2b34..313da43d3 100644
--- a/features/doc-add-table.feature
+++ b/features/doc-add-table.feature
@@ -4,11 +4,14 @@ Feature: Add a table
   I need a way to add a table
 
 
+  @wip
   Scenario: Add a table specifying only row and column count
     Given a blank document
      When I add a 2 x 2 table specifying only row and column count
      Then the document contains a 2 x 2 table
       And table.style is styles['Normal Table']
+      And the width of each column is 3.0 inches
+      And the width of each cell is 3.0 inches
 
 
   Scenario: Add a table specifying style
diff --git a/features/steps/table.py b/features/steps/table.py
index f4e5a5f20..dcfa5c8db 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -358,3 +358,19 @@ def _cell(table, idx):
     idx, inches = int(n_str) - 1, float(inches_str)
     cell = _cell(context.table_, idx)
     assert cell.width == Inches(inches), 'got %s' % cell.width.inches
+
+
+@then('the width of each cell is {inches} inches')
+def then_the_width_of_each_cell_is_inches(context, inches):
+    table = context.table_
+    expected_width = Inches(float(inches))
+    for cell in table._cells:
+        assert cell.width == expected_width, 'got %s' % cell.width.inches
+
+
+@then('the width of each column is {inches} inches')
+def then_the_width_of_each_column_is_inches(context, inches):
+    table = context.table_
+    expected_width = Inches(float(inches))
+    for column in table.columns:
+        assert column.width == expected_width, 'got %s' % column.width.inches

From 578f6c1fe8efcafff1a6248aa9249bdb740786fc Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 22:56:45 -0800
Subject: [PATCH 090/367] reorg: remove redundant tests from Describe_Body

---
 tests/test_document.py | 63 ------------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/tests/test_document.py b/tests/test_document.py
index 1d4cd70c0..d6a3c4392 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -320,69 +320,14 @@ def tables_(self, request):
 
 class Describe_Body(object):
 
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        body, expected_xml = add_paragraph_fixture
-        p = body.add_paragraph()
-        assert body._body.xml == expected_xml
-        assert isinstance(p, Paragraph)
-
-    def it_can_add_a_table(self, add_table_fixture):
-        body, rows, cols, expected_xml = add_table_fixture
-        table = body.add_table(rows, cols)
-        assert body._element.xml == expected_xml
-        assert isinstance(table, Table)
-
     def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
         body, expected_xml = clear_fixture
         _body = body.clear_content()
         assert body._body.xml == expected_xml
         assert _body is body
 
-    def it_provides_access_to_the_paragraphs_it_contains(
-            self, paragraphs_fixture):
-        body = paragraphs_fixture
-        paragraphs = body.paragraphs
-        assert len(paragraphs) == 2
-        for p in paragraphs:
-            assert isinstance(p, Paragraph)
-
-    def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
-        body = tables_fixture
-        tables = body.tables
-        assert len(tables) == 2
-        for table in tables:
-            assert isinstance(table, Table)
-
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:body',                 'w:body/w:p'),
-        ('w:body/w:p',             'w:body/(w:p, w:p)'),
-        ('w:body/w:sectPr',        'w:body/(w:p, w:sectPr)'),
-        ('w:body/(w:p, w:sectPr)', 'w:body/(w:p, w:p, w:sectPr)'),
-    ])
-    def add_paragraph_fixture(self, request):
-        before_cxml, after_cxml = request.param
-        body = _Body(element(before_cxml), None)
-        expected_xml = xml(after_cxml)
-        return body, expected_xml
-
-    @pytest.fixture(params=[
-        ('w:body', 0, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid)'),
-        ('w:body', 1, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid,w:tr)'),
-        ('w:body', 0, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid/w:gridCol)'),
-        ('w:body', 1, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid/w:gridCol,w:tr/w:tc/w:p)'),
-    ])
-    def add_table_fixture(self, request):
-        body_cxml, rows, cols, after_cxml = request.param
-        body = _Body(element(body_cxml), None)
-        expected_xml = xml(after_cxml)
-        return body, rows, cols, expected_xml
-
     @pytest.fixture(params=[
         ('w:body',                 'w:body'),
         ('w:body/w:p',             'w:body'),
@@ -394,11 +339,3 @@ def clear_fixture(self, request):
         body = _Body(element(before_cxml), None)
         expected_xml = xml(after_cxml)
         return body, expected_xml
-
-    @pytest.fixture
-    def paragraphs_fixture(self):
-        return _Body(element('w:body/(w:p, w:p)'), None)
-
-    @pytest.fixture
-    def tables_fixture(self):
-        return _Body(element('w:body/(w:tbl, w:tbl)'), None)

From 7ea4d297485cd84b0c9aa7dbea01cfd7f9deae62 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 20 Feb 2015 23:53:02 -0800
Subject: [PATCH 091/367] doc: rewrite Document.add_table()

* Add width parameter to BlockItemContainer.add_table()
* Temporarily stub down-call-stack methods and tests with width=None
  until they are rewritten in next commits
* add Document._block_width to calculate width of table (page width less
  margins).
---
 docx/blkcntnr.py       |  7 ++++---
 docx/document.py       | 15 +++++++++++++--
 docx/table.py          |  2 +-
 tests/test_blkcntnr.py |  2 +-
 tests/test_document.py | 40 +++++++++++++++++++++++++++++++++++-----
 5 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/docx/blkcntnr.py b/docx/blkcntnr.py
index 732d88fee..aa109981c 100644
--- a/docx/blkcntnr.py
+++ b/docx/blkcntnr.py
@@ -37,10 +37,11 @@ def add_paragraph(self, text='', style=None):
             paragraph.style = style
         return paragraph
 
-    def add_table(self, rows, cols):
+    def add_table(self, rows, cols, width):
         """
-        Return a newly added table having *rows* rows and *cols* cols,
-        appended to the content in this container.
+        Return a table of *width* having *rows* rows and *cols* columns,
+        newly appended to the content in this container. *width* is evenly
+        distributed between the table columns.
         """
         from .table import Table
         tbl = self._element.add_tbl()
diff --git a/docx/document.py b/docx/document.py
index 40f59bc9a..655a70e95 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -12,7 +12,7 @@
 from .enum.section import WD_SECTION
 from .enum.text import WD_BREAK
 from .section import Section, Sections
-from .shared import ElementProxy
+from .shared import ElementProxy, Emu
 
 
 class Document(ElementProxy):
@@ -96,7 +96,7 @@ def add_table(self, rows, cols, style=None):
         style object or a paragraph style name. If *style* is |None|, the
         table inherits the default table style of the document.
         """
-        table = self._body.add_table(rows, cols)
+        table = self._body.add_table(rows, cols, self._block_width)
         table.style = style
         return table
 
@@ -167,6 +167,17 @@ def tables(self):
         """
         return self._body.tables
 
+    @property
+    def _block_width(self):
+        """
+        Return a |Length| object specifying the width of available "writing"
+        space between the margins of the last section of this document.
+        """
+        section = self.sections[-1]
+        return Emu(
+            section.page_width - section.left_margin - section.right_margin
+        )
+
     @property
     def _body(self):
         """
diff --git a/docx/table.py b/docx/table.py
index 8d9df1317..52342b702 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -201,7 +201,7 @@ def add_table(self, rows, cols):
         added after the table because Word requires a paragraph element as
         the last element in every cell.
         """
-        new_table = super(_Cell, self).add_table(rows, cols)
+        new_table = super(_Cell, self).add_table(rows, cols, 914400)
         self.add_paragraph()
         return new_table
 
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 0c9c4ec09..4243ad198 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -31,7 +31,7 @@ def it_can_add_a_paragraph(self, add_paragraph_fixture):
 
     def it_can_add_a_table(self, add_table_fixture):
         blkcntnr, rows, cols, expected_xml = add_table_fixture
-        table = blkcntnr.add_table(rows, cols)
+        table = blkcntnr.add_table(rows, cols, None)
         assert blkcntnr._element.xml == expected_xml
         assert isinstance(table, Table)
 
diff --git a/tests/test_document.py b/tests/test_document.py
index d6a3c4392..fa37725d1 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -15,8 +15,9 @@
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
 from docx.parts.document import DocumentPart
-from docx.section import Sections
+from docx.section import Section, Sections
 from docx.shape import InlineShape, InlineShapes
+from docx.shared import Length
 from docx.styles.styles import Styles
 from docx.table import Table
 from docx.text.paragraph import Paragraph
@@ -75,9 +76,9 @@ def it_can_add_a_section(self, add_section_fixture):
         assert section is section_
 
     def it_can_add_a_table(self, add_table_fixture):
-        document, rows, cols, style, table_ = add_table_fixture
+        document, rows, cols, style, width, table_ = add_table_fixture
         table = document.add_table(rows, cols, style)
-        document._body.add_table.assert_called_once_with(rows, cols)
+        document._body.add_table.assert_called_once_with(rows, cols, width)
         assert table == table_
         assert table.style == style
 
@@ -125,6 +126,12 @@ def it_provides_access_to_the_document_body(self, body_fixture):
         _Body_.assert_called_once_with(body_elm, document)
         assert body is body_
 
+    def it_determines_block_width_to_help(self, block_width_fixture):
+        document, expected_value = block_width_fixture
+        width = document._block_width
+        assert isinstance(width, Length)
+        assert width == expected_value
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -186,11 +193,22 @@ def add_section_fixture(self, request, Section_):
         return document, start_type, Section_, section_, expected_xml
 
     @pytest.fixture
-    def add_table_fixture(self, body_prop_, table_):
+    def add_table_fixture(self, _block_width_prop_, body_prop_, table_):
         document = Document(None, None)
         rows, cols, style = 4, 2, 'Light Shading Accent 1'
         body_prop_.return_value.add_table.return_value = table_
-        return document, rows, cols, style, table_
+        _block_width_prop_.return_value = width = 42
+        return document, rows, cols, style, width, table_
+
+    @pytest.fixture
+    def block_width_fixture(self, sections_prop_, section_):
+        document = Document(None, None)
+        sections_prop_.return_value = [None, section_]
+        section_.page_width = 6000
+        section_.left_margin = 1500
+        section_.right_margin = 1000
+        expected_value = 3500
+        return document, expected_value
 
     @pytest.fixture
     def body_fixture(self, _Body_, body_):
@@ -261,6 +279,10 @@ def _Body_(self, request, body_):
     def body_(self, request):
         return instance_mock(request, _Body)
 
+    @pytest.fixture
+    def _block_width_prop_(self, request):
+        return property_mock(request, Document, '_block_width')
+
     @pytest.fixture
     def body_prop_(self, request, body_):
         return property_mock(request, Document, '_body', return_value=body_)
@@ -297,6 +319,10 @@ def run_(self, request):
     def Section_(self, request):
         return class_mock(request, 'docx.document.Section')
 
+    @pytest.fixture
+    def section_(self, request):
+        return instance_mock(request, Section)
+
     @pytest.fixture
     def Sections_(self, request):
         return class_mock(request, 'docx.document.Sections')
@@ -305,6 +331,10 @@ def Sections_(self, request):
     def sections_(self, request):
         return instance_mock(request, Sections)
 
+    @pytest.fixture
+    def sections_prop_(self, request):
+        return property_mock(request, Document, 'sections')
+
     @pytest.fixture
     def styles_(self, request):
         return instance_mock(request, Styles)

From 1ff6d382d495906decc58530539b2d0c3298ce53 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 01:23:47 -0800
Subject: [PATCH 092/367] blkct: rewrite BlockItemContainer.add_table()

* Fix Describe_Cell.it_can_add_a_table() to work until it can be
rewritten in next few commits.
---
 docx/blkcntnr.py                      | 11 ++---
 docx/oxml/document.py                 |  4 --
 docx/oxml/table.py                    | 61 +++++++++++++++++++++++----
 docx/table.py                         |  2 +-
 features/doc-add-table.feature        |  1 -
 tests/test_blkcntnr.py                | 30 ++++++-------
 tests/test_files/snippets/new-tbl.txt | 38 +++++++++++++++++
 tests/test_table.py                   |  6 ++-
 8 files changed, 111 insertions(+), 42 deletions(-)
 create mode 100644 tests/test_files/snippets/new-tbl.txt

diff --git a/docx/blkcntnr.py b/docx/blkcntnr.py
index aa109981c..d57a0cd0f 100644
--- a/docx/blkcntnr.py
+++ b/docx/blkcntnr.py
@@ -8,6 +8,7 @@
 
 from __future__ import absolute_import, print_function
 
+from .oxml.table import CT_Tbl
 from .shared import Parented
 from .text.paragraph import Paragraph
 
@@ -44,13 +45,9 @@ def add_table(self, rows, cols, width):
         distributed between the table columns.
         """
         from .table import Table
-        tbl = self._element.add_tbl()
-        table = Table(tbl, self)
-        for i in range(cols):
-            table.add_column()
-        for i in range(rows):
-            table.add_row()
-        return table
+        tbl = CT_Tbl.new_tbl(rows, cols, width)
+        self._element._insert_tbl(tbl)
+        return Table(tbl, self)
 
     @property
     def paragraphs(self):
diff --git a/docx/oxml/document.py b/docx/oxml/document.py
index 696338314..e1cb4ac55 100644
--- a/docx/oxml/document.py
+++ b/docx/oxml/document.py
@@ -5,7 +5,6 @@
 <w:document>.
 """
 
-from .table import CT_Tbl
 from .xmlchemy import BaseOxmlElement, ZeroOrOne, ZeroOrMore
 
 
@@ -47,9 +46,6 @@ def add_section_break(self):
         p.set_sectPr(cloned_sectPr)
         return sentinel_sectPr
 
-    def _new_tbl(self):
-        return CT_Tbl.new()
-
     def clear_content(self):
         """
         Remove all content child elements from this <w:body> element. Leave
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 2192ba18f..0767cbbdb 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -4,7 +4,9 @@
 Custom element classes for tables
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
 
 from . import parse_xml
 from ..exceptions import InvalidSpanError
@@ -77,13 +79,12 @@ def iter_tcs(self):
                 yield tc
 
     @classmethod
-    def new(cls):
+    def new_tbl(cls, rows, cols, width):
         """
-        Return a new ``<w:tbl>`` element, containing the required
-        ``<w:tblPr>`` and ``<w:tblGrid>`` child elements.
+        Return a new `w:tbl` element having *rows* rows and *cols* columns
+        with *width* distributed evenly between the columns.
         """
-        tbl = parse_xml(cls._tbl_xml())
-        return tbl
+        return parse_xml(cls._tbl_xml(rows, cols, width))
 
     @property
     def tblStyle_val(self):
@@ -109,16 +110,58 @@ def tblStyle_val(self, styleId):
         tblPr._add_tblStyle().val = styleId
 
     @classmethod
-    def _tbl_xml(cls):
+    def _tbl_xml(cls, rows, cols, width):
+        col_width = Emu(width/cols) if cols > 0 else Emu(0)
         return (
             '<w:tbl %s>\n'
             '  <w:tblPr>\n'
             '    <w:tblW w:type="auto" w:w="0"/>\n'
+            '    <w:tblLook w:firstColumn="1" w:firstRow="1"\n'
+            '               w:lastColumn="0" w:lastRow="0" w:noHBand="0"\n'
+            '               w:noVBand="1" w:val="04A0"/>\n'
             '  </w:tblPr>\n'
-            '  <w:tblGrid/>\n'
-            '</w:tbl>' % nsdecls('w')
+            '%s'  # tblGrid
+            '%s'  # trs
+            '</w:tbl>\n'
+        ) % (
+            nsdecls('w'),
+            cls._tblGrid_xml(cols, col_width),
+            cls._trs_xml(rows, cols, col_width)
         )
 
+    @classmethod
+    def _tblGrid_xml(cls, col_count, col_width):
+        xml = '  <w:tblGrid>\n'
+        for i in range(col_count):
+            xml += '    <w:gridCol w:w="%d"/>\n' % col_width.twips
+        xml += '  </w:tblGrid>\n'
+        return xml
+
+    @classmethod
+    def _trs_xml(cls, row_count, col_count, col_width):
+        xml = ''
+        for i in range(row_count):
+            xml += (
+                '  <w:tr>\n'
+                '%s'
+                '  </w:tr>\n'
+            ) % cls._tcs_xml(col_count, col_width)
+        return xml
+
+    @classmethod
+    def _tcs_xml(cls, col_count, col_width):
+        xml = ''
+        for i in range(col_count):
+            xml += (
+                '    <w:tc>\n'
+                '      <w:tcPr>\n'
+                '        <w:tcW w:type="dxa" w:w="%d"/>\n'
+                '      </w:tcPr>\n'
+                '      <w:p/>\n'
+                '    </w:tc>\n'
+            ) % col_width.twips
+        return xml
+
 
 class CT_TblGrid(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
index 52342b702..9cad18e0c 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -18,7 +18,7 @@ class Table(Parented):
     """
     def __init__(self, tbl, parent):
         super(Table, self).__init__(parent)
-        self._tbl = tbl
+        self._element = self._tbl = tbl
 
     def add_column(self):
         """
diff --git a/features/doc-add-table.feature b/features/doc-add-table.feature
index 313da43d3..e9b6abd84 100644
--- a/features/doc-add-table.feature
+++ b/features/doc-add-table.feature
@@ -4,7 +4,6 @@ Feature: Add a table
   I need a way to add a table
 
 
-  @wip
   Scenario: Add a table specifying only row and column count
     Given a blank document
      When I add a 2 x 2 table specifying only row and column count
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 4243ad198..6d4f43c21 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -9,10 +9,12 @@
 import pytest
 
 from docx.blkcntnr import BlockItemContainer
+from docx.shared import Inches
 from docx.table import Table
 from docx.text.paragraph import Paragraph
 
 from .unitutil.cxml import element, xml
+from .unitutil.file import snippet_seq
 from .unitutil.mock import call, instance_mock, method_mock
 
 
@@ -30,10 +32,11 @@ def it_can_add_a_paragraph(self, add_paragraph_fixture):
         assert new_paragraph is paragraph_
 
     def it_can_add_a_table(self, add_table_fixture):
-        blkcntnr, rows, cols, expected_xml = add_table_fixture
-        table = blkcntnr.add_table(rows, cols, None)
-        assert blkcntnr._element.xml == expected_xml
+        blkcntnr, rows, cols, width, expected_xml = add_table_fixture
+        table = blkcntnr.add_table(rows, cols, width)
         assert isinstance(table, Table)
+        assert table._element.xml == expected_xml
+        assert table._parent is blkcntnr
 
     def it_provides_access_to_the_paragraphs_it_contains(
             self, paragraphs_fixture):
@@ -91,21 +94,12 @@ def _add_paragraph_fixture(self, request):
         expected_xml = xml(after_cxml)
         return blkcntnr, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:body', 0, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid)'),
-        ('w:body', 1, 0, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid,w:tr)'),
-        ('w:body', 0, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid/w:gridCol)'),
-        ('w:body', 1, 1, 'w:body/w:tbl/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:'
-         'tblGrid/w:gridCol,w:tr/w:tc/w:p)'),
-    ])
-    def add_table_fixture(self, request):
-        blkcntnr_cxml, rows, cols, after_cxml = request.param
-        blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
-        expected_xml = xml(after_cxml)
-        return blkcntnr, rows, cols, expected_xml
+    @pytest.fixture
+    def add_table_fixture(self):
+        blkcntnr = BlockItemContainer(element('w:body'), None)
+        rows, cols, width = 2, 2, Inches(2)
+        expected_xml = snippet_seq('new-tbl')[0]
+        return blkcntnr, rows, cols, width, expected_xml
 
     @pytest.fixture(params=[
         ('w:body',                 0),
diff --git a/tests/test_files/snippets/new-tbl.txt b/tests/test_files/snippets/new-tbl.txt
new file mode 100644
index 000000000..952dfe60e
--- /dev/null
+++ b/tests/test_files/snippets/new-tbl.txt
@@ -0,0 +1,38 @@
+<w:tbl xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:tblPr>
+    <w:tblW w:type="auto" w:w="0"/>
+    <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+  </w:tblPr>
+  <w:tblGrid>
+    <w:gridCol w:w="1440"/>
+    <w:gridCol w:w="1440"/>
+  </w:tblGrid>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+</w:tbl>
diff --git a/tests/test_table.py b/tests/test_table.py
index 4ba6e36c9..dd490beb4 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -338,7 +338,7 @@ def it_can_add_a_paragraph(self, add_paragraph_fixture):
 
     def it_can_add_a_table(self, add_table_fixture):
         cell, expected_xml = add_table_fixture
-        table = cell.add_table(rows=0, cols=0)
+        table = cell.add_table(rows=0, cols=1)
         assert cell._tc.xml == expected_xml
         assert isinstance(table, Table)
 
@@ -372,7 +372,9 @@ def add_table_fixture(self, request):
         # the table has some overhead elements, also a blank para after since
         # it's in a cell.
         after_tc_cxml += (
-            '/(w:tblPr/w:tblW{w:type=auto,w:w=0},w:tblGrid),w:p)'
+            '/(w:tblPr/(w:tblW{w:type=auto,w:w=0},w:tblLook{w:firstColumn=1,'
+            'w:firstRow=1,w:lastColumn=0,w:lastRow=0,w:noHBand=0,w:noVBand=1'
+            ',w:val=04A0}),w:tblGrid/w:gridCol{w:w=1440}),w:p)'
         )
         cell = _Cell(element(tc_cxml), None)
         expected_xml = xml(after_tc_cxml)

From ebd5e85927e9cf3d9a5cfd46a31b999fc6f00bfb Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 02:01:02 -0800
Subject: [PATCH 093/367] acpt: add scenario for _Cell.add_table()

---
 features/cel-add-table.feature               |  13 +++++++++++++
 features/steps/cell.py                       |  17 ++++++++++++++++-
 features/steps/test_files/tbl-2x2-table.docx | Bin 0 -> 25129 bytes
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 features/cel-add-table.feature
 create mode 100644 features/steps/test_files/tbl-2x2-table.docx

diff --git a/features/cel-add-table.feature b/features/cel-add-table.feature
new file mode 100644
index 000000000..56b64e664
--- /dev/null
+++ b/features/cel-add-table.feature
@@ -0,0 +1,13 @@
+Feature: Add a table into a table cell
+  In order to nest a table within a table cell
+  As a developer using python-docx
+  I need a way to add a table to a table cell
+
+
+  @wip
+  Scenario: Add a table into a table cell
+    Given a table cell
+     When I add a 2 x 2 table into the first cell
+     Then cell.tables[0] is a 2 x 2 table
+      And the width of each column is 1.5375 inches
+      And the width of each cell is 1.5375 inches
diff --git a/features/steps/cell.py b/features/steps/cell.py
index 6f588cd8c..d1385c921 100644
--- a/features/steps/cell.py
+++ b/features/steps/cell.py
@@ -10,17 +10,24 @@
 
 from docx import Document
 
+from helpers import test_docx
+
 
 # given ===================================================
 
 @given('a table cell')
 def given_a_table_cell(context):
-    table = Document().add_table(rows=2, cols=2)
+    table = Document(test_docx('tbl-2x2-table')).tables[0]
     context.cell = table.cell(0, 0)
 
 
 # when =====================================================
 
+@when('I add a 2 x 2 table into the first cell')
+def when_I_add_a_2x2_table_into_the_first_cell(context):
+    context.table_ = context.cell.add_table(2, 2)
+
+
 @when('I assign a string to the cell text attribute')
 def when_assign_string_to_cell_text_attribute(context):
     cell = context.cell
@@ -31,6 +38,14 @@ def when_assign_string_to_cell_text_attribute(context):
 
 # then =====================================================
 
+@then('cell.tables[0] is a 2 x 2 table')
+def then_cell_tables_0_is_a_2x2_table(context):
+    cell = context.cell
+    table = cell.tables[0]
+    assert len(table.rows) == 2
+    assert len(table.columns) == 2
+
+
 @then('the cell contains the string I assigned')
 def then_cell_contains_string_assigned(context):
     cell, expected_text = context.cell, context.expected_text
diff --git a/features/steps/test_files/tbl-2x2-table.docx b/features/steps/test_files/tbl-2x2-table.docx
new file mode 100644
index 0000000000000000000000000000000000000000..06fef17f5ba7edc5f9439cd7bda8bdad56cd5a58
GIT binary patch
literal 25129
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
DLszB|

literal 0
HcmV?d00001


From 558a124bca0f205aa1ddb7973723c56fea0ceea8 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 02:19:36 -0800
Subject: [PATCH 094/367] cell: rewrite _Cell.add_table()

---
 docx/table.py                         |  7 +++--
 features/cel-add-table.feature        |  1 -
 tests/test_files/snippets/new-tbl.txt | 43 +++++++++++++++++++++++++++
 tests/test_table.py                   | 21 ++++---------
 4 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/docx/table.py b/docx/table.py
index 9cad18e0c..fff8f2638 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -9,7 +9,7 @@
 from .blkcntnr import BlockItemContainer
 from .enum.style import WD_STYLE_TYPE
 from .oxml.simpletypes import ST_Merge
-from .shared import lazyproperty, Parented
+from .shared import Inches, lazyproperty, Parented
 
 
 class Table(Parented):
@@ -201,9 +201,10 @@ def add_table(self, rows, cols):
         added after the table because Word requires a paragraph element as
         the last element in every cell.
         """
-        new_table = super(_Cell, self).add_table(rows, cols, 914400)
+        width = self.width if self.width is not None else Inches(1)
+        table = super(_Cell, self).add_table(rows, cols, width)
         self.add_paragraph()
-        return new_table
+        return table
 
     def merge(self, other_cell):
         """
diff --git a/features/cel-add-table.feature b/features/cel-add-table.feature
index 56b64e664..5aabcee8f 100644
--- a/features/cel-add-table.feature
+++ b/features/cel-add-table.feature
@@ -4,7 +4,6 @@ Feature: Add a table into a table cell
   I need a way to add a table to a table cell
 
 
-  @wip
   Scenario: Add a table into a table cell
     Given a table cell
      When I add a 2 x 2 table into the first cell
diff --git a/tests/test_files/snippets/new-tbl.txt b/tests/test_files/snippets/new-tbl.txt
index 952dfe60e..91465fd70 100644
--- a/tests/test_files/snippets/new-tbl.txt
+++ b/tests/test_files/snippets/new-tbl.txt
@@ -36,3 +36,46 @@
     </w:tc>
   </w:tr>
 </w:tbl>
+
+<w:tc xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:p/>
+  <w:tbl>
+    <w:tblPr>
+      <w:tblW w:type="auto" w:w="0"/>
+      <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+    </w:tblPr>
+    <w:tblGrid>
+      <w:gridCol w:w="720"/>
+      <w:gridCol w:w="720"/>
+    </w:tblGrid>
+    <w:tr>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+    </w:tr>
+    <w:tr>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+      <w:tc>
+        <w:tcPr>
+          <w:tcW w:type="dxa" w:w="720"/>
+        </w:tcPr>
+        <w:p/>
+      </w:tc>
+    </w:tr>
+  </w:tbl>
+  <w:p/>
+</w:tc>
diff --git a/tests/test_table.py b/tests/test_table.py
index dd490beb4..7884edf59 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -338,8 +338,8 @@ def it_can_add_a_paragraph(self, add_paragraph_fixture):
 
     def it_can_add_a_table(self, add_table_fixture):
         cell, expected_xml = add_table_fixture
-        table = cell.add_table(rows=0, cols=1)
-        assert cell._tc.xml == expected_xml
+        table = cell.add_table(rows=2, cols=2)
+        assert cell._element.xml == expected_xml
         assert isinstance(table, Table)
 
     def it_can_merge_itself_with_other_cells(self, merge_fixture):
@@ -363,21 +363,10 @@ def add_paragraph_fixture(self, request):
         expected_xml = xml(after_tc_cxml)
         return cell, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tc',     'w:tc/(w:tbl'),
-        ('w:tc/w:p', 'w:tc/(w:p, w:tbl'),
-    ])
+    @pytest.fixture
     def add_table_fixture(self, request):
-        tc_cxml, after_tc_cxml = request.param
-        # the table has some overhead elements, also a blank para after since
-        # it's in a cell.
-        after_tc_cxml += (
-            '/(w:tblPr/(w:tblW{w:type=auto,w:w=0},w:tblLook{w:firstColumn=1,'
-            'w:firstRow=1,w:lastColumn=0,w:lastRow=0,w:noHBand=0,w:noVBand=1'
-            ',w:val=04A0}),w:tblGrid/w:gridCol{w:w=1440}),w:p)'
-        )
-        cell = _Cell(element(tc_cxml), None)
-        expected_xml = xml(after_tc_cxml)
+        cell = _Cell(element('w:tc/w:p'), None)
+        expected_xml = snippet_seq('new-tbl')[1]
         return cell, expected_xml
 
     @pytest.fixture

From 8efe8adb4f82b0edd9db14c8958b361f6bf97f98 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 02:42:11 -0800
Subject: [PATCH 095/367] acpt: rewrite scenarios for Table add row & column

---
 features/steps/table.py             | 12 ++++++++----
 features/tbl-add-row-or-col.feature |  8 +++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/features/steps/table.py b/features/steps/table.py
index dcfa5c8db..f81efbab3 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -130,10 +130,9 @@ def given_a_table_having_two_rows(context):
 
 # when =====================================================
 
-@when('I add a column to the table')
-def when_add_column_to_table(context):
-    table = context.table_
-    context.column = table.add_column()
+@when('I add a 1.0 inch column to the table')
+def when_I_add_a_1_inch_column_to_table(context):
+    context.column = context.table_.add_column(Inches(1.0))
 
 
 @when('I add a row to the table')
@@ -299,6 +298,11 @@ def then_new_column_has_2_cells(context):
     assert len(context.column.cells) == 2
 
 
+@then('the new column is 1.0 inches wide')
+def then_new_column_is_1_inches_wide(context):
+    assert context.column.width == Inches(1)
+
+
 @then('the new row has 2 cells')
 def then_new_row_has_2_cells(context):
     assert len(context.row.cells) == 2
diff --git a/features/tbl-add-row-or-col.feature b/features/tbl-add-row-or-col.feature
index 74b3a9da1..4549403d4 100644
--- a/features/tbl-add-row-or-col.feature
+++ b/features/tbl-add-row-or-col.feature
@@ -3,14 +3,20 @@ Feature: Add a row or column to a table
   As a developer using python-docx
   I need methods to add a row or column
 
+
+  @wip
   Scenario: Add a row to a table
      Given a 2 x 2 table
       When I add a row to the table
       Then the table has 3 rows
        And the new row has 2 cells
+       And the width of each cell is 3.0 inches
+
 
+  @wip
   Scenario: Add a column to a table
      Given a 2 x 2 table
-      When I add a column to the table
+      When I add a 1.0 inch column to the table
       Then the table has 3 columns
        And the new column has 2 cells
+       And the new column is 1.0 inches wide

From 96ce9e31e518d88040bcda3be2d377daf4ea8b00 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 03:01:25 -0800
Subject: [PATCH 096/367] tbl: rewrite Table.add_row()

---
 docx/table.py                             |  3 +-
 features/tbl-add-row-or-col.feature       |  1 -
 tests/test_files/snippets/add-row-col.txt | 91 +++++++++++++++++++++++
 tests/test_table.py                       |  8 +-
 4 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 tests/test_files/snippets/add-row-col.txt

diff --git a/docx/table.py b/docx/table.py
index fff8f2638..f093e06a9 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -37,7 +37,8 @@ def add_row(self):
         tbl = self._tbl
         tr = tbl.add_tr()
         for gridCol in tbl.tblGrid.gridCol_lst:
-            tr.add_tc()
+            tc = tr.add_tc()
+            tc.width = gridCol.w
         return _Row(tr, self)
 
     @property
diff --git a/features/tbl-add-row-or-col.feature b/features/tbl-add-row-or-col.feature
index 4549403d4..6894da41e 100644
--- a/features/tbl-add-row-or-col.feature
+++ b/features/tbl-add-row-or-col.feature
@@ -4,7 +4,6 @@ Feature: Add a row or column to a table
   I need methods to add a row or column
 
 
-  @wip
   Scenario: Add a row to a table
      Given a 2 x 2 table
       When I add a row to the table
diff --git a/tests/test_files/snippets/add-row-col.txt b/tests/test_files/snippets/add-row-col.txt
new file mode 100644
index 000000000..716856786
--- /dev/null
+++ b/tests/test_files/snippets/add-row-col.txt
@@ -0,0 +1,91 @@
+<w:tbl xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:tblPr>
+    <w:tblW w:type="auto" w:w="0"/>
+    <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+  </w:tblPr>
+  <w:tblGrid>
+    <w:gridCol w:w="720"/>
+    <w:gridCol w:w="1440"/>
+  </w:tblGrid>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+</w:tbl>
+
+<w:tbl xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:tblPr>
+    <w:tblW w:type="auto" w:w="0"/>
+    <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+  </w:tblPr>
+  <w:tblGrid>
+    <w:gridCol w:w="720"/>
+    <w:gridCol w:w="1440"/>
+  </w:tblGrid>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+</w:tbl>
diff --git a/tests/test_table.py b/tests/test_table.py
index 7884edf59..fbb96fdba 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -101,7 +101,8 @@ def it_can_add_a_row(self, add_row_fixture):
         row = table.add_row()
         assert table._tbl.xml == expected_xml
         assert isinstance(row, _Row)
-        assert row._tr is table._tbl.tr_lst[1]
+        assert row._tr is table._tbl.tr_lst[-1]
+        assert row._parent is table
 
     def it_can_add_a_column(self, add_column_fixture):
         table, expected_xml = add_column_fixture
@@ -131,9 +132,10 @@ def add_column_fixture(self):
 
     @pytest.fixture
     def add_row_fixture(self):
-        tbl = _tbl_bldr(rows=1, cols=2).element
+        snippets = snippet_seq('add-row-col')
+        tbl = parse_xml(snippets[0])
         table = Table(tbl, None)
-        expected_xml = _tbl_bldr(rows=2, cols=2).xml()
+        expected_xml = snippets[1]
         return table, expected_xml
 
     @pytest.fixture(params=[

From 7541f201c44d3c80986f83d8f9eedd39b10dd594 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 03:15:12 -0800
Subject: [PATCH 097/367] tbl: rewrite Table.add_column()

Add width parameter.
---
 HISTORY.rst                               |  1 +
 docx/table.py                             |  9 ++--
 features/tbl-add-row-or-col.feature       |  1 -
 tests/test_files/snippets/add-row-col.txt | 52 +++++++++++++++++++++++
 tests/test_table.py                       | 15 ++++---
 5 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 72463681e..66fdbedc0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,7 @@ NEXT
 ++++++++++++++++++
 
 - Fix #149: KeyError on Document.add_table()
+- Fix #78: feature: add_table() sets cell widths
 
 
 0.8.4 (2015-02-20)
diff --git a/docx/table.py b/docx/table.py
index f093e06a9..237e679b4 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -20,14 +20,17 @@ def __init__(self, tbl, parent):
         super(Table, self).__init__(parent)
         self._element = self._tbl = tbl
 
-    def add_column(self):
+    def add_column(self, width):
         """
-        Return a |_Column| instance, newly added rightmost to the table.
+        Return a |_Column| object of *width*, newly added rightmost to the
+        table.
         """
         tblGrid = self._tbl.tblGrid
         gridCol = tblGrid.add_gridCol()
+        gridCol.w = width
         for tr in self._tbl.tr_lst:
-            tr.add_tc()
+            tc = tr.add_tc()
+            tc.width = width
         return _Column(gridCol, self)
 
     def add_row(self):
diff --git a/features/tbl-add-row-or-col.feature b/features/tbl-add-row-or-col.feature
index 6894da41e..0906a0a48 100644
--- a/features/tbl-add-row-or-col.feature
+++ b/features/tbl-add-row-or-col.feature
@@ -12,7 +12,6 @@ Feature: Add a row or column to a table
        And the width of each cell is 3.0 inches
 
 
-  @wip
   Scenario: Add a column to a table
      Given a 2 x 2 table
       When I add a 1.0 inch column to the table
diff --git a/tests/test_files/snippets/add-row-col.txt b/tests/test_files/snippets/add-row-col.txt
index 716856786..2249ac6cb 100644
--- a/tests/test_files/snippets/add-row-col.txt
+++ b/tests/test_files/snippets/add-row-col.txt
@@ -89,3 +89,55 @@
     </w:tc>
   </w:tr>
 </w:tbl>
+
+<w:tbl xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+  <w:tblPr>
+    <w:tblW w:type="auto" w:w="0"/>
+    <w:tblLook w:firstColumn="1" w:firstRow="1" w:lastColumn="0" w:lastRow="0" w:noHBand="0" w:noVBand="1" w:val="04A0"/>
+  </w:tblPr>
+  <w:tblGrid>
+    <w:gridCol w:w="720"/>
+    <w:gridCol w:w="1440"/>
+    <w:gridCol w:w="2160"/>
+  </w:tblGrid>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="2160"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+  <w:tr>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="720"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="1440"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+    <w:tc>
+      <w:tcPr>
+        <w:tcW w:type="dxa" w:w="2160"/>
+      </w:tcPr>
+      <w:p/>
+    </w:tc>
+  </w:tr>
+</w:tbl>
diff --git a/tests/test_table.py b/tests/test_table.py
index fbb96fdba..db81401e4 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -105,11 +105,12 @@ def it_can_add_a_row(self, add_row_fixture):
         assert row._parent is table
 
     def it_can_add_a_column(self, add_column_fixture):
-        table, expected_xml = add_column_fixture
-        column = table.add_column()
+        table, width, expected_xml = add_column_fixture
+        column = table.add_column(width)
         assert table._tbl.xml == expected_xml
         assert isinstance(column, _Column)
-        assert column._gridCol is table._tbl.tblGrid.gridCol_lst[1]
+        assert column._gridCol is table._tbl.tblGrid.gridCol_lst[-1]
+        assert column._parent is table
 
     def it_provides_access_to_its_cells_to_help(self, cells_fixture):
         table, cell_count, unique_count, matches = cells_fixture
@@ -125,10 +126,12 @@ def it_provides_access_to_its_cells_to_help(self, cells_fixture):
 
     @pytest.fixture
     def add_column_fixture(self):
-        tbl = _tbl_bldr(2, 1).element
+        snippets = snippet_seq('add-row-col')
+        tbl = parse_xml(snippets[0])
         table = Table(tbl, None)
-        expected_xml = _tbl_bldr(2, 2).xml()
-        return table, expected_xml
+        width = Inches(1.5)
+        expected_xml = snippets[2]
+        return table, width, expected_xml
 
     @pytest.fixture
     def add_row_fixture(self):

From 221e28c0e47ef6b35fdbded04ec727e56cbc6790 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 14:08:03 -0800
Subject: [PATCH 098/367] enum: add WD_TABLE_DIRECTION enumeration

---
 docs/api/enum/WdTableDirection.rst | 24 +++++++++++++++++++
 docs/api/enum/index.rst            |  1 +
 docx/enum/table.py                 | 37 ++++++++++++++++++++++++++++--
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 docs/api/enum/WdTableDirection.rst

diff --git a/docs/api/enum/WdTableDirection.rst b/docs/api/enum/WdTableDirection.rst
new file mode 100644
index 000000000..9a7b66c45
--- /dev/null
+++ b/docs/api/enum/WdTableDirection.rst
@@ -0,0 +1,24 @@
+.. _WdTableDirection:
+
+``WD_TABLE_DIRECTION``
+======================
+
+Specifies the direction in which an application orders cells in the
+specified table or row.
+
+Example::
+
+    from docx.enum.table import WD_TABLE_DIRECTION
+
+    table = document.add_table(3, 3)
+    table.direction = WD_TABLE_DIRECTION.RTL
+
+----
+
+LTR
+    The table or row is arranged with the first column in the leftmost
+    position.
+
+RTL
+    The table or row is arranged with the first column in the rightmost
+    position.
diff --git a/docs/api/enum/index.rst b/docs/api/enum/index.rst
index 9deecb2f3..cd0cba8e1 100644
--- a/docs/api/enum/index.rst
+++ b/docs/api/enum/index.rst
@@ -17,4 +17,5 @@ can be found here:
    WdSectionStart
    WdStyleType
    WdRowAlignment
+   WdTableDirection
    WdUnderline
diff --git a/docx/enum/table.py b/docx/enum/table.py
index 624d41a6f..bc201346c 100644
--- a/docx/enum/table.py
+++ b/docx/enum/table.py
@@ -4,9 +4,13 @@
 Enumerations related to tables in WordprocessingML files
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
 
-from .base import XmlEnumeration, XmlMappedEnumMember
+from .base import (
+    Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
+)
 
 
 class WD_TABLE_ALIGNMENT(XmlEnumeration):
@@ -36,3 +40,32 @@ class WD_TABLE_ALIGNMENT(XmlEnumeration):
             'RIGHT', 2, 'right', 'Right-aligned.'
         ),
     )
+
+
+class WD_TABLE_DIRECTION(Enumeration):
+    """
+    Specifies the direction in which an application orders cells in the
+    specified table or row.
+
+    Example::
+
+        from docx.enum.table import WD_TABLE_DIRECTION
+
+        table = document.add_table(3, 3)
+        table.direction = WD_TABLE_DIRECTION.RTL
+    """
+
+    __ms_name__ = 'WdTableDirection'
+
+    __url__ = ' http://msdn.microsoft.com/en-us/library/ff835141.aspx'
+
+    __members__ = (
+        EnumMember(
+            'LTR', 0, 'The table or row is arranged with the first column '
+            'in the leftmost position.'
+        ),
+        EnumMember(
+            'RTL', 1, 'The table or row is arranged with the first column '
+            'in the rightmost position.'
+        ),
+    )

From d2781975da2e62295be1f170a5d78d689ba4789b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 14:16:06 -0800
Subject: [PATCH 099/367] acpt: add scenarios for Table.table_direction

---
 docx/table.py                                 |   9 ++++++
 features/steps/table.py                       |  30 +++++++++++++++++-
 .../steps/test_files/tbl-on-off-props.docx    | Bin 0 -> 16017 bytes
 features/tbl-props.feature                    |  27 +++++++++++++++-
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 features/steps/test_files/tbl-on-off-props.docx

diff --git a/docx/table.py b/docx/table.py
index 237e679b4..badd97aa4 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -145,6 +145,15 @@ def table(self):
         """
         return self
 
+    @property
+    def table_direction(self):
+        """
+        A member of :ref:`WdTableDirection` indicating the direction in which
+        the table cells are ordered, e.g. `WD_TABLE_DIRECTION.LTR`. |None|
+        indicates the value is inherited from the style hierarchy.
+        """
+        raise NotImplementedError
+
     @property
     def _cells(self):
         """
diff --git a/features/steps/table.py b/features/steps/table.py
index f81efbab3..8521ef1b8 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -11,7 +11,7 @@
 from behave import given, then, when
 
 from docx import Document
-from docx.enum.table import WD_TABLE_ALIGNMENT
+from docx.enum.table import WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
 from docx.shared import Inches
 from docx.table import _Column, _Columns, _Row, _Rows
 
@@ -112,6 +112,17 @@ def given_a_table_having_style(context, style):
     context.table_ = document.tables[table_idx]
 
 
+@given('a table having table direction set {setting}')
+def given_a_table_having_table_direction_setting(context, setting):
+    table_idx = [
+        'to inherit',
+        'right-to-left',
+        'left-to-right'
+    ].index(setting)
+    document = Document(test_docx('tbl-on-off-props'))
+    context.table_ = document.tables[table_idx]
+
+
 @given('a table having two columns')
 def given_a_table_having_two_columns(context):
     docx_path = test_docx('blk-containing-table')
@@ -165,6 +176,14 @@ def when_apply_value_to_table_style(context, value):
     table.style = new_value
 
 
+@when('I assign {value} to table.table_direction')
+def when_assign_value_to_table_table_direction(context, value):
+    new_value = (
+        None if value == 'None' else getattr(WD_TABLE_DIRECTION, value)
+    )
+    context.table_.table_direction = new_value
+
+
 @when('I merge from cell {origin} to cell {other}')
 def when_I_merge_from_cell_origin_to_cell_other(context, origin, other):
     def cell(table, idx):
@@ -274,6 +293,15 @@ def then_table_style_is_styles_style_name(context, style_name):
     assert table.style == expected_style, "got '%s'" % table.style
 
 
+@then('table.table_direction is {value}')
+def then_table_table_direction_is_value(context, value):
+    expected_value = (
+        None if value == 'None' else getattr(WD_TABLE_DIRECTION, value)
+    )
+    actual_value = context.table_.table_direction
+    assert actual_value == expected_value, "got '%s'" % actual_value
+
+
 @then('the column cells text is {expected_text}')
 def then_the_column_cells_text_is_expected_text(context, expected_text):
     table = context.table_
diff --git a/features/steps/test_files/tbl-on-off-props.docx b/features/steps/test_files/tbl-on-off-props.docx
new file mode 100644
index 0000000000000000000000000000000000000000..793cad00124871e8260d3f2182adfbc62536b5d8
GIT binary patch
literal 16017
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

literal 0
HcmV?d00001

diff --git a/features/tbl-props.feature b/features/tbl-props.feature
index 6d4fb4da4..f35f7b05e 100644
--- a/features/tbl-props.feature
+++ b/features/tbl-props.feature
@@ -4,7 +4,7 @@ Feature: Get and set table properties
   I need a way to get and set a table's properties
 
 
-  Scenario Outline: Determine table alignment
+  Scenario Outline: Get table alignment
     Given a table having <alignment> alignment
      Then table.alignment is <value>
 
@@ -53,3 +53,28 @@ Feature: Get and set table properties
       | autofit             | autofit     | autofit          |
       | fixed               | fixed       | fixed            |
       | autofit             | fixed       | fixed            |
+
+
+  @wip
+  Scenario Outline: Get table direction
+    Given a table having table direction set <setting>
+     Then table.table_direction is <value>
+
+    Examples: Table on/off property values
+      | setting       | value |
+      | to inherit    | None  |
+      | right-to-left | RTL   |
+      | left-to-right | LTR   |
+
+
+  @wip
+  Scenario Outline: Set table direction
+    Given a table having table direction set <setting>
+     When I assign <new-value> to table.table_direction
+     Then table.table_direction is <value>
+
+    Examples: Results of assignment to Table.table_direction
+      | setting       | new-value | value |
+      | to inherit    | RTL       | RTL   |
+      | right-to-left | LTR       | LTR   |
+      | left-to-right | None      | None  |

From db70e4f329734e86ff34140506d7891efe0d3dc1 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 14:22:07 -0800
Subject: [PATCH 100/367] reorg: reorder tests in DescribeTable

---
 tests/test_table.py | 104 ++++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/tests/test_table.py b/tests/test_table.py
index db81401e4..7d3cbe5b6 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -26,6 +26,49 @@
 
 class DescribeTable(object):
 
+    def it_can_add_a_row(self, add_row_fixture):
+        table, expected_xml = add_row_fixture
+        row = table.add_row()
+        assert table._tbl.xml == expected_xml
+        assert isinstance(row, _Row)
+        assert row._tr is table._tbl.tr_lst[-1]
+        assert row._parent is table
+
+    def it_can_add_a_column(self, add_column_fixture):
+        table, width, expected_xml = add_column_fixture
+        column = table.add_column(width)
+        assert table._tbl.xml == expected_xml
+        assert isinstance(column, _Column)
+        assert column._gridCol is table._tbl.tblGrid.gridCol_lst[-1]
+        assert column._parent is table
+
+    def it_provides_access_to_a_cell_by_row_and_col_indices(self, table):
+        for row_idx in range(2):
+            for col_idx in range(2):
+                cell = table.cell(row_idx, col_idx)
+                assert isinstance(cell, _Cell)
+                tr = table._tbl.tr_lst[row_idx]
+                tc = tr.tc_lst[col_idx]
+                assert tc is cell._tc
+
+    def it_provides_access_to_the_table_rows(self, table):
+        rows = table.rows
+        assert isinstance(rows, _Rows)
+
+    def it_provides_access_to_the_table_columns(self, table):
+        columns = table.columns
+        assert isinstance(columns, _Columns)
+
+    def it_provides_access_to_the_cells_in_a_column(self, col_cells_fixture):
+        table, column_idx, expected_cells = col_cells_fixture
+        column_cells = table.column_cells(column_idx)
+        assert column_cells == expected_cells
+
+    def it_provides_access_to_the_cells_in_a_row(self, row_cells_fixture):
+        table, row_idx, expected_cells = row_cells_fixture
+        row_cells = table.row_cells(row_idx)
+        assert row_cells == expected_cells
+
     def it_knows_its_alignment_setting(self, alignment_get_fixture):
         table, expected_value = alignment_get_fixture
         assert table.alignment == expected_value
@@ -44,6 +87,10 @@ def it_can_change_its_autofit_setting(self, autofit_set_fixture):
         table.autofit = new_value
         assert table._tbl.xml == expected_xml
 
+    def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
+        table = table_fixture
+        assert table.table is table
+
     def it_knows_its_table_style(self, style_get_fixture):
         table, style_id_, style_ = style_get_fixture
         style = table.style
@@ -60,58 +107,6 @@ def it_can_change_its_table_style(self, style_set_fixture):
         )
         assert table._tbl.xml == expected_xml
 
-    def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
-        table = table_fixture
-        assert table.table is table
-
-    def it_knows_its_column_count_to_help(self, column_count_fixture):
-        table, expected_value = column_count_fixture
-        column_count = table._column_count
-        assert column_count == expected_value
-
-    def it_provides_access_to_the_table_rows(self, table):
-        rows = table.rows
-        assert isinstance(rows, _Rows)
-
-    def it_provides_access_to_the_table_columns(self, table):
-        columns = table.columns
-        assert isinstance(columns, _Columns)
-
-    def it_provides_access_to_a_cell_by_row_and_col_indices(self, table):
-        for row_idx in range(2):
-            for col_idx in range(2):
-                cell = table.cell(row_idx, col_idx)
-                assert isinstance(cell, _Cell)
-                tr = table._tbl.tr_lst[row_idx]
-                tc = tr.tc_lst[col_idx]
-                assert tc is cell._tc
-
-    def it_provides_access_to_the_cells_in_a_column(self, col_cells_fixture):
-        table, column_idx, expected_cells = col_cells_fixture
-        column_cells = table.column_cells(column_idx)
-        assert column_cells == expected_cells
-
-    def it_provides_access_to_the_cells_in_a_row(self, row_cells_fixture):
-        table, row_idx, expected_cells = row_cells_fixture
-        row_cells = table.row_cells(row_idx)
-        assert row_cells == expected_cells
-
-    def it_can_add_a_row(self, add_row_fixture):
-        table, expected_xml = add_row_fixture
-        row = table.add_row()
-        assert table._tbl.xml == expected_xml
-        assert isinstance(row, _Row)
-        assert row._tr is table._tbl.tr_lst[-1]
-        assert row._parent is table
-
-    def it_can_add_a_column(self, add_column_fixture):
-        table, width, expected_xml = add_column_fixture
-        column = table.add_column(width)
-        assert table._tbl.xml == expected_xml
-        assert isinstance(column, _Column)
-        assert column._gridCol is table._tbl.tblGrid.gridCol_lst[-1]
-        assert column._parent is table
-
     def it_provides_access_to_its_cells_to_help(self, cells_fixture):
         table, cell_count, unique_count, matches = cells_fixture
         cells = table._cells
@@ -122,6 +117,11 @@ def it_provides_access_to_its_cells_to_help(self, cells_fixture):
             for idx in matching_idxs[1:]:
                 assert cells[idx] is cells[comparator_idx]
 
+    def it_knows_its_column_count_to_help(self, column_count_fixture):
+        table, expected_value = column_count_fixture
+        column_count = table._column_count
+        assert column_count == expected_value
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture

From d4ca18d65a893fced1f19d5871ee3e2f558f9907 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 14:31:53 -0800
Subject: [PATCH 101/367] tbl: add Table.table_direction getter

---
 docx/oxml/__init__.py      | 25 +++++++++++++------------
 docx/oxml/table.py         | 13 +++++++++++++
 docx/table.py              |  2 +-
 features/tbl-props.feature |  1 -
 tests/test_table.py        | 17 ++++++++++++++++-
 5 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 4ac0fe8d7..d3b4d9fac 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -131,18 +131,19 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType, CT_TblPr,
     CT_TblWidth, CT_Tc, CT_TcPr, CT_VMerge
 )
-register_element_cls('w:gridCol',   CT_TblGridCol)
-register_element_cls('w:gridSpan',  CT_DecimalNumber)
-register_element_cls('w:tbl',       CT_Tbl)
-register_element_cls('w:tblGrid',   CT_TblGrid)
-register_element_cls('w:tblLayout', CT_TblLayoutType)
-register_element_cls('w:tblPr',     CT_TblPr)
-register_element_cls('w:tblStyle',  CT_String)
-register_element_cls('w:tc',        CT_Tc)
-register_element_cls('w:tcPr',      CT_TcPr)
-register_element_cls('w:tcW',       CT_TblWidth)
-register_element_cls('w:tr',        CT_Row)
-register_element_cls('w:vMerge',    CT_VMerge)
+register_element_cls('w:bidiVisual', CT_OnOff)
+register_element_cls('w:gridCol',    CT_TblGridCol)
+register_element_cls('w:gridSpan',   CT_DecimalNumber)
+register_element_cls('w:tbl',        CT_Tbl)
+register_element_cls('w:tblGrid',    CT_TblGrid)
+register_element_cls('w:tblLayout',  CT_TblLayoutType)
+register_element_cls('w:tblPr',      CT_TblPr)
+register_element_cls('w:tblStyle',   CT_String)
+register_element_cls('w:tc',         CT_Tc)
+register_element_cls('w:tcPr',       CT_TcPr)
+register_element_cls('w:tcW',        CT_TblWidth)
+register_element_cls('w:tr',         CT_Row)
+register_element_cls('w:vMerge',     CT_VMerge)
 
 from .text.font import (
     CT_Color, CT_Fonts, CT_HpsMeasure, CT_RPr, CT_Underline,
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 0767cbbdb..f68604b29 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -61,6 +61,18 @@ class CT_Tbl(BaseOxmlElement):
     tblGrid = OneAndOnlyOne('w:tblGrid')
     tr = ZeroOrMore('w:tr')
 
+    @property
+    def bidiVisual_val(self):
+        """
+        Value of `w:tblPr/w:bidiVisual/@w:val` or |None| if not present.
+        Controls whether table cells are displayed right-to-left or
+        left-to-right.
+        """
+        bidiVisual = self.tblPr.bidiVisual
+        if bidiVisual is None:
+            return None
+        return bidiVisual.val
+
     @property
     def col_count(self):
         """
@@ -208,6 +220,7 @@ class CT_TblPr(BaseOxmlElement):
         'w:tblDescription', 'w:tblPrChange'
     )
     tblStyle = ZeroOrOne('w:tblStyle', successors=_tag_seq[1:])
+    bidiVisual = ZeroOrOne('w:bidiVisual', successors=_tag_seq[4:])
     jc = ZeroOrOne('w:jc', successors=_tag_seq[8:])
     tblLayout = ZeroOrOne('w:tblLayout', successors=_tag_seq[13:])
     del _tag_seq
diff --git a/docx/table.py b/docx/table.py
index badd97aa4..2b4bf85eb 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -152,7 +152,7 @@ def table_direction(self):
         the table cells are ordered, e.g. `WD_TABLE_DIRECTION.LTR`. |None|
         indicates the value is inherited from the style hierarchy.
         """
-        raise NotImplementedError
+        return self._element.bidiVisual_val
 
     @property
     def _cells(self):
diff --git a/features/tbl-props.feature b/features/tbl-props.feature
index f35f7b05e..8c5ae530a 100644
--- a/features/tbl-props.feature
+++ b/features/tbl-props.feature
@@ -55,7 +55,6 @@ Feature: Get and set table properties
       | autofit             | fixed       | fixed            |
 
 
-  @wip
   Scenario Outline: Get table direction
     Given a table having table direction set <setting>
      Then table.table_direction is <value>
diff --git a/tests/test_table.py b/tests/test_table.py
index 7d3cbe5b6..26e05174f 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -9,7 +9,7 @@
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
-from docx.enum.table import WD_TABLE_ALIGNMENT
+from docx.enum.table import WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
 from docx.oxml import parse_xml
 from docx.oxml.table import CT_Tc
 from docx.parts.document import DocumentPart
@@ -91,6 +91,10 @@ def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
         table = table_fixture
         assert table.table is table
 
+    def it_knows_its_direction(self, direction_get_fixture):
+        table, expected_value = direction_get_fixture
+        assert table.table_direction == expected_value
+
     def it_knows_its_table_style(self, style_get_fixture):
         table, style_id_, style_ = style_get_fixture
         style = table.style
@@ -224,6 +228,17 @@ def column_count_fixture(self):
         table = Table(element(tbl_cxml), None)
         return table, expected_value
 
+    @pytest.fixture(params=[
+        ('w:tbl/w:tblPr',                        None),
+        ('w:tbl/w:tblPr/w:bidiVisual',           WD_TABLE_DIRECTION.RTL),
+        ('w:tbl/w:tblPr/w:bidiVisual{w:val=0}',  WD_TABLE_DIRECTION.LTR),
+        ('w:tbl/w:tblPr/w:bidiVisual{w:val=on}', WD_TABLE_DIRECTION.RTL),
+    ])
+    def direction_get_fixture(self, request):
+        tbl_cxml, expected_value = request.param
+        table = Table(element(tbl_cxml), None)
+        return table, expected_value
+
     @pytest.fixture
     def row_cells_fixture(self, _cells_, _column_count_):
         table = Table(None, None)

From 9605cc04f4ff1079412992c6a58a3f84a74c1905 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 14:50:10 -0800
Subject: [PATCH 102/367] tbl: add Table.table_direction setter

---
 HISTORY.rst                |  1 +
 docx/oxml/table.py         |  8 ++++++++
 docx/table.py              |  4 ++++
 features/tbl-props.feature |  1 -
 tests/test_table.py        | 21 +++++++++++++++++++++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 66fdbedc0..e9dc78033 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,6 +8,7 @@ NEXT
 
 - Fix #149: KeyError on Document.add_table()
 - Fix #78: feature: add_table() sets cell widths
+- Add #106: feature: Table.direction (i.e. right-to-left)
 
 
 0.8.4 (2015-02-20)
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index f68604b29..7b45b0ff9 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -73,6 +73,14 @@ def bidiVisual_val(self):
             return None
         return bidiVisual.val
 
+    @bidiVisual_val.setter
+    def bidiVisual_val(self, value):
+        tblPr = self.tblPr
+        if value is None:
+            tblPr._remove_bidiVisual()
+        else:
+            tblPr.get_or_add_bidiVisual().val = value
+
     @property
     def col_count(self):
         """
diff --git a/docx/table.py b/docx/table.py
index 2b4bf85eb..d0b472fc8 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -154,6 +154,10 @@ def table_direction(self):
         """
         return self._element.bidiVisual_val
 
+    @table_direction.setter
+    def table_direction(self, value):
+        self._element.bidiVisual_val = value
+
     @property
     def _cells(self):
         """
diff --git a/features/tbl-props.feature b/features/tbl-props.feature
index 8c5ae530a..e588c6e86 100644
--- a/features/tbl-props.feature
+++ b/features/tbl-props.feature
@@ -66,7 +66,6 @@ Feature: Get and set table properties
       | left-to-right | LTR   |
 
 
-  @wip
   Scenario Outline: Set table direction
     Given a table having table direction set <setting>
      When I assign <new-value> to table.table_direction
diff --git a/tests/test_table.py b/tests/test_table.py
index 26e05174f..44aec41dd 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -95,6 +95,11 @@ def it_knows_its_direction(self, direction_get_fixture):
         table, expected_value = direction_get_fixture
         assert table.table_direction == expected_value
 
+    def it_can_change_its_direction(self, direction_set_fixture):
+        table, new_value, expected_xml = direction_set_fixture
+        table.table_direction = new_value
+        assert table._element.xml == expected_xml
+
     def it_knows_its_table_style(self, style_get_fixture):
         table, style_id_, style_ = style_get_fixture
         style = table.style
@@ -239,6 +244,22 @@ def direction_get_fixture(self, request):
         table = Table(element(tbl_cxml), None)
         return table, expected_value
 
+    @pytest.fixture(params=[
+        ('w:tbl/w:tblPr',                       WD_TABLE_DIRECTION.RTL,
+         'w:tbl/w:tblPr/w:bidiVisual'),
+        ('w:tbl/w:tblPr/w:bidiVisual',          WD_TABLE_DIRECTION.LTR,
+         'w:tbl/w:tblPr/w:bidiVisual{w:val=0}'),
+        ('w:tbl/w:tblPr/w:bidiVisual{w:val=0}', WD_TABLE_DIRECTION.RTL,
+         'w:tbl/w:tblPr/w:bidiVisual'),
+        ('w:tbl/w:tblPr/w:bidiVisual{w:val=1}', None,
+         'w:tbl/w:tblPr'),
+    ])
+    def direction_set_fixture(self, request):
+        tbl_cxml, new_value, expected_cxml = request.param
+        table = Table(element(tbl_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return table, new_value, expected_xml
+
     @pytest.fixture
     def row_cells_fixture(self, _cells_, _column_count_):
         table = Table(None, None)

From 0c887e814ab89b46c428f3aa39e1fc58ec53a01b Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 16:56:53 -0800
Subject: [PATCH 103/367] tbl: add CT_Row.trPr

---
 HISTORY.rst              |  1 +
 docx/oxml/table.py       | 12 ++++++++++++
 tests/oxml/test_table.py | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index e9dc78033..e254738e1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,6 +9,7 @@ NEXT
 - Fix #149: KeyError on Document.add_table()
 - Fix #78: feature: add_table() sets cell widths
 - Add #106: feature: Table.direction (i.e. right-to-left)
+- Add #102: feature: add CT_Row.trPr
 
 
 0.8.4 (2015-02-20)
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 7b45b0ff9..30d349373 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -25,6 +25,8 @@ class CT_Row(BaseOxmlElement):
     """
     ``<w:tr>`` element
     """
+    tblPrEx = ZeroOrOne('w:tblPrEx')  # custom inserter below
+    trPr = ZeroOrOne('w:trPr')        # custom inserter below
     tc = ZeroOrMore('w:tc')
 
     def tc_at_grid_col(self, idx):
@@ -49,6 +51,16 @@ def tr_idx(self):
         """
         return self.getparent().tr_lst.index(self)
 
+    def _insert_tblPrEx(self, tblPrEx):
+        self.insert(0, tblPrEx)
+
+    def _insert_trPr(self, trPr):
+        tblPrEx = self.tblPrEx
+        if tblPrEx is not None:
+            tblPrEx.addnext(trPr)
+        else:
+            self.insert(0, trPr)
+
     def _new_tc(self):
         return CT_Tc.new()
 
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 5a7f68634..7ddbabe3d 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -21,6 +21,11 @@
 
 class DescribeCT_Row(object):
 
+    def it_can_add_a_trPr(self, add_trPr_fixture):
+        tr, expected_xml = add_trPr_fixture
+        tr._add_trPr()
+        assert tr.xml == expected_xml
+
     def it_raises_on_tc_at_grid_col(self, tc_raise_fixture):
         tr, idx = tc_raise_fixture
         with pytest.raises(ValueError):
@@ -28,6 +33,18 @@ def it_raises_on_tc_at_grid_col(self, tc_raise_fixture):
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:tr',                    'w:tr/w:trPr'),
+        ('w:tr/w:tblPrEx',          'w:tr/(w:tblPrEx,w:trPr)'),
+        ('w:tr/w:tc',               'w:tr/(w:trPr,w:tc)'),
+        ('w:tr/(w:sdt,w:del,w:tc)', 'w:tr/(w:trPr,w:sdt,w:del,w:tc)'),
+    ])
+    def add_trPr_fixture(self, request):
+        tr_cxml, expected_cxml = request.param
+        tr = element(tr_cxml)
+        expected_xml = xml(expected_cxml)
+        return tr, expected_xml
+
     @pytest.fixture(params=[(0, 0, 3), (1, 0, 1)])
     def tc_raise_fixture(self, request):
         snippet_idx, row_idx, col_idx = request.param

From bc34ec95a9e7bdff01f5b43b1070bbc0c018ab25 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 21 Feb 2015 17:08:02 -0800
Subject: [PATCH 104/367] release: prepare v0.8.5 release

---
 HISTORY.rst      | 2 +-
 docx/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index e254738e1..a51e27043 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,7 +3,7 @@
 Release History
 ---------------
 
-NEXT
+0.8.5 (2015-02-21)
 ++++++++++++++++++
 
 - Fix #149: KeyError on Document.add_table()
diff --git a/docx/__init__.py b/docx/__init__.py
index ab6a8de81..1bf421391 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.4'
+__version__ = '0.8.5'
 
 
 # register custom Part classes with opc package reader

From 5fd8b11fd3c04e6c105c88dedd10567d4b81fa1c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 13:15:34 -0700
Subject: [PATCH 105/367] docs: extract table feature analyses into subdir

Also, change Makefile 'docs' target to incremental build.
---
 Makefile                                      |  2 +-
 .../features/{ => table}/cell-merge.rst       |  0
 .../features/{table.rst => table/index.rst}   | 26 +++++++------------
 .../features/{ => table}/table-cell.rst       |  0
 .../features/{ => table}/table-props.rst      |  0
 docs/dev/analysis/index.rst                   |  5 +---
 6 files changed, 12 insertions(+), 21 deletions(-)
 rename docs/dev/analysis/features/{ => table}/cell-merge.rst (100%)
 rename docs/dev/analysis/features/{table.rst => table/index.rst} (96%)
 rename docs/dev/analysis/features/{ => table}/table-cell.rst (100%)
 rename docs/dev/analysis/features/{ => table}/table-props.rst (100%)

diff --git a/Makefile b/Makefile
index 2e8969154..765af00b4 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ coverage:
 	py.test --cov-report term-missing --cov=docx tests/
 
 docs:
-	$(MAKE) -C docs clean html
+	$(MAKE) -C docs html
 
 readme:
 	rst2html README.rst >README.html
diff --git a/docs/dev/analysis/features/cell-merge.rst b/docs/dev/analysis/features/table/cell-merge.rst
similarity index 100%
rename from docs/dev/analysis/features/cell-merge.rst
rename to docs/dev/analysis/features/table/cell-merge.rst
diff --git a/docs/dev/analysis/features/table.rst b/docs/dev/analysis/features/table/index.rst
similarity index 96%
rename from docs/dev/analysis/features/table.rst
rename to docs/dev/analysis/features/table/index.rst
index c934ddbb9..82836a746 100644
--- a/docs/dev/analysis/features/table.rst
+++ b/docs/dev/analysis/features/table/index.rst
@@ -8,6 +8,16 @@ correspond directly to the visual columns.
 
 All table content is contained in its cells.
 
+In addition to this overview, there are the following more specialized
+feature analyses:
+
+.. toctree::
+   :titlesonly:
+
+   table-props
+   table-cell
+   cell-merge
+
 
 Specimen XML
 ------------
@@ -199,19 +209,3 @@ Schema Definitions
       <xsd:pattern value="[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
     </xsd:restriction>
   </xsd:simpleType>
-
-
-Resources
----------
-
-* `Tables.Add Method on MSDN`_
-
-.. _Tables.Add Method on MSDN:
-   http://msdn.microsoft.com/en-us/library/office/microsoft.office.interop.wo
-   rd.tables.add(v=office.14).aspx
-
-* `Table Members on MSDN`_
-
-.. _`Table Members on MSDN`:
-   http://msdn.microsoft.com/en-us/library/office/microsoft.office.interop.wo
-   od.table_members(v=office.14).aspx
diff --git a/docs/dev/analysis/features/table-cell.rst b/docs/dev/analysis/features/table/table-cell.rst
similarity index 100%
rename from docs/dev/analysis/features/table-cell.rst
rename to docs/dev/analysis/features/table/table-cell.rst
diff --git a/docs/dev/analysis/features/table-props.rst b/docs/dev/analysis/features/table/table-props.rst
similarity index 100%
rename from docs/dev/analysis/features/table-props.rst
rename to docs/dev/analysis/features/table/table-props.rst
diff --git a/docs/dev/analysis/index.rst b/docs/dev/analysis/index.rst
index 07460ef88..c54375f36 100644
--- a/docs/dev/analysis/index.rst
+++ b/docs/dev/analysis/index.rst
@@ -11,12 +11,9 @@ Feature Analysis
    :titlesonly:
 
    features/text/index
+   features/table/index
    features/styles/index
    features/coreprops
-   features/cell-merge
-   features/table
-   features/table-props
-   features/table-cell
    features/numbering
    features/sections
    features/shapes

From 465a5581415cf713392f948dfb6288b26a0b739c Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 13:35:57 -0700
Subject: [PATCH 106/367] docs: extract shapes feature analyses into subdir

Also, add `cleandocs` Makefile target
---
 Makefile                                           |  3 +++
 .../features/{shapes.rst => shapes/index.rst}      | 14 ++++++++++----
 .../dev/analysis/features/{ => shapes}/picture.rst |  4 ----
 .../features/{ => shapes}/shapes-inline-size.rst   |  4 ----
 .../features/{ => shapes}/shapes-inline.rst        |  4 ----
 docs/dev/analysis/index.rst                        |  5 +----
 6 files changed, 14 insertions(+), 20 deletions(-)
 rename docs/dev/analysis/features/{shapes.rst => shapes/index.rst} (91%)
 rename docs/dev/analysis/features/{ => shapes}/picture.rst (99%)
 rename docs/dev/analysis/features/{ => shapes}/shapes-inline-size.rst (99%)
 rename docs/dev/analysis/features/{ => shapes}/shapes-inline.rst (99%)

diff --git a/Makefile b/Makefile
index 765af00b4..92abae53d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ clean:
 	find . -type f -name \*.pyc -exec rm {} \;
 	rm -rf dist *.egg-info .coverage .DS_Store
 
+cleandocs:
+	$(MAKE) -C docs clean
+
 coverage:
 	py.test --cov-report term-missing --cov=docx tests/
 
diff --git a/docs/dev/analysis/features/shapes.rst b/docs/dev/analysis/features/shapes/index.rst
similarity index 91%
rename from docs/dev/analysis/features/shapes.rst
rename to docs/dev/analysis/features/shapes/index.rst
index 6cb6c077e..37b4c49f4 100644
--- a/docs/dev/analysis/features/shapes.rst
+++ b/docs/dev/analysis/features/shapes/index.rst
@@ -2,10 +2,6 @@
 Shapes (in general)
 ===================
 
-
-Overview
---------
-
 A graphical object that appears in a Word document is known as a *shape*.
 A shape can be *inline* or *floating*. An inline shape appears on a text
 baseline as though it were a character glyph and affects the line height.
@@ -18,6 +14,16 @@ that determines the placement of the graphic. The same graphical object can be
 placed inline or floating by changing its container. The graphic itself is
 unaffected.
 
+In addition to this overview, there are the following more specialized
+feature analyses:
+
+.. toctree::
+   :titlesonly:
+
+   shapes-inline
+   shapes-inline-size
+   picture
+
 
 MS API
 ------
diff --git a/docs/dev/analysis/features/picture.rst b/docs/dev/analysis/features/shapes/picture.rst
similarity index 99%
rename from docs/dev/analysis/features/picture.rst
rename to docs/dev/analysis/features/shapes/picture.rst
index e98fed4bc..a98c6e906 100644
--- a/docs/dev/analysis/features/picture.rst
+++ b/docs/dev/analysis/features/shapes/picture.rst
@@ -2,10 +2,6 @@
 Picture
 =======
 
-
-Overview
---------
-
 Word allows a picture to be placed in a graphical object container, either an
 inline shape or a floating shape.
 
diff --git a/docs/dev/analysis/features/shapes-inline-size.rst b/docs/dev/analysis/features/shapes/shapes-inline-size.rst
similarity index 99%
rename from docs/dev/analysis/features/shapes-inline-size.rst
rename to docs/dev/analysis/features/shapes/shapes-inline-size.rst
index dd69c03c8..6e21e14ad 100644
--- a/docs/dev/analysis/features/shapes-inline-size.rst
+++ b/docs/dev/analysis/features/shapes/shapes-inline-size.rst
@@ -2,10 +2,6 @@
 Inline shape size
 =================
 
-
-Overview
---------
-
 The position of an inline shape is completely determined by the text it is
 inline with, however its dimensions can be specified. For some shape types,
 both the contained shape and the shape container specify a width and height.
diff --git a/docs/dev/analysis/features/shapes-inline.rst b/docs/dev/analysis/features/shapes/shapes-inline.rst
similarity index 99%
rename from docs/dev/analysis/features/shapes-inline.rst
rename to docs/dev/analysis/features/shapes/shapes-inline.rst
index c6e952dfb..cb6a0bbfb 100644
--- a/docs/dev/analysis/features/shapes-inline.rst
+++ b/docs/dev/analysis/features/shapes/shapes-inline.rst
@@ -2,10 +2,6 @@
 Inline shape
 ============
 
-
-Overview
---------
-
 Word allows a graphical object to be placed into a document as an inline
 object. An inline shape appears as a ``<w:drawing>`` element as a child of
 a ``<w:r>`` element.
diff --git a/docs/dev/analysis/index.rst b/docs/dev/analysis/index.rst
index c54375f36..e5546ca29 100644
--- a/docs/dev/analysis/index.rst
+++ b/docs/dev/analysis/index.rst
@@ -13,13 +13,10 @@ Feature Analysis
    features/text/index
    features/table/index
    features/styles/index
+   features/shapes/index
    features/coreprops
    features/numbering
    features/sections
-   features/shapes
-   features/shapes-inline
-   features/shapes-inline-size
-   features/picture
 
 
 Schema Analysis

From b1d0771175b1c62cded15f69806b8085edf303f3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 19:30:47 -0700
Subject: [PATCH 107/367] docs: document settings part analysis

---
 docs/conf.py                            |   2 +
 docs/dev/analysis/features/settings.rst | 136 ++++++++++++++++++++++++
 docs/dev/analysis/index.rst             |   1 +
 3 files changed, 139 insertions(+)
 create mode 100644 docs/dev/analysis/features/settings.rst

diff --git a/docs/conf.py b/docs/conf.py
index 496120816..1c642ef6b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -155,6 +155,8 @@
 
 .. |Sections| replace:: :class:`.Sections`
 
+.. |Settings| replace:: :class:`.Settings`
+
 .. |str| replace:: :class:`.str`
 
 .. |Styles| replace:: :class:`.Styles`
diff --git a/docs/dev/analysis/features/settings.rst b/docs/dev/analysis/features/settings.rst
new file mode 100644
index 000000000..0db461e17
--- /dev/null
+++ b/docs/dev/analysis/features/settings.rst
@@ -0,0 +1,136 @@
+
+Settings part
+=============
+
+In WordprocessingML, document-level settings are defined in the
+`settings.xml` part. There are 98 distinct settings, all of which are
+optional (according to the spec at least).
+
+The API does not provide for direct access to the settings part. A |Settings|
+proxy object is available on the :attr:`.Document.settings` property and
+provides access to the document-level settings. The |Document| object obtains
+access via its document part. |DocumentPart| brokers all access to the
+settings part.
+
+
+Candidate Protocol
+------------------
+
+.. highlight:: python
+
+::
+
+  >>> document = Document()
+  >>> document.settings
+  <docx.settings.Settings object at 0xdeadbeef4>
+
+
+Schema Excerpts
+---------------
+
+.. highlight:: xml
+
+::
+
+  <xsd:complexType name="CT_Settings">
+    <xsd:sequence>
+      <xsd:element name="writeProtection"            type="CT_WriteProtection" minOccurs="0"/>
+      <xsd:element name="view"                       type="CT_View"            minOccurs="0"/>
+      <xsd:element name="zoom"                       type="CT_Zoom"            minOccurs="0"/>
+      <xsd:element name="removePersonalInformation"  type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="removeDateAndTime"          type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="doNotDisplayPageBoundaries" type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="displayBackgroundShape"     type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="printPostScriptOverText"    type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="printFractionalCharacterWidth" type="CT_OnOff"        minOccurs="0"/>
+      <xsd:element name="printFormsData"             type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="embedTrueTypeFonts"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="embedSystemFonts"           type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="saveSubsetFonts"            type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="saveFormsData"              type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="mirrorMargins"              type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="alignBordersAndEdges"       type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="bordersDoNotSurroundHeader" type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="bordersDoNotSurroundFooter" type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="gutterAtTop"                type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="hideSpellingErrors"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="hideGrammaticalErrors"      type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="activeWritingStyle"         type="CT_WritingStyle"    minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="proofState"                 type="CT_Proof"           minOccurs="0"/>
+      <xsd:element name="formsDesign"                type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="attachedTemplate"           type="CT_Rel"             minOccurs="0"/>
+      <xsd:element name="linkStyles"                 type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="stylePaneFormatFilter"      type="CT_StylePaneFilter" minOccurs="0"/>
+      <xsd:element name="stylePaneSortMethod"        type="CT_StyleSort"       minOccurs="0"/>
+      <xsd:element name="documentType"               type="CT_DocType"         minOccurs="0"/>
+      <xsd:element name="mailMerge"                  type="CT_MailMerge"       minOccurs="0"/>
+      <xsd:element name="revisionView"               type="CT_TrackChangesView" minOccurs="0"/>
+      <xsd:element name="trackRevisions"             type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="doNotTrackMoves"            type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="doNotTrackFormatting"       type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="documentProtection"         type="CT_DocProtect"      minOccurs="0"/>
+      <xsd:element name="autoFormatOverride"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="styleLockTheme"             type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="styleLockQFSet"             type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="defaultTabStop"             type="CT_TwipsMeasure"    minOccurs="0"/>
+      <xsd:element name="autoHyphenation"            type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="consecutiveHyphenLimit"     type="CT_DecimalNumber"   minOccurs="0"/>
+      <xsd:element name="hyphenationZone"            type="CT_TwipsMeasure"    minOccurs="0"/>
+      <xsd:element name="doNotHyphenateCaps"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="showEnvelope"               type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="summaryLength"              type="CT_DecimalNumberOrPrecent" minOccurs="0"/>
+      <xsd:element name="clickAndTypeStyle"          type="CT_String"          minOccurs="0"/>
+      <xsd:element name="defaultTableStyle"          type="CT_String"          minOccurs="0"/>
+      <xsd:element name="evenAndOddHeaders"          type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="bookFoldRevPrinting"        type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="bookFoldPrinting"           type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="bookFoldPrintingSheets"      type="CT_DecimalNumber"   minOccurs="0"/>
+      <xsd:element name="drawingGridHorizontalSpacing"        type="CT_TwipsMeasure"  minOccurs="0"/>
+      <xsd:element name="drawingGridVerticalSpacing"          type="CT_TwipsMeasure"  minOccurs="0"/>
+      <xsd:element name="displayHorizontalDrawingGridEvery"   type="CT_DecimalNumber" minOccurs="0"/>
+      <xsd:element name="displayVerticalDrawingGridEvery"     type="CT_DecimalNumber" minOccurs="0"/>
+      <xsd:element name="doNotUseMarginsForDrawingGridOrigin" type="CT_OnOff"         minOccurs="0"/>
+      <xsd:element name="drawingGridHorizontalOrigin"         type="CT_TwipsMeasure"  minOccurs="0"/>
+      <xsd:element name="drawingGridVerticalOrigin"  type="CT_TwipsMeasure"    minOccurs="0"/>
+      <xsd:element name="doNotShadeFormData"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="noPunctuationKerning"       type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="characterSpacingControl"    type="CT_CharacterSpacing" minOccurs="0"/>
+      <xsd:element name="printTwoOnOne"              type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="strictFirstAndLastChars"    type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="noLineBreaksAfter"          type="CT_Kinsoku"         minOccurs="0"/>
+      <xsd:element name="noLineBreaksBefore"         type="CT_Kinsoku"         minOccurs="0"/>
+      <xsd:element name="savePreviewPicture"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="doNotValidateAgainstSchema" type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="saveInvalidXml"             type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="ignoreMixedContent"         type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="alwaysShowPlaceholderText"  type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="doNotDemarcateInvalidXml"   type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="saveXmlDataOnly"            type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="useXSLTWhenSaving"          type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="saveThroughXslt"            type="CT_SaveThroughXslt" minOccurs="0"/>
+      <xsd:element name="showXMLTags"                type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="alwaysMergeEmptyNamespace"  type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="updateFields"               type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="hdrShapeDefaults"           type="CT_ShapeDefaults"   minOccurs="0"/>
+      <xsd:element name="footnotePr"                 type="CT_FtnDocProps"     minOccurs="0"/>
+      <xsd:element name="endnotePr"                  type="CT_EdnDocProps"     minOccurs="0"/>
+      <xsd:element name="compat"                     type="CT_Compat"          minOccurs="0"/>
+      <xsd:element name="docVars"                    type="CT_DocVars"         minOccurs="0"/>
+      <xsd:element name="rsids"                      type="CT_DocRsids"        minOccurs="0"/>
+      <xsd:element  ref="m:mathPr"                                             minOccurs="0"/>
+      <xsd:element name="attachedSchema"             type="CT_String"          minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="themeFontLang"              type="CT_Language"        minOccurs="0"/>
+      <xsd:element name="clrSchemeMapping"           type="CT_ColorSchemeMapping" minOccurs="0"/>
+      <xsd:element name="doNotIncludeSubdocsInStats" type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="doNotAutoCompressPictures"  type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="forceUpgrade"               type="CT_Empty"           minOccurs="0"/>
+      <xsd:element name="captions"                   type="CT_Captions"        minOccurs="0"/>
+      <xsd:element name="readModeInkLockDown"        type="CT_ReadingModeInkLockDown" minOccurs="0"/>
+      <xsd:element name="smartTagType"               type="CT_SmartTagType"    minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element  ref="sl:schemaLibrary"                                     minOccurs="0"/>
+      <xsd:element name="shapeDefaults"              type="CT_ShapeDefaults"   minOccurs="0"/>
+      <xsd:element name="doNotEmbedSmartTags"        type="CT_OnOff"           minOccurs="0"/>
+      <xsd:element name="decimalSymbol"              type="CT_String"          minOccurs="0"/>
+      <xsd:element name="listSeparator"              type="CT_String"          minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
diff --git a/docs/dev/analysis/index.rst b/docs/dev/analysis/index.rst
index e5546ca29..9a8201afc 100644
--- a/docs/dev/analysis/index.rst
+++ b/docs/dev/analysis/index.rst
@@ -10,6 +10,7 @@ Feature Analysis
 .. toctree::
    :titlesonly:
 
+   features/settings
    features/text/index
    features/table/index
    features/styles/index

From 4f0c32289726f02e4dabd2d35305892d19ebef81 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 20:21:18 -0700
Subject: [PATCH 108/367] acpt: add scenarios for Document.settings

---
 docx/settings.py                              |  20 ++++++++++
 features/doc-settings.feature                 |  15 ++++++++
 features/doc-styles.feature                   |   2 -
 features/steps/settings.py                    |  36 ++++++++++++++++++
 .../test_files/set-no-settings-part.docx      | Bin 0 -> 10760 bytes
 5 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 docx/settings.py
 create mode 100644 features/doc-settings.feature
 create mode 100644 features/steps/settings.py
 create mode 100644 features/steps/test_files/set-no-settings-part.docx

diff --git a/docx/settings.py b/docx/settings.py
new file mode 100644
index 000000000..737146697
--- /dev/null
+++ b/docx/settings.py
@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+"""
+Settings object, providing access to document-level settings.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from .shared import ElementProxy
+
+
+class Settings(ElementProxy):
+    """
+    Provides access to document-level settings for a document. Accessed using
+    the :attr:`.Document.settings` property.
+    """
+
+    __slots__ = ()
diff --git a/features/doc-settings.feature b/features/doc-settings.feature
new file mode 100644
index 000000000..41fb0a622
--- /dev/null
+++ b/features/doc-settings.feature
@@ -0,0 +1,15 @@
+Feature: Access to document settings
+  In order to operate on document-level settings
+  As a developer using python-docx
+  I access to settings stored in the settings part
+
+
+  @wip
+  Scenario Outline: Access document settings
+    Given a document having <a-or-no> settings part
+     Then document.settings is a Settings object
+
+    Examples: having a settings part or not
+      | a-or-no   |
+      | a         |
+      | no        |
diff --git a/features/doc-styles.feature b/features/doc-styles.feature
index f08b64209..202a3a105 100644
--- a/features/doc-styles.feature
+++ b/features/doc-styles.feature
@@ -15,5 +15,3 @@ Feature: Access a document style
       | styles-state   | style-count |
       | a styles part  |      6      |
       | no styles part |      4      |
-
-
diff --git a/features/steps/settings.py b/features/steps/settings.py
new file mode 100644
index 000000000..b818487b5
--- /dev/null
+++ b/features/steps/settings.py
@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+"""
+Step implementations for document settings-related features
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from behave import given, then
+
+from docx import Document
+from docx.settings import Settings
+
+from helpers import test_docx
+
+
+# given ====================================================
+
+@given('a document having a settings part')
+def given_a_document_having_a_settings_part(context):
+    context.document = Document(test_docx('doc-word-default-blank'))
+
+
+@given('a document having no settings part')
+def given_a_document_having_no_settings_part(context):
+    context.document = Document(test_docx('set-no-settings-part'))
+
+
+# then =====================================================
+
+@then('document.settings is a Settings object')
+def then_document_settings_is_a_Settings_object(context):
+    document = context.document
+    assert type(document.settings) is Settings
diff --git a/features/steps/test_files/set-no-settings-part.docx b/features/steps/test_files/set-no-settings-part.docx
new file mode 100644
index 0000000000000000000000000000000000000000..49303cf8487907b8b422b6280c7f63d82b38e19b
GIT binary patch
literal 10760
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

literal 0
HcmV?d00001


From 3805d702566c2b3f5c01c576ac8eec99e7d01afc Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 20:31:01 -0700
Subject: [PATCH 109/367] doc: add Document.settings

---
 docx/document.py       |  8 ++++++++
 docx/parts/document.py |  8 ++++++++
 tests/test_document.py | 15 +++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/docx/document.py b/docx/document.py
index 655a70e95..ba94a7990 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -149,6 +149,14 @@ def sections(self):
         """
         return Sections(self._element)
 
+    @property
+    def settings(self):
+        """
+        A |Settings| object providing access to the document-level settings
+        for this document.
+        """
+        return self._part.settings
+
     @property
     def styles(self):
         """
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 2225da130..0a5ea7407 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -127,6 +127,14 @@ def save(self, path_or_stream):
         """
         self.package.save(path_or_stream)
 
+    @property
+    def settings(self):
+        """
+        A |Settings| object providing access to the settings in the settings
+        part of this document.
+        """
+        raise NotImplementedError
+
     @property
     def styles(self):
         """
diff --git a/tests/test_document.py b/tests/test_document.py
index fa37725d1..c1cb060ec 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -16,6 +16,7 @@
 from docx.opc.coreprops import CoreProperties
 from docx.parts.document import DocumentPart
 from docx.section import Section, Sections
+from docx.settings import Settings
 from docx.shape import InlineShape, InlineShapes
 from docx.shared import Length
 from docx.styles.styles import Styles
@@ -107,6 +108,10 @@ def it_provides_access_to_its_sections(self, sections_fixture):
         Sections_.assert_called_once_with(document._element)
         assert sections is sections_
 
+    def it_provides_access_to_its_settings(self, settings_fixture):
+        document, settings_ = settings_fixture
+        assert document.settings is settings_
+
     def it_provides_access_to_its_styles(self, styles_fixture):
         document, styles_ = styles_fixture
         assert document.styles is styles_
@@ -253,6 +258,12 @@ def sections_fixture(self, Sections_, sections_):
         Sections_.return_value = sections_
         return document, Sections_, sections_
 
+    @pytest.fixture
+    def settings_fixture(self, document_part_, settings_):
+        document = Document(None, document_part_)
+        document_part_.settings = settings_
+        return document, settings_
+
     @pytest.fixture
     def styles_fixture(self, document_part_, styles_):
         document = Document(None, document_part_)
@@ -335,6 +346,10 @@ def sections_(self, request):
     def sections_prop_(self, request):
         return property_mock(request, Document, 'sections')
 
+    @pytest.fixture
+    def settings_(self, request):
+        return instance_mock(request, Settings)
+
     @pytest.fixture
     def styles_(self, request):
         return instance_mock(request, Styles)

From c729d2b96eef2f907228b336d5dddf7b365732d6 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 20:45:34 -0700
Subject: [PATCH 110/367] doc: add DocumentPart.settings

---
 docx/parts/document.py       | 11 ++++++++++-
 docx/parts/settings.py       | 24 ++++++++++++++++++++++++
 tests/parts/test_document.py | 27 +++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 docx/parts/settings.py

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 0a5ea7407..11e670d96 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -133,7 +133,7 @@ def settings(self):
         A |Settings| object providing access to the settings in the settings
         part of this document.
         """
-        raise NotImplementedError
+        return self._settings_part.settings
 
     @property
     def styles(self):
@@ -143,6 +143,15 @@ def styles(self):
         """
         return self._styles_part.styles
 
+    @property
+    def _settings_part(self):
+        """
+        A |SettingsPart| object providing access to the document-level
+        settings for this document. Creates a default settings part if one is
+        not present.
+        """
+        raise NotImplementedError
+
     @property
     def _styles_part(self):
         """
diff --git a/docx/parts/settings.py b/docx/parts/settings.py
new file mode 100644
index 000000000..7e5e9f049
--- /dev/null
+++ b/docx/parts/settings.py
@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+"""
+|SettingsPart| and closely related objects
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from ..opc.part import XmlPart
+
+
+class SettingsPart(XmlPart):
+    """
+    Document-level settings part of a WordprocessingML (WML) package.
+    """
+    @property
+    def settings(self):
+        """
+        A |Settings| proxy object for the `w:settings` element in this part,
+        containing the document-level settings for this document.
+        """
+        raise NotImplementedError
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 01b9b3699..671af2539 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -15,7 +15,9 @@
 from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
+from docx.parts.settings import SettingsPart
 from docx.parts.styles import StylesPart
+from docx.settings import Settings
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
 from docx.text.paragraph import Paragraph
@@ -45,6 +47,11 @@ def it_can_get_or_add_an_image(self, get_image_fixture):
         document_part.relate_to.assert_called_once_with(image_part_, RT.IMAGE)
         assert (rId, image) == (rId_, image_)
 
+    def it_provides_access_to_the_document_settings(self, settings_fixture):
+        document_part, settings_ = settings_fixture
+        settings = document_part.settings
+        assert settings is settings_
+
     def it_provides_access_to_the_document_styles(self, styles_fixture):
         document_part, styles_ = styles_fixture
         styles = document_part.styles
@@ -217,6 +224,14 @@ def save_fixture(self, package_):
         file_ = 'foobar.docx'
         return document_part, file_
 
+    @pytest.fixture
+    def settings_fixture(self, _settings_part_prop_, settings_part_,
+                         settings_):
+        document_part = DocumentPart(None, None, None, None)
+        _settings_part_prop_.return_value = settings_part_
+        settings_part_.settings = settings_
+        return document_part, settings_
+
     @pytest.fixture
     def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
         document_part = DocumentPart(None, None, None, None)
@@ -289,6 +304,18 @@ def part_related_by_(self, request):
     def relate_to_(self, request):
         return method_mock(request, DocumentPart, 'relate_to')
 
+    @pytest.fixture
+    def settings_(self, request):
+        return instance_mock(request, Settings)
+
+    @pytest.fixture
+    def settings_part_(self, request):
+        return instance_mock(request, SettingsPart)
+
+    @pytest.fixture
+    def _settings_part_prop_(self, request):
+        return property_mock(request, DocumentPart, '_settings_part')
+
     @pytest.fixture
     def style_(self, request):
         return instance_mock(request, BaseStyle)

From 6a8d20791bd18c0c7d76dfb387c2b12d69f6c5f3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 21:02:38 -0700
Subject: [PATCH 111/367] doc: add DocumentPart._settings_part

---
 docx/parts/document.py       |  8 +++++++-
 docx/parts/settings.py       |  8 ++++++++
 tests/parts/test_document.py | 39 ++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 11e670d96..7a23e9a5e 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -15,6 +15,7 @@
 from ..oxml.shape import CT_Inline
 from ..shape import InlineShapes
 from ..shared import lazyproperty
+from .settings import SettingsPart
 from .styles import StylesPart
 
 
@@ -150,7 +151,12 @@ def _settings_part(self):
         settings for this document. Creates a default settings part if one is
         not present.
         """
-        raise NotImplementedError
+        try:
+            return self.part_related_by(RT.SETTINGS)
+        except KeyError:
+            settings_part = SettingsPart.default(self.package)
+            self.relate_to(settings_part, RT.SETTINGS)
+            return settings_part
 
     @property
     def _styles_part(self):
diff --git a/docx/parts/settings.py b/docx/parts/settings.py
index 7e5e9f049..b1c3e80c8 100644
--- a/docx/parts/settings.py
+++ b/docx/parts/settings.py
@@ -15,6 +15,14 @@ class SettingsPart(XmlPart):
     """
     Document-level settings part of a WordprocessingML (WML) package.
     """
+    @classmethod
+    def default(cls, package):
+        """
+        Return a newly created settings part, containing a default
+        `w:settings` element tree.
+        """
+        raise NotImplementedError
+
     @property
     def settings(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 671af2539..2e36d51e7 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -117,6 +117,26 @@ def it_can_get_the_id_of_a_style(self, get_style_id_fixture):
         )
         assert style_id is style_id_
 
+    def it_provides_access_to_its_settings_part_to_help(
+            self, settings_part_get_fixture):
+        document_part, settings_part_ = settings_part_get_fixture
+        settings_part = document_part._settings_part
+        document_part.part_related_by.assert_called_once_with(RT.SETTINGS)
+        assert settings_part is settings_part_
+
+    def it_creates_default_settings_part_if_not_present_to_help(
+            self, settings_part_create_fixture):
+        document_part, SettingsPart_, settings_part_ = (
+            settings_part_create_fixture
+        )
+        settings_part = document_part._settings_part
+
+        SettingsPart_.default.assert_called_once_with(document_part.package)
+        document_part.relate_to.assert_called_once_with(
+            settings_part_, RT.SETTINGS
+        )
+        assert settings_part is settings_part_
+
     def it_provides_access_to_its_styles_part_to_help(
             self, styles_part_get_fixture):
         document_part, styles_part_ = styles_part_get_fixture
@@ -232,6 +252,21 @@ def settings_fixture(self, _settings_part_prop_, settings_part_,
         settings_part_.settings = settings_
         return document_part, settings_
 
+    @pytest.fixture
+    def settings_part_create_fixture(
+            self, package_, part_related_by_, SettingsPart_, settings_part_,
+            relate_to_):
+        document_part = DocumentPart(None, None, None, package_)
+        part_related_by_.side_effect = KeyError
+        SettingsPart_.default.return_value = settings_part_
+        return document_part, SettingsPart_, settings_part_
+
+    @pytest.fixture
+    def settings_part_get_fixture(self, part_related_by_, settings_part_):
+        document_part = DocumentPart(None, None, None, None)
+        part_related_by_.return_value = settings_part_
+        return document_part, settings_part_
+
     @pytest.fixture
     def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
         document_part = DocumentPart(None, None, None, None)
@@ -304,6 +339,10 @@ def part_related_by_(self, request):
     def relate_to_(self, request):
         return method_mock(request, DocumentPart, 'relate_to')
 
+    @pytest.fixture
+    def SettingsPart_(self, request):
+        return class_mock(request, 'docx.parts.document.SettingsPart')
+
     @pytest.fixture
     def settings_(self, request):
         return instance_mock(request, Settings)

From 72167b7ea904a5b157de0f9c52e1aaaa74150d17 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 21:31:26 -0700
Subject: [PATCH 112/367] set: add SettingsPart.settings

---
 docx/parts/settings.py       |  3 ++-
 tests/parts/test_settings.py | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 tests/parts/test_settings.py

diff --git a/docx/parts/settings.py b/docx/parts/settings.py
index b1c3e80c8..cf7b026f2 100644
--- a/docx/parts/settings.py
+++ b/docx/parts/settings.py
@@ -9,6 +9,7 @@
 )
 
 from ..opc.part import XmlPart
+from ..settings import Settings
 
 
 class SettingsPart(XmlPart):
@@ -29,4 +30,4 @@ def settings(self):
         A |Settings| proxy object for the `w:settings` element in this part,
         containing the document-level settings for this document.
         """
-        raise NotImplementedError
+        return Settings(self.element)
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
new file mode 100644
index 000000000..3d516a5f5
--- /dev/null
+++ b/tests/parts/test_settings.py
@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+"""
+Test suite for the docx.parts.settings module
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+import pytest
+
+from docx.parts.settings import SettingsPart
+from docx.settings import Settings
+
+from ..unitutil.cxml import element
+from ..unitutil.mock import class_mock, instance_mock
+
+
+class DescribeSettingsPart(object):
+
+    def it_provides_access_to_its_settings(self, settings_fixture):
+        settings_part, Settings_, settings_ = settings_fixture
+        settings = settings_part.settings
+        Settings_.assert_called_once_with(settings_part.element)
+        assert settings is settings_
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def settings_fixture(self, Settings_, settings_):
+        settings_elm = element('w:settings')
+        settings_part = SettingsPart(None, None, settings_elm, None)
+        return settings_part, Settings_, settings_
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def Settings_(self, request, settings_):
+        return class_mock(
+            request, 'docx.parts.settings.Settings', return_value=settings_
+        )
+
+    @pytest.fixture
+    def settings_(self, request):
+        return instance_mock(request, Settings)

From f60fddd0f44da34ffe5312ee9f7d12dc4417ab61 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 21:51:15 -0700
Subject: [PATCH 113/367] set: configure loader for SettingsPart

---
 docx/__init__.py             |  2 ++
 tests/parts/test_settings.py | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/docx/__init__.py b/docx/__init__.py
index 1bf421391..7dadb58e7 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -14,6 +14,7 @@
 from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
+from docx.parts.settings import SettingsPart
 from docx.parts.styles import StylesPart
 
 
@@ -27,6 +28,7 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_type_for[CT.OPC_CORE_PROPERTIES] = CorePropertiesPart
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
 PartFactory.part_type_for[CT.WML_NUMBERING] = NumberingPart
+PartFactory.part_type_for[CT.WML_SETTINGS] = SettingsPart
 PartFactory.part_type_for[CT.WML_STYLES] = StylesPart
 
 del (
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index 3d516a5f5..e8b6566e4 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -10,15 +10,26 @@
 
 import pytest
 
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.part import PartFactory
+from docx.package import Package
 from docx.parts.settings import SettingsPart
 from docx.settings import Settings
 
 from ..unitutil.cxml import element
-from ..unitutil.mock import class_mock, instance_mock
+from ..unitutil.mock import class_mock, instance_mock, method_mock
 
 
 class DescribeSettingsPart(object):
 
+    def it_is_used_by_loader_to_construct_settings_part(self, load_fixture):
+        partname, content_type, blob, package_, settings_part_ = load_fixture
+        part = PartFactory(partname, content_type, None, blob, package_)
+        SettingsPart.load.assert_called_once_with(
+            partname, content_type, blob, package_
+        )
+        assert part is settings_part_
+
     def it_provides_access_to_its_settings(self, settings_fixture):
         settings_part, Settings_, settings_ = settings_fixture
         settings = settings_part.settings
@@ -27,6 +38,13 @@ def it_provides_access_to_its_settings(self, settings_fixture):
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture
+    def load_fixture(self, load_, package_, settings_part_):
+        partname, blob = 'partname', 'blob'
+        content_type = CT.WML_SETTINGS
+        load_.return_value = settings_part_
+        return partname, content_type, blob, package_, settings_part_
+
     @pytest.fixture
     def settings_fixture(self, Settings_, settings_):
         settings_elm = element('w:settings')
@@ -35,6 +53,14 @@ def settings_fixture(self, Settings_, settings_):
 
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def load_(self, request):
+        return method_mock(request, SettingsPart, 'load')
+
+    @pytest.fixture
+    def package_(self, request):
+        return instance_mock(request, Package)
+
     @pytest.fixture
     def Settings_(self, request, settings_):
         return class_mock(
@@ -44,3 +70,7 @@ def Settings_(self, request, settings_):
     @pytest.fixture
     def settings_(self, request):
         return instance_mock(request, Settings)
+
+    @pytest.fixture
+    def settings_part_(self, request):
+        return instance_mock(request, SettingsPart)

From 6fbda3524bfdfe69d545d29754bee82038851743 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 22:07:34 -0700
Subject: [PATCH 114/367] set: add SettingsPart.default()

---
 docx/parts/settings.py              | 23 ++++++++++++++++++++++-
 docx/templates/default-settings.xml | 26 ++++++++++++++++++++++++++
 features/doc-settings.feature       |  1 -
 tests/parts/test_settings.py        | 10 ++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 docx/templates/default-settings.xml

diff --git a/docx/parts/settings.py b/docx/parts/settings.py
index cf7b026f2..a701b1726 100644
--- a/docx/parts/settings.py
+++ b/docx/parts/settings.py
@@ -8,7 +8,12 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+import os
+
+from ..opc.constants import CONTENT_TYPE as CT
+from ..opc.packuri import PackURI
 from ..opc.part import XmlPart
+from ..oxml import parse_xml
 from ..settings import Settings
 
 
@@ -22,7 +27,10 @@ def default(cls, package):
         Return a newly created settings part, containing a default
         `w:settings` element tree.
         """
-        raise NotImplementedError
+        partname = PackURI('/word/settings.xml')
+        content_type = CT.WML_SETTINGS
+        element = parse_xml(cls._default_settings_xml())
+        return cls(partname, content_type, element, package)
 
     @property
     def settings(self):
@@ -31,3 +39,16 @@ def settings(self):
         containing the document-level settings for this document.
         """
         return Settings(self.element)
+
+    @classmethod
+    def _default_settings_xml(cls):
+        """
+        Return a bytestream containing XML for a default settings part.
+        """
+        path = os.path.join(
+            os.path.split(__file__)[0], '..', 'templates',
+            'default-settings.xml'
+        )
+        with open(path, 'rb') as f:
+            xml_bytes = f.read()
+        return xml_bytes
diff --git a/docx/templates/default-settings.xml b/docx/templates/default-settings.xml
new file mode 100644
index 000000000..fda1adef7
--- /dev/null
+++ b/docx/templates/default-settings.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:settings
+    xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
+    xmlns:mc="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:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
+    xmlns:v="urn:schemas-microsoft-com:vml"
+    xmlns:w10="urn:schemas-microsoft-com:office:word"
+    xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
+    xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+    mc:Ignorable="w14"
+    >
+  <w:defaultTabStop w:val="720"/>
+  <w:characterSpacingControl w:val="doNotCompress"/>
+  <w:savePreviewPicture/>
+  <w:compat>
+    <w:useFELayout/>
+    <w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="14"/>
+    <w:compatSetting w:name="overrideTableStyleFontSizeAndJustification" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="enableOpenTypeFeatures" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="doNotFlipMirrorIndents" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+  </w:compat>
+  <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
+  <w:doNotAutoCompressPictures/>
+</w:settings>
diff --git a/features/doc-settings.feature b/features/doc-settings.feature
index 41fb0a622..612dfcc19 100644
--- a/features/doc-settings.feature
+++ b/features/doc-settings.feature
@@ -4,7 +4,6 @@ Feature: Access to document settings
   I access to settings stored in the settings part
 
 
-  @wip
   Scenario Outline: Access document settings
     Given a document having <a-or-no> settings part
      Then document.settings is a Settings object
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index e8b6566e4..b870a3e72 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -11,6 +11,7 @@
 import pytest
 
 from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.package import OpcPackage
 from docx.opc.part import PartFactory
 from docx.package import Package
 from docx.parts.settings import SettingsPart
@@ -36,6 +37,15 @@ def it_provides_access_to_its_settings(self, settings_fixture):
         Settings_.assert_called_once_with(settings_part.element)
         assert settings is settings_
 
+    def it_constructs_a_default_settings_part_to_help(self):
+        package = OpcPackage()
+        settings_part = SettingsPart.default(package)
+        assert isinstance(settings_part, SettingsPart)
+        assert settings_part.partname == '/word/settings.xml'
+        assert settings_part.content_type == CT.WML_SETTINGS
+        assert settings_part.package is package
+        assert len(settings_part.element) == 6
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture

From 5f440f8da734aa1ff896f057bb2ba32f9e28eafc Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sun, 15 Mar 2015 22:40:56 -0700
Subject: [PATCH 115/367] docs: add API documentation for Settings object

---
 docs/api/settings.rst | 13 +++++++++++++
 docs/index.rst        |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 docs/api/settings.rst

diff --git a/docs/api/settings.rst b/docs/api/settings.rst
new file mode 100644
index 000000000..509b925b5
--- /dev/null
+++ b/docs/api/settings.rst
@@ -0,0 +1,13 @@
+
+.. _settings_api:
+
+Document |Settings| objects
+---------------------------
+
+.. currentmodule:: docx.settings
+
+.. autoclass:: Settings()
+   :members:
+   :inherited-members:
+   :exclude-members:
+       part
diff --git a/docs/index.rst b/docs/index.rst
index eb922f510..a3432a514 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -83,6 +83,7 @@ API Documentation
    :maxdepth: 2
 
    api/document
+   api/settings
    api/style
    api/text
    api/table

From 46cd9ab096bc8e0f7e2ef27f24de4daa90b490b6 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Sat, 13 Feb 2016 01:12:44 -0800
Subject: [PATCH 116/367] docs: document Font.highlight_color analysis

---
 .../features/text/font-highlight-color.rst    | 177 ++++++++++++++++++
 docs/dev/analysis/features/text/index.rst     |   1 +
 2 files changed, 178 insertions(+)
 create mode 100644 docs/dev/analysis/features/text/font-highlight-color.rst

diff --git a/docs/dev/analysis/features/text/font-highlight-color.rst b/docs/dev/analysis/features/text/font-highlight-color.rst
new file mode 100644
index 000000000..81dc1acc5
--- /dev/null
+++ b/docs/dev/analysis/features/text/font-highlight-color.rst
@@ -0,0 +1,177 @@
+
+Font highlight color
+====================
+
+Text in a Word document can be "highlighted" with a number of colors,
+providing text background color. The visual effect is similar to that
+produced using a highlighter (often fluorescent yellow) on a printed page.
+
+
+Protocol
+--------
+
+Text is highlighted by assigning a member of `WD_COLOR_INDEX` to
+`Font.highlight_color`.
+
+    >>> font = paragraph.add_run().font
+    >>> font.highlight_color
+    None
+    >>> font.highlight_color = WD_COLOR_INDEX.YELLOW
+    >>> font.highlight_color
+    YELLOW (7)
+    >>> font.highlight_color = WD_COLOR_INDEX.TURQUOISE
+    >>> font.highlight_color
+    TURQUOISE (3)
+    >>> font.highlight_color = None
+    >>> font.highlight_color
+    None
+
+
+Enumerations
+------------
+
+* `WdColorIndex Enumeration on MSDN`_
+
+.. _WdColorIndex Enumeration on MSDN: https://msdn.microsoft.com/EN-US/library/office/ff195343.aspx
+
+
+XML Semantics
+-------------
+
+Mapping of `WD_COLOR_INDEX` members to `ST_Highlight` values::
+
+    AUTO = 'default'
+    BLACK = 'black'
+    BLUE = 'blue'
+    BRIGHTGREEN = 'green'
+    DARKBLUE = 'darkBlue'
+    DARKRED = 'darkRed'
+    DARKYELLOW = 'darkYellow'
+    GRAY25 = 'lightGray'
+    GRAY50 = 'darkGray'
+    GREEN = 'darkGreen'
+    PINK = 'magenta'
+    RED = 'red'
+    TEAL = 'darkCyan'
+    TURQUOISE = 'cyan'
+    VOILET = 'darkMagenta'
+    WHITE = 'white'
+    YELLOW = 'yellow'
+
+
+Specimen XML
+------------
+
+.. highlight:: xml
+
+Baseline run::
+
+  <w:r>
+    <w:t>Black text on white background</w:t>
+  </w:r>
+
+Blue text, Bright Green Highlight::
+
+  <w:r>
+    <w:rPr>
+      <w:highlight w:val="green"/>
+    </w:rPr>
+    <w:t>Blue text on bright green background</w:t>
+  </w:r>
+
+Red text, Green Highlight::
+
+  <w:r>
+    <w:rPr>
+      <w:highlight w:val="darkGreen"/>
+    </w:rPr>
+    <w:t>Red text on green background</w:t>
+  </w:r>
+
+
+Schema excerpt
+--------------
+
+.. highlight:: xml
+
+According to the schema, run properties may appear in any order and may
+appear multiple times each. Not sure what the semantics of that would be or
+why one would want to do it, but something to note. Word seems to place them
+in the order below when it writes the file.::
+
+  <xsd:complexType name="CT_RPr">  <!-- denormalized -->
+    <xsd:sequence>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="rStyle"          type="CT_String"/>
+        <xsd:element name="rFonts"          type="CT_Fonts"/>
+        <xsd:element name="b"               type="CT_OnOff"/>
+        <xsd:element name="bCs"             type="CT_OnOff"/>
+        <xsd:element name="i"               type="CT_OnOff"/>
+        <xsd:element name="iCs"             type="CT_OnOff"/>
+        <xsd:element name="caps"            type="CT_OnOff"/>
+        <xsd:element name="smallCaps"       type="CT_OnOff"/>
+        <xsd:element name="strike"          type="CT_OnOff"/>
+        <xsd:element name="dstrike"         type="CT_OnOff"/>
+        <xsd:element name="outline"         type="CT_OnOff"/>
+        <xsd:element name="shadow"          type="CT_OnOff"/>
+        <xsd:element name="emboss"          type="CT_OnOff"/>
+        <xsd:element name="imprint"         type="CT_OnOff"/>
+        <xsd:element name="noProof"         type="CT_OnOff"/>
+        <xsd:element name="snapToGrid"      type="CT_OnOff"/>
+        <xsd:element name="vanish"          type="CT_OnOff"/>
+        <xsd:element name="webHidden"       type="CT_OnOff"/>
+        <xsd:element name="color"           type="CT_Color"/>
+        <xsd:element name="spacing"         type="CT_SignedTwipsMeasure"/>
+        <xsd:element name="w"               type="CT_TextScale"/>
+        <xsd:element name="kern"            type="CT_HpsMeasure"/>
+        <xsd:element name="position"        type="CT_SignedHpsMeasure"/>
+        <xsd:element name="sz"              type="CT_HpsMeasure"/>
+        <xsd:element name="szCs"            type="CT_HpsMeasure"/>
+        <xsd:element name="highlight"       type="CT_Highlight"/>
+        <xsd:element name="u"               type="CT_Underline"/>
+        <xsd:element name="effect"          type="CT_TextEffect"/>
+        <xsd:element name="bdr"             type="CT_Border"/>
+        <xsd:element name="shd"             type="CT_Shd"/>
+        <xsd:element name="fitText"         type="CT_FitText"/>
+        <xsd:element name="vertAlign"       type="CT_VerticalAlignRun"/>
+        <xsd:element name="rtl"             type="CT_OnOff"/>
+        <xsd:element name="cs"              type="CT_OnOff"/>
+        <xsd:element name="em"              type="CT_Em"/>
+        <xsd:element name="lang"            type="CT_Language"/>
+        <xsd:element name="eastAsianLayout" type="CT_EastAsianLayout"/>
+        <xsd:element name="specVanish"      type="CT_OnOff"/>
+        <xsd:element name="oMath"           type="CT_OnOff"/>
+      </xsd:choice>
+      <xsd:element name="rPrChange" type="CT_RPrChange" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:group>
+
+  <!-- complex types -->
+
+  <xsd:complexType name="CT_Highlight">
+    <xsd:attribute name="val" type="ST_Highlight" use="required"/>
+  </xsd:complexType>
+
+  <!-- simple types -->
+
+  <xsd:simpleType name="ST_Highlight">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="default"/>
+      <xsd:enumeration value="black"/>
+      <xsd:enumeration value="blue"/>
+      <xsd:enumeration value="green"/>
+      <xsd:enumeration value="darkBlue"/>
+      <xsd:enumeration value="darkRed"/>
+      <xsd:enumeration value="darkYellow"/>
+      <xsd:enumeration value="lightGray"/>
+      <xsd:enumeration value="darkGray"/>
+      <xsd:enumeration value="darkGreen"/>
+      <xsd:enumeration value="magenta"/>
+      <xsd:enumeration value="red"/>
+      <xsd:enumeration value="darkCyan"/>
+      <xsd:enumeration value="cyan"/>
+      <xsd:enumeration value="darkMagenta"/>
+      <xsd:enumeration value="white"/>
+      <xsd:enumeration value="yellow"/>
+    </xsd:restriction>
+  </xsd:simpleType>
diff --git a/docs/dev/analysis/features/text/index.rst b/docs/dev/analysis/features/text/index.rst
index 1c22dde66..3b7694731 100644
--- a/docs/dev/analysis/features/text/index.rst
+++ b/docs/dev/analysis/features/text/index.rst
@@ -5,6 +5,7 @@ Text
 .. toctree::
    :titlesonly:
 
+   font-highlight-color
    paragraph-format
    font
    font-color

From c25b7f3b3792350e6d50daeaa266ec60c481851c Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Wed, 17 Feb 2016 17:46:37 -0800
Subject: [PATCH 117/367] acpt: add scenarios for Font.highlight_color

---
 docs/api/enum/WdColorIndex.rst                |  60 ++++++++++++++++
 docs/api/enum/index.rst                       |   1 +
 docx/enum/text.py                             |  68 ++++++++++++++++++
 features/steps/font.py                        |  31 +++++++-
 .../test_files/txt-font-highlight-color.docx  | Bin 0 -> 12859 bytes
 features/txt-font-props.feature               |  25 +++++++
 6 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 docs/api/enum/WdColorIndex.rst
 create mode 100644 features/steps/test_files/txt-font-highlight-color.docx

diff --git a/docs/api/enum/WdColorIndex.rst b/docs/api/enum/WdColorIndex.rst
new file mode 100644
index 000000000..77d57e75f
--- /dev/null
+++ b/docs/api/enum/WdColorIndex.rst
@@ -0,0 +1,60 @@
+.. _WdColorIndex:
+
+``WD_COLOR_INDEX``
+==================
+
+Specifies a standard preset color to apply. Used for font highlighting and
+perhaps other applications.
+
+----
+
+AUTO
+    Automatic color. Default; usually black.
+
+BLACK
+    Black color.
+
+BLUE
+    Blue color
+
+BRIGHT_GREEN
+    Bright green color.
+
+DARK_BLUE
+    Dark blue color.
+
+DARK_RED
+    Dark red color.
+
+DARK_YELLOW
+    Dark yellow color.
+
+GRAY_25
+    25% shade of gray color.
+
+GRAY_50
+    50% shade of gray color.
+
+GREEN
+    Green color.
+
+PINK
+    Pink color.
+
+RED
+    Red color.
+
+TEAL
+    Teal color.
+
+TURQUOISE
+    Turquoise color.
+
+VIOLET
+    Violet color.
+
+WHITE
+    White color.
+
+YELLOW
+    Yellow color.
diff --git a/docs/api/enum/index.rst b/docs/api/enum/index.rst
index cd0cba8e1..9c7371dcf 100644
--- a/docs/api/enum/index.rst
+++ b/docs/api/enum/index.rst
@@ -12,6 +12,7 @@ can be found here:
    MsoThemeColorIndex
    WdAlignParagraph
    WdBuiltinStyle
+   WdColorIndex
    WdLineSpacing
    WdOrientation
    WdSectionStart
diff --git a/docx/enum/text.py b/docx/enum/text.py
index 3bb16d308..70b7fd47c 100644
--- a/docx/enum/text.py
+++ b/docx/enum/text.py
@@ -84,6 +84,74 @@ class WD_BREAK_TYPE(object):
 WD_BREAK = WD_BREAK_TYPE
 
 
+class WD_COLOR_INDEX(XmlEnumeration):
+    """
+    Specifies a standard preset color to apply. Used for font highlighting and
+    perhaps other applications.
+    """
+
+    __ms_name__ = 'WdColorIndex'
+
+    __url__ = 'https://msdn.microsoft.com/EN-US/library/office/ff195343.aspx'
+
+    __members__ = (
+        XmlMappedEnumMember(
+            None, None, None, 'Color is inherited from the style hierarchy.'
+        ),
+        XmlMappedEnumMember(
+            'AUTO', 0, 'default', 'Automatic color. Default; usually black.'
+        ),
+        XmlMappedEnumMember(
+            'BLACK', 1, 'black', 'Black color.'
+        ),
+        XmlMappedEnumMember(
+            'BLUE', 2, 'blue', 'Blue color'
+        ),
+        XmlMappedEnumMember(
+            'BRIGHT_GREEN', 4, 'green', 'Bright green color.'
+        ),
+        XmlMappedEnumMember(
+            'DARK_BLUE', 9, 'darkBlue', 'Dark blue color.'
+        ),
+        XmlMappedEnumMember(
+            'DARK_RED', 13, 'darkRed', 'Dark red color.'
+        ),
+        XmlMappedEnumMember(
+            'DARK_YELLOW', 14, 'darkYellow', 'Dark yellow color.'
+        ),
+        XmlMappedEnumMember(
+            'GRAY_25', 16, 'lightGray', '25% shade of gray color.'
+        ),
+        XmlMappedEnumMember(
+            'GRAY_50', 15, 'darkGray', '50% shade of gray color.'
+        ),
+        XmlMappedEnumMember(
+            'GREEN', 11, 'darkGreen', 'Green color.'
+        ),
+        XmlMappedEnumMember(
+            'PINK', 5, 'magenta', 'Pink color.'
+        ),
+        XmlMappedEnumMember(
+            'RED', 6, 'red', 'Red color.'
+        ),
+        XmlMappedEnumMember(
+            'TEAL', 10, 'darkCyan', 'Teal color.'
+        ),
+        XmlMappedEnumMember(
+            'TURQUOISE', 3, 'cyan', 'Turquoise color.'
+        ),
+        XmlMappedEnumMember(
+            'VIOLET', 12, 'darkMagenta', 'Violet color.'
+        ),
+        XmlMappedEnumMember(
+            'WHITE', 8, 'white', 'White color.'
+        ),
+        XmlMappedEnumMember(
+            'YELLOW', 7, 'yellow', 'Yellow color.'
+        ),
+    )
+
+
 class WD_LINE_SPACING(XmlEnumeration):
     """
     Specifies a line spacing format to be applied to a paragraph.
diff --git a/features/steps/font.py b/features/steps/font.py
index 98e01bf69..60f308d86 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -13,7 +13,7 @@
 from docx import Document
 from docx.dml.color import ColorFormat
 from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
-from docx.enum.text import WD_UNDERLINE
+from docx.enum.text import WD_COLOR_INDEX, WD_UNDERLINE
 from docx.shared import RGBColor
 
 from helpers import test_docx
@@ -27,6 +27,17 @@ def given_a_font(context):
     context.font = document.paragraphs[0].runs[0].font
 
 
+@given('a font having {color} highlighting')
+def given_a_font_having_color_highlighting(context, color):
+    paragraph_index = {
+        'no':           0,
+        'yellow':       1,
+        'bright green': 2,
+    }[color]
+    document = Document(test_docx('txt-font-highlight-color'))
+    context.font = document.paragraphs[paragraph_index].runs[0].font
+
+
 @given('a font having {type} color')
 def given_a_font_having_type_color(context, type):
     run_idx = ['no', 'auto', 'an RGB', 'a theme'].index(type)
@@ -94,6 +105,15 @@ def when_I_assign_value_to_font_color_theme_color(context, value):
     font.color.theme_color = new_value
 
 
+@when('I assign {value} to font.highlight_color')
+def when_I_assign_value_to_font_highlight_color(context, value):
+    font = context.font
+    expected_value = (
+        None if value == 'None' else getattr(WD_COLOR_INDEX, value)
+    )
+    font.highlight_color = expected_value
+
+
 @when('I assign {value} to font.name')
 def when_I_assign_value_to_font_name(context, value):
     font = context.font
@@ -170,6 +190,15 @@ def then_font_color_type_is_value(context, value):
     assert font.color.type == expected_value
 
 
+@then('font.highlight_color is {value}')
+def then_font_highlight_color_is_value(context, value):
+    font = context.font
+    expected_value = (
+        None if value == 'None' else getattr(WD_COLOR_INDEX, value)
+    )
+    assert font.highlight_color == expected_value
+
+
 @then('font.name is {value}')
 def then_font_name_is_value(context, value):
     font = context.font
diff --git a/features/steps/test_files/txt-font-highlight-color.docx b/features/steps/test_files/txt-font-highlight-color.docx
new file mode 100644
index 0000000000000000000000000000000000000000..3c406750a5bf50efc6bdb7f37811810d149a80cc
GIT binary patch
literal 12859
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

literal 0
HcmV?d00001

diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
index 32ef19f74..aaa90f2d8 100644
--- a/features/txt-font-props.feature
+++ b/features/txt-font-props.feature
@@ -4,6 +4,31 @@ Feature: Get or set font properties
   I need a set of read/write properties on the Font object
 
 
+  @wip
+  Scenario Outline: Get highlight color
+    Given a font having <color> highlighting 
+     Then font.highlight_color is <value>
+
+    Examples: font.highlight_color values
+      | color           | value        |
+      | no              | None         |
+      | yellow          | YELLOW       |
+      | bright green    | BRIGHT_GREEN |
+
+
+  @wip
+  Scenario Outline: Set highlight color
+    Given a font having <color> highlighting
+     When I assign <value> to font.highlight_color
+     Then font.highlight_color is <value>
+
+    Examples: font.highlight_color values
+      | color           | value        |
+      | no              | YELLOW       |
+      | yellow          | None         |
+      | bright green    | BRIGHT_GREEN |
+      
+      
   Scenario Outline: Get typeface name
     Given a font having typeface name <name>
      Then font.name is <value>

From 85cd8bf7645cbef1fa1aace5a26d6af801a3cb66 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 25 Feb 2016 15:11:56 -0800
Subject: [PATCH 118/367] font: add Font.highlight_color getter

* Also, add `WD_COLOR` alias to `WD_COLOR_INDEX` enumeration.
---
 docs/api/enum/WdColorIndex.rst  |  2 ++
 docx/enum/text.py               |  1 +
 docx/oxml/__init__.py           |  3 ++-
 docx/oxml/text/font.py          | 21 ++++++++++++++++++++-
 docx/text/font.py               | 11 +++++++++++
 features/txt-font-props.feature |  1 -
 tests/text/test_font.py         | 17 ++++++++++++++++-
 7 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/docs/api/enum/WdColorIndex.rst b/docs/api/enum/WdColorIndex.rst
index 77d57e75f..f8adb2d51 100644
--- a/docs/api/enum/WdColorIndex.rst
+++ b/docs/api/enum/WdColorIndex.rst
@@ -3,6 +3,8 @@
 ``WD_COLOR_INDEX``
 ==================
 
+alias: **WD_COLOR**
+
 Specifies a standard preset color to apply. Used for font highlighting and
 perhaps other applications.
 
diff --git a/docx/enum/text.py b/docx/enum/text.py
index 70b7fd47c..97597eed1 100644
--- a/docx/enum/text.py
+++ b/docx/enum/text.py
@@ -84,6 +84,7 @@ class WD_BREAK_TYPE(object):
 WD_BREAK = WD_BREAK_TYPE
 
 
+@alias('WD_COLOR')
 class WD_COLOR_INDEX(XmlEnumeration):
     """
     Specifies a standard preset color to apply. Used for font highlighting and
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index d3b4d9fac..3e320a217 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -146,7 +146,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vMerge',     CT_VMerge)
 
 from .text.font import (
-    CT_Color, CT_Fonts, CT_HpsMeasure, CT_RPr, CT_Underline,
+    CT_Color, CT_Fonts, CT_Highlight, CT_HpsMeasure, CT_RPr, CT_Underline,
     CT_VerticalAlignRun
 )
 register_element_cls('w:b',          CT_OnOff)
@@ -156,6 +156,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:cs',         CT_OnOff)
 register_element_cls('w:dstrike',    CT_OnOff)
 register_element_cls('w:emboss',     CT_OnOff)
+register_element_cls('w:highlight',  CT_Highlight)
 register_element_cls('w:i',          CT_OnOff)
 register_element_cls('w:iCs',        CT_OnOff)
 register_element_cls('w:imprint',    CT_OnOff)
diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
index f92ad0426..c36173b95 100644
--- a/docx/oxml/text/font.py
+++ b/docx/oxml/text/font.py
@@ -6,7 +6,7 @@
 
 from .. import parse_xml
 from ...enum.dml import MSO_THEME_COLOR
-from ...enum.text import WD_UNDERLINE
+from ...enum.text import WD_COLOR, WD_UNDERLINE
 from ..ns import nsdecls, qn
 from ..simpletypes import (
     ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
@@ -34,6 +34,13 @@ class CT_Fonts(BaseOxmlElement):
     hAnsi = OptionalAttribute('w:hAnsi', ST_String)
 
 
+class CT_Highlight(BaseOxmlElement):
+    """
+    `w:highlight` element, specifying font highlighting/background color.
+    """
+    val = RequiredAttribute('w:val', WD_COLOR)
+
+
 class CT_HpsMeasure(BaseOxmlElement):
     """
     Used for ``<w:sz>`` element and others, specifying font size in
@@ -75,6 +82,7 @@ class CT_RPr(BaseOxmlElement):
     webHidden = ZeroOrOne('w:webHidden', successors=_tag_seq[18:])
     color = ZeroOrOne('w:color', successors=_tag_seq[19:])
     sz = ZeroOrOne('w:sz', successors=_tag_seq[24:])
+    highlight = ZeroOrOne('w:highlight', successors=_tag_seq[26:])
     u = ZeroOrOne('w:u', successors=_tag_seq[27:])
     vertAlign = ZeroOrOne('w:vertAlign', successors=_tag_seq[32:])
     rtl = ZeroOrOne('w:rtl', successors=_tag_seq[33:])
@@ -90,6 +98,17 @@ def _new_color(self):
         """
         return parse_xml('<w:color %s w:val="000000"/>' % nsdecls('w'))
 
+    @property
+    def highlight_val(self):
+        """
+        Value of `w:highlight/@val` attribute, specifying a font's highlight
+        color, or `None` if the text is not highlighted.
+        """
+        highlight = self.highlight
+        if highlight is None:
+            return None
+        return highlight.val
+
     @property
     def rFonts_ascii(self):
         """
diff --git a/docx/text/font.py b/docx/text/font.py
index d6dbe2927..532d79542 100644
--- a/docx/text/font.py
+++ b/docx/text/font.py
@@ -125,6 +125,17 @@ def hidden(self):
     def hidden(self, value):
         self._set_bool_prop('vanish', value)
 
+    @property
+    def highlight_color(self):
+        """
+        A member of :ref:`WdColorIndex` indicating the color of highlighting
+        applied, or `None` if no highlighting is applied.
+        """
+        rPr = self._element.rPr
+        if rPr is None:
+            return None
+        return rPr.highlight_val
+
     @property
     def italic(self):
         """
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
index aaa90f2d8..3d5c152fa 100644
--- a/features/txt-font-props.feature
+++ b/features/txt-font-props.feature
@@ -4,7 +4,6 @@ Feature: Get or set font properties
   I need a set of read/write properties on the Font object
 
 
-  @wip
   Scenario Outline: Get highlight color
     Given a font having <color> highlighting 
      Then font.highlight_color is <value>
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index b0d0ccac1..04180d5b3 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -9,7 +9,7 @@
 )
 
 from docx.dml.color import ColorFormat
-from docx.enum.text import WD_UNDERLINE
+from docx.enum.text import WD_COLOR, WD_UNDERLINE
 from docx.shared import Pt
 from docx.text.font import Font
 
@@ -81,6 +81,10 @@ def it_can_change_its_underline_type(self, underline_set_fixture):
         font.underline = underline
         assert font._element.xml == expected_xml
 
+    def it_knows_its_highlight_color(self, highlight_get_fixture):
+        font, expected_value = highlight_get_fixture
+        assert font.highlight_color is expected_value
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -174,6 +178,17 @@ def color_fixture(self, ColorFormat_, color_):
         font = Font(element('w:r'))
         return font, color_, ColorFormat_
 
+    @pytest.fixture(params=[
+        ('w:r',                                  None),
+        ('w:r/w:rPr',                            None),
+        ('w:r/w:rPr/w:highlight{w:val=default}', WD_COLOR.AUTO),
+        ('w:r/w:rPr/w:highlight{w:val=blue}',    WD_COLOR.BLUE),
+    ])
+    def highlight_get_fixture(self, request):
+        r_cxml, expected_value = request.param
+        font = Font(element(r_cxml), None)
+        return font, expected_value
+
     @pytest.fixture(params=[
         ('w:r',                               None),
         ('w:r/w:rPr',                         None),

From 17dce958ee612d13bd942ea2a78f93ff158dec3f Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Mon, 29 Feb 2016 20:43:25 -0800
Subject: [PATCH 119/367] font: add Font.highlight_color setter

---
 docx/oxml/text/font.py          |  8 ++++++++
 docx/text/font.py               |  5 +++++
 features/txt-font-props.feature |  1 -
 tests/text/test_font.py         | 25 +++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
index c36173b95..810ec2b30 100644
--- a/docx/oxml/text/font.py
+++ b/docx/oxml/text/font.py
@@ -109,6 +109,14 @@ def highlight_val(self):
             return None
         return highlight.val
 
+    @highlight_val.setter
+    def highlight_val(self, value):
+        if value is None:
+            self._remove_highlight()
+            return
+        highlight = self.get_or_add_highlight()
+        highlight.val = value
+
     @property
     def rFonts_ascii(self):
         """
diff --git a/docx/text/font.py b/docx/text/font.py
index 532d79542..162832101 100644
--- a/docx/text/font.py
+++ b/docx/text/font.py
@@ -136,6 +136,11 @@ def highlight_color(self):
             return None
         return rPr.highlight_val
 
+    @highlight_color.setter
+    def highlight_color(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.highlight_val = value
+
     @property
     def italic(self):
         """
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
index 3d5c152fa..113ff0778 100644
--- a/features/txt-font-props.feature
+++ b/features/txt-font-props.feature
@@ -15,7 +15,6 @@ Feature: Get or set font properties
       | bright green    | BRIGHT_GREEN |
 
 
-  @wip
   Scenario Outline: Set highlight color
     Given a font having <color> highlighting
      When I assign <value> to font.highlight_color
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index 04180d5b3..52564b12b 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -85,6 +85,11 @@ def it_knows_its_highlight_color(self, highlight_get_fixture):
         font, expected_value = highlight_get_fixture
         assert font.highlight_color is expected_value
 
+    def it_can_change_its_highlight_color(self, highlight_set_fixture):
+        font, highlight_color, expected_xml = highlight_set_fixture
+        font.highlight_color = highlight_color
+        assert font._element.xml == expected_xml
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -189,6 +194,26 @@ def highlight_get_fixture(self, request):
         font = Font(element(r_cxml), None)
         return font, expected_value
 
+    @pytest.fixture(params=[
+        ('w:r',                                 WD_COLOR.AUTO,
+         'w:r/w:rPr/w:highlight{w:val=default}'),
+        ('w:r/w:rPr',                           WD_COLOR.BRIGHT_GREEN,
+         'w:r/w:rPr/w:highlight{w:val=green}'),
+        ('w:r/w:rPr/w:highlight{w:val=green}',  WD_COLOR.YELLOW,
+         'w:r/w:rPr/w:highlight{w:val=yellow}'),
+        ('w:r/w:rPr/w:highlight{w:val=yellow}', None,
+         'w:r/w:rPr'),
+        ('w:r/w:rPr',                           None,
+         'w:r/w:rPr'),
+        ('w:r',                                 None,
+         'w:r/w:rPr'),
+    ])
+    def highlight_set_fixture(self, request):
+        r_cxml, value, expected_cxml = request.param
+        font = Font(element(r_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return font, value, expected_xml
+
     @pytest.fixture(params=[
         ('w:r',                               None),
         ('w:r/w:rPr',                         None),

From 19b16648093f4893bf96d7f4e008f8ea7bbf6231 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 9 Apr 2016 18:26:28 -0700
Subject: [PATCH 120/367] build: add Python 3.5 to tox environments

* behave stopped working with Python 2.6 with v1.2.5, lacking
  a dependency for `importlib`. Fix this by adding it to the tox
  dependencies list.
---
 tox.ini | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 014fd8dda..5e2b58843 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ python_classes = Test Describe
 python_functions = it_ they_
 
 [tox]
-envlist = py26, py27, py33, py34
+envlist = py26, py27, py33, py34, py35
 
 [testenv]
 deps =
@@ -25,6 +25,15 @@ commands =
     py.test -qx
     behave --format progress --stop --tags=-wip
 
+[testenv:py26]
+deps =
+    importlib>=1.0.3
+    behave
+    lxml
+    mock
+    pyparsing
+    pytest
+
 [testenv:py33]
 deps =
     behave

From 61b40b161b64173ab8e362aec1fd197948431beb Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 9 Apr 2016 18:31:57 -0700
Subject: [PATCH 121/367] oxml: don't resolve XML entities in oxml_parser

Resolving entities in the XML is not required by the Open XML standard
and represents a security vulnerability. Turn off entity resolution in
both the opc (package) parser and the part parser.
---
 docx/opc/oxml.py      | 2 +-
 docx/oxml/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docx/opc/oxml.py b/docx/opc/oxml.py
index 0c09312b5..494b31dca 100644
--- a/docx/opc/oxml.py
+++ b/docx/opc/oxml.py
@@ -16,7 +16,7 @@
 
 # configure XML parser
 element_class_lookup = etree.ElementNamespaceClassLookup()
-oxml_parser = etree.XMLParser(remove_blank_text=True)
+oxml_parser = etree.XMLParser(remove_blank_text=True, resolve_entities=False)
 oxml_parser.set_element_class_lookup(element_class_lookup)
 
 nsmap = {
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 3e320a217..a96cfc1b4 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -14,7 +14,7 @@
 
 # configure XML parser
 element_class_lookup = etree.ElementNamespaceClassLookup()
-oxml_parser = etree.XMLParser(remove_blank_text=True)
+oxml_parser = etree.XMLParser(remove_blank_text=True, resolve_entities=False)
 oxml_parser.set_element_class_lookup(element_class_lookup)
 
 

From 27c3888c6464599d054915204e89d0fcc7f3a617 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 9 Apr 2016 18:51:12 -0700
Subject: [PATCH 122/367] oxml: improve CT_Tc._tc XPath expression

Under certain circumstances, the w:tbl parent of a w:tc element is not
returned first in the result sequence. Add a position qualifier such
that only the first ancestor is returned and the return sequence only
contains that single value.
---
 docx/oxml/table.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 30d349373..24d91690e 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -651,7 +651,7 @@ def _tbl(self):
         """
         The tbl element this tc element appears in.
         """
-        return self.xpath('./ancestor::w:tbl')[0]
+        return self.xpath('./ancestor::w:tbl[position()=1]')[0]
 
     @property
     def _tc_above(self):
@@ -675,7 +675,7 @@ def _tr(self):
         """
         The tr element this tc element appears in.
         """
-        return self.xpath('./ancestor::w:tr')[0]
+        return self.xpath('./ancestor::w:tr[position()=1]')[0]
 
     @property
     def _tr_above(self):

From cb572393cf44791d42dc58903be6f2ae35dd7e0e Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Sat, 9 Apr 2016 23:26:02 -0700
Subject: [PATCH 123/367] build: update Makefile to current build process

---
 Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 92abae53d..f335818fe 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,11 @@ help:
 	@echo "Please use \`make <target>' where <target> is one or more of"
 	@echo "  accept    run acceptance tests using behave"
 	@echo "  clean     delete intermediate work product and start fresh"
+	@echo "  cleandocs delete intermediate documentation files"
 	@echo "  coverage  run nosetests with coverage"
 	@echo "  docs      generate documentation"
-	@echo "  readme    update README.html from README.rst"
+	@echo "  opendocs  open browser to local version of documentation"
 	@echo "  register  update metadata (README.rst) on PyPI"
-	@echo "  test      run tests using setup.py"
 	@echo "  sdist     generate a source distribution into dist/"
 	@echo "  upload    upload distribution tarball to PyPI"
 
@@ -33,9 +33,8 @@ coverage:
 docs:
 	$(MAKE) -C docs html
 
-readme:
-	rst2html README.rst >README.html
-	open README.html
+opendocs:
+	open docs/.build/html/index.html
 
 register:
 	$(SETUP) register
@@ -43,8 +42,5 @@ register:
 sdist:
 	$(SETUP) sdist
 
-test:
-	$(SETUP) test
-
 upload:
 	$(SETUP) sdist upload

From 13dd6f0220e266461d17512a1c012d1049c2b6a3 Mon Sep 17 00:00:00 2001
From: eupharis <dan@highwaterlabs.com>
Date: Mon, 4 Apr 2016 11:04:11 -0700
Subject: [PATCH 124/367] docs: document header/footer feature analysis

---
 docs/conf.py                          |   2 +
 docs/dev/analysis/features/header.rst | 263 ++++++++++++++++++++++++++
 docs/dev/analysis/index.rst           |   1 +
 3 files changed, 266 insertions(+)
 create mode 100644 docs/dev/analysis/features/header.rst

diff --git a/docs/conf.py b/docs/conf.py
index 1c642ef6b..7a95370c7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,6 +73,8 @@
 
 .. |BaseStyle| replace:: :class:`.BaseStyle`
 
+.. |BlockItemContainer| replace:: :class:`.BlockItemContainer`
+
 .. |_Body| replace:: :class:`._Body`
 
 .. |_Cell| replace:: :class:`._Cell`
diff --git a/docs/dev/analysis/features/header.rst b/docs/dev/analysis/features/header.rst
new file mode 100644
index 000000000..5eac6f5de
--- /dev/null
+++ b/docs/dev/analysis/features/header.rst
@@ -0,0 +1,263 @@
+.. _header:
+
+Header and Footer
+=================
+
+In a WordprocessingML document, a page header is text that is separated from
+the main body of text and appears at the top of a printed page. The page
+headers in a document are often the same from page to page, with only small
+differences in content, such as a section title or page number. Such a header
+is also known as a running head.
+
+In book-printed documents, where pages are intended to be bound on the long
+edge and presented side-by-side, the header on a right-hand (recto) page is
+often different than that on a left-hand (verso) page. Supporting this
+difference gives rise to the option to have an even-page header that differs
+from the default odd-page header in a document.
+
+A page footer is analogous in every way to a page header except that it
+appears at the bottom of a page. It should not be confused with a footnote,
+which is not uniform between pages. For brevity's sake, the term *header* is
+often used below to refer to what may be either a header or footer object,
+trusting the reader to understand its applicability to both object types.
+
+In WordprocessingML, a header or footer appears within the margin area of
+a page. With a few exceptions, a header or footer may contain all the types
+of content that can appear in the main body, including text and images. Each
+header and footer has access to the styles defined in ``/word/styles.xml``.
+
+Each section has its own set of headers and footers, although a section can
+be configured to "inherit" headers and footers from the prior section. Each
+section can have three header definitions, the default header, even header,
+and first page header. When different even/odd headers are not enabled, the
+default header appears on both even and odd numbered pages. If even/odd
+headers are enabled, the default header is used for odd pages.
+A corresponding set of three footer definitions are also possible. All
+header/footer definitions are optional.
+
+
+Candidate Protocol
+------------------
+
+Every section has a header; it is never None::
+
+    >>> header = section.header
+    >>> header
+    <docx.hdrftr.Header object at 0x02468ACE>
+
+
+There are three header properties on |Section|: `.header`,
+`.even_page_header`, and `.first_page_header`. All header objects share the
+same properties and methods. There are three corresponding properties for the
+footers.
+
+Header is a subclass of |BlockItemContainer|, from which it inherits the same
+content editing capabilities as |Document|, such as `.add_paragraph()`.
+
+If the `w:headerReference` element for a header is not present, the
+definition for that header is "inherited" from the prior section. This action
+is recursive, such that, for example, the header definition from the first
+section could be applied to the third section. A header that inherits its
+definition is said to be "linked to previous". Perhaps counterintuitively,
+a header for the first section can be "linked to previous", even though no
+previous section exists. The `.is_linked_to_previous` property is simply
+a test for the existence of a header definition in the current section::
+
+    >>> header.is_linked_to_previous
+    True
+
+Editing operations transparently operate on the source header, the one in the
+first prior section having a header of that type (when one is not present in
+the current section). If no prior sections have a header, one is created in
+the first section of the document on the first constructive edit call::
+
+    >>> header = document.sections[0].header
+    >>> header.is_linked_to_previous
+    True
+    >>> header.text = 'foobar'
+    >>> header.is_linked_to_previous
+    False
+
+Assigning False to `.is_linked_to_previous` creates a blank header for that
+section when one does not already exist::
+
+    >>> header.is_linked_to_previous
+    True
+    >>> header.is_linked_to_previous = False
+    >>> header.is_linked_to_previous
+    False
+
+Conversely, an existing header is deleted from a section by assigning True to
+`.is_linked_to_previous`::
+
+    >>> header.is_linked_to_previous
+    False
+    >>> header.is_linked_to_previous = True
+    >>> header.is_linked_to_previous
+    True
+
+The document settings object has a read/write
+`.odd_and_even_pages_header_footer` property that indicates verso and recto
+pages will have a different header. An existing even page header definition is
+preserved when `.odd_and_even_pages_header_footer` is False; it is simply not
+rendered by Word. Assigning `True` to `.odd_and_even_pages_header_footer`
+does not automatically create a new even header definition::
+
+    >>> document.settings.odd_and_even_pages_header_footer
+    False
+    >>> document.settings.odd_and_even_pages_header_footer = True
+    >>> section.even_page_header.is_linked_to_previous
+    True
+
+`Section` has a read/write `.different_first_page_header_footer` property
+that indicates whether the first page of the section should have a distinct
+header. Assigning `True` to `.different_first_page_header_footer` does not
+automatically create a new first page header definition::
+
+    >>> section.different_first_page_header_footer
+    False
+    >>> section.different_first_page_header_footer = True
+    >>> section.different_first_page_header_footer
+    True
+    >>> section.first_page_header.is_linked_to_previous
+    True
+
+
+Specimen XML
+------------
+
+.. highlight:: xml
+
+There are seven different permutations of headers:
+
+The same header on all pages of the document::
+
+   <w:sectPr>
+       <w:headerReference w:type="default" r:id="rId3"/>
+       ...
+   </w:sectPr>
+
+
+Only an odd header. The section is exactly the same as above but
+`settings.xml` has the the `<w:evenAndOddHeaders>` property::
+
+   <w:settings xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
+      ...
+      <w:evenAndOddHeaders w:val="1"/>
+      ...
+   </w:settings>
+
+Different even and odd headers::
+
+   <w:sectPr>
+       <w:headerReference w:type="default" r:id="rId3"/>
+       <w:headerReference w:type="even" r:id="rId4"/>
+       ...
+   </w:sectPr>
+
+Distinct first page header, subsequent pages all have the same header::
+
+   <w:sectPr>
+       <w:headerReference w:type="default" r:id="rId3"/>
+       <w:headerReference w:type="first" r:id="rId4"/>
+       <w:titlePg/>
+       ...
+   </w:sectPr>
+
+Distinct first, even, and odd page headers::
+
+   <w:sectPr>
+       <w:headerReference w:type="default" r:id="rId3"/>
+       <w:headerReference w:type="first" r:id="rId4"/>
+       <w:headerReference w:type="even" r:id="rId5"/>
+       <w:titlePg/>
+       ...
+   </w:sectPr>
+
+
+Word Behavior
+-------------
+
+* When you turn off even/odd headers, Word sets the value of
+  `w:evenAndOddHeaders` to 0, but does not actually remove the even header.
+
+* When you turn off first page header, Word sets the value of `w:titlePg` to
+  0, but does not actually remove the even header.
+
+* Word will load a file with an even page header but no odd page header.
+
+
+MS API
+------
+
+.. highlight:: python
+
+WdHeaderFooterIndex Enumeration::
+
+   EVEN_PAGES = 3
+   FIRST_PAGE = 2
+   PRIMARY    = 1
+
+Create footer in MS API::
+
+   section = Document.Sections(1)
+   footers = section.Footers  # a HeadersFooters collection object
+   default_footer = footers(wdHeaderFooterPrimary)
+   default_footer.Range.Text = "Footer text"
+
+PageSetup object::
+
+   DifferentFirstPageHeaderFooter: Read/write {True, False, WD_UNDEFINED}
+   OddAndEvenPagesHeaderFooter: Read/write {True, False, WD_UNDEFINED}
+
+
+Schema Excerpt
+--------------
+
+.. code-block:: xml
+
+    <xsd:complexType name="CT_SectPr">  <!-- denormalized -->
+      <xsd:sequence>
+        <xsd:choice minOccurs="0" maxOccurs="6"/>
+          <xsd:element name="headerReference" type="CT_HdrFtrRef"/>
+          <xsd:element name="footerReference" type="CT_HdrFtrRef"/>
+        </xsd:choice>
+        <xsd:element name="footnotePr"      type="CT_FtnProps"      minOccurs="0"/>
+        <xsd:element name="endnotePr"       type="CT_EdnProps"      minOccurs="0"/>
+        <xsd:element name="type"            type="CT_SectType"      minOccurs="0"/>
+        <xsd:element name="pgSz"            type="CT_PageSz"        minOccurs="0"/>
+        <xsd:element name="pgMar"           type="CT_PageMar"       minOccurs="0"/>
+        <xsd:element name="paperSrc"        type="CT_PaperSource"   minOccurs="0"/>
+        <xsd:element name="pgBorders"       type="CT_PageBorders"   minOccurs="0"/>
+        <xsd:element name="lnNumType"       type="CT_LineNumber"    minOccurs="0"/>
+        <xsd:element name="pgNumType"       type="CT_PageNumber"    minOccurs="0"/>
+        <xsd:element name="cols"            type="CT_Columns"       minOccurs="0"/>
+        <xsd:element name="formProt"        type="CT_OnOff"         minOccurs="0"/>
+        <xsd:element name="vAlign"          type="CT_VerticalJc"    minOccurs="0"/>
+        <xsd:element name="noEndnote"       type="CT_OnOff"         minOccurs="0"/>
+        <xsd:element name="titlePg"         type="CT_OnOff"         minOccurs="0"/>
+        <xsd:element name="textDirection"   type="CT_TextDirection" minOccurs="0"/>
+        <xsd:element name="bidi"            type="CT_OnOff"         minOccurs="0"/>
+        <xsd:element name="rtlGutter"       type="CT_OnOff"         minOccurs="0"/>
+        <xsd:element name="docGrid"         type="CT_DocGrid"       minOccurs="0"/>
+        <xsd:element name="printerSettings" type="CT_Rel"           minOccurs="0"/>
+        <xsd:element name="sectPrChange"    type="CT_SectPrChange"  minOccurs="0"/>
+      </xsd:sequence>
+      <xsd:attribute name="rsidRPr"  type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidDel"  type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidR"    type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidSect" type="ST_LongHexNumber"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="CT_HdrFtrRef">
+      <xsd:attribute  ref="r:id"                  use="required"/>
+      <xsd:attribute name="type" type="ST_HdrFtr" use="required"/>
+    </xsd:complexType>
+
+    <xsd:simpleType name="ST_HdrFtr">
+      <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="even"/>
+        <xsd:enumeration value="default"/>
+        <xsd:enumeration value="first"/>
+      </xsd:restriction>
+    </xsd:simpleType>
diff --git a/docs/dev/analysis/index.rst b/docs/dev/analysis/index.rst
index 9a8201afc..b32bf5cc1 100644
--- a/docs/dev/analysis/index.rst
+++ b/docs/dev/analysis/index.rst
@@ -10,6 +10,7 @@ Feature Analysis
 .. toctree::
    :titlesonly:
 
+   features/header
    features/settings
    features/text/index
    features/table/index

From 6717686902607b04bbeff09e540dc03cfebe29f3 Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 22 Apr 2016 19:55:47 -0700
Subject: [PATCH 125/367] docs: small documentation fixes

---
 docs/user/documents.rst | 9 +++++++--
 docs/user/sections.rst  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/user/documents.rst b/docs/user/documents.rst
index ecdd82e95..ecdfefab1 100644
--- a/docs/user/documents.rst
+++ b/docs/user/documents.rst
@@ -1,3 +1,4 @@
+.. _documents:
 
 Working with Documents
 ==========================
@@ -70,13 +71,13 @@ to (or aren't allowed to) interact with the file system. In practice this means
 you can pass an open file or StringIO/BytesIO stream object to open or save
 a document like so::
 
-    f = open('foobar.docx')
+    f = open('foobar.docx', 'rb')
     document = Document(f)
     f.close()
 
     # or
 
-    with open('foobar.docx') as f:
+    with open('foobar.docx', 'rb') as f:
         source_stream = StringIO(f.read())
     document = Document(source_stream)
     source_stream.close()
@@ -84,6 +85,10 @@ a document like so::
     target_stream = StringIO()
     document.save(target_stream)
 
+The ``'rb'`` file open mode parameter isn't required on all operating
+systems. It defaults to ``'r'`` which is enough sometimes, but the 'b'
+(selecting binary mode) is required on Windows and at least some versions of
+Linux to allow Zipfile to open the file.
 
 Okay, so you've got a document open and are pretty sure you can save it
 somewhere later. Next step is to get some content in there ...
diff --git a/docs/user/sections.rst b/docs/user/sections.rst
index 6ab37015b..5dc956172 100644
--- a/docs/user/sections.rst
+++ b/docs/user/sections.rst
@@ -52,7 +52,7 @@ The :meth:`Document.add_section` method allows a new section to be started at
 the end of the document. Paragraphs and tables added after calling this method
 will appear in the new section::
 
-    >>> current_section = document.section[-1]  # last section in document
+    >>> current_section = document.sections[-1]  # last section in document
     >>> current_section.start_type
     NEW_PAGE (2)
     >>> new_section = document.add_section(WD_SECTION.ODD_PAGE)

From 66592e0b1f99c563245a6ed5875de2e7f3e9f58e Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Wed, 10 Feb 2016 13:30:12 -0600
Subject: [PATCH 126/367] docs: document TabStops analysis

---
 docs/dev/analysis/features/text/index.rst     |   1 +
 docs/dev/analysis/features/text/tab-stops.rst | 256 ++++++++++++++++++
 2 files changed, 257 insertions(+)
 create mode 100644 docs/dev/analysis/features/text/tab-stops.rst

diff --git a/docs/dev/analysis/features/text/index.rst b/docs/dev/analysis/features/text/index.rst
index 3b7694731..2fff03924 100644
--- a/docs/dev/analysis/features/text/index.rst
+++ b/docs/dev/analysis/features/text/index.rst
@@ -5,6 +5,7 @@ Text
 .. toctree::
    :titlesonly:
 
+   tab-stops
    font-highlight-color
    paragraph-format
    font
diff --git a/docs/dev/analysis/features/text/tab-stops.rst b/docs/dev/analysis/features/text/tab-stops.rst
new file mode 100644
index 000000000..c29496e85
--- /dev/null
+++ b/docs/dev/analysis/features/text/tab-stops.rst
@@ -0,0 +1,256 @@
+
+Tab Stops
+=========
+
+WordprocessingML allows for custom specification of tab stops at the
+paragraph level.  Tab stop spacing is a subset of paragraph formatting in
+this system, so will be implemented within the
+docx.text.parfmt.ParagraphFormatting object.  Tab stops will be handled as
+a List-like TabStops object made up of TabStop objects.
+
+A TabStop object has three properties, alignment, leader, and position.
+Alignment is a WD_TAB_ALIGNMENT member and position is a Length() object.
+
+Tab stops are always sorted in position order.  Alignment defaults to
+WD_TAB_ALIGNMENT.LEFT, and leader defaults to WD_TAB_LEADER.SPACES.
+
+Tab stops specify how tab characters in a paragraph are rendered. Insertion
+of tab characters is accomplished using the Run object.
+
+
+Protocol
+--------
+
+.. highlight:: python
+
+Getting and setting tab stops::
+
+    >>> tab_stops = paragraph.paragraph_format.tab_stops
+    >>> tab_stops
+    <docx.text.parfmt.TabStops object at 0x104ea8c30>
+
+    >>> tab_stop = tab_stops.add_tab_stop(Inches(2), WD_TAB_ALIGNMENT.LEFT, WD_TAB_LEADER.DOTS)
+
+    # add_tab_stop defaults to WD_TAB_ALIGNMENT.LEFT, WD_TAB_LEADER.SPACES
+
+    >>> tab_stop = tab_stops.add_tab_stop(Inches(0.5))
+    >>> tab_stop.alignment
+    WD_TAB_ALIGNMENT.LEFT
+    >>> tab_stop.leader
+    WD_TAB_LEADER.SPACES
+
+    # TabStop properties are read/write
+
+    >>> tab_stop.position = Inches(2.5)
+    >>> tab_stop.alignment = WD_TAB_ALIGNMENT.CENTER
+    >>> tab_stop.leader = WD_TAB_LEADER.DASHES
+
+    # Tab stops are sorted into position order as created or modified
+
+    >>> [(t.position, t.alignment) for t in tab_stops]
+    [(914400, WD_TAB_ALIGNMENT.LEFT), (2286000, WD_TAB_ALIGNMENT.CENTER)]
+
+    # A tab stop is deleted using del statement
+
+    >>> len(tab_stops)
+    2
+    >>> del tab_stops[1]
+    >>> len(tab_stops)
+    1
+
+    # Restore default tabs
+
+    >>> tab_stops.clear()
+
+
+Word Behavior
+-------------
+
+When the w:tabs element is empty or not present, Word uses default tab stops
+(typically every half inch).
+
+Word resumes using default tab stops following the last specified tab stop.
+
+TabStops must be in position order within the XML.  If they are not, the out-
+of-order tab stop will appear in the ruler and in the properties dialog, but
+will not actually be used by Word.
+
+
+XML Semantics
+-------------
+
+* Both "num" and "list" alignment are a legacy from early versions of Word
+  before hanging indents were available. Both are deprecated.
+
+* "start" alignment is equivalent to "left", and "end" alignment are equivalent
+  to "right". (Confirmed with manually edited XML.)
+
+* A "clear" tab stop is not shown in Word's tab bar and default tab behavior
+  is followed in the document.  That is, Word ignores that tab stop
+  specification completely, acting as if it were not there at all.  This
+  allows a tab stop inherited from a style, for example, to be ignored.
+
+* The w:pos attribute uses twips rather than EMU.
+
+* The w:tabs element must be removed when empty. If present, it must contain
+  at least one w:tab element.
+
+
+Specimen XML
+------------
+
+.. highlight:: xml
+
+::
+
+  <w:pPr>
+    <w:tabs>
+      <w:tab w:val="left" w:leader="dot" w:pos="2880"/>
+      <w:tab w:val="decimal" w:pos="6480"/>
+    </w:tabs>
+  </w:pPr>
+
+
+Enumerations
+------------
+
+* `WdTabAlignment Enumeration on MSDN`_
+
+.. _WdTabAlignment Enumeration on MSDN:
+   https://msdn.microsoft.com/EN-US/library/office/ff195609.aspx
+
+=================   ========  =====
+Name                XML       Value
+=================   ========  =====
+wdAlignTabBar       bar         4
+wdAlignTabCenter    center      1
+wdAlignTabDecimal   decimal     3
+wdAlignTabLeft      left        0
+wdAlignTabList      list        6
+wdAlignTabRight     right       2
+=================   ========  =====
+
+Additional Enumeration values not appearing in WdTabAlignment
+
+===============   ========  =====
+Name              XML       Value
+===============   ========  =====
+wdAlignTabClear   clear      101
+wdAlignTabEnd     end        102
+wdAlignTabNum     num        103
+wdAlignTabStart   start      104
+===============   ========  =====
+
+
+* `WdTabLeader Enumeration on MSDN`_
+
+.. _WdTabLeader Enumeration on MSDN:
+   https://msdn.microsoft.com/en-us/library/office/ff845050.aspx
+
+====================   ==========  =====
+Name                   XML         Value
+====================   ==========  =====
+wdTabLeaderDashes      hyphen        2
+wdTabLeaderDots        dot           1
+wdTabLeaderHeavy       heavy         4
+wdTabLeaderLines       underscore    3
+wdTabLeaderMiddleDot   middleDot     5
+wdTabLeaderSpaces      none          0
+====================   ==========  =====
+
+
+MS API Protocol
+---------------
+
+The MS API defines a `TabStops object`_ which is a collection of
+`TabStop objects`_.
+
+.. _TabStops object:
+  https://msdn.microsoft.com/EN-US/library/office/ff192806.aspx
+
+.. _TabStop objects:
+   https://msdn.microsoft.com/EN-US/library/office/ff195736.aspx
+
+
+Schema excerpt
+--------------
+
+::
+
+  <xsd:complexType name="CT_PPr">  <!-- denormalized -->
+    <xsd:sequence>
+      <xsd:element name="pStyle"              type="CT_String"           minOccurs="0"/>
+      <xsd:element name="keepNext"            type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="keepLines"           type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="pageBreakBefore"     type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="framePr"             type="CT_FramePr"          minOccurs="0"/>
+      <xsd:element name="widowControl"        type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="numPr"               type="CT_NumPr"            minOccurs="0"/>
+      <xsd:element name="suppressLineNumbers" type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="pBdr"                type="CT_PBdr"             minOccurs="0"/>
+      <xsd:element name="shd"                 type="CT_Shd"              minOccurs="0"/>
+      <xsd:element name="tabs"                type="CT_Tabs"             minOccurs="0"/>
+      <xsd:element name="suppressAutoHyphens" type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="kinsoku"             type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="wordWrap"            type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="overflowPunct"       type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="topLinePunct"        type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="autoSpaceDE"         type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="autoSpaceDN"         type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="bidi"                type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="adjustRightInd"      type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="snapToGrid"          type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="spacing"             type="CT_Spacing"          minOccurs="0"/>
+      <xsd:element name="ind"                 type="CT_Ind"              minOccurs="0"/>
+      <xsd:element name="contextualSpacing"   type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="mirrorIndents"       type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="suppressOverlap"     type="CT_OnOff"            minOccurs="0"/>
+      <xsd:element name="jc"                  type="CT_Jc"               minOccurs="0"/>
+      <xsd:element name="textDirection"       type="CT_TextDirection"    minOccurs="0"/>
+      <xsd:element name="textAlignment"       type="CT_TextAlignment"    minOccurs="0"/>
+      <xsd:element name="textboxTightWrap"    type="CT_TextboxTightWrap" minOccurs="0"/>
+      <xsd:element name="outlineLvl"          type="CT_DecimalNumber"    minOccurs="0"/>
+      <xsd:element name="divId"               type="CT_DecimalNumber"    minOccurs="0"/>
+      <xsd:element name="cnfStyle"            type="CT_Cnf"              minOccurs="0"/>
+      <xsd:element name="rPr"                 type="CT_ParaRPr"          minOccurs="0"/>
+      <xsd:element name="sectPr"              type="CT_SectPr"           minOccurs="0"/>
+      <xsd:element name="pPrChange"           type="CT_PPrChange"        minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="CT_Tabs">
+    <xsd:sequence>
+      <xsd:element name="tab" type="CT_TabStop" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="CT_TabStop">
+    <xsd:attribute name="val"    type="ST_TabJc"              use="required"/>
+    <xsd:attribute name="leader" type="ST_TabTlc"             use="optional"/>
+    <xsd:attribute name="pos"    type="ST_SignedTwipsMeasure" use="required"/>
+  </xsd:complexType>
+
+  <xsd:simpleType name="ST_TabJc">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="clear"/>
+      <xsd:enumeration value="start"/>
+      <xsd:enumeration value="center"/>
+      <xsd:enumeration value="end"/>
+      <xsd:enumeration value="decimal"/>
+      <xsd:enumeration value="bar"/>
+      <xsd:enumeration value="num"/>
+      <xsd:enumeration value="left"/>
+      <xsd:enumeration value="right"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_TabTlc">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="none"/>
+      <xsd:enumeration value="dot"/>
+      <xsd:enumeration value="hyphen"/>
+      <xsd:enumeration value="underscore"/>
+      <xsd:enumeration value="heavy"/>
+      <xsd:enumeration value="middleDot"/>
+    </xsd:restriction>
+  </xsd:simpleType>

From 770978710dc24324b8fd991c907abe5a8f91f519 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Fri, 18 Mar 2016 23:07:39 -0700
Subject: [PATCH 127/367] acpt: add scenario for ParagraphFormat.tab_stops

---
 docx/text/tabstops.py                    |  20 ++++++++++++++++++++
 features/steps/parfmt.py                 |  13 +++++++++++++
 features/steps/test_files/tab-stops.docx | Bin 0 -> 12828 bytes
 features/txt-parfmt-props.feature        |   6 ++++++
 4 files changed, 39 insertions(+)
 create mode 100644 docx/text/tabstops.py
 create mode 100644 features/steps/test_files/tab-stops.docx

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
new file mode 100644
index 000000000..f4a345618
--- /dev/null
+++ b/docx/text/tabstops.py
@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+"""
+Tabstop-related proxy types.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from ..shared import ElementProxy
+
+
+class TabStops(ElementProxy):
+    """
+    A sequence providing access to the tab stops of a paragraph or paragraph
+    style. Supports iteration, indexed access, del, and len(). It is accesed
+    using the `tab_stops` property of ParagraphFormat; it is not intended to
+    be constructed directly.
+    """
diff --git a/features/steps/parfmt.py b/features/steps/parfmt.py
index ea695ca99..f3203f7e5 100644
--- a/features/steps/parfmt.py
+++ b/features/steps/parfmt.py
@@ -13,12 +13,19 @@
 from docx import Document
 from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
 from docx.shared import Pt
+from docx.text.tabstops import TabStops
 
 from helpers import test_docx
 
 
 # given ===================================================
 
+@given('a paragraph format')
+def given_a_paragraph_format(context):
+    document = Document(test_docx('tab-stops'))
+    context.paragraph_format = document.paragraphs[0].paragraph_format
+
+
 @given('a paragraph format having {prop_name} set {setting}')
 def given_a_paragraph_format_having_prop_set(context, prop_name, setting):
     style_name = {
@@ -139,6 +146,12 @@ def when_I_assign_value_to_paragraph_format_prop(context, value, prop_name):
 
 # then =====================================================
 
+@then('paragraph_format.tab_stops is a TabStops object')
+def then_paragraph_format_tab_stops_is_a_tabstops_object(context):
+    tab_stops = context.paragraph_format.tab_stops
+    assert isinstance(tab_stops, TabStops)
+
+
 @then('paragraph_format.alignment is {value}')
 def then_paragraph_format_alignment_is_value(context, value):
     expected_value = {
diff --git a/features/steps/test_files/tab-stops.docx b/features/steps/test_files/tab-stops.docx
new file mode 100644
index 0000000000000000000000000000000000000000..a33532779dc9647b56e4e1a0f94d864c4041de6e
GIT binary patch
literal 12828
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

literal 0
HcmV?d00001

diff --git a/features/txt-parfmt-props.feature b/features/txt-parfmt-props.feature
index 401de6c01..86b901f42 100644
--- a/features/txt-parfmt-props.feature
+++ b/features/txt-parfmt-props.feature
@@ -4,6 +4,12 @@ Feature: Get or set paragraph formatting properties
   I need a ParagraphFormat object with read/write formatting properties
 
 
+  @wip
+  Scenario: Get tab stops
+    Given a paragraph format
+     Then paragraph_format.tab_stops is a TabStops object
+
+
   Scenario Outline: Get paragraph alignment
     Given a paragraph format having <align-type> alignment
      Then paragraph_format.alignment is <value>

From 9113b49c7df8e837876cd5ebdc1cb521540ffc28 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Sun, 10 Apr 2016 18:12:01 -0700
Subject: [PATCH 128/367] parfmt: add ParagraphFormat.tab_stops

---
 docx/text/parfmt.py               | 14 ++++++++++++--
 docx/text/tabstops.py             |  6 ++++++
 features/txt-parfmt-props.feature |  1 -
 tests/text/test_parfmt.py         | 27 +++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/docx/text/parfmt.py b/docx/text/parfmt.py
index 710da9733..37206729c 100644
--- a/docx/text/parfmt.py
+++ b/docx/text/parfmt.py
@@ -9,7 +9,8 @@
 )
 
 from ..enum.text import WD_LINE_SPACING
-from ..shared import ElementProxy, Emu, Length, Pt, Twips
+from ..shared import ElementProxy, Emu, lazyproperty, Length, Pt, Twips
+from .tabstops import TabStops
 
 
 class ParagraphFormat(ElementProxy):
@@ -19,7 +20,7 @@ class ParagraphFormat(ElementProxy):
     control.
     """
 
-    __slots__ = ()
+    __slots__ = ('_tab_stops',)
 
     @property
     def alignment(self):
@@ -243,6 +244,15 @@ def space_before(self):
     def space_before(self, value):
         self._element.get_or_add_pPr().spacing_before = value
 
+    @lazyproperty
+    def tab_stops(self):
+        """
+        |TabStops| object providing access to the tab stops defined for this
+        paragraph format.
+        """
+        pPr = self._element.get_or_add_pPr()
+        return TabStops(pPr)
+
     @property
     def widow_control(self):
         """
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index f4a345618..4acb6b9b4 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -18,3 +18,9 @@ class TabStops(ElementProxy):
     using the `tab_stops` property of ParagraphFormat; it is not intended to
     be constructed directly.
     """
+
+    __slots__ = ('_pPr')
+
+    def __init__(self, element):
+        super(TabStops, self).__init__(element, None)
+        self._pPr = element
diff --git a/features/txt-parfmt-props.feature b/features/txt-parfmt-props.feature
index 86b901f42..b4ec6ffd4 100644
--- a/features/txt-parfmt-props.feature
+++ b/features/txt-parfmt-props.feature
@@ -4,7 +4,6 @@ Feature: Get or set paragraph formatting properties
   I need a ParagraphFormat object with read/write formatting properties
 
 
-  @wip
   Scenario: Get tab stops
     Given a paragraph format
      Then paragraph_format.tab_stops is a TabStops object
diff --git a/tests/text/test_parfmt.py b/tests/text/test_parfmt.py
index e64fd68a6..9e7bb4d52 100644
--- a/tests/text/test_parfmt.py
+++ b/tests/text/test_parfmt.py
@@ -12,10 +12,12 @@
 from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
 from docx.shared import Pt
 from docx.text.parfmt import ParagraphFormat
+from docx.text.tabstops import TabStops
 
 import pytest
 
 from ..unitutil.cxml import element, xml
+from ..unitutil.mock import class_mock, instance_mock
 
 
 class DescribeParagraphFormat(object):
@@ -102,6 +104,12 @@ def it_can_change_its_on_off_props(self, on_off_set_fixture):
         setattr(paragraph_format, prop_name, value)
         assert paragraph_format._element.xml == expected_xml
 
+    def it_provides_access_to_its_tab_stops(self, tab_stops_fixture):
+        paragraph_format, TabStops_, pPr, tab_stops_ = tab_stops_fixture
+        tab_stops = paragraph_format.tab_stops
+        TabStops_.assert_called_once_with(pPr)
+        assert tab_stops is tab_stops_
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -393,3 +401,22 @@ def space_before_set_fixture(self, request):
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
+
+    @pytest.fixture
+    def tab_stops_fixture(self, TabStops_, tab_stops_):
+        p = element('w:p/w:pPr')
+        pPr = p.pPr
+        paragraph_format = ParagraphFormat(p, None)
+        return paragraph_format, TabStops_, pPr, tab_stops_
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def TabStops_(self, request, tab_stops_):
+        return class_mock(
+            request, 'docx.text.parfmt.TabStops', return_value=tab_stops_
+        )
+
+    @pytest.fixture
+    def tab_stops_(self, request):
+        return instance_mock(request, TabStops)

From a72300617f12a9c039da71ea380c55fce1b40b84 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 21 Apr 2016 15:46:52 -0700
Subject: [PATCH 129/367] acpt: add scenarios for tab stop access

---
 docs/conf.py                     |  4 +++
 docx/text/tabstops.py            | 13 +++++++++
 features/steps/tabstops.py       | 45 ++++++++++++++++++++++++++++++++
 features/tab-access-tabs.feature | 22 ++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 features/steps/tabstops.py
 create mode 100644 features/tab-access-tabs.feature

diff --git a/docs/conf.py b/docs/conf.py
index 7a95370c7..5041e8fd7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -169,6 +169,10 @@
 
 .. |_TableStyle| replace:: :class:`._TableStyle`
 
+.. |TabStop| replace:: :class:`.TabStop`
+
+.. |TabStops| replace:: :class:`.TabStops`
+
 .. |_Text| replace:: :class:`._Text`
 
 .. |True| replace:: :class:`True`
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 4acb6b9b4..c59adff61 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -24,3 +24,16 @@ class TabStops(ElementProxy):
     def __init__(self, element):
         super(TabStops, self).__init__(element, None)
         self._pPr = element
+
+
+class TabStop(ElementProxy):
+    """
+    An individual tab stop applying to a paragraph or style. Each of these is
+    a member of a set held in a |TabStops| object.
+    """
+
+    __slots__ = ('_tab')
+
+    def __init__(self, element):
+        super(TabStop, self).__init__(element, None)
+        self._tab = element
diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
new file mode 100644
index 000000000..b6396f8bb
--- /dev/null
+++ b/features/steps/tabstops.py
@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+"""
+Step implementations for paragraph-related features
+"""
+
+from behave import given, then
+
+from docx import Document
+from docx.text.tabstops import TabStop
+
+from helpers import test_docx
+
+
+# given ===================================================
+
+@given('a tab_stops having {count} tab stops')
+def given_a_tab_stops_having_count_tab_stops(context, count):
+    paragraph_idx = {'0': 0, '3': 1}[count]
+    document = Document(test_docx('tab-stops'))
+    paragraph_format = document.paragraphs[paragraph_idx].paragraph_format
+    context.tab_stops = paragraph_format.tab_stops
+
+
+# then =====================================================
+
+@then('I can access a tab stop by index')
+def then_I_can_access_a_tab_stop_by_index(context):
+    tab_stops = context.tab_stops
+    for idx in range(3):
+        tab_stop = tab_stops[idx]
+        assert isinstance(tab_stop, TabStop)
+
+
+@then('I can iterate the TabStops object')
+def then_I_can_iterate_the_TabStops_object(context):
+    items = [ts for ts in context.tab_stops]
+    assert len(items) == 3
+    assert all(isinstance(item, TabStop) for item in items)
+
+
+@then('len(tab_stops) is {count}')
+def then_len_tab_stops_is_count(context, count):
+    tab_stops = context.tab_stops
+    assert len(tab_stops) == int(count)
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
new file mode 100644
index 000000000..a59d8864c
--- /dev/null
+++ b/features/tab-access-tabs.feature
@@ -0,0 +1,22 @@
+Feature: Access TabStop objects
+  In order to interact with an individual tab stop for a paragraph or style
+  As a developer using python-docx
+  I need methods to create, access, and remove a tab stop
+
+
+  @wip
+  Scenario Outline: TabStops.__len__
+    Given a tab_stops having <count> tab stops
+     Then len(tab_stops) is <count>
+
+    Examples: tab_stop counts
+      | count |
+      |   0   |
+      |   3   |
+
+
+  @wip
+  Scenario: Access an existing TabStop object
+    Given a tab_stops having 3 tab stops
+     Then I can iterate the TabStops object
+      And I can access a tab stop by index

From d0bd28edb58ecd557d6e8d6ec93e9a7faf5bccee Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 21 Apr 2016 16:28:56 -0700
Subject: [PATCH 130/367] tabs: add TabStops.__len__()

---
 docx/oxml/__init__.py            |  3 ++-
 docx/oxml/text/parfmt.py         | 11 ++++++++++-
 docx/text/tabstops.py            |  6 ++++++
 features/tab-access-tabs.feature |  1 -
 tests/text/test_tabstops.py      | 34 ++++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 tests/text/test_tabstops.py

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index a96cfc1b4..8c5b2a6ed 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -181,7 +181,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 from .text.paragraph import CT_P
 register_element_cls('w:p', CT_P)
 
-from .text.parfmt import CT_Ind, CT_Jc, CT_PPr, CT_Spacing
+from .text.parfmt import CT_Ind, CT_Jc, CT_PPr, CT_Spacing, CT_TabStops
 register_element_cls('w:ind',             CT_Ind)
 register_element_cls('w:jc',              CT_Jc)
 register_element_cls('w:keepLines',       CT_OnOff)
@@ -190,6 +190,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:pPr',             CT_PPr)
 register_element_cls('w:pStyle',          CT_String)
 register_element_cls('w:spacing',         CT_Spacing)
+register_element_cls('w:tabs',            CT_TabStops)
 register_element_cls('w:widowControl',    CT_OnOff)
 
 from .text.run import CT_Br, CT_R, CT_Text
diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
index f34cb0e5d..78922e231 100644
--- a/docx/oxml/text/parfmt.py
+++ b/docx/oxml/text/parfmt.py
@@ -8,7 +8,8 @@
 from ...shared import Length
 from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
 from ..xmlchemy import (
-    BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
+    BaseOxmlElement, OneOrMore, OptionalAttribute, RequiredAttribute,
+    ZeroOrOne
 )
 
 
@@ -50,6 +51,7 @@ class CT_PPr(BaseOxmlElement):
     pageBreakBefore = ZeroOrOne('w:pageBreakBefore', successors=_tag_seq[4:])
     widowControl = ZeroOrOne('w:widowControl', successors=_tag_seq[6:])
     numPr = ZeroOrOne('w:numPr', successors=_tag_seq[7:])
+    tabs = ZeroOrOne('w:tabs', successors=_tag_seq[11:])
     spacing = ZeroOrOne('w:spacing', successors=_tag_seq[22:])
     ind = ZeroOrOne('w:ind', successors=_tag_seq[23:])
     jc = ZeroOrOne('w:jc', successors=_tag_seq[27:])
@@ -311,3 +313,10 @@ class CT_Spacing(BaseOxmlElement):
     before = OptionalAttribute('w:before', ST_TwipsMeasure)
     line = OptionalAttribute('w:line', ST_SignedTwipsMeasure)
     lineRule = OptionalAttribute('w:lineRule', WD_LINE_SPACING)
+
+
+class CT_TabStops(BaseOxmlElement):
+    """
+    ``<w:tabs>`` element, container for a sorted sequence of tab stops.
+    """
+    tab = OneOrMore('w:tab', successors=())
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index c59adff61..52979b899 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -25,6 +25,12 @@ def __init__(self, element):
         super(TabStops, self).__init__(element, None)
         self._pPr = element
 
+    def __len__(self):
+        tabs = self._pPr.tabs
+        if tabs is None:
+            return 0
+        return len(tabs.tab_lst)
+
 
 class TabStop(ElementProxy):
     """
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
index a59d8864c..837e2a2f1 100644
--- a/features/tab-access-tabs.feature
+++ b/features/tab-access-tabs.feature
@@ -4,7 +4,6 @@ Feature: Access TabStop objects
   I need methods to create, access, and remove a tab stop
 
 
-  @wip
   Scenario Outline: TabStops.__len__
     Given a tab_stops having <count> tab stops
      Then len(tab_stops) is <count>
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
new file mode 100644
index 000000000..df009f499
--- /dev/null
+++ b/tests/text/test_tabstops.py
@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+"""
+Test suite for the docx.text.tabstops module, containing the TabStops and
+TabStop objects.
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+from docx.text.tabstops import TabStops
+
+import pytest
+
+from ..unitutil.cxml import element
+
+
+class DescribeTabStops(object):
+
+    def it_knows_its_length(self, len_fixture):
+        tab_stops, expected_value = len_fixture
+        assert len(tab_stops) == expected_value
+
+    # fixture --------------------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:pPr',                          0),
+        ('w:pPr/w:tabs/w:tab{w:pos=2880}', 1),
+    ])
+    def len_fixture(self, request):
+        tab_stops_cxml, expected_value = request.param
+        tab_stops = TabStops(element(tab_stops_cxml))
+        return tab_stops, expected_value

From 1bcdf4aaca37f6a9baaccf5ef76c2ec910018865 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Fri, 22 Apr 2016 20:28:52 -0700
Subject: [PATCH 131/367] tabs: add TabStops.__iter__()

---
 docx/text/tabstops.py       | 10 ++++++++++
 tests/text/test_tabstops.py | 39 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 52979b899..14876da32 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -25,6 +25,16 @@ def __init__(self, element):
         super(TabStops, self).__init__(element, None)
         self._pPr = element
 
+    def __iter__(self):
+        """
+        Generate a TabStop object for each of the w:tab elements, in XML
+        document order.
+        """
+        tabs = self._pPr.tabs
+        if tabs is not None:
+            for tab in tabs.tab_lst:
+                yield TabStop(tab)
+
     def __len__(self):
         tabs = self._pPr.tabs
         if tabs is None:
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index df009f499..ca5a85df3 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -9,11 +9,12 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from docx.text.tabstops import TabStops
+from docx.text.tabstops import TabStop, TabStops
 
 import pytest
 
 from ..unitutil.cxml import element
+from ..unitutil.mock import call, class_mock, instance_mock
 
 
 class DescribeTabStops(object):
@@ -22,8 +23,32 @@ def it_knows_its_length(self, len_fixture):
         tab_stops, expected_value = len_fixture
         assert len(tab_stops) == expected_value
 
+    def it_can_iterate_over_its_tab_stops(self, iter_fixture):
+        tab_stops, expected_count, tab_stop_, TabStop_, expected_calls = (
+            iter_fixture
+        )
+        count = 0
+        for tab_stop in tab_stops:
+            assert tab_stop is tab_stop_
+            count += 1
+        assert count == expected_count
+        assert TabStop_.call_args_list == expected_calls
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:pPr',                                              0),
+        ('w:pPr/w:tabs/w:tab{w:pos=2880}',                     1),
+        ('w:pPr/w:tabs/(w:tab{w:pos=2880},w:tab{w:pos=5760})', 2),
+    ])
+    def iter_fixture(self, request, TabStop_, tab_stop_):
+        pPr_cxml, expected_count = request.param
+        pPr = element(pPr_cxml)
+        tab_elms = pPr.xpath('//w:tab')
+        tab_stops = TabStops(pPr)
+        expected_calls = [call(tab) for tab in tab_elms]
+        return tab_stops, expected_count, tab_stop_, TabStop_, expected_calls
+
     @pytest.fixture(params=[
         ('w:pPr',                          0),
         ('w:pPr/w:tabs/w:tab{w:pos=2880}', 1),
@@ -32,3 +57,15 @@ def len_fixture(self, request):
         tab_stops_cxml, expected_value = request.param
         tab_stops = TabStops(element(tab_stops_cxml))
         return tab_stops, expected_value
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def TabStop_(self, request, tab_stop_):
+        return class_mock(
+            request, 'docx.text.tabstops.TabStop', return_value=tab_stop_
+        )
+
+    @pytest.fixture
+    def tab_stop_(self, request):
+        return instance_mock(request, TabStop)

From e5233fdf7165a807d952b56f3d1649beaf9b1ded Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Mon, 25 Apr 2016 19:01:33 -0700
Subject: [PATCH 132/367] tabs: add TabStops.__getitem__()

---
 docx/text/tabstops.py            | 10 ++++++++++
 features/tab-access-tabs.feature |  1 -
 tests/text/test_tabstops.py      | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 14876da32..a857299c0 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -25,6 +25,16 @@ def __init__(self, element):
         super(TabStops, self).__init__(element, None)
         self._pPr = element
 
+    def __getitem__(self, idx):
+        """
+        Enables list-style access by index.
+        """
+        tabs = self._pPr.tabs
+        if tabs is None:
+            raise IndexError('TabStops object is empty')
+        tab = tabs.tab_lst[idx]
+        return TabStop(tab)
+
     def __iter__(self):
         """
         Generate a TabStop object for each of the w:tab elements, in XML
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
index 837e2a2f1..c517ed012 100644
--- a/features/tab-access-tabs.feature
+++ b/features/tab-access-tabs.feature
@@ -14,7 +14,6 @@ Feature: Access TabStop objects
       |   3   |
 
 
-  @wip
   Scenario: Access an existing TabStop object
     Given a tab_stops having 3 tab stops
      Then I can iterate the TabStops object
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index ca5a85df3..05652cdd1 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -34,8 +34,31 @@ def it_can_iterate_over_its_tab_stops(self, iter_fixture):
         assert count == expected_count
         assert TabStop_.call_args_list == expected_calls
 
+    def it_can_get_a_tab_stop_by_index(self, index_fixture):
+        tab_stops, idx, TabStop_, tab, tab_stop_ = index_fixture
+        tab_stop = tab_stops[idx]
+        TabStop_.assert_called_once_with(tab)
+        assert tab_stop is tab_stop_
+
+    def it_raises_on_indexed_access_when_empty(self):
+        tab_stops = TabStops(element('w:pPr'))
+        with pytest.raises(IndexError):
+            tab_stops[0]
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:pPr/w:tabs/w:tab{w:pos=0}',                                 0),
+        ('w:pPr/w:tabs/(w:tab{w:pos=1},w:tab{w:pos=2},w:tab{w:pos=3})', 1),
+        ('w:pPr/w:tabs/(w:tab{w:pos=4},w:tab{w:pos=5},w:tab{w:pos=6})', 2),
+    ])
+    def index_fixture(self, request, TabStop_, tab_stop_):
+        pPr_cxml, idx = request.param
+        pPr = element(pPr_cxml)
+        tab = pPr.xpath('./w:tabs/w:tab')[idx]
+        tab_stops = TabStops(pPr)
+        return tab_stops, idx, TabStop_, tab, tab_stop_
+
     @pytest.fixture(params=[
         ('w:pPr',                                              0),
         ('w:pPr/w:tabs/w:tab{w:pos=2880}',                     1),

From ff5e5c240f4e91f34e0f7ba0de044a0db3dcfa06 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 5 May 2016 18:23:37 -0700
Subject: [PATCH 133/367] acpt: add scenarios for TabStop property getters

---
 docs/api/enum/WdTabAlignment.rst         |  38 ++++++++++++
 docs/api/enum/WdTabLeader.rst            |  26 ++++++++
 docs/api/enum/index.rst                  |   4 +-
 docx/enum/text.py                        |  74 +++++++++++++++++++++++
 features/steps/tabstops.py               |  45 ++++++++++++++
 features/steps/test_files/tab-stops.docx | Bin 12828 -> 13170 bytes
 features/tab-tabstop-props.feature       |  37 ++++++++++++
 7 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 docs/api/enum/WdTabAlignment.rst
 create mode 100644 docs/api/enum/WdTabLeader.rst
 create mode 100644 features/tab-tabstop-props.feature

diff --git a/docs/api/enum/WdTabAlignment.rst b/docs/api/enum/WdTabAlignment.rst
new file mode 100644
index 000000000..a4adb0fc9
--- /dev/null
+++ b/docs/api/enum/WdTabAlignment.rst
@@ -0,0 +1,38 @@
+.. _WdTabAlignment:
+
+``WD_TAB_ALIGNMENT``
+====================
+
+Specifies the tab stop alignment to apply.
+
+----
+
+LEFT
+    Left-aligned.
+
+CENTER
+    Center-aligned.
+
+RIGHT
+    Right-aligned.
+
+DECIMAL
+    Decimal-aligned.
+
+BAR
+    Bar-aligned.
+
+LIST
+    List-aligned. (deprecated)
+
+CLEAR
+    Clear an inherited tab stop.
+
+END
+    Right-aligned.  (deprecated)
+
+NUM
+    Left-aligned.  (deprecated)
+
+START
+    Left-aligned.  (deprecated)
diff --git a/docs/api/enum/WdTabLeader.rst b/docs/api/enum/WdTabLeader.rst
new file mode 100644
index 000000000..73990eeef
--- /dev/null
+++ b/docs/api/enum/WdTabLeader.rst
@@ -0,0 +1,26 @@
+.. _WdTabLeader:
+
+``WD_TAB_LEADER``
+=================
+
+Specifies the character to use as the leader with formatted tabs.
+
+----
+
+SPACES
+    Spaces. Default.
+
+DOTS
+    Dots.
+
+DASHES
+    Dashes.
+
+LINES
+    Double lines.
+
+HEAVY
+    A heavy line.
+
+MIDDLE_DOT
+    A vertically-centered dot.
diff --git a/docs/api/enum/index.rst b/docs/api/enum/index.rst
index 9c7371dcf..f6ba1e261 100644
--- a/docs/api/enum/index.rst
+++ b/docs/api/enum/index.rst
@@ -15,8 +15,10 @@ can be found here:
    WdColorIndex
    WdLineSpacing
    WdOrientation
+   WdRowAlignment
    WdSectionStart
    WdStyleType
-   WdRowAlignment
+   WdTabAlignment
+   WdTabLeader
    WdTableDirection
    WdUnderline
diff --git a/docx/enum/text.py b/docx/enum/text.py
index 97597eed1..f4111eb92 100644
--- a/docx/enum/text.py
+++ b/docx/enum/text.py
@@ -195,6 +195,80 @@ class WD_LINE_SPACING(XmlEnumeration):
     )
 
 
+class WD_TAB_ALIGNMENT(XmlEnumeration):
+    """
+    Specifies the tab stop alignment to apply.
+    """
+
+    __ms_name__ = 'WdTabAlignment'
+
+    __url__ = 'https://msdn.microsoft.com/EN-US/library/office/ff195609.aspx'
+
+    __members__ = (
+        XmlMappedEnumMember(
+            'LEFT', 0, 'left', 'Left-aligned.'
+        ),
+        XmlMappedEnumMember(
+            'CENTER', 1, 'center', 'Center-aligned.'
+        ),
+        XmlMappedEnumMember(
+            'RIGHT', 2, 'right', 'Right-aligned.'
+        ),
+        XmlMappedEnumMember(
+            'DECIMAL', 3, 'decimal', 'Decimal-aligned.'
+        ),
+        XmlMappedEnumMember(
+            'BAR', 4, 'bar', 'Bar-aligned.'
+        ),
+        XmlMappedEnumMember(
+            'LIST', 6, 'list', 'List-aligned. (deprecated)'
+        ),
+        XmlMappedEnumMember(
+            'CLEAR', 101, 'clear', 'Clear an inherited tab stop.'
+        ),
+        XmlMappedEnumMember(
+            'END', 102, 'end', 'Right-aligned.  (deprecated)'
+        ),
+        XmlMappedEnumMember(
+            'NUM', 103, 'num', 'Left-aligned.  (deprecated)'
+        ),
+        XmlMappedEnumMember(
+            'START', 104, 'start', 'Left-aligned.  (deprecated)'
+        ),
+    )
+
+
+class WD_TAB_LEADER(XmlEnumeration):
+    """
+    Specifies the character to use as the leader with formatted tabs.
+    """
+
+    __ms_name__ = 'WdTabLeader'
+
+    __url__ = 'https://msdn.microsoft.com/en-us/library/office/ff845050.aspx'
+
+    __members__ = (
+        XmlMappedEnumMember(
+            'SPACES', 0, 'none', 'Spaces. Default.'
+        ),
+        XmlMappedEnumMember(
+            'DOTS', 1, 'dot', 'Dots.'
+        ),
+        XmlMappedEnumMember(
+            'DASHES', 2, 'hyphen', 'Dashes.'
+        ),
+        XmlMappedEnumMember(
+            'LINES', 3, 'underscore', 'Double lines.'
+        ),
+        XmlMappedEnumMember(
+            'HEAVY', 4, 'heavy', 'A heavy line.'
+        ),
+        XmlMappedEnumMember(
+            'MIDDLE_DOT', 5, 'middleDot', 'A vertically-centered dot.'
+        ),
+    )
+
+
 class WD_UNDERLINE(XmlEnumeration):
     """
     Specifies the style of underline applied to a run of characters.
diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
index b6396f8bb..8f8250e59 100644
--- a/features/steps/tabstops.py
+++ b/features/steps/tabstops.py
@@ -7,6 +7,7 @@
 from behave import given, then
 
 from docx import Document
+from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
 from docx.text.tabstops import TabStop
 
 from helpers import test_docx
@@ -22,6 +23,30 @@ def given_a_tab_stops_having_count_tab_stops(context, count):
     context.tab_stops = paragraph_format.tab_stops
 
 
+@given('a tab stop 0.5 inches {in_or_out} from the paragraph left edge')
+def given_a_tab_stop_inches_from_paragraph_left_edge(context, in_or_out):
+    tab_idx = {'out': 0, 'in': 1}[in_or_out]
+    document = Document(test_docx('tab-stops'))
+    paragraph_format = document.paragraphs[2].paragraph_format
+    context.tab_stop = paragraph_format.tab_stops[tab_idx]
+
+
+@given('a tab stop having {alignment} alignment')
+def given_a_tab_stop_having_alignment_alignment(context, alignment):
+    tab_idx = {'LEFT': 0, 'CENTER': 1, 'RIGHT': 2}[alignment]
+    document = Document(test_docx('tab-stops'))
+    paragraph_format = document.paragraphs[1].paragraph_format
+    context.tab_stop = paragraph_format.tab_stops[tab_idx]
+
+
+@given('a tab stop having {leader} leader')
+def given_a_tab_stop_having_leader_leader(context, leader):
+    tab_idx = {'no specified': 0, 'a dotted': 2}[leader]
+    document = Document(test_docx('tab-stops'))
+    paragraph_format = document.paragraphs[1].paragraph_format
+    context.tab_stop = paragraph_format.tab_stops[tab_idx]
+
+
 # then =====================================================
 
 @then('I can access a tab stop by index')
@@ -43,3 +68,23 @@ def then_I_can_iterate_the_TabStops_object(context):
 def then_len_tab_stops_is_count(context, count):
     tab_stops = context.tab_stops
     assert len(tab_stops) == int(count)
+
+
+@then('tab_stop.alignment is {alignment}')
+def then_tab_stop_alignment_is_alignment(context, alignment):
+    expected_value = getattr(WD_TAB_ALIGNMENT, alignment)
+    tab_stop = context.tab_stop
+    assert tab_stop.alignment == expected_value
+
+
+@then('tab_stop.leader is {leader}')
+def then_tab_stop_leader_is_leader(context, leader):
+    expected_value = getattr(WD_TAB_LEADER, leader)
+    tab_stop = context.tab_stop
+    assert tab_stop.leader == expected_value
+
+
+@then('tab_stop.position is {position}')
+def then_tab_stop_position_is_position(context, position):
+    tab_stop = context.tab_stop
+    assert tab_stop.position == int(position)
diff --git a/features/steps/test_files/tab-stops.docx b/features/steps/test_files/tab-stops.docx
index a33532779dc9647b56e4e1a0f94d864c4041de6e..fa51252ed4102b62265cbab8a535e69a191f5233 100644
GIT binary patch
delta 8788
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
Dm|sov

delta 8479
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

diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
new file mode 100644
index 000000000..a35ac6fe4
--- /dev/null
+++ b/features/tab-tabstop-props.feature
@@ -0,0 +1,37 @@
+Feature: Tab stop properties
+  To change the properties of an individual tab stop
+  As a developer using python-docx
+  I need a set of read/write properties on TabStop
+
+
+  @wip
+  Scenario Outline: Get TabStop.position
+    Given a tab stop 0.5 inches <in-or-out> from the paragraph left edge
+     Then tab_stop.position is <position>
+
+    Examples: tab stop positions
+      | in-or-out | position |
+      |    in     |  457200  |
+      |    out    | -457200  |
+
+
+  @wip
+  Scenario Outline: Get TabStop.alignment
+    Given a tab stop having <alignment> alignment
+     Then tab_stop.alignment is <alignment>
+
+    Examples: tab stop alignments
+      | alignment |
+      | LEFT      |
+      | RIGHT     |
+
+
+  @wip
+  Scenario Outline: Get TabStop.leader
+    Given a tab stop having <leader> leader
+     Then tab_stop.leader is <value>
+
+    Examples: tab stop leaders
+      | leader       | value  |
+      | no specified | SPACES |
+      | a dotted     | DOTS   |

From 5b7edf96ef4b1b44cd86f5edd2bbe9ed039bc7e2 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 5 May 2016 19:20:32 -0700
Subject: [PATCH 134/367] tabs: add TabStop.position

---
 docx/oxml/__init__.py              |  5 ++++-
 docx/oxml/text/parfmt.py           |  7 +++++++
 docx/text/tabstops.py              |  8 ++++++++
 features/tab-tabstop-props.feature |  1 -
 tests/text/test_tabstops.py        | 15 +++++++++++++++
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 8c5b2a6ed..528b1eac7 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -181,7 +181,9 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 from .text.paragraph import CT_P
 register_element_cls('w:p', CT_P)
 
-from .text.parfmt import CT_Ind, CT_Jc, CT_PPr, CT_Spacing, CT_TabStops
+from .text.parfmt import (
+    CT_Ind, CT_Jc, CT_PPr, CT_Spacing, CT_TabStop, CT_TabStops
+)
 register_element_cls('w:ind',             CT_Ind)
 register_element_cls('w:jc',              CT_Jc)
 register_element_cls('w:keepLines',       CT_OnOff)
@@ -190,6 +192,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:pPr',             CT_PPr)
 register_element_cls('w:pStyle',          CT_String)
 register_element_cls('w:spacing',         CT_Spacing)
+register_element_cls('w:tab',             CT_TabStop)
 register_element_cls('w:tabs',            CT_TabStops)
 register_element_cls('w:widowControl',    CT_OnOff)
 
diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
index 78922e231..42fc11807 100644
--- a/docx/oxml/text/parfmt.py
+++ b/docx/oxml/text/parfmt.py
@@ -315,6 +315,13 @@ class CT_Spacing(BaseOxmlElement):
     lineRule = OptionalAttribute('w:lineRule', WD_LINE_SPACING)
 
 
+class CT_TabStop(BaseOxmlElement):
+    """
+    ``<w:tab>`` element, representing an individual tab stop.
+    """
+    pos = RequiredAttribute('w:pos', ST_SignedTwipsMeasure)
+
+
 class CT_TabStops(BaseOxmlElement):
     """
     ``<w:tabs>`` element, container for a sorted sequence of tab stops.
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index a857299c0..771503ee3 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -63,3 +63,11 @@ class TabStop(ElementProxy):
     def __init__(self, element):
         super(TabStop, self).__init__(element, None)
         self._tab = element
+
+    @property
+    def position(self):
+        """
+        The distance (in EMU) of this tab stop from the inside edge of the
+        paragraph. May be positive or negative.
+        """
+        return self._tab.pos
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index a35ac6fe4..05e25609d 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -4,7 +4,6 @@ Feature: Tab stop properties
   I need a set of read/write properties on TabStop
 
 
-  @wip
   Scenario Outline: Get TabStop.position
     Given a tab stop 0.5 inches <in-or-out> from the paragraph left edge
      Then tab_stop.position is <position>
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index 05652cdd1..ae05f81aa 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -9,6 +9,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.shared import Twips
 from docx.text.tabstops import TabStop, TabStops
 
 import pytest
@@ -17,6 +18,20 @@
 from ..unitutil.mock import call, class_mock, instance_mock
 
 
+class DescribeTabStop(object):
+
+    def it_knows_its_position(self, position_get_fixture):
+        tab_stop, expected_value = position_get_fixture
+        assert tab_stop.position == expected_value
+
+    # fixture --------------------------------------------------------
+
+    @pytest.fixture
+    def position_get_fixture(self, request):
+        tab_stop = TabStop(element('w:tab{w:pos=720}'))
+        return tab_stop, Twips(720)
+
+
 class DescribeTabStops(object):
 
     def it_knows_its_length(self, len_fixture):

From 48a7e3189f32d19ac3826de1b5780e536bd31070 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 5 May 2016 19:27:50 -0700
Subject: [PATCH 135/367] tabs: add TabStop.alignment

---
 docx/oxml/text/parfmt.py           |  5 ++++-
 docx/text/tabstops.py              |  8 ++++++++
 features/tab-tabstop-props.feature |  1 -
 tests/text/test_tabstops.py        | 15 +++++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
index 42fc11807..4835ec55f 100644
--- a/docx/oxml/text/parfmt.py
+++ b/docx/oxml/text/parfmt.py
@@ -4,7 +4,9 @@
 Custom element classes related to paragraph properties (CT_PPr).
 """
 
-from ...enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
+from ...enum.text import (
+    WD_ALIGN_PARAGRAPH, WD_LINE_SPACING, WD_TAB_ALIGNMENT
+)
 from ...shared import Length
 from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
 from ..xmlchemy import (
@@ -319,6 +321,7 @@ class CT_TabStop(BaseOxmlElement):
     """
     ``<w:tab>`` element, representing an individual tab stop.
     """
+    val = RequiredAttribute('w:val', WD_TAB_ALIGNMENT)
     pos = RequiredAttribute('w:pos', ST_SignedTwipsMeasure)
 
 
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 771503ee3..6d6677d85 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -64,6 +64,14 @@ def __init__(self, element):
         super(TabStop, self).__init__(element, None)
         self._tab = element
 
+    @property
+    def alignment(self):
+        """
+        A member of :ref:`WdTabAlignment` specifying the alignment setting
+        for this tab stop.
+        """
+        return self._tab.val
+
     @property
     def position(self):
         """
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index 05e25609d..3dc2947bb 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -14,7 +14,6 @@ Feature: Tab stop properties
       |    out    | -457200  |
 
 
-  @wip
   Scenario Outline: Get TabStop.alignment
     Given a tab stop having <alignment> alignment
      Then tab_stop.alignment is <alignment>
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index ae05f81aa..b6dffd7df 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -9,6 +9,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.enum.text import WD_TAB_ALIGNMENT
 from docx.shared import Twips
 from docx.text.tabstops import TabStop, TabStops
 
@@ -24,8 +25,22 @@ def it_knows_its_position(self, position_get_fixture):
         tab_stop, expected_value = position_get_fixture
         assert tab_stop.position == expected_value
 
+    def it_knows_its_alignment(self, alignment_get_fixture):
+        tab_stop, expected_value = alignment_get_fixture
+        assert tab_stop.alignment == expected_value
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:tab{w:val=left}',  'LEFT'),
+        ('w:tab{w:val=right}', 'RIGHT'),
+    ])
+    def alignment_get_fixture(self, request):
+        tab_stop_cxml, member = request.param
+        tab_stop = TabStop(element(tab_stop_cxml))
+        expected_value = getattr(WD_TAB_ALIGNMENT, member)
+        return tab_stop, expected_value
+
     @pytest.fixture
     def position_get_fixture(self, request):
         tab_stop = TabStop(element('w:tab{w:pos=720}'))

From 321cad1ba6e98d9668286c4f13822e2b99fe4a8c Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Thu, 5 May 2016 19:39:00 -0700
Subject: [PATCH 136/367] tabs: add TabStop.leader

---
 docx/oxml/text/parfmt.py           |  5 ++++-
 docx/text/tabstops.py              |  9 +++++++++
 features/tab-tabstop-props.feature |  1 -
 tests/text/test_tabstops.py        | 17 ++++++++++++++++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
index 4835ec55f..10529be7e 100644
--- a/docx/oxml/text/parfmt.py
+++ b/docx/oxml/text/parfmt.py
@@ -5,7 +5,7 @@
 """
 
 from ...enum.text import (
-    WD_ALIGN_PARAGRAPH, WD_LINE_SPACING, WD_TAB_ALIGNMENT
+    WD_ALIGN_PARAGRAPH, WD_LINE_SPACING, WD_TAB_ALIGNMENT, WD_TAB_LEADER
 )
 from ...shared import Length
 from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
@@ -322,6 +322,9 @@ class CT_TabStop(BaseOxmlElement):
     ``<w:tab>`` element, representing an individual tab stop.
     """
     val = RequiredAttribute('w:val', WD_TAB_ALIGNMENT)
+    leader = OptionalAttribute(
+        'w:leader', WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES
+    )
     pos = RequiredAttribute('w:pos', ST_SignedTwipsMeasure)
 
 
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 6d6677d85..c344c907b 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -72,6 +72,15 @@ def alignment(self):
         """
         return self._tab.val
 
+    @property
+    def leader(self):
+        """
+        A member of :ref:`WdTabLeader` specifying a repeating character used
+        as a "leader", filling in the space spanned by this tab. Assigning
+        |None| produces the same result as assigning `WD_TAB_LEADER.SPACES`.
+        """
+        return self._tab.leader
+
     @property
     def position(self):
         """
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index 3dc2947bb..a76fc98c5 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -24,7 +24,6 @@ Feature: Tab stop properties
       | RIGHT     |
 
 
-  @wip
   Scenario Outline: Get TabStop.leader
     Given a tab stop having <leader> leader
      Then tab_stop.leader is <value>
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index b6dffd7df..b4062b92e 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -9,7 +9,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from docx.enum.text import WD_TAB_ALIGNMENT
+from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
 from docx.shared import Twips
 from docx.text.tabstops import TabStop, TabStops
 
@@ -29,6 +29,10 @@ def it_knows_its_alignment(self, alignment_get_fixture):
         tab_stop, expected_value = alignment_get_fixture
         assert tab_stop.alignment == expected_value
 
+    def it_knows_its_leader(self, leader_get_fixture):
+        tab_stop, expected_value = leader_get_fixture
+        assert tab_stop.leader == expected_value
+
     # fixture --------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -41,6 +45,17 @@ def alignment_get_fixture(self, request):
         expected_value = getattr(WD_TAB_ALIGNMENT, member)
         return tab_stop, expected_value
 
+    @pytest.fixture(params=[
+        ('w:tab',                'SPACES'),
+        ('w:tab{w:leader=none}', 'SPACES'),
+        ('w:tab{w:leader=dot}',  'DOTS'),
+    ])
+    def leader_get_fixture(self, request):
+        tab_stop_cxml, member = request.param
+        tab_stop = TabStop(element(tab_stop_cxml))
+        expected_value = getattr(WD_TAB_LEADER, member)
+        return tab_stop, expected_value
+
     @pytest.fixture
     def position_get_fixture(self, request):
         tab_stop = TabStop(element('w:tab{w:pos=720}'))

From bcd4a55b0365de1a52f9453813eb9c37bf0cbbd3 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Fri, 6 May 2016 17:29:59 -0700
Subject: [PATCH 137/367] acpt: add scenarios for TabStop property setters

---
 features/steps/tabstops.py         | 29 ++++++++++++++++++++++-
 features/tab-tabstop-props.feature | 37 ++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
index 8f8250e59..b5b02cc3a 100644
--- a/features/steps/tabstops.py
+++ b/features/steps/tabstops.py
@@ -4,7 +4,7 @@
 Step implementations for paragraph-related features
 """
 
-from behave import given, then
+from behave import given, then, when
 
 from docx import Document
 from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
@@ -28,6 +28,7 @@ def given_a_tab_stop_inches_from_paragraph_left_edge(context, in_or_out):
     tab_idx = {'out': 0, 'in': 1}[in_or_out]
     document = Document(test_docx('tab-stops'))
     paragraph_format = document.paragraphs[2].paragraph_format
+    context.tab_stops = paragraph_format.tab_stops
     context.tab_stop = paragraph_format.tab_stops[tab_idx]
 
 
@@ -47,6 +48,25 @@ def given_a_tab_stop_having_leader_leader(context, leader):
     context.tab_stop = paragraph_format.tab_stops[tab_idx]
 
 
+# when ====================================================
+
+@when('I assign {member} to tab_stop.alignment')
+def when_I_assign_member_to_tab_stop_alignment(context, member):
+    value = getattr(WD_TAB_ALIGNMENT, member)
+    context.tab_stop.alignment = value
+
+
+@when('I assign {member} to tab_stop.leader')
+def when_I_assign_member_to_tab_stop_leader(context, member):
+    value = getattr(WD_TAB_LEADER, member)
+    context.tab_stop.leader = value
+
+
+@when('I assign {value} to tab_stop.position')
+def when_I_assign_value_to_tab_stop_value(context, value):
+    context.tab_stop.position = int(value)
+
+
 # then =====================================================
 
 @then('I can access a tab stop by index')
@@ -88,3 +108,10 @@ def then_tab_stop_leader_is_leader(context, leader):
 def then_tab_stop_position_is_position(context, position):
     tab_stop = context.tab_stop
     assert tab_stop.position == int(position)
+
+
+@then('the tab stops are sequenced in position order')
+def then_the_tab_stops_are_sequenced_in_position_order(context):
+    tab_stops = context.tab_stops
+    for idx in range(len(tab_stops) - 1):
+        assert tab_stops[idx].position < tab_stops[idx+1].position
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index a76fc98c5..6de26c0e2 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -14,6 +14,19 @@ Feature: Tab stop properties
       |    out    | -457200  |
 
 
+  @wip
+  Scenario Outline: Set TabStop.position
+    Given a tab stop 0.5 inches in from the paragraph left edge
+     When I assign <value> to tab_stop.position
+      Then tab_stop.position is <value>
+       And the tab stops are sequenced in position order
+
+    Examples: tab stop positions
+      |  value  |
+      |  228600 |
+      | -914400 |
+
+
   Scenario Outline: Get TabStop.alignment
     Given a tab stop having <alignment> alignment
      Then tab_stop.alignment is <alignment>
@@ -24,6 +37,18 @@ Feature: Tab stop properties
       | RIGHT     |
 
 
+  @wip
+  Scenario Outline: Set TabStop.alignment
+   Given a tab stop having <alignment> alignment
+    When I assign <member> to tab_stop.alignment
+     Then tab_stop.alignment is <member>
+
+    Examples: tab stop alignments
+      | alignment | member |
+      | LEFT      | CENTER |
+      | RIGHT     | LEFT   |
+
+
   Scenario Outline: Get TabStop.leader
     Given a tab stop having <leader> leader
      Then tab_stop.leader is <value>
@@ -32,3 +57,15 @@ Feature: Tab stop properties
       | leader       | value  |
       | no specified | SPACES |
       | a dotted     | DOTS   |
+
+
+  @wip
+  Scenario Outline: Set TabStop.leader
+   Given a tab stop having <leader> leader
+    When I assign <member> to tab_stop.leader
+     Then tab_stop.leader is <member>
+
+    Examples: tab stop leaders
+      | leader       | member |
+      | no specified | DOTS   |
+      | a dotted     | SPACES |

From edf8d037ebf7ba1ccadbd3ecbbd9998d074346de Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Fri, 6 May 2016 17:35:53 -0700
Subject: [PATCH 138/367] tabs: add TabStop.position setter

---
 docx/oxml/text/parfmt.py           | 13 ++++++++++++
 docx/text/tabstops.py              |  7 +++++++
 features/tab-tabstop-props.feature |  1 -
 tests/text/test_tabstops.py        | 33 +++++++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
index 10529be7e..466b11b1b 100644
--- a/docx/oxml/text/parfmt.py
+++ b/docx/oxml/text/parfmt.py
@@ -333,3 +333,16 @@ class CT_TabStops(BaseOxmlElement):
     ``<w:tabs>`` element, container for a sorted sequence of tab stops.
     """
     tab = OneOrMore('w:tab', successors=())
+
+    def insert_tab_in_order(self, pos, align, leader):
+        """
+        Insert a newly created `w:tab` child element in *pos* order.
+        """
+        new_tab = self._new_tab()
+        new_tab.pos, new_tab.val, new_tab.leader = pos, align, leader
+        for tab in self.tab_lst:
+            if new_tab.pos < tab.pos:
+                tab.addprevious(new_tab)
+                return new_tab
+        self.append(new_tab)
+        return new_tab
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index c344c907b..9914c49ad 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -88,3 +88,10 @@ def position(self):
         paragraph. May be positive or negative.
         """
         return self._tab.pos
+
+    @position.setter
+    def position(self, value):
+        tab = self._tab
+        tabs = tab.getparent()
+        self._tab = tabs.insert_tab_in_order(value, tab.val, tab.leader)
+        tabs.remove(tab)
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index 6de26c0e2..eb8b8609d 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -14,7 +14,6 @@ Feature: Tab stop properties
       |    out    | -457200  |
 
 
-  @wip
   Scenario Outline: Set TabStop.position
     Given a tab stop 0.5 inches in from the paragraph left edge
      When I assign <value> to tab_stop.position
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index b4062b92e..1da8c6e44 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -15,7 +15,7 @@
 
 import pytest
 
-from ..unitutil.cxml import element
+from ..unitutil.cxml import element, xml
 from ..unitutil.mock import call, class_mock, instance_mock
 
 
@@ -25,6 +25,12 @@ def it_knows_its_position(self, position_get_fixture):
         tab_stop, expected_value = position_get_fixture
         assert tab_stop.position == expected_value
 
+    def it_can_change_its_position(self, position_set_fixture):
+        tab_stop, value, tabs, new_idx, expected_xml = position_set_fixture
+        tab_stop.position = value
+        assert tab_stop._tab is tabs[new_idx]
+        assert tabs.xml == expected_xml
+
     def it_knows_its_alignment(self, alignment_get_fixture):
         tab_stop, expected_value = alignment_get_fixture
         assert tab_stop.alignment == expected_value
@@ -61,6 +67,31 @@ def position_get_fixture(self, request):
         tab_stop = TabStop(element('w:tab{w:pos=720}'))
         return tab_stop, Twips(720)
 
+    @pytest.fixture(params=[
+        ('w:tabs/w:tab{w:pos=360,w:val=left}',
+         Twips(720), 0,
+         'w:tabs/w:tab{w:pos=720,w:val=left}'),
+        ('w:tabs/(w:tab{w:pos=360,w:val=left},w:tab{w:pos=720,w:val=left})',
+         Twips(180), 0,
+         'w:tabs/(w:tab{w:pos=180,w:val=left},w:tab{w:pos=720,w:val=left})'),
+        ('w:tabs/(w:tab{w:pos=360,w:val=left},w:tab{w:pos=720,w:val=left})',
+         Twips(960), 1,
+         'w:tabs/(w:tab{w:pos=720,w:val=left},w:tab{w:pos=960,w:val=left})'),
+        ('w:tabs/(w:tab{w:pos=-72,w:val=left},w:tab{w:pos=-36,w:val=left})',
+         Twips(-48), 0,
+         'w:tabs/(w:tab{w:pos=-48,w:val=left},w:tab{w:pos=-36,w:val=left})'),
+        ('w:tabs/(w:tab{w:pos=-72,w:val=left},w:tab{w:pos=-36,w:val=left})',
+         Twips(-16), 1,
+         'w:tabs/(w:tab{w:pos=-36,w:val=left},w:tab{w:pos=-16,w:val=left})'),
+    ])
+    def position_set_fixture(self, request):
+        tabs_cxml, value, new_idx, expected_cxml = request.param
+        tabs = element(tabs_cxml)
+        tab = tabs.tab_lst[0]
+        tab_stop = TabStop(tab)
+        expected_xml = xml(expected_cxml)
+        return tab_stop, value, tabs, new_idx, expected_xml
+
 
 class DescribeTabStops(object):
 

From 7f76a129117e1dc48b9613470760ab935d1c1114 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Fri, 6 May 2016 17:43:33 -0700
Subject: [PATCH 139/367] tabs: add TabStop.alignment setter

---
 docx/text/tabstops.py              |  4 ++++
 features/tab-tabstop-props.feature |  1 -
 tests/text/test_tabstops.py        | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 9914c49ad..cd117534d 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -72,6 +72,10 @@ def alignment(self):
         """
         return self._tab.val
 
+    @alignment.setter
+    def alignment(self, value):
+        self._tab.val = value
+
     @property
     def leader(self):
         """
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index eb8b8609d..ed559daf9 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -36,7 +36,6 @@ Feature: Tab stop properties
       | RIGHT     |
 
 
-  @wip
   Scenario Outline: Set TabStop.alignment
    Given a tab stop having <alignment> alignment
     When I assign <member> to tab_stop.alignment
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index 1da8c6e44..c47bb075b 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -35,6 +35,11 @@ def it_knows_its_alignment(self, alignment_get_fixture):
         tab_stop, expected_value = alignment_get_fixture
         assert tab_stop.alignment == expected_value
 
+    def it_can_change_its_alignment(self, alignment_set_fixture):
+        tab_stop, value, expected_xml = alignment_set_fixture
+        tab_stop.alignment = value
+        assert tab_stop._element.xml == expected_xml
+
     def it_knows_its_leader(self, leader_get_fixture):
         tab_stop, expected_value = leader_get_fixture
         assert tab_stop.leader == expected_value
@@ -51,6 +56,17 @@ def alignment_get_fixture(self, request):
         expected_value = getattr(WD_TAB_ALIGNMENT, member)
         return tab_stop, expected_value
 
+    @pytest.fixture(params=[
+        ('w:tab{w:val=left}',  'RIGHT', 'w:tab{w:val=right}'),
+        ('w:tab{w:val=right}', 'LEFT',  'w:tab{w:val=left}'),
+    ])
+    def alignment_set_fixture(self, request):
+        tab_stop_cxml, member, expected_cxml = request.param
+        tab_stop = TabStop(element(tab_stop_cxml))
+        expected_xml = xml(expected_cxml)
+        value = getattr(WD_TAB_ALIGNMENT, member)
+        return tab_stop, value, expected_xml
+
     @pytest.fixture(params=[
         ('w:tab',                'SPACES'),
         ('w:tab{w:leader=none}', 'SPACES'),

From 78ecbd6189cf7f83d3146993444bff476a61523d Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Fri, 6 May 2016 17:56:15 -0700
Subject: [PATCH 140/367] tabs: add TabStop.leader setter

---
 docx/text/tabstops.py              |  4 ++++
 features/tab-tabstop-props.feature |  1 -
 tests/text/test_tabstops.py        | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index cd117534d..4d14611d4 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -85,6 +85,10 @@ def leader(self):
         """
         return self._tab.leader
 
+    @leader.setter
+    def leader(self, value):
+        self._tab.leader = value
+
     @property
     def position(self):
         """
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
index ed559daf9..9031023a1 100644
--- a/features/tab-tabstop-props.feature
+++ b/features/tab-tabstop-props.feature
@@ -57,7 +57,6 @@ Feature: Tab stop properties
       | a dotted     | DOTS   |
 
 
-  @wip
   Scenario Outline: Set TabStop.leader
    Given a tab stop having <leader> leader
     When I assign <member> to tab_stop.leader
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index c47bb075b..4f698e212 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -44,6 +44,11 @@ def it_knows_its_leader(self, leader_get_fixture):
         tab_stop, expected_value = leader_get_fixture
         assert tab_stop.leader == expected_value
 
+    def it_can_change_its_leader(self, leader_set_fixture):
+        tab_stop, value, expected_xml = leader_set_fixture
+        tab_stop.leader = value
+        assert tab_stop._element.xml == expected_xml
+
     # fixture --------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -78,6 +83,23 @@ def leader_get_fixture(self, request):
         expected_value = getattr(WD_TAB_LEADER, member)
         return tab_stop, expected_value
 
+    @pytest.fixture(params=[
+        ('w:tab',                  'DOTS',   'w:tab{w:leader=dot}'),
+        ('w:tab{w:leader=dot}',    'DASHES', 'w:tab{w:leader=hyphen}'),
+        ('w:tab{w:leader=hyphen}', 'SPACES', 'w:tab'),
+        ('w:tab{w:leader=hyphen}', None,     'w:tab'),
+        ('w:tab',                  'SPACES', 'w:tab'),
+        ('w:tab',                  None,     'w:tab'),
+    ])
+    def leader_set_fixture(self, request):
+        tab_stop_cxml, new_value, expected_cxml = request.param
+        tab_stop = TabStop(element(tab_stop_cxml))
+        value = (
+            None if new_value is None else getattr(WD_TAB_LEADER, new_value)
+        )
+        expected_xml = xml(expected_cxml)
+        return tab_stop, value, expected_xml
+
     @pytest.fixture
     def position_get_fixture(self, request):
         tab_stop = TabStop(element('w:tab{w:pos=720}'))

From 2bdaf7eb51c6135abf0a0e38970a08d67fbf6f2c Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Wed, 18 May 2016 21:00:21 -0700
Subject: [PATCH 141/367] acpt: add scenarios for add/remove tab stop

---
 features/steps/tabstops.py       | 26 ++++++++++++++++++++++++++
 features/tab-access-tabs.feature | 28 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
index b5b02cc3a..4a6b442e0 100644
--- a/features/steps/tabstops.py
+++ b/features/steps/tabstops.py
@@ -8,6 +8,7 @@
 
 from docx import Document
 from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
+from docx.shared import Inches
 from docx.text.tabstops import TabStop
 
 from helpers import test_docx
@@ -50,6 +51,12 @@ def given_a_tab_stop_having_leader_leader(context, leader):
 
 # when ====================================================
 
+@when('I add a tab stop')
+def when_I_add_a_tab_stop(context):
+    tab_stops = context.tab_stops
+    tab_stops.add_tab_stop(Inches(1.75))
+
+
 @when('I assign {member} to tab_stop.alignment')
 def when_I_assign_member_to_tab_stop_alignment(context, member):
     value = getattr(WD_TAB_ALIGNMENT, member)
@@ -67,6 +74,18 @@ def when_I_assign_value_to_tab_stop_value(context, value):
     context.tab_stop.position = int(value)
 
 
+@when('I call tab_stops.clear_all()')
+def when_I_call_tab_stops_clear_all(context):
+    tab_stops = context.tab_stops
+    tab_stops.clear_all()
+
+
+@when('I remove a tab stop')
+def when_I_remove_a_tab_stop(context):
+    tab_stops = context.tab_stops
+    del tab_stops[1]
+
+
 # then =====================================================
 
 @then('I can access a tab stop by index')
@@ -110,6 +129,13 @@ def then_tab_stop_position_is_position(context, position):
     assert tab_stop.position == int(position)
 
 
+@then('the removed tab stop is no longer present in tab_stops')
+def then_the_removed_tab_stop_is_no_longer_present_in_tab_stops(context):
+    tab_stops = context.tab_stops
+    assert tab_stops[0].position == Inches(1)
+    assert tab_stops[1].position == Inches(3)
+
+
 @then('the tab stops are sequenced in position order')
 def then_the_tab_stops_are_sequenced_in_position_order(context):
     tab_stops = context.tab_stops
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
index c517ed012..390d22dbc 100644
--- a/features/tab-access-tabs.feature
+++ b/features/tab-access-tabs.feature
@@ -18,3 +18,31 @@ Feature: Access TabStop objects
     Given a tab_stops having 3 tab stops
      Then I can iterate the TabStops object
       And I can access a tab stop by index
+
+
+  @wip
+  Scenario Outline: TabStops.add_tab_stop()
+    Given a tab_stops having <count> tab stops
+     When I add a tab stop
+     Then len(tab_stops) is <new-count>
+      And the tab stops are sequenced in position order
+
+    Examples: tab stop object counts
+      | count | new-count |
+      |   0   |     1     |
+      |   3   |     4     |
+
+
+  @wip
+  Scenario: TabStops.__delitem__()
+    Given a tab_stops having 3 tab stops
+     When I remove a tab stop
+     Then len(tab_stops) is 2
+      And the removed tab stop is no longer present in tab_stops
+
+
+  @wip
+  Scenario: TabStops.clear_all()
+    Given a tab_stops having 3 tab stops
+     When I call tab_stops.clear_all()
+     Then len(tab_stops) is 0

From 17e7e38b4a8d11aca391f26d58003bfab3829e14 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Tue, 24 May 2016 19:12:21 -0700
Subject: [PATCH 142/367] tab: add TabStops.add_tab_stop()

---
 docx/text/tabstops.py            | 14 ++++++++++++++
 features/tab-access-tabs.feature |  1 -
 tests/text/test_tabstops.py      | 27 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 4d14611d4..ab00d565a 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -9,6 +9,7 @@
 )
 
 from ..shared import ElementProxy
+from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
 
 
 class TabStops(ElementProxy):
@@ -51,6 +52,19 @@ def __len__(self):
             return 0
         return len(tabs.tab_lst)
 
+    def add_tab_stop(self, position, alignment=WD_TAB_ALIGNMENT.LEFT,
+                     leader=WD_TAB_LEADER.SPACES):
+        """
+        Add a new tab stop at *position*. Tab alignment defaults to left, but
+        may be specified by passing a member of the :ref:`WdTabAlignment`
+        enumeration as *alignment*. An optional leader character can be
+        specified by passing a member of the :ref:`WdTabLeader` enumeration
+        as *leader*.
+        """
+        tabs = self._pPr.get_or_add_tabs()
+        tab = tabs.insert_tab_in_order(position, alignment, leader)
+        return TabStop(tab)
+
 
 class TabStop(ElementProxy):
     """
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
index 390d22dbc..5d81ed145 100644
--- a/features/tab-access-tabs.feature
+++ b/features/tab-access-tabs.feature
@@ -20,7 +20,6 @@ Feature: Access TabStop objects
       And I can access a tab stop by index
 
 
-  @wip
   Scenario Outline: TabStops.add_tab_stop()
     Given a tab_stops having <count> tab stops
      When I add a tab stop
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index 4f698e212..7af4d5eef 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -159,8 +159,35 @@ def it_raises_on_indexed_access_when_empty(self):
         with pytest.raises(IndexError):
             tab_stops[0]
 
+    def it_can_add_a_tab_stop(self, add_tab_fixture):
+        tab_stops, position, kwargs, expected_xml = add_tab_fixture
+        tab_stops.add_tab_stop(position, **kwargs)
+        assert tab_stops._element.xml == expected_xml
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:pPr', Twips(42), {},
+         'w:pPr/w:tabs/w:tab{w:pos=42,w:val=left}'),
+        ('w:pPr', Twips(72), {'alignment': WD_TAB_ALIGNMENT.RIGHT},
+         'w:pPr/w:tabs/w:tab{w:pos=72,w:val=right}'),
+        ('w:pPr', Twips(24),
+         {'alignment': WD_TAB_ALIGNMENT.CENTER,
+          'leader': WD_TAB_LEADER.DOTS},
+         'w:pPr/w:tabs/w:tab{w:pos=24,w:val=center,w:leader=dot}'),
+        ('w:pPr/w:tabs/w:tab{w:pos=42}', Twips(72), {},
+         'w:pPr/w:tabs/(w:tab{w:pos=42},w:tab{w:pos=72,w:val=left})'),
+        ('w:pPr/w:tabs/w:tab{w:pos=42}', Twips(24), {},
+         'w:pPr/w:tabs/(w:tab{w:pos=24,w:val=left},w:tab{w:pos=42})'),
+        ('w:pPr/w:tabs/w:tab{w:pos=42}', Twips(42), {},
+         'w:pPr/w:tabs/(w:tab{w:pos=42},w:tab{w:pos=42,w:val=left})'),
+    ])
+    def add_tab_fixture(self, request):
+        pPr_cxml, position, kwargs, expected_cxml = request.param
+        tab_stops = TabStops(element(pPr_cxml))
+        expected_xml = xml(expected_cxml)
+        return tab_stops, position, kwargs, expected_xml
+
     @pytest.fixture(params=[
         ('w:pPr/w:tabs/w:tab{w:pos=0}',                                 0),
         ('w:pPr/w:tabs/(w:tab{w:pos=1},w:tab{w:pos=2},w:tab{w:pos=3})', 1),

From df0406325033536851667cf23b676b9ff446ad24 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Wed, 25 May 2016 15:08:52 -0700
Subject: [PATCH 143/367] tab: add TabStops.__delitem__()

---
 docx/text/tabstops.py            | 13 ++++++++++++
 features/tab-access-tabs.feature |  1 -
 tests/text/test_tabstops.py      | 34 ++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index ab00d565a..77798d517 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -26,6 +26,19 @@ def __init__(self, element):
         super(TabStops, self).__init__(element, None)
         self._pPr = element
 
+    def __delitem__(self, idx):
+        """
+        Remove the tab at offset *idx* in this sequence.
+        """
+        tabs = self._pPr.tabs
+        try:
+            tabs.remove(tabs[idx])
+        except (AttributeError, IndexError):
+            raise IndexError('tab index out of range')
+
+        if len(tabs) == 0:
+            self._pPr.remove(tabs)
+
     def __getitem__(self, idx):
         """
         Enables list-style access by index.
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
index 5d81ed145..8a8c60dcf 100644
--- a/features/tab-access-tabs.feature
+++ b/features/tab-access-tabs.feature
@@ -32,7 +32,6 @@ Feature: Access TabStop objects
       |   3   |     4     |
 
 
-  @wip
   Scenario: TabStops.__delitem__()
     Given a tab_stops having 3 tab stops
      When I remove a tab stop
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index 7af4d5eef..fea8c20c9 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -164,8 +164,42 @@ def it_can_add_a_tab_stop(self, add_tab_fixture):
         tab_stops.add_tab_stop(position, **kwargs)
         assert tab_stops._element.xml == expected_xml
 
+    def it_can_delete_a_tab_stop(self, del_fixture):
+        tab_stops, idx, expected_xml = del_fixture
+        del tab_stops[idx]
+        assert tab_stops._element.xml == expected_xml
+
+    def it_raises_on_del_idx_invalid(self, del_raises_fixture):
+        tab_stops, idx = del_raises_fixture
+        with pytest.raises(IndexError) as exc:
+            del tab_stops[idx]
+        assert exc.value.args[0] == 'tab index out of range'
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:pPr/w:tabs/w:tab{w:pos=42}',                   0,
+         'w:pPr'),
+        ('w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})', 0,
+         'w:pPr/w:tabs/w:tab{w:pos=42}'),
+        ('w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})', 1,
+         'w:pPr/w:tabs/w:tab{w:pos=24}'),
+    ])
+    def del_fixture(self, request):
+        pPr_cxml, idx, expected_cxml = request.param
+        tab_stops = TabStops(element(pPr_cxml))
+        expected_xml = xml(expected_cxml)
+        return tab_stops, idx, expected_xml
+
+    @pytest.fixture(params=[
+        ('w:pPr',                        0),
+        ('w:pPr/w:tabs/w:tab{w:pos=42}', 1),
+    ])
+    def del_raises_fixture(self, request):
+        tab_stops_cxml, idx = request.param
+        tab_stops = TabStops(element(tab_stops_cxml))
+        return tab_stops, idx
+
     @pytest.fixture(params=[
         ('w:pPr', Twips(42), {},
          'w:pPr/w:tabs/w:tab{w:pos=42,w:val=left}'),

From 58e2151ef02aa94c71cbe25dfca840ed4d3131b2 Mon Sep 17 00:00:00 2001
From: DKWoods <david@spurgeonwoods.com>
Date: Wed, 25 May 2016 17:46:43 -0700
Subject: [PATCH 144/367] tab: add TabStops.clear_all()

---
 docx/text/tabstops.py            |  6 ++++++
 features/tab-access-tabs.feature |  1 -
 tests/text/test_tabstops.py      | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 77798d517..32b5bdc78 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -78,6 +78,12 @@ def add_tab_stop(self, position, alignment=WD_TAB_ALIGNMENT.LEFT,
         tab = tabs.insert_tab_in_order(position, alignment, leader)
         return TabStop(tab)
 
+    def clear_all(self):
+        """
+        Remove all custom tab stops.
+        """
+        self._pPr._remove_tabs()
+
 
 class TabStop(ElementProxy):
     """
diff --git a/features/tab-access-tabs.feature b/features/tab-access-tabs.feature
index 8a8c60dcf..92adff4a2 100644
--- a/features/tab-access-tabs.feature
+++ b/features/tab-access-tabs.feature
@@ -39,7 +39,6 @@ Feature: Access TabStop objects
       And the removed tab stop is no longer present in tab_stops
 
 
-  @wip
   Scenario: TabStops.clear_all()
     Given a tab_stops having 3 tab stops
      When I call tab_stops.clear_all()
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index fea8c20c9..0ca10e62d 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -175,8 +175,24 @@ def it_raises_on_del_idx_invalid(self, del_raises_fixture):
             del tab_stops[idx]
         assert exc.value.args[0] == 'tab index out of range'
 
+    def it_can_clear_all_its_tab_stops(self, clear_all_fixture):
+        tab_stops, expected_xml = clear_all_fixture
+        tab_stops.clear_all()
+        assert tab_stops._element.xml == expected_xml
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        'w:pPr',
+        'w:pPr/w:tabs/w:tab{w:pos=42}',
+        'w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})',
+    ])
+    def clear_all_fixture(self, request):
+        pPr_cxml = request.param
+        tab_stops = TabStops(element(pPr_cxml))
+        expected_xml = xml('w:pPr')
+        return tab_stops, expected_xml
+
     @pytest.fixture(params=[
         ('w:pPr/w:tabs/w:tab{w:pos=42}',                   0,
          'w:pPr'),

From 5cb582048903f9eec6d612f09795d8a6d7e9c73a Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 27 May 2016 14:09:08 -0700
Subject: [PATCH 145/367] docs: document TabStops and TabStop

* fix some documentation bugs in the example code resulting from
  moving alignment and indent to ParagraphFormat.
---
 docs/api/text.rst     | 16 ++++++++++
 docs/user/text.rst    | 73 +++++++++++++++++++++++++++++++++++--------
 docx/text/tabstops.py | 33 ++++++++++---------
 3 files changed, 95 insertions(+), 27 deletions(-)

diff --git a/docs/api/text.rst b/docs/api/text.rst
index 180701bb4..cc9b4892f 100644
--- a/docs/api/text.rst
+++ b/docs/api/text.rst
@@ -31,3 +31,19 @@ Text-related objects
 
 .. autoclass:: docx.text.run.Font()
    :members:
+
+
+|TabStop| objects
+-----------------
+
+.. autoclass:: docx.text.tabstops.TabStop()
+   :members:
+
+
+|TabStops| objects
+------------------
+
+.. autoclass:: docx.text.tabstops.TabStops()
+   :members: clear_all
+
+   .. automethod:: docx.text.tabstops.TabStops.add_tab_stop(position, alignment=WD_TAB_ALIGNMENT.LEFT, leader=WD_TAB_LEADER.SPACES)
diff --git a/docs/user/text.rst b/docs/user/text.rst
index 113501fa4..1b28feaab 100644
--- a/docs/user/text.rst
+++ b/docs/user/text.rst
@@ -93,40 +93,87 @@ inheritance from the style hierarchy::
     >>> paragraph = document.add_paragraph()
     >>> paragraph_format = paragraph.paragraph_format
 
-    >>> paragraph.left_indent
+    >>> paragraph_format.left_indent
     None  # indicating indentation is inherited from the style hierarchy
-    >>> paragraph.left_indent = Inches(0.5)
-    >>> paragraph.left_indent
+    >>> paragraph_format.left_indent = Inches(0.5)
+    >>> paragraph_format.left_indent
     457200
-    >>> paragraph.left_indent.inches
+    >>> paragraph_format.left_indent.inches
     0.5
 
 
 Right-side indent works in a similar way::
 
     >>> from docx.shared import Pt
-    >>> paragraph.right_indent
+    >>> paragraph_format.right_indent
     None
-    >>> paragraph.right_indent = Pt(24)
-    >>> paragraph.right_indent
+    >>> paragraph_format.right_indent = Pt(24)
+    >>> paragraph_format.right_indent
     304800
-    >>> paragraph.right_indent.pt
+    >>> paragraph_format.right_indent.pt
     24.0
 
 
+
+
 First-line indent is specified using the
 :attr:`~.ParagraphFormat.first_line_indent` property and is interpreted
 relative to the left indent. A negative value indicates a hanging indent::
 
-    >>> paragraph.first_line_indent
+    >>> paragraph_format.first_line_indent
     None
-    >>> paragraph.first_line_indent = Inches(-0.25)
-    >>> paragraph.first_line_indent
+    >>> paragraph_format.first_line_indent = Inches(-0.25)
+    >>> paragraph_format.first_line_indent
     -228600
-    >>> paragraph.first_line_indent.inches
+    >>> paragraph_format.first_line_indent.inches
     -0.25
 
 
+Tab stops
+~~~~~~~~~
+
+A tab stop determines the rendering of a tab character in the text of
+a paragraph. In particular, it specifies the position where the text
+following the tab character will start, how it will be aligned to that
+position, and an optional leader character that will fill the horizontal
+space spanned by the tab.
+
+The tab stops for a paragraph or style are contained in a |TabStops| object
+accessed using the :attr:`~.ParagraphFormat.tab_stops` property on
+|ParagraphFormat|::
+
+    >>> tab_stops = paragraph_format.tab_stops
+    >>> tab_stops
+    <docx.text.tabstops.TabStops object at 0x106b802d8>
+
+A new tab stop is added using the :meth:`~.TabStops.add_tab_stop` method::
+
+    >>> tab_stop = tab_stops.add_tab_stop(Inches(1.5))
+    >>> tab_stop.position
+    1371600
+    >>> tab_stop.position.inches
+    1.5
+
+Alignment defaults to left, but may be specified by providing a member of the
+:ref:`WdTabAlignment` enumeration. The leader character defaults to spaces,
+but may be specified by providing a member of the :ref:`WdTabLeader`
+enumeration::
+
+    >>> from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
+    >>> tab_stop = tab_stops.add_tab_stop(Inches(1.5), WD_TAB_ALIGNMENT.RIGHT, WD_TAB_LEADER.DOTS)
+    >>> print(tab_stop.alignment)
+    RIGHT (2)
+    >>> print(tab_stop.leader)
+    DOTS (1)
+
+Existing tab stops are accessed using sequence semantics on |TabStops|::
+
+    >>> tab_stops[0]
+    <docx.text.tabstops.TabStop object at 0x1105427e8>
+
+More details are available in the |TabStops| and |TabStop| API documentation
+
+
 Paragraph spacing
 ~~~~~~~~~~~~~~~~~
 
@@ -177,7 +224,7 @@ of the :ref:`WdLineSpacing` enumeration or |None|::
     None
 
     >>> paragraph_format.line_spacing = Pt(18)
-    >>> isinstance(Length, paragraph_format.line_spacing)
+    >>> isinstance(paragraph_format.line_spacing, Length)
     True
     >>> paragraph_format.line_spacing.pt
     18.0
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index 32b5bdc78..c22b9bc91 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -14,10 +14,11 @@
 
 class TabStops(ElementProxy):
     """
-    A sequence providing access to the tab stops of a paragraph or paragraph
-    style. Supports iteration, indexed access, del, and len(). It is accesed
-    using the `tab_stops` property of ParagraphFormat; it is not intended to
-    be constructed directly.
+    A sequence of |TabStop| objects providing access to the tab stops of
+    a paragraph or paragraph style. Supports iteration, indexed access, del,
+    and len(). It is accesed using the :attr:`~.ParagraphFormat.tab_stops`
+    property of ParagraphFormat; it is not intended to be constructed
+    directly.
     """
 
     __slots__ = ('_pPr')
@@ -68,11 +69,13 @@ def __len__(self):
     def add_tab_stop(self, position, alignment=WD_TAB_ALIGNMENT.LEFT,
                      leader=WD_TAB_LEADER.SPACES):
         """
-        Add a new tab stop at *position*. Tab alignment defaults to left, but
-        may be specified by passing a member of the :ref:`WdTabAlignment`
-        enumeration as *alignment*. An optional leader character can be
-        specified by passing a member of the :ref:`WdTabLeader` enumeration
-        as *leader*.
+        Add a new tab stop at *position*, a |Length| object specifying the
+        location of the tab stop relative to the paragraph edge. A negative
+        *position* value is valid and appears in hanging indentation. Tab
+        alignment defaults to left, but may be specified by passing a member
+        of the :ref:`WdTabAlignment` enumeration as *alignment*. An optional
+        leader character can be specified by passing a member of the
+        :ref:`WdTabLeader` enumeration as *leader*.
         """
         tabs = self._pPr.get_or_add_tabs()
         tab = tabs.insert_tab_in_order(position, alignment, leader)
@@ -87,8 +90,8 @@ def clear_all(self):
 
 class TabStop(ElementProxy):
     """
-    An individual tab stop applying to a paragraph or style. Each of these is
-    a member of a set held in a |TabStops| object.
+    An individual tab stop applying to a paragraph or style. Accessed using
+    list semantics on its containing |TabStops| object.
     """
 
     __slots__ = ('_tab')
@@ -101,7 +104,7 @@ def __init__(self, element):
     def alignment(self):
         """
         A member of :ref:`WdTabAlignment` specifying the alignment setting
-        for this tab stop.
+        for this tab stop. Read/write.
         """
         return self._tab.val
 
@@ -115,6 +118,7 @@ def leader(self):
         A member of :ref:`WdTabLeader` specifying a repeating character used
         as a "leader", filling in the space spanned by this tab. Assigning
         |None| produces the same result as assigning `WD_TAB_LEADER.SPACES`.
+        Read/write.
         """
         return self._tab.leader
 
@@ -125,8 +129,9 @@ def leader(self, value):
     @property
     def position(self):
         """
-        The distance (in EMU) of this tab stop from the inside edge of the
-        paragraph. May be positive or negative.
+        A |Length| object representing the distance of this tab stop from the
+        inside edge of the paragraph. May be positive or negative.
+        Read/write.
         """
         return self._tab.pos
 

From e784a73bfcdc24ba08f772055f8b4240f420adcf Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Wed, 22 Jun 2016 16:02:30 -0700
Subject: [PATCH 146/367] release: prepare v0.8.6 release

---
 HISTORY.rst      | 8 ++++++++
 docx/__init__.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index a51e27043..5b947d561 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,14 @@
 Release History
 ---------------
 
+0.8.6 (2016-06-22)
+++++++++++++++++++
+
+- Add #257: add Font.highlight_color
+- Add #261: add ParagraphFormat.tab_stops
+- Add #303: disallow XML entity expansion
+
+
 0.8.5 (2015-02-21)
 ++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index 7dadb58e7..cfa48729d 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.5'
+__version__ = '0.8.6'
 
 
 # register custom Part classes with opc package reader

From f02b1d641d4f1411d11692b37f0fd422d9dff2fe Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Tue, 26 Jul 2016 21:11:02 -0700
Subject: [PATCH 147/367] docs: document analysis for _Row.height

---
 docs/dev/analysis/features/table/index.rst    |   1 +
 .../dev/analysis/features/table/table-row.rst | 133 ++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 docs/dev/analysis/features/table/table-row.rst

diff --git a/docs/dev/analysis/features/table/index.rst b/docs/dev/analysis/features/table/index.rst
index 82836a746..e1212b7be 100644
--- a/docs/dev/analysis/features/table/index.rst
+++ b/docs/dev/analysis/features/table/index.rst
@@ -15,6 +15,7 @@ feature analyses:
    :titlesonly:
 
    table-props
+   table-row
    table-cell
    cell-merge
 
diff --git a/docs/dev/analysis/features/table/table-row.rst b/docs/dev/analysis/features/table/table-row.rst
new file mode 100644
index 000000000..9593e6db3
--- /dev/null
+++ b/docs/dev/analysis/features/table/table-row.rst
@@ -0,0 +1,133 @@
+
+Table Row
+=========
+
+A table row has certain properties such as height.
+
+
+Row.height
+----------
+
+Candidate protocol::
+
+    >>> from docx.enum.table import WD_ROW_HEIGHT
+    >>> row = table.add_row()
+    >>> row
+    <docx.table._Row object at 0x...>
+    >>> row.height_rule
+    None
+    >>> row.height_rule = WD_ROW_HEIGHT.EXACTLY
+    >>> row.height
+    None
+    >>> row.height = Pt(24)
+
+
+MS API
+------
+
+https://msdn.microsoft.com/en-us/library/office/ff193915.aspx
+
+Methods
+~~~~~~~
+
+* Delete()
+* SetHeight()
+* SetLeftIndent()
+
+Properties
+~~~~~~~~~~
+
+* Alignment
+* AllowBreakAcrossPages
+* Borders
+* Cells
+* HeadingFormat
+* Height
+* HeightRule
+* Index
+* IsFirst
+* IsLast
+* LeftIndent
+* NestingLevel
+* Next
+* Previous
+* Shading
+* SpaceBetweenColumns
+
+
+WD_ROW_HEIGHT_RULE Enumeration
+------------------------------
+
+Alias: WD_ROW_HEIGHT
+
+* wdRowHeightAtLeast (1) The row height is at least a minimum specified value.
+* wdRowHeightAuto (0) The row height is adjusted to accommodate the tallest
+  value in the row.
+* wdRowHeightExactly (2) The row height is an exact value.
+
+
+Schema Definitions
+------------------
+
+.. highlight:: xml
+
+::
+
+  <xsd:complexType name="CT_Tbl">  <!-- denormalized -->
+    <xsd:sequence>
+      <xsd:group    ref="EG_RangeMarkupElements"        minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="tblPr"       type="CT_TblPr"/>
+      <xsd:element name="tblGrid"     type="CT_TblGrid"/>
+      <xsd:choice                                       minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="tr"        type="CT_Row"/>
+        <xsd:element name="customXml" type="CT_CustomXmlRow"/>
+        <xsd:element name="sdt"       type="CT_SdtRow"/>
+        <xsd:group    ref="EG_RunLevelElts"             minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="CT_Row">
+    <xsd:sequence>
+      <xsd:element name="tblPrEx" type="CT_TblPrEx" minOccurs="0"/>
+      <xsd:element name="trPr"    type="CT_TrPr"    minOccurs="0"/>
+      <xsd:group    ref="EG_ContentCellContent"     minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="rsidRPr" type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidR"   type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidDel" type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidTr"  type="ST_LongHexNumber"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="CT_TrPr">  <!-- denormalized -->
+    <xsd:sequence>
+      <xsd:element name="cnfStyle"       type="CT_Cnf"           minOccurs="0"/>
+      <xsd:element name="divId"          type="CT_DecimalNumber" minOccurs="0"/>
+      <xsd:element name="gridBefore"     type="CT_DecimalNumber" minOccurs="0"/>
+      <xsd:element name="gridAfter"      type="CT_DecimalNumber" minOccurs="0"/>
+      <xsd:element name="wBefore"        type="CT_TblWidth"      minOccurs="0"/>
+      <xsd:element name="wAfter"         type="CT_TblWidth"      minOccurs="0"/>
+      <xsd:element name="cantSplit"      type="CT_OnOff"         minOccurs="0"/>
+      <xsd:element name="trHeight"       type="CT_Height"        minOccurs="0"/>
+      <xsd:element name="tblHeader"      type="CT_OnOff"         minOccurs="0"/>
+      <xsd:element name="tblCellSpacing" type="CT_TblWidth"      minOccurs="0"/>
+      <xsd:element name="jc"             type="CT_JcTable"       minOccurs="0"/>
+      <xsd:element name="hidden"         type="CT_OnOff"         minOccurs="0"/>
+      <xsd:element name="ins"            type="CT_TrackChange"   minOccurs="0"/>
+      <xsd:element name="del"            type="CT_TrackChange"   minOccurs="0"/>
+      <xsd:element name="trPrChange"     type="CT_TrPrChange"    minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="CT_Height">
+    <xsd:attribute name="val"   type="s:ST_TwipsMeasure"/>
+    <xsd:attribute name="hRule" type="ST_HeightRule"/>
+  </xsd:complexType>
+
+  <xsd:simpleType name="ST_HeightRule">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="auto"/>
+      <xsd:enumeration value="exact"/>
+      <xsd:enumeration value="atLeast"/>
+    </xsd:restriction>
+  </xsd:simpleType>

From 4d930576658c10f083141a0914bfec75431a3abe Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Thu, 18 Aug 2016 19:32:33 -0700
Subject: [PATCH 148/367] acpt: add scenarios for _Row.height, .height_rule

---
 docx/enum/table.py                       |  34 +++++++++++-
 features/steps/table.py                  |  63 ++++++++++++++++++++++-
 features/steps/test_files/tbl-props.docx | Bin 20094 -> 21549 bytes
 features/tbl-row-props.feature           |  56 ++++++++++++++++++++
 4 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 features/tbl-row-props.feature

diff --git a/docx/enum/table.py b/docx/enum/table.py
index bc201346c..1755a308c 100644
--- a/docx/enum/table.py
+++ b/docx/enum/table.py
@@ -9,10 +9,42 @@
 )
 
 from .base import (
-    Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
+    alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
 )
 
 
+@alias('WD_ROW_HEIGHT')
+class WD_ROW_HEIGHT_RULE(XmlEnumeration):
+    """
+    Specifies the rule for determining the height or a table row
+
+    Example::
+
+        from docx.enum.table import WD_ROW_HEIGHT_RULE
+
+        table = document.add_table(3, 3)
+        table.rows[0].height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+    """
+
+    __ms_name__ = "WdRowHeightRule"
+
+    __url__ = 'https://msdn.microsoft.com/en-us/library/office/ff193620.aspx'
+
+    __members__ = (
+        XmlMappedEnumMember(
+            'AUTO', 0, 'auto', 'The row height is adjusted to accommodate th'
+            'e tallest value in the row.'
+        ),
+        XmlMappedEnumMember(
+            'AT_LEAST', 1, 'atLeast', 'The row height is at least a minimum '
+            'specified value.'
+        ),
+        XmlMappedEnumMember(
+            'EXACTLY', 2, 'exact', 'The row height is an exact value.'
+        ),
+    )
+
+
 class WD_TABLE_ALIGNMENT(XmlEnumeration):
     """
     Specifies table justification type.
diff --git a/features/steps/table.py b/features/steps/table.py
index 8521ef1b8..5974de8d2 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -11,7 +11,9 @@
 from behave import given, then, when
 
 from docx import Document
-from docx.enum.table import WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+from docx.enum.table import (
+    WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+)
 from docx.shared import Inches
 from docx.table import _Column, _Columns, _Row, _Rows
 
@@ -139,6 +141,31 @@ def given_a_table_having_two_rows(context):
     context.table_ = document.tables[0]
 
 
+@given('a table row having height of {state}')
+def given_a_table_row_having_height_of_state(context, state):
+    table_idx = {
+        'no explicit setting': 0,
+        '2 inches':            2,
+        '3 inches':            3
+    }[state]
+    document = Document(test_docx('tbl-props'))
+    table = document.tables[table_idx]
+    context.row = table.rows[0]
+
+
+@given('a table row having height rule {state}')
+def given_a_table_row_having_height_rule_state(context, state):
+    table_idx = {
+        'no explicit setting': 0,
+        'automatic':           1,
+        'at least':            2,
+        'exactly':             3
+    }[state]
+    document = Document(test_docx('tbl-props'))
+    table = document.tables[table_idx]
+    context.row = table.rows[0]
+
+
 # when =====================================================
 
 @when('I add a 1.0 inch column to the table')
@@ -152,6 +179,20 @@ def when_add_row_to_table(context):
     context.row = table.add_row()
 
 
+@when('I assign {value} to row.height')
+def when_I_assign_value_to_row_height(context, value):
+    new_value = None if value == 'None' else int(value)
+    context.row.height = new_value
+
+
+@when('I assign {value} to row.height_rule')
+def when_I_assign_value_to_row_height_rule(context, value):
+    new_value = (
+        None if value == 'None' else getattr(WD_ROW_HEIGHT_RULE, value)
+    )
+    context.row.height_rule = new_value
+
+
 @when('I assign {value_str} to table.alignment')
 def when_I_assign_value_to_table_alignment(context, value_str):
     value = {
@@ -266,6 +307,26 @@ def then_can_iterate_over_row_collection(context):
     assert actual_count == 2
 
 
+@then('row.height is {value}')
+def then_row_height_is_value(context, value):
+    expected_height = None if value == 'None' else int(value)
+    actual_height = context.row.height
+    assert actual_height == expected_height, (
+        'expected %s, got %s' % (expected_height, actual_height)
+    )
+
+
+@then('row.height_rule is {value}')
+def then_row_height_rule_is_value(context, value):
+    expected_rule = (
+        None if value == 'None' else getattr(WD_ROW_HEIGHT_RULE, value)
+    )
+    actual_rule = context.row.height_rule
+    assert actual_rule == expected_rule, (
+        'expected %s, got %s' % (expected_rule, actual_rule)
+    )
+
+
 @then('table.alignment is {value_str}')
 def then_table_alignment_is_value(context, value_str):
     value = {
diff --git a/features/steps/test_files/tbl-props.docx b/features/steps/test_files/tbl-props.docx
index 3ca129cea7fddc267ddd7240340874488e95ec66..e69eec83bbd92239db495db961a062775e135e3a 100644
GIT binary patch
delta 3945
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

delta 2506
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
X6sQMDO8DOZV2$u~6K-0Ww6OXg<uTs+

diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
new file mode 100644
index 000000000..c493c8fdd
--- /dev/null
+++ b/features/tbl-row-props.feature
@@ -0,0 +1,56 @@
+Feature: Get and set table row properties
+  In order to format a table row to my requirements
+  As a developer using python-docx
+  I need a way to get and set the properties of a table row
+
+
+  @wip
+  Scenario Outline: Get Row.height_rule
+    Given a table row having height rule <state>
+     Then row.height_rule is <value>
+
+    Examples: Row.height_rule value cases
+      | state               | value    |
+      | no explicit setting | None     |
+      | automatic           | AUTO     |
+      | at least            | AT_LEAST |
+
+
+  @wip
+  Scenario Outline: Set Row.height_rule
+    Given a table row having height rule <state>
+     When I assign <value> to row.height_rule
+     Then row.height_rule is <value>
+
+    Examples: Row.height_rule assignment cases
+      | state               | value    |
+      | no explicit setting | AUTO     |
+      | automatic           | AT_LEAST |
+      | at least            | None     |
+      | no explicit setting | None     |
+
+
+  @wip
+  Scenario Outline: Get Row.height
+    Given a table row having height of <state>
+     Then row.height is <value>
+
+    Examples: Row.height value cases
+      | state               | value   |
+      | no explicit setting | None    |
+      | 2 inches            | 1828800 |
+      | 3 inches            | 2743200 |
+
+
+  @wip
+  Scenario Outline: Set row height
+    Given a table row having height of <state>
+     When I assign <value> to row.height
+     Then row.height is <value>
+
+    Examples: Row.height assignment cases
+      | state               | value   |
+      | no explicit setting | 1828800 |
+      | 2 inches            | 2743200 |
+      | 3 inches            | None    |
+      | no explicit setting | None    |

From 4f28d9339b1e1527008abae754909a9ae279f3b5 Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Sat, 29 Oct 2016 09:39:41 -0700
Subject: [PATCH 149/367] tbl: add _Row.height_rule getter

---
 docx/oxml/__init__.py          |  6 +++--
 docx/oxml/table.py             | 44 ++++++++++++++++++++++++++++++++++
 docx/table.py                  |  9 +++++++
 features/tbl-row-props.feature |  1 -
 tests/test_table.py            | 23 +++++++++++++++++-
 5 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 528b1eac7..d0d3ab66f 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -128,8 +128,8 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:unhideWhenUsed', CT_OnOff)
 
 from .table import (
-    CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType, CT_TblPr,
-    CT_TblWidth, CT_Tc, CT_TcPr, CT_VMerge
+    CT_Height, CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType,
+    CT_TblPr, CT_TblWidth, CT_Tc, CT_TcPr, CT_TrPr, CT_VMerge
 )
 register_element_cls('w:bidiVisual', CT_OnOff)
 register_element_cls('w:gridCol',    CT_TblGridCol)
@@ -143,6 +143,8 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:tcPr',       CT_TcPr)
 register_element_cls('w:tcW',        CT_TblWidth)
 register_element_cls('w:tr',         CT_Row)
+register_element_cls('w:trHeight',   CT_Height)
+register_element_cls('w:trPr',       CT_TrPr)
 register_element_cls('w:vMerge',     CT_VMerge)
 
 from .text.font import (
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 24d91690e..868e909f2 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -9,6 +9,7 @@
 )
 
 from . import parse_xml
+from ..enum.table import WD_ROW_HEIGHT_RULE
 from ..exceptions import InvalidSpanError
 from .ns import nsdecls, qn
 from ..shared import Emu, Twips
@@ -21,6 +22,14 @@
 )
 
 
+class CT_Height(BaseOxmlElement):
+    """
+    Used for ``<w:trHeight>`` to specify a row height and row height rule.
+    """
+    val = OptionalAttribute('w:val', ST_TwipsMeasure)
+    hRule = OptionalAttribute('w:hRule', WD_ROW_HEIGHT_RULE)
+
+
 class CT_Row(BaseOxmlElement):
     """
     ``<w:tr>`` element
@@ -51,6 +60,17 @@ def tr_idx(self):
         """
         return self.getparent().tr_lst.index(self)
 
+    @property
+    def trHeight_hRule(self):
+        """
+        Return the value of `w:trPr/w:trHeight@w:hRule`, or |None| if not
+        present.
+        """
+        trPr = self.trPr
+        if trPr is None:
+            return None
+        return trPr.trHeight_hRule
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -776,6 +796,30 @@ def width(self, value):
         tcW.width = value
 
 
+class CT_TrPr(BaseOxmlElement):
+    """
+    ``<w:trPr>`` element, defining table row properties
+    """
+    _tag_seq = (
+        'w:cnfStyle', 'w:divId', 'w:gridBefore', 'w:gridAfter', 'w:wBefore',
+        'w:wAfter', 'w:cantSplit', 'w:trHeight', 'w:tblHeader',
+        'w:tblCellSpacing', 'w:jc', 'w:hidden', 'w:ins', 'w:del',
+        'w:trPrChange'
+    )
+    trHeight = ZeroOrOne('w:trHeight', successors=_tag_seq[8:])
+    del _tag_seq
+
+    @property
+    def trHeight_hRule(self):
+        """
+        Return the value of `w:trHeight@w:hRule`, or |None| if not present.
+        """
+        trHeight = self.trHeight
+        if trHeight is None:
+            return None
+        return trHeight.hRule
+
+
 class CT_VMerge(BaseOxmlElement):
     """
     ``<w:vMerge>`` element, specifying vertical merging behavior of a cell.
diff --git a/docx/table.py b/docx/table.py
index d0b472fc8..370815691 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -383,6 +383,15 @@ def cells(self):
         """
         return tuple(self.table.row_cells(self._index))
 
+    @property
+    def height_rule(self):
+        """
+        Return the height rule of this cell as a member of the
+        :ref:`WdRowHeightRule` enumeration, or |None| if no explicit
+        height_rule is set.
+        """
+        return self._tr.trHeight_hRule
+
     @property
     def table(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
index c493c8fdd..bfd5a32be 100644
--- a/features/tbl-row-props.feature
+++ b/features/tbl-row-props.feature
@@ -4,7 +4,6 @@ Feature: Get and set table row properties
   I need a way to get and set the properties of a table row
 
 
-  @wip
   Scenario Outline: Get Row.height_rule
     Given a table row having height rule <state>
      Then row.height_rule is <value>
diff --git a/tests/test_table.py b/tests/test_table.py
index 44aec41dd..d3e212a12 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -9,7 +9,9 @@
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
-from docx.enum.table import WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+from docx.enum.table import (
+    WD_ROW_HEIGHT, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+)
 from docx.oxml import parse_xml
 from docx.oxml.table import CT_Tc
 from docx.parts.document import DocumentPart
@@ -651,6 +653,10 @@ def table_(self, request):
 
 class Describe_Row(object):
 
+    def it_knows_its_height_rule(self, height_rule_get_fixture):
+        row, expected_rule = height_rule_get_fixture
+        assert row.height_rule == expected_rule
+
     def it_provides_access_to_its_cells(self, cells_fixture):
         row, row_idx, expected_cells = cells_fixture
         cells = row.cells
@@ -675,6 +681,21 @@ def cells_fixture(self, _index_, table_prop_, table_):
         table_.row_cells.return_value = list(expected_cells)
         return row, row_idx, expected_cells
 
+    @pytest.fixture(params=[
+        ('w:tr',        None),
+        ('w:tr/w:trPr', None),
+        ('w:tr/w:trPr/w:trHeight{w:val=0, w:hRule=auto}',
+         WD_ROW_HEIGHT.AUTO),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=atLeast}',
+         WD_ROW_HEIGHT.AT_LEAST),
+        ('w:tr/w:trPr/w:trHeight{w:val=2880, w:hRule=exact}',
+         WD_ROW_HEIGHT.EXACTLY),
+    ])
+    def height_rule_get_fixture(self, request):
+        tr_cxml, expected_rule = request.param
+        row = _Row(element(tr_cxml), None)
+        return row, expected_rule
+
     @pytest.fixture
     def idx_fixture(self):
         tbl = element('w:tbl/(w:tr,w:tr,w:tr)')

From 4f12bde2473f32afa0711a79986a2c779bea7eb3 Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Sat, 29 Oct 2016 14:27:59 -0700
Subject: [PATCH 150/367] tbl: add _Row.height_rule setter

---
 docx/oxml/table.py             | 12 ++++++++++++
 docx/table.py                  |  4 ++++
 features/tbl-row-props.feature |  1 -
 tests/test_table.py            | 31 +++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 868e909f2..fb7a27031 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -71,6 +71,11 @@ def trHeight_hRule(self):
             return None
         return trPr.trHeight_hRule
 
+    @trHeight_hRule.setter
+    def trHeight_hRule(self, value):
+        trPr = self.get_or_add_trPr()
+        trPr.trHeight_hRule = value
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -819,6 +824,13 @@ def trHeight_hRule(self):
             return None
         return trHeight.hRule
 
+    @trHeight_hRule.setter
+    def trHeight_hRule(self, value):
+        if value is None and self.trHeight is None:
+            return
+        trHeight = self.get_or_add_trHeight()
+        trHeight.hRule = value
+
 
 class CT_VMerge(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
index 370815691..11ef958f1 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -392,6 +392,10 @@ def height_rule(self):
         """
         return self._tr.trHeight_hRule
 
+    @height_rule.setter
+    def height_rule(self, value):
+        self._tr.trHeight_hRule = value
+
     @property
     def table(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
index bfd5a32be..8a4eddc6c 100644
--- a/features/tbl-row-props.feature
+++ b/features/tbl-row-props.feature
@@ -15,7 +15,6 @@ Feature: Get and set table row properties
       | at least            | AT_LEAST |
 
 
-  @wip
   Scenario Outline: Set Row.height_rule
     Given a table row having height rule <state>
      When I assign <value> to row.height_rule
diff --git a/tests/test_table.py b/tests/test_table.py
index d3e212a12..a798a6869 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -657,6 +657,11 @@ def it_knows_its_height_rule(self, height_rule_get_fixture):
         row, expected_rule = height_rule_get_fixture
         assert row.height_rule == expected_rule
 
+    def it_can_change_its_height_rule(self, height_rule_set_fixture):
+        row, rule, expected_xml = height_rule_set_fixture
+        row.height_rule = rule
+        assert row._tr.xml == expected_xml
+
     def it_provides_access_to_its_cells(self, cells_fixture):
         row, row_idx, expected_cells = cells_fixture
         cells = row.cells
@@ -696,6 +701,32 @@ def height_rule_get_fixture(self, request):
         row = _Row(element(tr_cxml), None)
         return row, expected_rule
 
+    @pytest.fixture(params=[
+        ('w:tr',
+         WD_ROW_HEIGHT.AUTO,
+         'w:tr/w:trPr/w:trHeight{w:hRule=auto}'),
+        ('w:tr/w:trPr',
+         WD_ROW_HEIGHT.AT_LEAST,
+         'w:tr/w:trPr/w:trHeight{w:hRule=atLeast}'),
+        ('w:tr/w:trPr/w:trHeight',
+         WD_ROW_HEIGHT.EXACTLY,
+         'w:tr/w:trPr/w:trHeight{w:hRule=exact}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=exact}',
+         WD_ROW_HEIGHT.AUTO,
+         'w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}',
+         None,
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr',                   None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr',            None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr/w:trHeight', None, 'w:tr/w:trPr/w:trHeight'),
+    ])
+    def height_rule_set_fixture(self, request):
+        tr_cxml, new_rule, expected_cxml = request.param
+        row = _Row(element(tr_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return row, new_rule, expected_xml
+
     @pytest.fixture
     def idx_fixture(self):
         tbl = element('w:tbl/(w:tr,w:tr,w:tr)')

From 6b6ef6b7305357267fd3153250cfda337cb157b0 Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Sat, 29 Oct 2016 14:42:47 -0700
Subject: [PATCH 151/367] tbl: add _Row.height getter

---
 docx/oxml/table.py             | 21 +++++++++++++++++++++
 docx/table.py                  | 10 +++++++++-
 features/tbl-row-props.feature |  1 -
 tests/test_table.py            | 16 ++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index fb7a27031..fb9ffb8de 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -76,6 +76,17 @@ def trHeight_hRule(self, value):
         trPr = self.get_or_add_trPr()
         trPr.trHeight_hRule = value
 
+    @property
+    def trHeight_val(self):
+        """
+        Return the value of `w:trPr/w:trHeight@w:val`, or |None| if not
+        present.
+        """
+        trPr = self.trPr
+        if trPr is None:
+            return None
+        return trPr.trHeight_val
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -831,6 +842,16 @@ def trHeight_hRule(self, value):
         trHeight = self.get_or_add_trHeight()
         trHeight.hRule = value
 
+    @property
+    def trHeight_val(self):
+        """
+        Return the value of `w:trHeight@w:val`, or |None| if not present.
+        """
+        trHeight = self.trHeight
+        if trHeight is None:
+            return None
+        return trHeight.val
+
 
 class CT_VMerge(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
index 11ef958f1..fe44f4b34 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -374,7 +374,7 @@ class _Row(Parented):
     """
     def __init__(self, tr, parent):
         super(_Row, self).__init__(parent)
-        self._tr = tr
+        self._tr = self._element = tr
 
     @property
     def cells(self):
@@ -383,6 +383,14 @@ def cells(self):
         """
         return tuple(self.table.row_cells(self._index))
 
+    @property
+    def height(self):
+        """
+        Return a |Length| object representing the height of this cell, or
+        |None| if no explicit height is set.
+        """
+        return self._tr.trHeight_val
+
     @property
     def height_rule(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
index 8a4eddc6c..c498c6351 100644
--- a/features/tbl-row-props.feature
+++ b/features/tbl-row-props.feature
@@ -28,7 +28,6 @@ Feature: Get and set table row properties
       | no explicit setting | None     |
 
 
-  @wip
   Scenario Outline: Get Row.height
     Given a table row having height of <state>
      Then row.height is <value>
diff --git a/tests/test_table.py b/tests/test_table.py
index a798a6869..5ae3596a3 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -653,6 +653,10 @@ def table_(self, request):
 
 class Describe_Row(object):
 
+    def it_knows_its_height(self, height_get_fixture):
+        row, expected_height = height_get_fixture
+        assert row.height == expected_height
+
     def it_knows_its_height_rule(self, height_rule_get_fixture):
         row, expected_rule = height_rule_get_fixture
         assert row.height_rule == expected_rule
@@ -686,6 +690,18 @@ def cells_fixture(self, _index_, table_prop_, table_):
         table_.row_cells.return_value = list(expected_cells)
         return row, row_idx, expected_cells
 
+    @pytest.fixture(params=[
+        ('w:tr',                               None),
+        ('w:tr/w:trPr',                        None),
+        ('w:tr/w:trPr/w:trHeight',             None),
+        ('w:tr/w:trPr/w:trHeight{w:val=0}',    0),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440}', 914400),
+    ])
+    def height_get_fixture(self, request):
+        tr_cxml, expected_height = request.param
+        row = _Row(element(tr_cxml), None)
+        return row, expected_height
+
     @pytest.fixture(params=[
         ('w:tr',        None),
         ('w:tr/w:trPr', None),

From 254d2ef97c7ae8cce9633ba7f46f2cc905130bbf Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Sat, 29 Oct 2016 19:26:37 -0700
Subject: [PATCH 152/367] tbl: add _Row.height setter

---
 docx/oxml/table.py             | 12 ++++++++++++
 docx/table.py                  |  4 ++++
 features/tbl-row-props.feature |  1 -
 tests/test_table.py            | 26 ++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index fb9ffb8de..64fff7b71 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -87,6 +87,11 @@ def trHeight_val(self):
             return None
         return trPr.trHeight_val
 
+    @trHeight_val.setter
+    def trHeight_val(self, value):
+        trPr = self.get_or_add_trPr()
+        trPr.trHeight_val = value
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -852,6 +857,13 @@ def trHeight_val(self):
             return None
         return trHeight.val
 
+    @trHeight_val.setter
+    def trHeight_val(self, value):
+        if value is None and self.trHeight is None:
+            return
+        trHeight = self.get_or_add_trHeight()
+        trHeight.val = value
+
 
 class CT_VMerge(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
index fe44f4b34..ed792d8cc 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -391,6 +391,10 @@ def height(self):
         """
         return self._tr.trHeight_val
 
+    @height.setter
+    def height(self, value):
+        self._tr.trHeight_val = value
+
     @property
     def height_rule(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
index c498c6351..377f2853e 100644
--- a/features/tbl-row-props.feature
+++ b/features/tbl-row-props.feature
@@ -39,7 +39,6 @@ Feature: Get and set table row properties
       | 3 inches            | 2743200 |
 
 
-  @wip
   Scenario Outline: Set row height
     Given a table row having height of <state>
      When I assign <value> to row.height
diff --git a/tests/test_table.py b/tests/test_table.py
index 5ae3596a3..731ccb5c9 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -657,6 +657,11 @@ def it_knows_its_height(self, height_get_fixture):
         row, expected_height = height_get_fixture
         assert row.height == expected_height
 
+    def it_can_change_its_height(self, height_set_fixture):
+        row, value, expected_xml = height_set_fixture
+        row.height = value
+        assert row._tr.xml == expected_xml
+
     def it_knows_its_height_rule(self, height_rule_get_fixture):
         row, expected_rule = height_rule_get_fixture
         assert row.height_rule == expected_rule
@@ -702,6 +707,27 @@ def height_get_fixture(self, request):
         row = _Row(element(tr_cxml), None)
         return row, expected_height
 
+    @pytest.fixture(params=[
+        ('w:tr',                               Inches(1),
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr/w:trPr',                        Inches(1),
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr/w:trPr/w:trHeight',             Inches(1),
+         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440}', Inches(2),
+         'w:tr/w:trPr/w:trHeight{w:val=2880}'),
+        ('w:tr/w:trPr/w:trHeight{w:val=2880}', None,
+         'w:tr/w:trPr/w:trHeight'),
+        ('w:tr',                   None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr',            None, 'w:tr/w:trPr'),
+        ('w:tr/w:trPr/w:trHeight', None, 'w:tr/w:trPr/w:trHeight'),
+    ])
+    def height_set_fixture(self, request):
+        tr_cxml, new_value, expected_cxml = request.param
+        row = _Row(element(tr_cxml), None)
+        expected_xml = xml(expected_cxml)
+        return row, new_value, expected_xml
+
     @pytest.fixture(params=[
         ('w:tr',        None),
         ('w:tr/w:trPr', None),

From 5001c62bb6ca5f929653b68326fa140477a0e5ec Mon Sep 17 00:00:00 2001
From: Steve Canny <scanny@cisco.com>
Date: Fri, 4 Nov 2016 16:13:52 -0700
Subject: [PATCH 153/367] docs: add API documentation for WD_ROW_HEIGHT_RULE

---
 docs/api/enum/WdRowHeightRule.rst | 26 ++++++++++++++++++++++++++
 docs/api/enum/index.rst           |  1 +
 docx/enum/table.py                |  4 +++-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 docs/api/enum/WdRowHeightRule.rst

diff --git a/docs/api/enum/WdRowHeightRule.rst b/docs/api/enum/WdRowHeightRule.rst
new file mode 100644
index 000000000..a72d4bdae
--- /dev/null
+++ b/docs/api/enum/WdRowHeightRule.rst
@@ -0,0 +1,26 @@
+.. _WdRowHeightRule:
+
+``WD_ROW_HEIGHT_RULE``
+======================
+
+alias: **WD_ROW_HEIGHT**
+
+Specifies the rule for determining the height of a table row
+
+Example::
+
+    from docx.enum.table import WD_ROW_HEIGHT_RULE
+
+    table = document.add_table(3, 3)
+    table.rows[0].height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+
+----
+
+AUTO
+    The row height is adjusted to accommodate the tallest value in the row.
+
+AT_LEAST
+    The row height is at least a minimum specified value.
+
+EXACTLY
+    The row height is an exact value.
diff --git a/docs/api/enum/index.rst b/docs/api/enum/index.rst
index f6ba1e261..099b1d7b0 100644
--- a/docs/api/enum/index.rst
+++ b/docs/api/enum/index.rst
@@ -16,6 +16,7 @@ can be found here:
    WdLineSpacing
    WdOrientation
    WdRowAlignment
+   WdRowHeightRule
    WdSectionStart
    WdStyleType
    WdTabAlignment
diff --git a/docx/enum/table.py b/docx/enum/table.py
index 1755a308c..725caef95 100644
--- a/docx/enum/table.py
+++ b/docx/enum/table.py
@@ -16,7 +16,9 @@
 @alias('WD_ROW_HEIGHT')
 class WD_ROW_HEIGHT_RULE(XmlEnumeration):
     """
-    Specifies the rule for determining the height or a table row
+    alias: **WD_ROW_HEIGHT**
+
+    Specifies the rule for determining the height of a table row
 
     Example::
 

From c1b7682ebd2ea017e4e3b0b1b26e9b6bc96c5f89 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 09:58:37 -0700
Subject: [PATCH 154/367] fix: small documentation fixes

---
 docs/conf.py                                    |  2 +-
 docs/dev/analysis/features/styles/style.rst     | 10 +++++++++-
 docs/dev/analysis/features/table/cell-merge.rst |  4 ++--
 docs/index.rst                                  |  6 +++---
 docs/user/quickstart.rst                        |  8 ++++----
 docs/user/sections.rst                          |  2 +-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 5041e8fd7..7a09401ae 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -371,4 +371,4 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {'http://docs.python.org/3/': None}
diff --git a/docs/dev/analysis/features/styles/style.rst b/docs/dev/analysis/features/styles/style.rst
index 5121b074b..e8e3ebf5b 100644
--- a/docs/dev/analysis/features/styles/style.rst
+++ b/docs/dev/analysis/features/styles/style.rst
@@ -182,6 +182,8 @@ contents does not cause the `w:semiHidden` element to be removed.
 Candidate protocol
 ~~~~~~~~~~~~~~~~~~
 
+.. highlight:: python
+
 ::
 
     >>> style = document.styles['Foo']
@@ -243,6 +245,8 @@ will appear in the gallery in the order specified by `w:uiPriority`.
 Candidate protocol
 ~~~~~~~~~~~~~~~~~~
 
+.. highlight:: python
+
 ::
 
     >>> style = document.styles['Foo']
@@ -300,6 +304,8 @@ Behavior
 Candidate protocol
 ~~~~~~~~~~~~~~~~~~
 
+.. highlight:: python
+
 ::
 
     >>> style = document.styles['Foo']
@@ -344,6 +350,8 @@ used when writing XML::
 Candidate protocols
 -------------------
 
+.. highlight:: python
+
 Identification::
 
     >>> style = document.styles['Body Text']
@@ -385,7 +393,7 @@ Example XML
 
   <w:styles>
 
-    <!-- ... -->   
+    <!-- ... -->
 
     <w:style w:type="paragraph" w:default="1" w:styleId="Normal">
       <w:name w:val="Normal"/>
diff --git a/docs/dev/analysis/features/table/cell-merge.rst b/docs/dev/analysis/features/table/cell-merge.rst
index 2b432dfbf..31451cd5b 100644
--- a/docs/dev/analysis/features/table/cell-merge.rst
+++ b/docs/dev/analysis/features/table/cell-merge.rst
@@ -60,8 +60,8 @@ Basic merge protocol
 A merge is specified using two diagonal cells::
 
     >>> table = document.add_table(3, 3)
-    >>> a = table.cells(0, 0)
-    >>> b = table.cells(1, 1)
+    >>> a = table.cell(0, 0)
+    >>> b = table.cell(1, 1)
     >>> A = a.merge(b)
 
 ::
diff --git a/docs/index.rst b/docs/index.rst
index a3432a514..0a77e9533 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,13 +31,13 @@ Here's an example of what |docx| can do:
                                                 p.add_run('italic.').italic = True
 
                                                 document.add_heading('Heading, level 1', level=1)
-                                                document.add_paragraph('Intense quote', style='IntenseQuote')
+                                                document.add_paragraph('Intense quote', style='Intense Quote')
 
                                                 document.add_paragraph(
-                                                    'first item in unordered list', style='ListBullet'
+                                                    'first item in unordered list', style='List Bullet'
                                                 )
                                                 document.add_paragraph(
-                                                    'first item in ordered list', style='ListNumber'
+                                                    'first item in ordered list', style='List Number'
                                                 )
 
                                                 document.add_picture('monty-truth.png', width=Inches(1.25))
diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst
index 1c6f419ab..09205f367 100644
--- a/docs/user/quickstart.rst
+++ b/docs/user/quickstart.rst
@@ -132,7 +132,7 @@ the sequence::
 You can also add rows to a table incrementally like so::
 
     row = table.add_row()
-    
+
 This can be very handy for the variable length table scenario we mentioned
 above::
 
@@ -282,14 +282,14 @@ Note that you can set bold or italic right on the result of ``.add_run()`` if
 you don't need it for anything else::
 
     paragraph.add_run('dolor').bold = True
-    
+
     # is equivalent to:
 
     run = paragraph.add_run('dolor')
     run.bold = True
 
     # except you don't have a reference to `run` afterward
-    
+
 
 It's not necessary to provide text to the ``.add_paragraph()`` method. This can
 make your code simpler if you're building the paragraph up from runs anyway::
@@ -298,7 +298,7 @@ make your code simpler if you're building the paragraph up from runs anyway::
     paragraph.add_run('Lorem ipsum ')
     paragraph.add_run('dolor').bold = True
     paragraph.add_run(' sit amet.')
- 
+
 
 Applying a character style
 --------------------------
diff --git a/docs/user/sections.rst b/docs/user/sections.rst
index 5dc956172..3fe98acd0 100644
--- a/docs/user/sections.rst
+++ b/docs/user/sections.rst
@@ -98,7 +98,7 @@ from portrait to landscape::
     >>> section.page_width = new_width
     >>> section.page_height = new_height
     >>> section.orientation, section.page_width, section.page_height
-    (LANDSCAPE (1), 10058400, 7772400) 
+    (LANDSCAPE (1), 10058400, 7772400)
 
 
 Page margins

From c9e5ecb431b18d01130f2a97c54b68f6a9bc3fd3 Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Fri, 4 Nov 2016 16:37:46 -0700
Subject: [PATCH 155/367] docs: document analysis f/ Cell.vertical_alignment

---
 .../analysis/features/table/table-cell.rst    | 73 ++++++++++++++++---
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/docs/dev/analysis/features/table/table-cell.rst b/docs/dev/analysis/features/table/table-cell.rst
index 40be36b32..e7d177719 100644
--- a/docs/dev/analysis/features/table/table-cell.rst
+++ b/docs/dev/analysis/features/table/table-cell.rst
@@ -7,6 +7,22 @@ properties affecting its size, appearance, and how the content it contains is
 formatted.
 
 
+Candidate protocol
+------------------
+
+Cell.vertical_alignment::
+
+    >>> from docx.enum.table import WD_CELL_ALIGN_VERTICAL
+    >>> cell = table.add_row().cells[0]
+    >>> cell
+    <docx.table._Cell object at 0x...>
+    >>> cell.vertical_alignment
+    None
+    >>> cell.vertical_alignment = WD_CELL_ALIGN_VERTICAL.CENTER
+    >>> print(cell.vertical_alignment)
+    CENTER (1)
+
+
 MS API - Partial Summary
 ------------------------
 
@@ -29,6 +45,25 @@ MS API - Partial Summary
 * WordWrap
 
 
+WD_ALIGN_VERTICAL Enumeration
+---------------------------------
+
+wdAlignVerticalBoth (101)
+    This is an option in the OpenXml spec, but not in Word itself. It's not
+    clear what Word behavior this setting produces. If you find out please let
+    us know and we'll update the documentation. Otherwise, probably best to
+    avoid this option.
+
+wdAlignVerticalBottom (3)
+    Text is aligned to the bottom border of the cell.
+
+wdAlignVerticalCenter (1)
+    Text is aligned to the center of the cell.
+
+wdAlignVerticalTop (0)
+    Text is aligned to the top border of the cell.
+
+
 Specimen XML
 ------------
 
@@ -39,6 +74,7 @@ Specimen XML
   <w:tc>
     <w:tcPr>
       <w:tcW w:w="7038" w:type="dxa"/>
+      <w:vAlign w:val="bottom"/>
     </w:tcPr>
     <w:p>
       <w:pPr>
@@ -127,22 +163,18 @@ Schema Definitions
     <xsd:attribute name="type" type="ST_TblWidth"/>
   </xsd:complexType>
 
-  <xsd:simpleType name="ST_MeasurementOrPercent">
-    <xsd:union memberTypes="ST_DecimalNumberOrPercent s:ST_UniversalMeasure"/>
-  </xsd:simpleType>
+  <xsd:complexType name="CT_VerticalJc">
+    <xsd:attribute name="val" type="ST_VerticalJc" use="required"/>
+  </xsd:complexType>
+
+  <!-- simple types -->
 
   <xsd:simpleType name="ST_DecimalNumberOrPercent">
     <xsd:union memberTypes="ST_UnqualifiedPercentage s:ST_Percentage"/>
   </xsd:simpleType>
 
-  <xsd:simpleType name="ST_UniversalMeasure">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="-?[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="ST_UnqualifiedPercentage">
-    <xsd:restriction base="xsd:integer"/>
+  <xsd:simpleType name="ST_MeasurementOrPercent">
+    <xsd:union memberTypes="ST_DecimalNumberOrPercent s:ST_UniversalMeasure"/>
   </xsd:simpleType>
 
   <xsd:simpleType name="ST_Percentage">
@@ -160,6 +192,25 @@ Schema Definitions
     </xsd:restriction>
   </xsd:simpleType>
 
+  <xsd:simpleType name="ST_UniversalMeasure">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="-?[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_UnqualifiedPercentage">
+    <xsd:restriction base="xsd:integer"/>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_VerticalJc">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="top"/>
+      <xsd:enumeration value="center"/>
+      <xsd:enumeration value="both"/>
+      <xsd:enumeration value="bottom"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
 
 .. _`WdRowHeightRule`:
    http://msdn.microsoft.com/en-us/library/office/ff193620(v=office.15).aspx

From fbfaaa6749a8d710fb01c0cd7ac0db35782248b1 Mon Sep 17 00:00:00 2001
From: Remko van der Vossen <remko.van.der.vossen@asml.com>
Date: Sat, 18 Aug 2018 11:25:24 -0700
Subject: [PATCH 156/367] acpt: add scenarios for Cell.vertical_alignment

---
 docs/api/enum/WdCellVerticalAlignment.rst |  32 +++++++++++++++++
 docs/api/enum/index.rst                   |   1 +
 docx/enum/table.py                        |  41 ++++++++++++++++++++++
 docx/table.py                             |  10 ++++++
 features/steps/table.py                   |  28 +++++++++++++++
 features/steps/test_files/tbl-props.docx  | Bin 21549 -> 20178 bytes
 features/tbl-cell-props.feature           |  26 ++++++++++++++
 7 files changed, 138 insertions(+)
 create mode 100644 docs/api/enum/WdCellVerticalAlignment.rst

diff --git a/docs/api/enum/WdCellVerticalAlignment.rst b/docs/api/enum/WdCellVerticalAlignment.rst
new file mode 100644
index 000000000..8a2f76022
--- /dev/null
+++ b/docs/api/enum/WdCellVerticalAlignment.rst
@@ -0,0 +1,32 @@
+.. _WdCellVerticalAlignment:
+
+``WD_CELL_VERTICAL_ALIGNMENT``
+==============================
+
+alias: **WD_ALIGN_VERTICAL**
+
+Specifies the vertical alignment of text in one or more cells of a table.
+
+Example::
+
+    from docx.enum.table import WD_ALIGN_VERTICAL
+
+    table = document.add_table(3, 3)
+    table.cell(0, 0).vertical_alignment = WD_ALIGN_VERTICAL.BOTTOM
+
+----
+
+TOP
+    Text is aligned to the top border of the cell.
+
+CENTER
+    Text is aligned to the center of the cell.
+
+BOTTOM
+    Text is aligned to the bottom border of the cell.
+
+BOTH
+    This is an option in the OpenXml spec, but not in Word itself. It's not
+    clear what Word behavior this setting produces. If you find out please let
+    us know and we'll update this documentation. Otherwise, probably best to
+    avoid this option.
diff --git a/docs/api/enum/index.rst b/docs/api/enum/index.rst
index 099b1d7b0..ce76e7f51 100644
--- a/docs/api/enum/index.rst
+++ b/docs/api/enum/index.rst
@@ -12,6 +12,7 @@ can be found here:
    MsoThemeColorIndex
    WdAlignParagraph
    WdBuiltinStyle
+   WdCellVerticalAlignment
    WdColorIndex
    WdLineSpacing
    WdOrientation
diff --git a/docx/enum/table.py b/docx/enum/table.py
index 725caef95..eedab082e 100644
--- a/docx/enum/table.py
+++ b/docx/enum/table.py
@@ -13,6 +13,47 @@
 )
 
 
+@alias('WD_ALIGN_VERTICAL')
+class WD_CELL_VERTICAL_ALIGNMENT(XmlEnumeration):
+    """
+    alias: **WD_ALIGN_VERTICAL**
+
+    Specifies the vertical alignment of text in one or more cells of a table.
+
+    Example::
+
+        from docx.enum.table import WD_ALIGN_VERTICAL
+
+        table = document.add_table(3, 3)
+        table.cell(0, 0).vertical_alignment = WD_ALIGN_VERTICAL.BOTTOM
+    """
+
+    __ms_name__ = 'WdCellVerticalAlignment'
+
+    __url__ = 'https://msdn.microsoft.com/en-us/library/office/ff193345.aspx'
+
+    __members__ = (
+        XmlMappedEnumMember(
+            'TOP', 0, 'top', 'Text is aligned to the top border of the cell.'
+        ),
+        XmlMappedEnumMember(
+            'CENTER', 1, 'center', 'Text is aligned to the center of the cel'
+            'l.'
+        ),
+        XmlMappedEnumMember(
+            'BOTTOM', 3, 'bottom', 'Text is aligned to the bottom border of '
+            'the cell.'
+        ),
+        XmlMappedEnumMember(
+            'BOTH', 101, 'both', 'This is an option in the OpenXml spec, but'
+            ' not in Word itself. It\'s not clear what Word behavior this se'
+            'tting produces. If you find out please let us know and we\'ll u'
+            'pdate this documentation. Otherwise, probably best to avoid thi'
+            's option.'
+        ),
+    )
+
+
 @alias('WD_ROW_HEIGHT')
 class WD_ROW_HEIGHT_RULE(XmlEnumeration):
     """
diff --git a/docx/table.py b/docx/table.py
index ed792d8cc..fe8b3b767 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -270,6 +270,16 @@ def text(self, text):
         r = p.add_r()
         r.text = text
 
+    @property
+    def vertical_alignment(self):
+        """Member of :ref:`WdCellVerticalAlignment` or None.
+
+        A value of |None| indicates vertical alignment for this cell is
+        inherited. Assigning |None| causes any explicitly defined vertical
+        alignment to be removed, restoring inheritance.
+        """
+        raise NotImplementedError
+
     @property
     def width(self):
         """
diff --git a/features/steps/table.py b/features/steps/table.py
index 5974de8d2..dc6001941 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -11,6 +11,7 @@
 from behave import given, then, when
 
 from docx import Document
+from docx.enum.table import WD_ALIGN_VERTICAL  # noqa
 from docx.enum.table import (
     WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
 )
@@ -39,6 +40,19 @@ def given_a_3x3_table_having_span_state(context, span_state):
     context.table_ = document.tables[table_idx]
 
 
+@given('a _Cell object with {state} vertical alignment as cell')
+def given_a_Cell_object_with_vertical_alignment_as_cell(context, state):
+    table_idx = {
+        'inherited': 0,
+        'bottom':    1,
+        'center':    2,
+        'top':       3,
+    }[state]
+    document = Document(test_docx('tbl-props'))
+    table = document.tables[table_idx]
+    context.cell = table.cell(0, 0)
+
+
 @given('a column collection having two columns')
 def given_a_column_collection_having_two_columns(context):
     docx_path = test_docx('blk-containing-table')
@@ -179,6 +193,11 @@ def when_add_row_to_table(context):
     context.row = table.add_row()
 
 
+@when('I assign {value} to cell.vertical_alignment')
+def when_I_assign_value_to_cell_vertical_alignment(context, value):
+    context.cell.vertical_alignment = eval(value)
+
+
 @when('I assign {value} to row.height')
 def when_I_assign_value_to_row_height(context, value):
     new_value = None if value == 'None' else int(value)
@@ -257,6 +276,15 @@ def when_I_set_the_table_autofit_to_setting(context, setting):
 
 # then =====================================================
 
+@then('cell.vertical_alignment is {value}')
+def then_cell_vertical_alignment_is_value(context, value):
+    expected_value = eval(value)
+    actual_value = context.cell.vertical_alignment
+    assert actual_value is expected_value, (
+        'cell.vertical_alignment is %s' % actual_value
+    )
+
+
 @then('I can access a collection column by index')
 def then_can_access_collection_column_by_index(context):
     columns = context.columns
diff --git a/features/steps/test_files/tbl-props.docx b/features/steps/test_files/tbl-props.docx
index e69eec83bbd92239db495db961a062775e135e3a..9d2db676e37d73bbf58a8e00b9dd080e7b41fc3f 100644
GIT binary patch
delta 2945
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

delta 4219
zcmb7{c|25mAIHyF=2{+0nj*$pWC;&ZaxG~HSrVfn?%2kXZHyU9T*p$RLPD~W=a!|o
zmXam$*dF0QvSlk}R}@ldbkA5aQ?~v%^EzIyIq&)WzMt>;em|Zi!R}|k^bB-p=@0+_
zFaSQ+12n`Cbxd9`02rYMfSmvmIEQj|Az)ny7_>JI>uxUP<?LjPW&~(2r1+xA7txCu
zfYBj|06@n?0|0q4zA%spq5*(FNR`&o&B_NHqG9k@CwJ*3KxzD`GkJ-p&inwNR>S%(
zn@ED5pM=oN-=CKvQ#MuseYfBl3<fh>Uk4+^v2nFFz`NppMT)MM_W3G702oyV08RiI
zr4Q#qZma>4U<+>&R3n#kZ&2;12UOB-NZ1a_AGdbJW49`3K`EU->?j$7Gu88sfH17I
z0KiU(vBcrFq>yN$R(&xHB~kf853xL5@ixo0Ou8kUkx5?Hmi5a?wq@z@ExqLfsLkDF
zqT7go4%7%82nkiRQ<r!1idu_u!T#7n1;HNcjQxcUi&hhQR0{`yQgHy-1&Odg?cQ93
z2dV{rjO+)`yB=C0$kKZZ0Kl<Y1Y78BL0eimZS8BE^Z^=>?1iQe!Tt{Pwt31gx5rX3
zp#~*7L$BR;W68dduOD8Qx94<>UMsMdH|J^%{WmmpU&GBL?pygtAKNV3EYVwi$}Ws`
z+GSlg8%{G!=3?q2ss){_v;+bwgk6+PF`g5k;{$%*&lfl~lX?UiP|1l&70oaIvvZ#c
ze{lV$$u|)L{h8j+>gjcY4-9JKJn;N)_G6k=|BRap=}oCs6H+up-I%w_1Ur%#B0u^(
z?oFYSX;7_8OL?CdQEit}r>w$#$*(2hy;Bzo2pkk|dc^;x*zEt7^^y&xF(tQ(+IAm&
zQVyyEw+vaMio=c7l~_2sj|`eLUPKh+B}Vq?wi#s}#0r(MrW^E1nAe&$y*2TS7bcyk
z8$*V~x5WZqirmm_!xObPk7lP_INkxbIf6APF7xkf2-Kn()>dI`yEKrTt>>YCUf7Yv
zh3j`6!G5XHpleNUnvYrXe5%45B4hs7>39)L)liSV^7+~!_M4seBIOPbOnT=yD0-G9
zxjw=A#!D4m>Ty_z>}@30t4|}$jjzSu8R`irj{h6YA^LGawU)8Di@0xxc7*5i@X2Iw
zoM01JGF;_DG+`K26wh@W6UrVc89LFcsb<&l1lwvdU-ay=By&h#f0Y|pFN2Tr&-uCw
zoX<3i)1$}m&PUB8nDSP5$oL^_iyytgE26Ec#T{D5rtP`+hb@+*aow1nLW{gEp0yLJ
ztQp5#U~8196g9dDgkyuy<}U)-O<P+M(+D>B3?-4^SiGBs5zAR7p=wezb~1!6z$}7&
za1@)(@b2Py;dV?>{NnG9jTn!(C+yi^u<iBXumlpOd)lHTF;NNzSM*?<>z(tDeJhy&
zue_|cw{_Iv_><1UzpjfTW9&u}@O#274SHmGyJ%RS!zyQG6pT;0rtl0f-X7)j8C?+N
z3N?gX{Bo>jI$W6{NlqMj()8N>-s1e;gmnIDE~jSI)Z*)0{lTPyV6dABqyAAD%&<E3
z<&;C5nSOem)qqdN;8>y*GSAkr&{BR@mqpPFCvZ>XIsU+vQPx+JV+z*uzT(3{$6uLG
zUw+8;PIYcnzKIvd?*NwxeN`qf&z#Eg<!VX*p*82=(Z^2@?Ez5Dx4Dl*|0{KZ^@A>F
zp?`WpMcOABg$8BLusbA?OGT){Ar$D*vv^27sqUV)mQVGEf7d!+K0nsN!*x<byu%<W
zqmp;VQ@_m|`8@v6Q5y@FM;I?fY4IYGwEH|(np*%xYl8~+JNfZgY{`X$p6sL-J&lc$
zCYgd!rt#^@2{E}-=DZChhI|rr`3VAfX?DQG*~#_{OO86{8M&7=T?OSiYJBuywX8=t
zZi?8X>UUqeugDjne2!CDG5>&*^@l)>2>ok^Pt6MW!%Li<a5W3s))mvKSIwvFC*{p|
z8ad}WluAm#h`LSvxZ8ZETMy#o9@BXuN*PU(LnJ5cyMhGeBVRr6#uwbZU6*RWqd*ur
z?DiXa7ID%-H7ogkHlIz8NUA+8=-u$uv}pi6caQm5078L|cF<(BU99Y|Pr!s=QTxOl
zPfO`zwEpsQ#OJR#749gv0C^Et{qwVeSaA_{sPpXJ@ZM>45^uNT4jLAps+@kiFgk{O
zr#}0crwjKxwEV7L7FZCy@et%67RcJ!GM*l@e`HkiHbFr9MT_WP$%}^Cjv)Ql2feZ5
zs1b=u*}298iLU#1>+D@ztQDJaJ<X!cCb{6yB_cH&KEep({T<eLMzt?_hNFo#+B8As
zuCFIrM6q3Oy!?xIS&<#CqE)XCRc9q#i{L`U`Pf+`RrT2@G`}QD7Cz)_Q;HRGnyL=e
zcpvjy`6DkSF@)Zke9QwH79J4iwoi=kIvdRXB!Gt73*{2sGgA#-`^h};e>o-;UGrxw
zLeJoGrx^pEbV)l;sm9bki>jj{NJGCJ2M5jMs^6m#gCDX~BJkaDcN^KBrZx2o&KrlN
zpJs}BDTFA$n6pPGQdBwJMmXkMaB9x@w_A$eX8EaBpo#|3MmDq(+JCapS|ewJrQz?6
zB@i53?A*T({|&-c!MIEV?N0J8Qg0d>?t!*g85B;qp)IDT#IyMpvsW5|tCOD`H61bn
zpe6hex)7@ZJh4_r+tuK5f(E8ZnIM6YO8K*p7E?6<U|S`+6TF?UTOX)P-V_ePX!vM1
z3Zz_1VG_~`_y>@0*Nvz2%klJwRcW9@2Cp9<;J`ANoUA~SS`G9At8oT`k)!Imur-y`
zL6uS^Jrog^Su3%1D|O({(V3A#9!X6T>KBRtyFG!_@pbjI<T75N#1ZU?Q7O92pfP$g
znQP~!&bE~2P8Oz6xt4UdhXtv_E+rSUpMv{6`fi3@w*2SVyIKTxfTX4%1_iL?5DcLv
z!Jm`XX6?gF<&Wno>(^R{G7hsNSBT4<UM3dRq06_0DeHGOwKNflm1C~PWazNl=<el^
zyn8hzQ`+Gu5rsi<ZXs>0U#LSfCCFcPMcNM$dNXI2xsbEq4=I`w{7!BKOr5F8HgDwe
znqKPpOo<&(T)~p3weH%u-dgX^1DldNp%SI5gxq#PspmH(i2L}8z@Mi1HYEN5tp@5r
fPKmbHTs=F*Sl@_B5A6c-e@GkvD|E-GPyXv4d8;%b

diff --git a/features/tbl-cell-props.feature b/features/tbl-cell-props.feature
index 32e59dfbe..7fe30b14e 100644
--- a/features/tbl-cell-props.feature
+++ b/features/tbl-cell-props.feature
@@ -4,6 +4,32 @@ Feature: Get and set table cell properties
   I need a way to get and set the properties of a table cell
 
 
+  @wip
+  Scenario Outline: Get _Cell.vertical_alignment
+    Given a _Cell object with <state> vertical alignment as cell
+     Then cell.vertical_alignment is <value>
+
+    Examples: Cell.vertical_alignment value cases
+      | state     | value                    |
+      | inherited | None                     |
+      | bottom    | WD_ALIGN_VERTICAL.BOTTOM |
+      | center    | WD_ALIGN_VERTICAL.CENTER |
+
+
+  @wip
+  Scenario Outline: Set Cell.vertical_alignment
+    Given a _Cell object with <state> vertical alignment as cell
+     When I assign <value> to cell.vertical_alignment
+     Then cell.vertical_alignment is <value>
+
+    Examples: Cell.vertical_alignment assignment cases
+      | state     | value                    |
+      | inherited | WD_ALIGN_VERTICAL.BOTTOM |
+      | bottom    | WD_ALIGN_VERTICAL.CENTER |
+      | center    | None                     |
+      | inherited | None                     |
+
+
   Scenario Outline: Get cell width
     Given a table cell having a width of <width-setting>
      Then the reported width of the cell is <reported-width>

From 4732b99f80ae01b25a12d26e145e79ed5201c46b Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 12:52:20 -0700
Subject: [PATCH 157/367] tbl: add _Cell.vertical_alignment getter

---
 docx/oxml/__init__.py           |  3 ++-
 docx/oxml/table.py              | 24 ++++++++++++++++++++----
 docx/table.py                   | 12 +++++++-----
 features/tbl-cell-props.feature |  1 -
 tests/test_table.py             | 18 +++++++++++++++++-
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index d0d3ab66f..2731302e2 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -129,7 +129,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 
 from .table import (
     CT_Height, CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType,
-    CT_TblPr, CT_TblWidth, CT_Tc, CT_TcPr, CT_TrPr, CT_VMerge
+    CT_TblPr, CT_TblWidth, CT_Tc, CT_TcPr, CT_TrPr, CT_VerticalJc, CT_VMerge
 )
 register_element_cls('w:bidiVisual', CT_OnOff)
 register_element_cls('w:gridCol',    CT_TblGridCol)
@@ -145,6 +145,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:tr',         CT_Row)
 register_element_cls('w:trHeight',   CT_Height)
 register_element_cls('w:trPr',       CT_TrPr)
+register_element_cls('w:vAlign',     CT_VerticalJc)
 register_element_cls('w:vMerge',     CT_VMerge)
 
 from .text.font import (
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 64fff7b71..30580c024 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -1,15 +1,13 @@
 # encoding: utf-8
 
-"""
-Custom element classes for tables
-"""
+"""Custom element classes for tables"""
 
 from __future__ import (
     absolute_import, division, print_function, unicode_literals
 )
 
 from . import parse_xml
-from ..enum.table import WD_ROW_HEIGHT_RULE
+from ..enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
 from ..exceptions import InvalidSpanError
 from .ns import nsdecls, qn
 from ..shared import Emu, Twips
@@ -764,6 +762,7 @@ class CT_TcPr(BaseOxmlElement):
     tcW = ZeroOrOne('w:tcW', successors=_tag_seq[2:])
     gridSpan = ZeroOrOne('w:gridSpan', successors=_tag_seq[3:])
     vMerge = ZeroOrOne('w:vMerge', successors=_tag_seq[5:])
+    vAlign = ZeroOrOne('w:vAlign', successors=_tag_seq[12:])
     del _tag_seq
 
     @property
@@ -783,6 +782,18 @@ def grid_span(self, value):
         if value > 1:
             self.get_or_add_gridSpan().val = value
 
+    @property
+    def vAlign_val(self):
+        """Value of `w:val` attribute on  `w:vAlign` child.
+
+        Value is |None| if `w:vAlign` child is not present. The `w:val`
+        attribute on `w:vAlign` is required.
+        """
+        vAlign = self.vAlign
+        if vAlign is None:
+            return None
+        return vAlign.val
+
     @property
     def vMerge_val(self):
         """
@@ -865,6 +876,11 @@ def trHeight_val(self, value):
         trHeight.val = value
 
 
+class CT_VerticalJc(BaseOxmlElement):
+    """`w:vAlign` element, specifying vertical alignment of cell."""
+    val = RequiredAttribute('w:val', WD_CELL_VERTICAL_ALIGNMENT)
+
+
 class CT_VMerge(BaseOxmlElement):
     """
     ``<w:vMerge>`` element, specifying vertical merging behavior of a cell.
diff --git a/docx/table.py b/docx/table.py
index fe8b3b767..0f79d6ee5 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -190,12 +190,11 @@ def _tblPr(self):
 
 
 class _Cell(BlockItemContainer):
-    """
-    Table cell
-    """
+    """Table cell"""
+
     def __init__(self, tc, parent):
         super(_Cell, self).__init__(tc, parent)
-        self._tc = tc
+        self._tc = self._element = tc
 
     def add_paragraph(self, text='', style=None):
         """
@@ -278,7 +277,10 @@ def vertical_alignment(self):
         inherited. Assigning |None| causes any explicitly defined vertical
         alignment to be removed, restoring inheritance.
         """
-        raise NotImplementedError
+        tcPr = self._element.tcPr
+        if tcPr is None:
+            return None
+        return tcPr.vAlign_val
 
     @property
     def width(self):
diff --git a/features/tbl-cell-props.feature b/features/tbl-cell-props.feature
index 7fe30b14e..2314a266f 100644
--- a/features/tbl-cell-props.feature
+++ b/features/tbl-cell-props.feature
@@ -4,7 +4,6 @@ Feature: Get and set table cell properties
   I need a way to get and set the properties of a table cell
 
 
-  @wip
   Scenario Outline: Get _Cell.vertical_alignment
     Given a _Cell object with <state> vertical alignment as cell
      Then cell.vertical_alignment is <value>
diff --git a/tests/test_table.py b/tests/test_table.py
index 731ccb5c9..a6982040b 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -10,7 +10,7 @@
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.table import (
-    WD_ROW_HEIGHT, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+    WD_ALIGN_VERTICAL, WD_ROW_HEIGHT, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
 )
 from docx.oxml import parse_xml
 from docx.oxml.table import CT_Tc
@@ -339,6 +339,11 @@ def it_can_replace_its_content_with_a_string_of_text(
         cell.text = text
         assert cell._tc.xml == expected_xml
 
+    def it_knows_its_vertical_alignment(self, alignment_get_fixture):
+        cell, expected_value = alignment_get_fixture
+        vertical_alignment = cell.vertical_alignment
+        assert vertical_alignment == expected_value
+
     def it_knows_its_width_in_EMU(self, width_get_fixture):
         cell, expected_width = width_get_fixture
         assert cell.width == expected_width
@@ -412,6 +417,17 @@ def add_table_fixture(self, request):
         expected_xml = snippet_seq('new-tbl')[1]
         return cell, expected_xml
 
+    @pytest.fixture(params=[
+        ('w:tc', None),
+        ('w:tc/w:tcPr', None),
+        ('w:tc/w:tcPr/w:vAlign{w:val=bottom}', WD_ALIGN_VERTICAL.BOTTOM),
+        ('w:tc/w:tcPr/w:vAlign{w:val=top}', WD_ALIGN_VERTICAL.TOP),
+    ])
+    def alignment_get_fixture(self, request):
+        tc_cxml, expected_value = request.param
+        cell = _Cell(element(tc_cxml), None)
+        return cell, expected_value
+
     @pytest.fixture
     def merge_fixture(self, tc_, tc_2_, parent_, merged_tc_):
         cell, other_cell = _Cell(tc_, parent_), _Cell(tc_2_, parent_)

From e51ae26f9d63904206cce458f53eb1a0bf41563f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 13:34:14 -0700
Subject: [PATCH 158/367] tbl: add _Cell.vertical_alignment setter

---
 docx/oxml/table.py              |  7 +++++++
 docx/table.py                   |  5 +++++
 features/tbl-cell-props.feature |  1 -
 tests/test_table.py             | 29 ++++++++++++++++++++++++++---
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 30580c024..95f9c6243 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -794,6 +794,13 @@ def vAlign_val(self):
             return None
         return vAlign.val
 
+    @vAlign_val.setter
+    def vAlign_val(self, value):
+        if value is None:
+            self._remove_vAlign()
+            return
+        self.get_or_add_vAlign().val = value
+
     @property
     def vMerge_val(self):
         """
diff --git a/docx/table.py b/docx/table.py
index 0f79d6ee5..b3bc090fb 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -282,6 +282,11 @@ def vertical_alignment(self):
             return None
         return tcPr.vAlign_val
 
+    @vertical_alignment.setter
+    def vertical_alignment(self, value):
+        tcPr = self._element.get_or_add_tcPr()
+        tcPr.vAlign_val = value
+
     @property
     def width(self):
         """
diff --git a/features/tbl-cell-props.feature b/features/tbl-cell-props.feature
index 2314a266f..609d2f442 100644
--- a/features/tbl-cell-props.feature
+++ b/features/tbl-cell-props.feature
@@ -15,7 +15,6 @@ Feature: Get and set table cell properties
       | center    | WD_ALIGN_VERTICAL.CENTER |
 
 
-  @wip
   Scenario Outline: Set Cell.vertical_alignment
     Given a _Cell object with <state> vertical alignment as cell
      When I assign <value> to cell.vertical_alignment
diff --git a/tests/test_table.py b/tests/test_table.py
index a6982040b..1d2183fd6 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.table module
-"""
+"""Test suite for the docx.table module"""
 
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -344,6 +342,11 @@ def it_knows_its_vertical_alignment(self, alignment_get_fixture):
         vertical_alignment = cell.vertical_alignment
         assert vertical_alignment == expected_value
 
+    def it_can_change_its_vertical_alignment(self, alignment_set_fixture):
+        cell, new_value, expected_xml = alignment_set_fixture
+        cell.vertical_alignment = new_value
+        assert cell._element.xml == expected_xml
+
     def it_knows_its_width_in_EMU(self, width_get_fixture):
         cell, expected_width = width_get_fixture
         assert cell.width == expected_width
@@ -428,6 +431,26 @@ def alignment_get_fixture(self, request):
         cell = _Cell(element(tc_cxml), None)
         return cell, expected_value
 
+    @pytest.fixture(params=[
+        ('w:tc', WD_ALIGN_VERTICAL.TOP,
+         'w:tc/w:tcPr/w:vAlign{w:val=top}'),
+        ('w:tc/w:tcPr', WD_ALIGN_VERTICAL.CENTER,
+         'w:tc/w:tcPr/w:vAlign{w:val=center}'),
+        ('w:tc/w:tcPr/w:vAlign{w:val=center}', WD_ALIGN_VERTICAL.BOTTOM,
+         'w:tc/w:tcPr/w:vAlign{w:val=bottom}'),
+        ('w:tc/w:tcPr/w:vAlign{w:val=center}', None,
+         'w:tc/w:tcPr'),
+        ('w:tc', None,
+         'w:tc/w:tcPr'),
+        ('w:tc/w:tcPr', None,
+         'w:tc/w:tcPr'),
+    ])
+    def alignment_set_fixture(self, request):
+        cxml, new_value, expected_cxml = request.param
+        cell = _Cell(element(cxml), None)
+        expected_xml = xml(expected_cxml)
+        return cell, new_value, expected_xml
+
     @pytest.fixture
     def merge_fixture(self, tc_, tc_2_, parent_, merged_tc_):
         cell, other_cell = _Cell(tc_, parent_), _Cell(tc_2_, parent_)

From bdf4c369cb5e6b86157c79f6c54cbf995814a45c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 13:50:31 -0700
Subject: [PATCH 159/367] fix: #455 Increment max-id, don't fill gaps

While this may not work in all cases, it is less ugly than arbitrarily
boosting the id value as suggested. A general-case fix will have to wait
for access to headers and footers. It definitely reduces the likelihood
of a collision.
---
 docx/parts/document.py       | 15 ++++++++-------
 tests/parts/test_document.py | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 7a23e9a5e..01266b3bd 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -96,16 +96,17 @@ def new_pic_inline(self, image_descriptor, width, height):
 
     @property
     def next_id(self):
-        """
-        The next available positive integer id value in this document. Gaps
-        in id sequence are filled. The id attribute value is unique in the
-        document, without regard to the element type it appears on.
+        """Next available positive integer id value in this document.
+
+        Calculated by incrementing maximum existing id value. Gaps in the
+        existing id sequence are not filled. The id attribute value is unique
+        in the document, without regard to the element type it appears on.
         """
         id_str_lst = self._element.xpath('//@id')
         used_ids = [int(id_str) for id_str in id_str_lst if id_str.isdigit()]
-        for n in range(1, len(used_ids)+2):
-            if n not in used_ids:
-                return n
+        if not used_ids:
+            return 1
+        return max(used_ids) + 1
 
     @lazyproperty
     def numbering_part(self):
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 2e36d51e7..0c35756f1 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.parts.document module
-"""
+"""Test suite for the docx.parts.document module"""
 
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -198,8 +196,15 @@ def inline_shapes_fixture(self, request, InlineShapes_):
         return document, InlineShapes_, body_elm
 
     @pytest.fixture(params=[
-        ((), 1), ((1,), 2), ((2,), 1), ((1, 2, 3), 4), ((1, 2, 4), 3),
-        ((0, 0), 1), ((0, 0, 1, 3), 2), (('foo', 1, 2), 3), ((1, 'bar'), 2)
+        ((), 1),
+        ((1,), 2),
+        ((2,), 3),
+        ((1, 2, 3), 4),
+        ((1, 2, 4), 5),
+        ((0, 0), 1),
+        ((0, 0, 1, 3), 4),
+        (('foo', 1, 2), 3),
+        ((1, 'bar'), 2)
     ])
     def next_id_fixture(self, request):
         existing_ids, expected_id = request.param

From 7b7174eac72a890e93755cbf2ea2973815417cdf Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 13:58:00 -0700
Subject: [PATCH 160/367] fix: #375 import docx failure on --OO optimization

---
 docx/enum/base.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docx/enum/base.py b/docx/enum/base.py
index aad44e9c8..36764b1a6 100644
--- a/docx/enum/base.py
+++ b/docx/enum/base.py
@@ -28,11 +28,13 @@ def decorator(cls):
 
 
 class _DocsPageFormatter(object):
-    """
+    """Generate an .rst doc page for an enumeration.
+
     Formats a RestructuredText documention page (string) for the enumeration
     class parts passed to the constructor. An immutable one-shot service
     object.
     """
+
     def __init__(self, clsname, clsdict):
         self._clsname = clsname
         self._clsdict = clsdict
@@ -52,14 +54,15 @@ def page_str(self):
 
     @property
     def _intro_text(self):
-        """
-        The docstring of the enumeration, formatted for use at the top of the
-        documentation page
-        """
+        """Docstring of the enumeration, formatted for documentation page."""
         try:
             cls_docstring = self._clsdict['__doc__']
         except KeyError:
             cls_docstring = ''
+
+        if cls_docstring is None:
+            return ''
+
         return textwrap.dedent(cls_docstring).strip()
 
     def _member_def(self, member):

From d563fa4ad49ed25fe9bc922087048b54089e7eff Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 14:13:34 -0700
Subject: [PATCH 161/367] fix: #254 Remove default zoom percentage

---
 docx/templates/default.docx | Bin 38024 -> 38003 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docx/templates/default.docx b/docx/templates/default.docx
index 85201dd1d12caa32be32f1f10f50f75417c8e42d..dd00cd2fc1bbea08f8a92e1ca0b1afd1e276d866 100644
GIT binary patch
delta 1984
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
F{{wdfO4R@W

delta 2038
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


From e24c77d98ab9dd719c5014f25fbc5b68f2a76007 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 14:54:48 -0700
Subject: [PATCH 162/367] fix: #266 miscellaneous doc updates

---
 docs/index.rst           | 14 ++++++++++----
 docs/user/quickstart.rst | 29 +++++++++++++----------------
 docx/styles/styles.py    |  2 +-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 0a77e9533..0dd00e956 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -42,16 +42,22 @@ Here's an example of what |docx| can do:
 
                                                 document.add_picture('monty-truth.png', width=Inches(1.25))
 
+                                                records = (
+                                                    (3, '101', 'Spam'),
+                                                    (7, '422', 'Eggs'),
+                                                    (4, '631', 'Spam, spam, eggs, and spam')
+                                                )
+
                                                 table = document.add_table(rows=1, cols=3)
                                                 hdr_cells = table.rows[0].cells
                                                 hdr_cells[0].text = 'Qty'
                                                 hdr_cells[1].text = 'Id'
                                                 hdr_cells[2].text = 'Desc'
-                                                for item in recordset:
+                                                for qty, id, desc in records:
                                                     row_cells = table.add_row().cells
-                                                    row_cells[0].text = str(item.qty)
-                                                    row_cells[1].text = str(item.id)
-                                                    row_cells[2].text = item.desc
+                                                    row_cells[0].text = str(qty)
+                                                    row_cells[1].text = id
+                                                    row_cells[2].text = desc
 
                                                 document.add_page_break()
 
diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst
index 09205f367..604fe7a2d 100644
--- a/docs/user/quickstart.rst
+++ b/docs/user/quickstart.rst
@@ -115,9 +115,9 @@ supports indexed access, like a list::
     row.cells[0].text = 'Foo bar to you.'
     row.cells[1].text = 'And a hearty foo bar to you too sir!'
 
-The ``.rows`` and ``.columns`` collections on a table are iterable, so you can
-use them directly in a ``for`` loop. Same with the ``.cells`` sequences on
-a row or column::
+The ``.rows`` and ``.columns`` collections on a table are iterable, so you
+can use them directly in a ``for`` loop. Same with the ``.cells`` sequences
+on a row or column::
 
     for row in table.rows:
         for cell in row.cells:
@@ -137,7 +137,11 @@ This can be very handy for the variable length table scenario we mentioned
 above::
 
     # get table data -------------
-    items = get_things_from_database_or_something()
+    items = (
+        (7, '1024', 'Plush kittens'),
+        (3, '2042', 'Furbees'),
+        (1, '1288', 'French Poodle Collars, Deluxe'),
+    )
 
     # add table ------------------
     table = document.add_table(1, 3)
@@ -229,14 +233,11 @@ thing. You can also apply a style afterward. These two lines are equivalent to
 the one above::
 
     paragraph = document.add_paragraph('Lorem ipsum dolor sit amet.')
-    paragraph.style = 'ListBullet'
+    paragraph.style = 'List Bullet'
 
-The style is specified using its style ID, 'ListBullet' in this example.
-Generally, the style ID is formed by removing the spaces in the style name as
-it appears in the Word user interface (UI). So the style 'List Number 3'
-would be specified as ``'ListNumber3'``. However, note that if you are using
-a localized version of Word, the style ID may be derived from the English
-style name and may not correspond so neatly to its style name in the Word UI.
+The style is specified using its style name, 'List Bullet' in this example.
+Generally, the style name is exactly as it appears in the Word user interface
+(UI).
 
 
 Applying bold and italic
@@ -324,8 +325,4 @@ the same result as the lines above::
     run = paragraph.add_run('text with emphasis.')
     run.style = 'Emphasis'
 
-As with a paragraph style, the style ID is formed by removing the spaces in
-the name as it appears in the Word UI. So the style 'Subtle Emphasis' would
-be specified as ``'SubtleEmphasis'``. Note that if you are using
-a localized version of Word, the style ID may be derived from the English
-style name and may not correspond to its style name in the Word UI.
+As with a paragraph style, the style name is as it appears in the Word UI.
diff --git a/docx/styles/styles.py b/docx/styles/styles.py
index eabe53b20..ad27fa764 100644
--- a/docx/styles/styles.py
+++ b/docx/styles/styles.py
@@ -51,7 +51,7 @@ def __getitem__(self, key):
                 'style lookup by style_id is deprecated. Use style name as '
                 'key instead.'
             )
-            warn(msg, UserWarning)
+            warn(msg, UserWarning, stacklevel=2)
             return StyleFactory(style_elm)
 
         raise KeyError("no style with name '%s'" % key)

From aad71d4df7d02eeb4e62f4252699de151b6ed3e5 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 14:56:00 -0700
Subject: [PATCH 163/367] fix: #175 refine MANIFEST.ini

---
 MANIFEST.in | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 6419bc8a0..e8803804e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,9 @@
 include HISTORY.rst LICENSE README.rst tox.ini
-recursive-include tests *.py
-recursive-include features *
-recursive-include docx/templates *
-recursive-include tests/test_files *
-
+graft docx/templates *
+graft features
+graft tests
+graft docs
+prune docs/.build
+global-exclude .DS_Store
+global-exclude __pycache__
+global-exclude *.py[co]

From 37822d3268d85d081222314d4b1f62a79e5087fa Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 15:00:38 -0700
Subject: [PATCH 164/367] fix: #168 Unicode error on Python 2 core-props

---
 docx/oxml/coreprops.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/docx/oxml/coreprops.py b/docx/oxml/coreprops.py
index b53807443..0ba85d027 100644
--- a/docx/oxml/coreprops.py
+++ b/docx/oxml/coreprops.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-lxml custom element classes for core properties-related XML elements.
-"""
+"""Custom element classes for core properties-related XML elements"""
 
 from __future__ import (
     absolute_import, division, print_function, unicode_literals
@@ -12,9 +10,10 @@
 
 from datetime import datetime, timedelta
 
-from . import parse_xml
-from .ns import nsdecls, qn
-from .xmlchemy import BaseOxmlElement, ZeroOrOne
+from docx.compat import is_string
+from docx.oxml import parse_xml
+from docx.oxml.ns import nsdecls, qn
+from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
 class CT_CoreProperties(BaseOxmlElement):
@@ -293,10 +292,10 @@ def _set_element_datetime(self, prop_name, value):
             del self.attrib[qn('xsi:foo')]
 
     def _set_element_text(self, prop_name, value):
-        """
-        Set string value of *name* property to *value*.
-        """
-        value = str(value)
+        """Set string value of *name* property to *value*."""
+        if not is_string(value):
+            value = str(value)
+
         if len(value) > 255:
             tmpl = (
                 "exceeded 255 char limit for property, got:\n\n'%s'"

From 94623ff627f400991c9e550a9da7473ef3acf36f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 18 Aug 2018 16:55:05 -0700
Subject: [PATCH 165/367] release: prepare v0.8.7 release

---
 .travis.yml      |  4 ++--
 HISTORY.rst      | 14 ++++++++++++++
 docx/__init__.py |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3345ff24f..fd69637be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
-  - "3.4"
-  - "3.3"
+  - "3.6"
+  - "3.5"
   - "2.7"
   - "2.6"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
diff --git a/HISTORY.rst b/HISTORY.rst
index 5b947d561..1f6514d7e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,20 @@
 Release History
 ---------------
 
+0.8.7 (2018-08-18)
+++++++++++++++++++
+
+- Add _Row.height_rule
+- Add _Row.height
+- Add _Cell.vertical_alignment
+- Fix #455: increment next_id, don't fill gaps
+- Add #375: import docx failure on --OO optimization
+- Add #254: remove default zoom percentage
+- Add #266: miscellaneous documentation fixes
+- Add #175: refine MANIFEST.ini
+- Add #168: Unicode error on core-props in Python 2
+
+
 0.8.6 (2016-06-22)
 ++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index cfa48729d..7083abe56 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.6'
+__version__ = '0.8.7'
 
 
 # register custom Part classes with opc package reader

From 1eda7f36d36d946694bc352d0beffe18dde3aada Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 12:56:25 -0800
Subject: [PATCH 166/367] pep8: fixes for latest version of flake8

* Also take care of a pesky warning from pytest when getting style by
  id.
---
 docx/enum/shape.py          |  1 +
 docx/enum/text.py           |  1 +
 docx/image/png.py           |  4 ++--
 docx/oxml/__init__.py       | 26 ++++++++++++--------------
 docx/oxml/coreprops.py      |  2 +-
 docx/oxml/xmlchemy.py       | 16 +++++++---------
 features/steps/helpers.py   |  1 +
 setup.py                    |  1 +
 tests/image/test_helpers.py |  4 ++--
 tests/styles/test_styles.py |  1 +
 tests/unitutil/cxml.py      |  1 +
 tox.ini                     |  1 +
 12 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/docx/enum/shape.py b/docx/enum/shape.py
index f1d6ffd8c..937f30a9f 100644
--- a/docx/enum/shape.py
+++ b/docx/enum/shape.py
@@ -18,4 +18,5 @@ class WD_INLINE_SHAPE_TYPE(object):
     SMART_ART = 15
     NOT_IMPLEMENTED = -6
 
+
 WD_INLINE_SHAPE = WD_INLINE_SHAPE_TYPE
diff --git a/docx/enum/text.py b/docx/enum/text.py
index f4111eb92..67f6a66af 100644
--- a/docx/enum/text.py
+++ b/docx/enum/text.py
@@ -81,6 +81,7 @@ class WD_BREAK_TYPE(object):
     SECTION_ODD_PAGE = 5
     TEXT_WRAPPING = 11
 
+
 WD_BREAK = WD_BREAK_TYPE
 
 
diff --git a/docx/image/png.py b/docx/image/png.py
index c9123f76c..4e899fa5c 100644
--- a/docx/image/png.py
+++ b/docx/image/png.py
@@ -132,7 +132,7 @@ def IHDR(self):
         """
         IHDR chunk in PNG image
         """
-        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.IHDR
+        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.IHDR  # noqa
         IHDR = self._find_first(match)
         if IHDR is None:
             raise InvalidImageStreamError('no IHDR chunk in PNG image')
@@ -143,7 +143,7 @@ def pHYs(self):
         """
         pHYs chunk in PNG image, or |None| if not present
         """
-        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.pHYs
+        match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.pHYs  # noqa
         return self._find_first(match)
 
     def _find_first(self, match):
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 2731302e2..c9e895a7e 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -64,19 +64,17 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 # custom element class mappings
 # ===========================================================================
 
-from .shared import CT_DecimalNumber, CT_OnOff, CT_String
+from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
 
 
-from .coreprops import CT_CoreProperties
+from .coreprops import CT_CoreProperties  # noqa
 register_element_cls('cp:coreProperties', CT_CoreProperties)
 
-from .document import CT_Body, CT_Document
+from .document import CT_Body, CT_Document  # noqa
 register_element_cls('w:body',     CT_Body)
 register_element_cls('w:document', CT_Document)
 
-from .numbering import (
-    CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
-)
+from .numbering import CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr  # noqa
 register_element_cls('w:abstractNumId', CT_DecimalNumber)
 register_element_cls('w:ilvl',          CT_DecimalNumber)
 register_element_cls('w:lvlOverride',   CT_NumLvl)
@@ -86,13 +84,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:numbering',     CT_Numbering)
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
-from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType
+from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
 register_element_cls('w:pgMar',  CT_PageMar)
 register_element_cls('w:pgSz',   CT_PageSz)
 register_element_cls('w:sectPr', CT_SectPr)
 register_element_cls('w:type',   CT_SectType)
 
-from .shape import (
+from .shape import (  # noqa
     CT_Blip, CT_BlipFillProperties, CT_GraphicalObject,
     CT_GraphicalObjectData, CT_Inline, CT_NonVisualDrawingProps, CT_Picture,
     CT_PictureNonVisual, CT_Point2D, CT_PositiveSize2D, CT_ShapeProperties,
@@ -113,7 +111,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('wp:extent',     CT_PositiveSize2D)
 register_element_cls('wp:inline',     CT_Inline)
 
-from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles
+from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles  # noqa
 register_element_cls('w:basedOn',        CT_String)
 register_element_cls('w:latentStyles',   CT_LatentStyles)
 register_element_cls('w:locked',         CT_OnOff)
@@ -127,7 +125,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:uiPriority',     CT_DecimalNumber)
 register_element_cls('w:unhideWhenUsed', CT_OnOff)
 
-from .table import (
+from .table import (  # noqa
     CT_Height, CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType,
     CT_TblPr, CT_TblWidth, CT_Tc, CT_TcPr, CT_TrPr, CT_VerticalJc, CT_VMerge
 )
@@ -148,7 +146,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vAlign',     CT_VerticalJc)
 register_element_cls('w:vMerge',     CT_VMerge)
 
-from .text.font import (
+from .text.font import (  # noqa
     CT_Color, CT_Fonts, CT_Highlight, CT_HpsMeasure, CT_RPr, CT_Underline,
     CT_VerticalAlignRun
 )
@@ -181,10 +179,10 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vertAlign',  CT_VerticalAlignRun)
 register_element_cls('w:webHidden',  CT_OnOff)
 
-from .text.paragraph import CT_P
+from .text.paragraph import CT_P  # noqa
 register_element_cls('w:p', CT_P)
 
-from .text.parfmt import (
+from .text.parfmt import (  # noqa
     CT_Ind, CT_Jc, CT_PPr, CT_Spacing, CT_TabStop, CT_TabStops
 )
 register_element_cls('w:ind',             CT_Ind)
@@ -199,7 +197,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:tabs',            CT_TabStops)
 register_element_cls('w:widowControl',    CT_OnOff)
 
-from .text.run import CT_Br, CT_R, CT_Text
+from .text.run import CT_Br, CT_R, CT_Text  # noqa
 register_element_cls('w:br', CT_Br)
 register_element_cls('w:r',  CT_R)
 register_element_cls('w:t',  CT_Text)
diff --git a/docx/oxml/coreprops.py b/docx/oxml/coreprops.py
index 0ba85d027..ed3dd1001 100644
--- a/docx/oxml/coreprops.py
+++ b/docx/oxml/coreprops.py
@@ -237,7 +237,7 @@ def _offset_dt(cls, dt, offset_str):
         td = timedelta(hours=hours, minutes=minutes)
         return dt + td
 
-    _offset_pattern = re.compile('([+-])(\d\d):(\d\d)')
+    _offset_pattern = re.compile(r'([+-])(\d\d):(\d\d)')
 
     @classmethod
     def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
diff --git a/docx/oxml/xmlchemy.py b/docx/oxml/xmlchemy.py
index 40df33494..46dbf462b 100644
--- a/docx/oxml/xmlchemy.py
+++ b/docx/oxml/xmlchemy.py
@@ -11,11 +11,11 @@
 
 import re
 
-from . import OxmlElement
-from ..compat import Unicode
-from .exceptions import InvalidXmlError
-from .ns import NamespacePrefixedTag, nsmap, qn
-from ..shared import lazyproperty
+from docx.compat import Unicode
+from docx.oxml import OxmlElement
+from docx.oxml.exceptions import InvalidXmlError
+from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
+from docx.shared import lazyproperty
 
 
 def serialize_for_reading(element):
@@ -39,9 +39,7 @@ class XmlString(Unicode):
     #  front      attrs                                     | text
     #                                                     close
 
-    _xml_elm_line_patt = re.compile(
-        '( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$'
-    )
+    _xml_elm_line_patt = re.compile(r'( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$')
 
     def __eq__(self, other):
         lines = self.splitlines()
@@ -473,7 +471,7 @@ def _prop_name(self):
         Calculate property name from tag name, e.g. a:schemeClr -> schemeClr.
         """
         if ':' in self._nsptagname:
-            start = self._nsptagname.index(':')+1
+            start = self._nsptagname.index(':') + 1
         else:
             start = 0
         return self._nsptagname[start:]
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
index 24ce059fe..6733bfc13 100644
--- a/features/steps/helpers.py
+++ b/features/steps/helpers.py
@@ -10,6 +10,7 @@
 def absjoin(*paths):
     return os.path.abspath(os.path.join(*paths))
 
+
 thisdir = os.path.split(__file__)[0]
 scratch_dir = absjoin(thisdir, '../_scratch')
 
diff --git a/setup.py b/setup.py
index bb248dafc..098d28e69 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@ def text_of(relpath):
         text = f.read()
     return text
 
+
 # Read the version from docx.__version__ without importing the package
 # (and thus attempting to import packages it depends on that may not be
 # installed yet)
diff --git a/tests/image/test_helpers.py b/tests/image/test_helpers.py
index 4a4ff178a..6091f4883 100644
--- a/tests/image/test_helpers.py
+++ b/tests/image/test_helpers.py
@@ -28,8 +28,8 @@ def it_raises_on_unexpected_EOF(self, read_str_fixture):
 
     def it_can_read_a_long(self, read_long_fixture):
         stream_rdr, offset, expected_int = read_long_fixture
-        l = stream_rdr.read_long(offset)
-        assert l == expected_int
+        long_ = stream_rdr.read_long(offset)
+        assert long_ == expected_int
 
     # fixtures -------------------------------------------------------
 
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index a669b8d57..50b8952f9 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -43,6 +43,7 @@ def it_can_iterate_over_its_styles(self, iter_fixture):
         assert count == expected_count
         assert StyleFactory_.call_args_list == expected_calls
 
+    @pytest.mark.filterwarnings('ignore::UserWarning')
     def it_can_get_a_style_by_id(self, getitem_id_fixture):
         styles, key, expected_element = getitem_id_fixture
         style = styles[key]
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index 6bf0ce3f3..4e4858de3 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -261,4 +261,5 @@ def grammar():
 
     return root_node
 
+
 root_node = grammar()
diff --git a/tox.ini b/tox.ini
index 5e2b58843..76f1ce0fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@
 
 [flake8]
 exclude = dist,docs,*.egg-info,.git,ref,_scratch,.tox
+max-line-length = 88
 
 [pytest]
 norecursedirs = doc docx *.egg-info features .git ref _scratch .tox

From 5dcb24c7905d71f79df5dfb63f3c4dadfed79f18 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 31 Dec 2018 19:30:23 -0800
Subject: [PATCH 167/367] test: upgrade mock helpers to autospec by default

---
 .gitignore                   |   1 +
 docx/blkcntnr.py             |  27 +++---
 docx/document.py             |  47 ++++------
 docx/opc/package.py          |   7 +-
 docx/oxml/table.py           |   5 +-
 docx/package.py              |  21 ++---
 docx/parts/document.py       |  48 +++++-----
 docx/styles/styles.py        |  30 +++---
 tests/image/test_bmp.py      |  25 +++--
 tests/image/test_gif.py      |  25 ++---
 tests/image/test_image.py    |  35 ++++---
 tests/image/test_jpeg.py     | 173 +++++++++++++++--------------------
 tests/image/test_png.py      | 121 ++++++++++--------------
 tests/image/test_tiff.py     | 144 +++++++++++++++--------------
 tests/opc/test_package.py    |  72 +++++++--------
 tests/opc/test_part.py       |  54 ++++-------
 tests/opc/test_pkgreader.py  |  55 ++++++-----
 tests/oxml/test_table.py     |  65 ++++++-------
 tests/parts/test_document.py | 172 ++++++++++++++--------------------
 tests/parts/test_image.py    |  46 ++++------
 tests/parts/test_settings.py |  31 +++----
 tests/styles/test_styles.py  | 124 +++++++++++--------------
 tests/test_blkcntnr.py       |  38 +++-----
 tests/test_document.py       |  44 ++++-----
 tests/test_package.py        | 150 +++++++++++++-----------------
 tests/text/test_paragraph.py |  26 ++----
 tests/unitutil/mock.py       |  54 ++++++-----
 tox.ini                      |   2 +-
 28 files changed, 719 insertions(+), 923 deletions(-)

diff --git a/.gitignore b/.gitignore
index de25a6f76..e24445137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /docs/.build/
 /*.egg-info
 *.pyc
+.pytest_cache/
 _scratch/
 Session.vim
 /.tox/
diff --git a/docx/blkcntnr.py b/docx/blkcntnr.py
index d57a0cd0f..a80903e52 100644
--- a/docx/blkcntnr.py
+++ b/docx/blkcntnr.py
@@ -1,25 +1,26 @@
 # encoding: utf-8
 
-"""
-Block item container, used by body, cell, header, etc. Block level items are
-things like paragraph and table, although there are a few other specialized
-ones like structured document tags.
+"""Block item container, used by body, cell, header, etc.
+
+Block level items are things like paragraph and table, although there are a few other
+specialized ones like structured document tags.
 """
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .oxml.table import CT_Tbl
-from .shared import Parented
-from .text.paragraph import Paragraph
+from docx.oxml.table import CT_Tbl
+from docx.shared import Parented
+from docx.text.paragraph import Paragraph
 
 
 class BlockItemContainer(Parented):
+    """Base class for proxy objects that can contain block items.
+
+    These containers include _Body, _Cell, header, footer, footnote, endnote, comment,
+    and text box objects. Provides the shared functionality to add a block item like
+    a paragraph or table.
     """
-    Base class for proxy objects that can contain block items, such as _Body,
-    _Cell, header, footer, footnote, endnote, comment, and text box objects.
-    Provides the shared functionality to add a block item like a paragraph or
-    table.
-    """
+
     def __init__(self, element, parent):
         super(BlockItemContainer, self).__init__(parent)
         self._element = element
diff --git a/docx/document.py b/docx/document.py
index ba94a7990..a2842595a 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -1,24 +1,21 @@
 # encoding: utf-8
 
-"""
-|Document| and closely related objects
-"""
+"""|Document| and closely related objects"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .blkcntnr import BlockItemContainer
-from .enum.section import WD_SECTION
-from .enum.text import WD_BREAK
-from .section import Section, Sections
-from .shared import ElementProxy, Emu
+from docx.blkcntnr import BlockItemContainer
+from docx.enum.section import WD_SECTION
+from docx.enum.text import WD_BREAK
+from docx.section import Section, Sections
+from docx.shared import ElementProxy, Emu
 
 
 class Document(ElementProxy):
-    """
-    WordprocessingML (WML) document. Not intended to be constructed directly.
-    Use :func:`docx.Document` to open or create a document.
+    """WordprocessingML (WML) document.
+
+    Not intended to be constructed directly. Use :func:`docx.Document` to open or create
+    a document.
     """
 
     __slots__ = ('_part', '__body')
@@ -28,25 +25,21 @@ def __init__(self, element, part):
         self._part = part
         self.__body = None
 
-    def add_heading(self, text='', level=1):
-        """
-        Return a heading paragraph newly added to the end of the document,
-        containing *text* and having its paragraph style determined by
-        *level*. If *level* is 0, the style is set to `Title`. If *level* is
-        1 (or omitted), `Heading 1` is used. Otherwise the style is set to
-        `Heading {level}`. Raises |ValueError| if *level* is outside the
-        range 0-9.
+    def add_heading(self, text="", level=1):
+        """Return a heading paragraph newly added to the end of the document.
+
+        The heading paragraph will contain *text* and have its paragraph style
+        determined by *level*. If *level* is 0, the style is set to `Title`. If *level*
+        is 1 (or omitted), `Heading 1` is used. Otherwise the style is set to `Heading
+        {level}`. Raises |ValueError| if *level* is outside the range 0-9.
         """
         if not 0 <= level <= 9:
             raise ValueError("level must be in range 0-9, got %d" % level)
-        style = 'Title' if level == 0 else 'Heading %d' % level
+        style = "Title" if level == 0 else "Heading %d" % level
         return self.add_paragraph(text, style)
 
     def add_page_break(self):
-        """
-        Return a paragraph newly added to the end of the document and
-        containing only a page break.
-        """
+        """Return newly |Paragraph| object containing only a page break."""
         paragraph = self.add_paragraph()
         paragraph.add_run().add_break(WD_BREAK.PAGE)
         return paragraph
diff --git a/docx/opc/package.py b/docx/opc/package.py
index b0ea37ea5..177f5503c 100644
--- a/docx/opc/package.py
+++ b/docx/opc/package.py
@@ -23,6 +23,7 @@ class OpcPackage(object):
     the :meth:`open` class method with a path to a package file or file-like
     object containing one.
     """
+
     def __init__(self):
         super(OpcPackage, self).__init__()
 
@@ -174,10 +175,8 @@ def _core_properties_part(self):
 
 
 class Unmarshaller(object):
-    """
-    Hosts static methods for unmarshalling a package from a |PackageReader|
-    instance.
-    """
+    """Hosts static methods for unmarshalling a package from a |PackageReader|."""
+
     @staticmethod
     def unmarshal(pkg_reader, package, part_factory):
         """
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index 95f9c6243..e55bf9126 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -367,9 +367,8 @@ def width(self, value):
 
 
 class CT_Tc(BaseOxmlElement):
-    """
-    ``<w:tc>`` table cell element
-    """
+    """`w:tc` table cell element"""
+
     tcPr = ZeroOrOne('w:tcPr')  # bunches of successors, overriding insert
     p = OneOrMore('w:p')
     tbl = OneOrMore('w:tbl')
diff --git a/docx/package.py b/docx/package.py
index 4c9a6f6a1..65e319845 100644
--- a/docx/package.py
+++ b/docx/package.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-"""
-WordprocessingML Package class and related objects
-"""
+"""WordprocessingML Package class and related objects"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
@@ -47,12 +45,9 @@ def _gather_image_parts(self):
 
 
 class ImageParts(object):
-    """
-    Collection of |ImagePart| instances corresponding to each image part in
-    the package.
-    """
+    """Collection of |ImagePart| objects corresponding to images in the package"""
+
     def __init__(self):
-        super(ImageParts, self).__init__()
         self._image_parts = []
 
     def __contains__(self, item):
@@ -68,10 +63,10 @@ def append(self, item):
         self._image_parts.append(item)
 
     def get_or_add_image_part(self, image_descriptor):
-        """
-        Return an |ImagePart| instance containing the image identified by
-        *image_descriptor*, newly created if a matching one is not present in
-        the collection.
+        """Return |ImagePart| object containing image identified by *image_descriptor*.
+
+        The image-part is newly created if a matching one is not present in the
+        collection.
         """
         image = Image.from_file(image_descriptor)
         matching_image_part = self._get_by_sha1(image.sha1)
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 01266b3bd..1a85741a6 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -1,33 +1,29 @@
 # encoding: utf-8
 
-"""
-|DocumentPart| and closely related objects
-"""
+"""|DocumentPart| and closely related objects"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from ..document import Document
-from .numbering import NumberingPart
-from ..opc.constants import RELATIONSHIP_TYPE as RT
-from ..opc.part import XmlPart
-from ..oxml.shape import CT_Inline
-from ..shape import InlineShapes
-from ..shared import lazyproperty
-from .settings import SettingsPart
-from .styles import StylesPart
+from docx.document import Document
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
+from docx.opc.part import XmlPart
+from docx.oxml.shape import CT_Inline
+from docx.parts.numbering import NumberingPart
+from docx.parts.settings import SettingsPart
+from docx.parts.styles import StylesPart
+from docx.shape import InlineShapes
+from docx.shared import lazyproperty
 
 
 class DocumentPart(XmlPart):
+    """Main document part of a WordprocessingML (WML) package, aka a .docx file.
+
+    Acts as broker to other parts such as image, core properties, and style parts. It
+    also acts as a convenient delegate when a mid-document object needs a service
+    involving a remote ancestor. The `Parented.part` property inherited by many content
+    objects provides access to this part object for that purpose.
     """
-    Main document part of a WordprocessingML (WML) package, aka a .docx file.
-    Acts as broker to other parts such as image, core properties, and style
-    parts. It also acts as a convenient delegate when a mid-document object
-    needs a service involving a remote ancestor. The `Parented.part` property
-    inherited by many content objects provides access to this part object for
-    that purpose.
-    """
+
     @property
     def core_properties(self):
         """
@@ -84,10 +80,10 @@ def inline_shapes(self):
         return InlineShapes(self._element.body, self)
 
     def new_pic_inline(self, image_descriptor, width, height):
-        """
-        Return a newly-created `w:inline` element containing the image
-        specified by *image_descriptor* and scaled based on the values of
-        *width* and *height*.
+        """Return a newly-created `w:inline` element.
+
+        The element contains the image specified by *image_descriptor* and is scaled
+        based on the values of *width* and *height*.
         """
         rId, image = self.get_or_add_image(image_descriptor)
         cx, cy = image.scaled_dimensions(width, height)
diff --git a/docx/styles/styles.py b/docx/styles/styles.py
index ad27fa764..f9f1cd2fb 100644
--- a/docx/styles/styles.py
+++ b/docx/styles/styles.py
@@ -1,26 +1,22 @@
 # encoding: utf-8
 
-"""
-Styles object, container for all objects in the styles part.
-"""
+"""Styles object, container for all objects in the styles part"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from warnings import warn
 
-from . import BabelFish
-from .latent import LatentStyles
-from ..shared import ElementProxy
-from .style import BaseStyle, StyleFactory
+from docx.shared import ElementProxy
+from docx.styles import BabelFish
+from docx.styles.latent import LatentStyles
+from docx.styles.style import BaseStyle, StyleFactory
 
 
 class Styles(ElementProxy):
-    """
-    A collection providing access to the styles defined in a document.
-    Accessed using the :attr:`.Document.styles` property. Supports ``len()``,
-    iteration, and dictionary-style access by style name.
+    """Provides access to the styles defined in a document.
+
+    Accessed using the :attr:`.Document.styles` property. Supports ``len()``, iteration,
+    and dictionary-style access by style name.
     """
 
     __slots__ = ()
@@ -87,9 +83,9 @@ def default(self, style_type):
         return StyleFactory(style)
 
     def get_by_id(self, style_id, style_type):
-        """
-        Return the style of *style_type* matching *style_id*. Returns the
-        default for *style_type* if *style_id* is not found or is |None|, or
+        """Return the style of *style_type* matching *style_id*.
+
+        Returns the default for *style_type* if *style_id* is not found or is |None|, or
         if the style having *style_id* is not of *style_type*.
         """
         if style_id is None:
diff --git a/tests/image/test_bmp.py b/tests/image/test_bmp.py
index 812f55e90..37961369a 100644
--- a/tests/image/test_bmp.py
+++ b/tests/image/test_bmp.py
@@ -12,15 +12,22 @@
 from docx.image.constants import MIME_TYPE
 from docx.image.bmp import Bmp
 
-from ..unitutil.mock import initializer_mock
+from ..unitutil.mock import ANY, initializer_mock
 
 
 class DescribeBmp(object):
 
-    def it_can_construct_from_a_bmp_stream(self, from_stream_fixture):
-        stream, Bmp__init__, cx, cy, horz_dpi, vert_dpi = from_stream_fixture
+    def it_can_construct_from_a_bmp_stream(self, Bmp__init__):
+        cx, cy, horz_dpi, vert_dpi = 26, 43, 200, 96
+        bytes_ = (
+            b'fillerfillerfiller\x1A\x00\x00\x00\x2B\x00\x00\x00'
+            b'fillerfiller\xB8\x1E\x00\x00\x00\x00\x00\x00'
+        )
+        stream = BytesIO(bytes_)
+
         bmp = Bmp.from_stream(stream)
-        Bmp__init__.assert_called_once_with(cx, cy, horz_dpi, vert_dpi)
+
+        Bmp__init__.assert_called_once_with(ANY, cx, cy, horz_dpi, vert_dpi)
         assert isinstance(bmp, Bmp)
 
     def it_knows_its_content_type(self):
@@ -33,16 +40,6 @@ def it_knows_its_default_ext(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(self, Bmp__init__):
-        cx, cy, horz_dpi, vert_dpi = 26, 43, 200, 96
-        bytes_ = (
-            b'fillerfillerfiller\x1A\x00\x00\x00\x2B\x00\x00\x00'
-            b'fillerfiller\xB8\x1E\x00\x00\x00\x00\x00\x00'
-        )
-        stream = BytesIO(bytes_)
-        return stream, Bmp__init__, cx, cy, horz_dpi, vert_dpi
-
     @pytest.fixture
     def Bmp__init__(self, request):
         return initializer_mock(request, Bmp)
diff --git a/tests/image/test_gif.py b/tests/image/test_gif.py
index 2592f2854..707419f5c 100644
--- a/tests/image/test_gif.py
+++ b/tests/image/test_gif.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.image.gif module
-"""
+"""Unit test suite for docx.image.gif module"""
 
 from __future__ import absolute_import, print_function
 
@@ -12,15 +10,19 @@
 from docx.image.constants import MIME_TYPE
 from docx.image.gif import Gif
 
-from ..unitutil.mock import initializer_mock
+from ..unitutil.mock import ANY, initializer_mock
 
 
 class DescribeGif(object):
 
-    def it_can_construct_from_a_gif_stream(self, from_stream_fixture):
-        stream, Gif__init__, cx, cy = from_stream_fixture
+    def it_can_construct_from_a_gif_stream(self, Gif__init__):
+        cx, cy = 42, 24
+        bytes_ = b'filler\x2A\x00\x18\x00'
+        stream = BytesIO(bytes_)
+
         gif = Gif.from_stream(stream)
-        Gif__init__.assert_called_once_with(cx, cy, 72, 72)
+
+        Gif__init__.assert_called_once_with(ANY, cx, cy, 72, 72)
         assert isinstance(gif, Gif)
 
     def it_knows_its_content_type(self):
@@ -31,14 +33,7 @@ def it_knows_its_default_ext(self):
         gif = Gif(None, None, None, None)
         assert gif.default_ext == 'gif'
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def from_stream_fixture(self, Gif__init__):
-        cx, cy = 42, 24
-        bytes_ = b'filler\x2A\x00\x18\x00'
-        stream = BytesIO(bytes_)
-        return stream, Gif__init__, cx, cy
+    # fixture components ---------------------------------------------
 
     @pytest.fixture
     def Gif__init__(self, request):
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index a70f76564..07f9d0666 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.image package
-"""
+"""Unit test suite for docx.image package"""
 
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -21,16 +19,23 @@
 
 from ..unitutil.file import test_file
 from ..unitutil.mock import (
-    function_mock, class_mock, initializer_mock, instance_mock, method_mock,
-    property_mock
+    ANY,
+    class_mock,
+    function_mock,
+    initializer_mock,
+    instance_mock,
+    method_mock,
+    property_mock,
 )
 
 
 class DescribeImage(object):
 
-    def it_can_construct_from_an_image_blob(self, from_blob_fixture):
-        blob_, BytesIO_, _from_stream_, stream_, image_ = from_blob_fixture
+    def it_can_construct_from_an_image_blob(
+        self, blob_, BytesIO_, _from_stream_, stream_, image_
+    ):
         image = Image.from_blob(blob_)
+
         BytesIO_.assert_called_once_with(blob_)
         _from_stream_.assert_called_once_with(stream_, blob_)
         assert image is image_
@@ -50,17 +55,14 @@ def it_can_construct_from_an_image_file_like(self, from_filelike_fixture):
         assert image is image_
 
     def it_can_construct_from_an_image_stream(self, from_stream_fixture):
-        # fixture ----------------------
         stream_, blob_, filename_in = from_stream_fixture[:3]
         _ImageHeaderFactory_, image_header_ = from_stream_fixture[3:5]
         Image__init_, filename_out = from_stream_fixture[5:]
-        # exercise ---------------------
+
         image = Image._from_stream(stream_, blob_, filename_in)
-        # verify -----------------------
+
         _ImageHeaderFactory_.assert_called_once_with(stream_)
-        Image__init_.assert_called_once_with(
-            blob_, filename_out, image_header_
-        )
+        Image__init_.assert_called_once_with(ANY, blob_, filename_out, image_header_)
         assert isinstance(image, Image)
 
     def it_provides_access_to_the_image_blob(self):
@@ -150,11 +152,6 @@ def dpi_fixture(self, image_header_):
         image_header_.vert_dpi = vert_dpi
         return image_header_, horz_dpi, vert_dpi
 
-    @pytest.fixture
-    def from_blob_fixture(
-            self, blob_, BytesIO_, _from_stream_, stream_, image_):
-        return blob_, BytesIO_, _from_stream_, stream_, image_
-
     @pytest.fixture
     def from_filelike_fixture(self, _from_stream_, image_):
         image_path = test_file('python-icon.png')
@@ -238,7 +235,7 @@ def filename_(self, request):
     @pytest.fixture
     def _from_stream_(self, request, image_):
         return method_mock(
-            request, Image, '_from_stream', return_value=image_
+            request, Image, '_from_stream', autospec=False, return_value=image_
         )
 
     @pytest.fixture
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index 3aaad4960..cbbc869bb 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.image.jpeg module
-"""
+"""Unit test suite for docx.image.jpeg module"""
 
 from __future__ import absolute_import, print_function
 
@@ -12,13 +10,27 @@
 from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.jpeg import (
-    _App0Marker, _App1Marker, Exif, Jfif, _JfifMarkers, Jpeg, _Marker,
-    _MarkerFactory, _MarkerFinder, _MarkerParser, _SofMarker
+    _App0Marker,
+    _App1Marker,
+    Exif,
+    Jfif,
+    _JfifMarkers,
+    Jpeg,
+    _Marker,
+    _MarkerFactory,
+    _MarkerFinder,
+    _MarkerParser,
+    _SofMarker,
 )
 from docx.image.tiff import Tiff
 
 from ..unitutil.mock import (
-    call, class_mock, initializer_mock, instance_mock, method_mock
+    ANY,
+    call,
+    class_mock,
+    initializer_mock,
+    instance_mock,
+    method_mock,
 )
 
 
@@ -106,13 +118,15 @@ def stream_(self, request):
 
 class Describe_JfifMarkers(object):
 
-    def it_can_construct_from_a_jfif_stream(self, from_stream_fixture):
-        stream_, _MarkerParser_, _JfifMarkers__init_, marker_lst = (
-            from_stream_fixture
-        )
+    def it_can_construct_from_a_jfif_stream(
+            self, stream_, _MarkerParser_, _JfifMarkers__init_, soi_, app0_, sof_, sos_
+    ):
+        marker_lst = [soi_, app0_, sof_, sos_]
+
         jfif_markers = _JfifMarkers.from_stream(stream_)
+
         _MarkerParser_.from_stream.assert_called_once_with(stream_)
-        _JfifMarkers__init_.assert_called_once_with(marker_lst)
+        _JfifMarkers__init_.assert_called_once_with(ANY, marker_lst)
         assert isinstance(jfif_markers, _JfifMarkers)
 
     def it_can_find_the_APP0_marker(self, app0_fixture):
@@ -177,13 +191,6 @@ def eoi_(self, request):
             request, _SofMarker, marker_code=JPEG_MARKER_CODE.EOI
         )
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, _MarkerParser_, _JfifMarkers__init_, soi_, app0_,
-            sof_, sos_):
-        marker_lst = [soi_, app0_, sof_, sos_]
-        return stream_, _MarkerParser_, _JfifMarkers__init_, marker_lst
-
     @pytest.fixture
     def _JfifMarkers__init_(self, request):
         return initializer_mock(request, _JfifMarkers)
@@ -251,11 +258,11 @@ def stream_(self, request):
 class Describe_Marker(object):
 
     def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
-        stream, marker_code, offset, _Marker__init_, length = (
-            from_stream_fixture
-        )
+        stream, marker_code, offset, _Marker__init_, length = from_stream_fixture
+
         marker = _Marker.from_stream(stream, marker_code, offset)
-        _Marker__init_.assert_called_once_with(marker_code, offset, length)
+
+        _Marker__init_.assert_called_once_with(ANY, marker_code, offset, length)
         assert isinstance(marker, _Marker)
 
     # fixtures -------------------------------------------------------
@@ -277,12 +284,16 @@ def _Marker__init_(self, request):
 
 class Describe_App0Marker(object):
 
-    def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
-        (stream, marker_code, offset, _App0Marker__init_, length,
-         density_units, x_density, y_density) = from_stream_fixture
+    def it_can_construct_from_a_stream_and_offset(self, _App0Marker__init_):
+        bytes_ = b'\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18'
+        marker_code, offset, length = JPEG_MARKER_CODE.APP0, 0, 16
+        density_units, x_density, y_density = 1, 42, 24
+        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+
         app0_marker = _App0Marker.from_stream(stream, marker_code, offset)
+
         _App0Marker__init_.assert_called_once_with(
-            marker_code, offset, length, density_units, x_density, y_density
+            ANY, marker_code, offset, length, density_units, x_density, y_density
         )
         assert isinstance(app0_marker, _App0Marker)
 
@@ -311,38 +322,34 @@ def dpi_fixture(self, request):
         )
         return density_units, x_density, y_density, horz_dpi, vert_dpi
 
-    @pytest.fixture
-    def from_stream_fixture(self, request, _App0Marker__init_):
-        bytes_ = b'\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18'
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
-        marker_code, offset, length = JPEG_MARKER_CODE.APP0, 0, 16
-        density_units, x_density, y_density = 1, 42, 24
-        return (
-            stream_reader, marker_code, offset, _App0Marker__init_, length,
-            density_units, x_density, y_density
-        )
-
 
 class Describe_App1Marker(object):
 
-    def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
-        (stream, marker_code, offset, _App1Marker__init_, length,
-         _tiff_from_exif_segment_, horz_dpi, vert_dpi) = from_stream_fixture
+    def it_can_construct_from_a_stream_and_offset(
+        self, _App1Marker__init_, _tiff_from_exif_segment_
+    ):
+        bytes_ = b'\x00\x42Exif\x00\x00'
+        marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
+        horz_dpi, vert_dpi = 42, 24
+        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+
         app1_marker = _App1Marker.from_stream(stream, marker_code, offset)
-        _tiff_from_exif_segment_.assert_called_once_with(
-            stream, offset, length
-        )
+
+        _tiff_from_exif_segment_.assert_called_once_with(stream, offset, length)
         _App1Marker__init_.assert_called_once_with(
-            marker_code, offset, length, horz_dpi, vert_dpi
+            ANY, marker_code, offset, length, horz_dpi, vert_dpi
         )
         assert isinstance(app1_marker, _App1Marker)
 
-    def it_can_construct_from_non_Exif_APP1_segment(self, non_Exif_fixture):
-        stream, marker_code, offset = non_Exif_fixture[:3]
-        _App1Marker__init_, length = non_Exif_fixture[3:]
+    def it_can_construct_from_non_Exif_APP1_segment(self, _App1Marker__init_):
+        bytes_ = b'\x00\x42Foobar'
+        marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
+        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+
         app1_marker = _App1Marker.from_stream(stream, marker_code, offset)
+
         _App1Marker__init_.assert_called_once_with(
-            marker_code, offset, length, 72, 72
+            ANY, marker_code, offset, length, 72, 72
         )
         assert isinstance(app1_marker, _App1Marker)
 
@@ -374,18 +381,6 @@ def BytesIO_(self, request, substream_):
             request, 'docx.image.jpeg.BytesIO', return_value=substream_
         )
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, request, _App1Marker__init_, _tiff_from_exif_segment_):
-        bytes_ = b'\x00\x42Exif\x00\x00'
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
-        marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
-        horz_dpi, vert_dpi = 42, 24
-        return (
-            stream_reader, marker_code, offset, _App1Marker__init_, length,
-            _tiff_from_exif_segment_, horz_dpi, vert_dpi
-        )
-
     @pytest.fixture
     def get_tiff_fixture(self, request, BytesIO_, substream_, Tiff_, tiff_):
         bytes_ = b'xfillerxMM\x00*\x00\x00\x00\x42'
@@ -396,13 +391,6 @@ def get_tiff_fixture(self, request, BytesIO_, substream_, Tiff_, tiff_):
             substream_, Tiff_, tiff_
         )
 
-    @pytest.fixture
-    def non_Exif_fixture(self, request, _App1Marker__init_):
-        bytes_ = b'\x00\x42Foobar'
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
-        marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
-        return stream_reader, marker_code, offset, _App1Marker__init_, length
-
     @pytest.fixture
     def substream_(self, request):
         return instance_mock(request, BytesIO)
@@ -420,19 +408,23 @@ def tiff_(self, request):
     @pytest.fixture
     def _tiff_from_exif_segment_(self, request, tiff_):
         return method_mock(
-            request, _App1Marker, '_tiff_from_exif_segment',
+            request, _App1Marker, '_tiff_from_exif_segment', autospec=False,
             return_value=tiff_
         )
 
 
 class Describe_SofMarker(object):
 
-    def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
-        (stream, marker_code, offset, _SofMarker__init_, length,
-         px_width, px_height) = from_stream_fixture
+    def it_can_construct_from_a_stream_and_offset(self, request, _SofMarker__init_):
+        bytes_ = b'\x00\x11\x00\x00\x2A\x00\x18'
+        marker_code, offset, length = JPEG_MARKER_CODE.SOF0, 0, 17
+        px_width, px_height = 24, 42
+        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+
         sof_marker = _SofMarker.from_stream(stream, marker_code, offset)
+
         _SofMarker__init_.assert_called_once_with(
-            marker_code, offset, length, px_width, px_height
+            ANY, marker_code, offset, length, px_width, px_height
         )
         assert isinstance(sof_marker, _SofMarker)
 
@@ -443,17 +435,6 @@ def it_knows_the_image_width_and_height(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(self, request, _SofMarker__init_):
-        bytes_ = b'\x00\x11\x00\x00\x2A\x00\x18'
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
-        marker_code, offset, length = JPEG_MARKER_CODE.SOF0, 0, 17
-        px_width, px_height = 24, 42
-        return (
-            stream_reader, marker_code, offset, _SofMarker__init_, length,
-            px_width, px_height
-        )
-
     @pytest.fixture
     def _SofMarker__init_(self, request):
         return initializer_mock(request, _SofMarker)
@@ -519,10 +500,10 @@ def stream_(self, request):
 
 class Describe_MarkerFinder(object):
 
-    def it_can_construct_from_a_stream(self, from_stream_fixture):
-        stream_, _MarkerFinder__init_ = from_stream_fixture
+    def it_can_construct_from_a_stream(self, stream_, _MarkerFinder__init_):
         marker_finder = _MarkerFinder.from_stream(stream_)
-        _MarkerFinder__init_.assert_called_once_with(stream_)
+
+        _MarkerFinder__init_.assert_called_once_with(ANY, stream_)
         assert isinstance(marker_finder, _MarkerFinder)
 
     def it_can_find_the_next_marker_after_a_given_offset(self, next_fixture):
@@ -532,10 +513,6 @@ def it_can_find_the_next_marker_after_a_given_offset(self, next_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(self, stream_, _MarkerFinder__init_):
-        return stream_, _MarkerFinder__init_
-
     @pytest.fixture
     def _MarkerFinder__init_(self, request):
         return initializer_mock(request, _MarkerFinder)
@@ -564,13 +541,13 @@ def stream_(self, request):
 
 class Describe_MarkerParser(object):
 
-    def it_can_construct_from_a_jfif_stream(self, from_stream_fixture):
-        stream_, StreamReader_, _MarkerParser__init_, stream_reader_ = (
-            from_stream_fixture
-        )
+    def it_can_construct_from_a_jfif_stream(
+        self, stream_, StreamReader_, _MarkerParser__init_, stream_reader_
+    ):
         marker_parser = _MarkerParser.from_stream(stream_)
+
         StreamReader_.assert_called_once_with(stream_, BIG_ENDIAN)
-        _MarkerParser__init_.assert_called_once_with(stream_reader_)
+        _MarkerParser__init_.assert_called_once_with(ANY, stream_reader_)
         assert isinstance(marker_parser, _MarkerParser)
 
     def it_can_iterate_over_the_jfif_markers_in_its_stream(
@@ -600,12 +577,6 @@ def app0_(self, request):
     def eoi_(self, request):
         return instance_mock(request, _Marker, segment_length=0)
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, StreamReader_, _MarkerParser__init_,
-            stream_reader_):
-        return stream_, StreamReader_, _MarkerParser__init_, stream_reader_
-
     @pytest.fixture
     def iter_markers_fixture(
             self, stream_reader_, _MarkerFinder_, marker_finder_,
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index 73f1e26ab..21ed66fa3 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.image.png module
-"""
+"""Unit test suite for docx.image.png module"""
 
 from __future__ import absolute_import, print_function
 
@@ -18,20 +16,33 @@
 )
 
 from ..unitutil.mock import (
-    call, class_mock, function_mock, initializer_mock, instance_mock,
-    method_mock
+    ANY,
+    call,
+    class_mock,
+    function_mock,
+    initializer_mock,
+    instance_mock,
+    method_mock,
 )
 
 
 class DescribePng(object):
 
-    def it_can_construct_from_a_png_stream(self, from_stream_fixture):
-        stream_, _PngParser_, Png__init__, cx, cy, horz_dpi, vert_dpi = (
-            from_stream_fixture
-        )
+    def it_can_construct_from_a_png_stream(
+            self, stream_, _PngParser_, png_parser_, Png__init__
+    ):
+        px_width, px_height, horz_dpi, vert_dpi = 42, 24, 36, 63
+        png_parser_.px_width = px_width
+        png_parser_.px_height = px_height
+        png_parser_.horz_dpi = horz_dpi
+        png_parser_.vert_dpi = vert_dpi
+
         png = Png.from_stream(stream_)
+
         _PngParser_.parse.assert_called_once_with(stream_)
-        Png__init__.assert_called_once_with(cx, cy, horz_dpi, vert_dpi)
+        Png__init__.assert_called_once_with(
+            ANY, px_width, px_height, horz_dpi, vert_dpi
+        )
         assert isinstance(png, Png)
 
     def it_knows_its_content_type(self):
@@ -44,19 +55,6 @@ def it_knows_its_default_ext(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, _PngParser_, png_parser_, Png__init__):
-        px_width, px_height, horz_dpi, vert_dpi = 42, 24, 36, 63
-        png_parser_.px_width = px_width
-        png_parser_.px_height = px_height
-        png_parser_.horz_dpi = horz_dpi
-        png_parser_.vert_dpi = vert_dpi
-        return (
-            stream_, _PngParser_, Png__init__, px_width, px_height,
-            horz_dpi, vert_dpi
-        )
-
     @pytest.fixture
     def Png__init__(self, request):
         return initializer_mock(request, Png)
@@ -78,11 +76,13 @@ def stream_(self, request):
 
 class Describe_PngParser(object):
 
-    def it_can_parse_the_headers_of_a_PNG_stream(self, parse_fixture):
-        stream_, _Chunks_, _PngParser__init_, chunks_ = parse_fixture
+    def it_can_parse_the_headers_of_a_PNG_stream(
+        self, stream_, _Chunks_, _PngParser__init_, chunks_
+    ):
         png_parser = _PngParser.parse(stream_)
+
         _Chunks_.from_stream.assert_called_once_with(stream_)
-        _PngParser__init_.assert_called_once_with(chunks_)
+        _PngParser__init_.assert_called_once_with(ANY, chunks_)
         assert isinstance(png_parser, _PngParser)
 
     def it_knows_the_image_width_and_height(self, dimensions_fixture):
@@ -148,10 +148,6 @@ def no_dpi_fixture(self, request, chunks_):
         png_parser = _PngParser(chunks_)
         return png_parser
 
-    @pytest.fixture
-    def parse_fixture(self, stream_, _Chunks_, _PngParser__init_, chunks_):
-        return stream_, _Chunks_, _PngParser__init_, chunks_
-
     @pytest.fixture
     def _PngParser__init_(self, request):
         return initializer_mock(request, _PngParser)
@@ -163,14 +159,17 @@ def stream_(self, request):
 
 class Describe_Chunks(object):
 
-    def it_can_construct_from_a_stream(self, from_stream_fixture):
-        stream_, _ChunkParser_, chunk_parser_, _Chunks__init_, chunk_lst = (
-            from_stream_fixture
-        )
+    def it_can_construct_from_a_stream(
+        self, stream_, _ChunkParser_, chunk_parser_, _Chunks__init_
+    ):
+        chunk_lst = [1, 2]
+        chunk_parser_.iter_chunks.return_value = iter(chunk_lst)
+
         chunks = _Chunks.from_stream(stream_)
+
         _ChunkParser_.from_stream.assert_called_once_with(stream_)
         chunk_parser_.iter_chunks.assert_called_once_with()
-        _Chunks__init_.assert_called_once_with(chunk_lst)
+        _Chunks__init_.assert_called_once_with(ANY, chunk_lst)
         assert isinstance(chunks, _Chunks)
 
     def it_provides_access_to_the_IHDR_chunk(self, IHDR_fixture):
@@ -188,15 +187,6 @@ def it_raises_if_theres_no_IHDR_chunk(self, no_IHDR_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, _ChunkParser_, chunk_parser_, _Chunks__init_):
-        chunk_lst = [1, 2]
-        chunk_parser_.iter_chunks.return_value = iter(chunk_lst)
-        return (
-            stream_, _ChunkParser_, chunk_parser_, _Chunks__init_, chunk_lst
-        )
-
     @pytest.fixture
     def _ChunkParser_(self, request, chunk_parser_):
         _ChunkParser_ = class_mock(request, 'docx.image.png._ChunkParser')
@@ -252,23 +242,25 @@ def stream_(self, request):
 
 class Describe_ChunkParser(object):
 
-    def it_can_construct_from_a_stream(self, from_stream_fixture):
-        stream_, StreamReader_, stream_rdr_, _ChunkParser__init_ = (
-            from_stream_fixture
-        )
+    def it_can_construct_from_a_stream(
+        self, stream_, StreamReader_, stream_rdr_, _ChunkParser__init_
+    ):
         chunk_parser = _ChunkParser.from_stream(stream_)
+
         StreamReader_.assert_called_once_with(stream_, BIG_ENDIAN)
-        _ChunkParser__init_.assert_called_once_with(stream_rdr_)
+        _ChunkParser__init_.assert_called_once_with(ANY, stream_rdr_)
         assert isinstance(chunk_parser, _ChunkParser)
 
-    def it_can_iterate_over_the_chunks_in_its_png_stream(self, iter_fixture):
-        # fixture ----------------------
-        chunk_parser, _iter_chunk_offsets_, _ChunkFactory_ = iter_fixture[:3]
-        stream_rdr_, offsets, chunk_lst = iter_fixture[3:]
-        # exercise ---------------------
+    def it_can_iterate_over_the_chunks_in_its_png_stream(
+        self, _iter_chunk_offsets_, _ChunkFactory_, stream_rdr_, chunk_, chunk_2_
+    ):
+        offsets = [2, 4, 6]
+        chunk_lst = [chunk_, chunk_2_]
+        chunk_parser = _ChunkParser(stream_rdr_)
+
         chunks = [chunk for chunk in chunk_parser.iter_chunks()]
-        # verify -----------------------
-        _iter_chunk_offsets_.assert_called_once_with()
+
+        _iter_chunk_offsets_.assert_called_once_with(chunk_parser)
         assert _ChunkFactory_.call_args_list == [
             call(PNG_CHUNK_TYPE.IHDR, stream_rdr_, offsets[0]),
             call(PNG_CHUNK_TYPE.pHYs, stream_rdr_, offsets[1]),
@@ -306,11 +298,6 @@ def chunk_lst_(self, chunk_, chunk_2_):
     def _ChunkParser__init_(self, request):
         return initializer_mock(request, _ChunkParser)
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, StreamReader_, stream_rdr_, _ChunkParser__init_):
-        return stream_, StreamReader_, stream_rdr_, _ChunkParser__init_
-
     @pytest.fixture
     def _iter_chunk_offsets_(self, request):
         chunk_offsets = (
@@ -322,18 +309,6 @@ def _iter_chunk_offsets_(self, request):
             return_value=iter(chunk_offsets)
         )
 
-    @pytest.fixture
-    def iter_fixture(
-            self, _iter_chunk_offsets_, _ChunkFactory_, stream_rdr_, chunk_,
-            chunk_2_):
-        chunk_parser = _ChunkParser(stream_rdr_)
-        offsets = [2, 4, 6]
-        chunk_lst = [chunk_, chunk_2_]
-        return (
-            chunk_parser, _iter_chunk_offsets_, _ChunkFactory_, stream_rdr_,
-            offsets, chunk_lst
-        )
-
     @pytest.fixture
     def iter_offsets_fixture(self):
         bytes_ = b'-filler-\x00\x00\x00\x00IHDRxxxx\x00\x00\x00\x00IEND'
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index 3d6ea5971..277df5f21 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -1,8 +1,6 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.image.tiff module
-"""
+"""Unit test suite for docx.image.tiff module"""
 
 from __future__ import absolute_import, print_function
 
@@ -12,25 +10,47 @@
 from docx.image.constants import MIME_TYPE, TIFF_TAG
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from docx.image.tiff import (
-    _AsciiIfdEntry, _IfdEntries, _IfdEntry, _IfdEntryFactory, _IfdParser,
-    _LongIfdEntry, _RationalIfdEntry, _ShortIfdEntry, Tiff, _TiffParser
+    _AsciiIfdEntry,
+    _IfdEntries,
+    _IfdEntry,
+    _IfdEntryFactory,
+    _IfdParser,
+    _LongIfdEntry,
+    _RationalIfdEntry,
+    _ShortIfdEntry,
+    Tiff,
+    _TiffParser,
 )
 
 from ..unitutil.mock import (
-    call, class_mock, function_mock, initializer_mock, instance_mock,
-    loose_mock, method_mock
+    ANY,
+    call,
+    class_mock,
+    function_mock,
+    initializer_mock,
+    instance_mock,
+    loose_mock,
+    method_mock,
 )
 
 
 class DescribeTiff(object):
 
-    def it_can_construct_from_a_tiff_stream(self, from_stream_fixture):
-        (stream_, _TiffParser_, Tiff__init_, px_width, px_height, horz_dpi,
-         vert_dpi) = from_stream_fixture
+    def it_can_construct_from_a_tiff_stream(
+        self, stream_, _TiffParser_, tiff_parser_, Tiff__init_
+    ):
+        px_width, px_height = 111, 222
+        horz_dpi, vert_dpi = 333, 444
+        tiff_parser_.px_width = px_width
+        tiff_parser_.px_height = px_height
+        tiff_parser_.horz_dpi = horz_dpi
+        tiff_parser_.vert_dpi = vert_dpi
+
         tiff = Tiff.from_stream(stream_)
+
         _TiffParser_.parse.assert_called_once_with(stream_)
         Tiff__init_.assert_called_once_with(
-            px_width, px_height, horz_dpi, vert_dpi
+            ANY, px_width, px_height, horz_dpi, vert_dpi
         )
         assert isinstance(tiff, Tiff)
 
@@ -44,20 +64,6 @@ def it_knows_its_default_ext(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, _TiffParser_, tiff_parser_, Tiff__init_):
-        px_width, px_height = 111, 222
-        horz_dpi, vert_dpi = 333, 444
-        tiff_parser_.px_width = px_width
-        tiff_parser_.px_height = px_height
-        tiff_parser_.horz_dpi = horz_dpi
-        tiff_parser_.vert_dpi = vert_dpi
-        return (
-            stream_, _TiffParser_, Tiff__init_, px_width, px_height,
-            horz_dpi, vert_dpi
-        )
-
     @pytest.fixture
     def Tiff__init_(self, request):
         return initializer_mock(request, Tiff)
@@ -80,15 +86,22 @@ def stream_(self, request):
 class Describe_TiffParser(object):
 
     def it_can_parse_the_properties_from_a_tiff_stream(
-            self, from_stream_fixture):
-        (stream_, _make_stream_reader_, _IfdEntries_, ifd0_offset_,
-         stream_rdr_, _TiffParser__init_, ifd_entries_) = from_stream_fixture
+        self,
+        stream_,
+        _make_stream_reader_,
+        _IfdEntries_,
+        ifd0_offset_,
+        stream_rdr_,
+        _TiffParser__init_,
+        ifd_entries_,
+    ):
         tiff_parser = _TiffParser.parse(stream_)
+
         _make_stream_reader_.assert_called_once_with(stream_)
         _IfdEntries_.from_stream.assert_called_once_with(
             stream_rdr_, ifd0_offset_
         )
-        _TiffParser__init_.assert_called_once_with(ifd_entries_)
+        _TiffParser__init_.assert_called_once_with(ANY, ifd_entries_)
         assert isinstance(tiff_parser, _TiffParser)
 
     def it_makes_a_stream_reader_to_help_parse(self, mk_stream_rdr_fixture):
@@ -137,15 +150,6 @@ def dpi_fixture(self, request):
         tiff_parser = _TiffParser(entries)
         return tiff_parser, expected_horz_dpi, expected_vert_dpi
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, _make_stream_reader_, _IfdEntries_, ifd0_offset_,
-            stream_rdr_, _TiffParser__init_, ifd_entries_):
-        return (
-            stream_, _make_stream_reader_, _IfdEntries_, ifd0_offset_,
-            stream_rdr_, _TiffParser__init_, ifd_entries_
-        )
-
     @pytest.fixture
     def _IfdEntries_(self, request, ifd_entries_):
         _IfdEntries_ = class_mock(request, 'docx.image.tiff._IfdEntries')
@@ -163,7 +167,10 @@ def ifd0_offset_(self, request):
     @pytest.fixture
     def _make_stream_reader_(self, request, stream_rdr_):
         return method_mock(
-            request, _TiffParser, '_make_stream_reader',
+            request,
+            _TiffParser,
+            '_make_stream_reader',
+            autospec=False,
             return_value=stream_rdr_
         )
 
@@ -199,13 +206,23 @@ def _TiffParser__init_(self, request):
 
 class Describe_IfdEntries(object):
 
-    def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
-        stream_, offset_, _IfdParser_, _IfdEntries__init_, entries_ = (
-            from_stream_fixture
-        )
+    def it_can_construct_from_a_stream_and_offset(
+        self,
+        stream_,
+        offset_,
+        _IfdParser_,
+        ifd_parser_,
+        _IfdEntries__init_,
+        ifd_entry_,
+        ifd_entry_2_,
+    ):
+        ifd_parser_.iter_entries.return_value = [ifd_entry_, ifd_entry_2_]
+        entries_ = {1: 42, 2: 24}
+
         ifd_entries = _IfdEntries.from_stream(stream_, offset_)
+
         _IfdParser_.assert_called_once_with(stream_, offset_)
-        _IfdEntries__init_.assert_called_once_with(entries_)
+        _IfdEntries__init_.assert_called_once_with(ANY, entries_)
         assert isinstance(ifd_entries, _IfdEntries)
 
     def it_has_basic_mapping_semantics(self):
@@ -217,14 +234,6 @@ def it_has_basic_mapping_semantics(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, stream_, offset_, _IfdParser_, ifd_parser_,
-            _IfdEntries__init_, ifd_entry_, ifd_entry_2_):
-        ifd_parser_.iter_entries.return_value = [ifd_entry_, ifd_entry_2_]
-        entries_ = {1: 42, 2: 24}
-        return stream_, offset_, _IfdParser_, _IfdEntries__init_, entries_
-
     @pytest.fixture
     def ifd_entry_(self, request):
         return instance_mock(request, _IfdEntry, tag=1, value=42)
@@ -377,14 +386,20 @@ def offset_(self, request):
 
 class Describe_IfdEntry(object):
 
-    def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
-        (stream_rdr, offset, _parse_value_, value_count, value_offset,
-         _IfdEntry__init_, tag_code, value_) = from_stream_fixture
+    def it_can_construct_from_a_stream_and_offset(
+        self, _parse_value_, _IfdEntry__init_, value_
+    ):
+        bytes_ = b'\x00\x01\x66\x66\x00\x00\x00\x02\x00\x00\x00\x03'
+        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        offset, tag_code, value_count, value_offset = 0, 1, 2, 3
+        _parse_value_.return_value = value_
+
         ifd_entry = _IfdEntry.from_stream(stream_rdr, offset)
+
         _parse_value_.assert_called_once_with(
             stream_rdr, offset, value_count, value_offset
         )
-        _IfdEntry__init_.assert_called_once_with(tag_code, value_)
+        _IfdEntry__init_.assert_called_once_with(ANY, tag_code, value_)
         assert isinstance(ifd_entry, _IfdEntry)
 
     def it_provides_read_only_access_to_the_directory_entry(self):
@@ -394,26 +409,13 @@ def it_provides_read_only_access_to_the_directory_entry(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def from_stream_fixture(
-            self, _parse_value_, _IfdEntry__init_, value_):
-        bytes_ = b'\x00\x01\x66\x66\x00\x00\x00\x02\x00\x00\x00\x03'
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
-        offset, tag_code, value_count, value_offset = 0, 1, 2, 3
-        return (
-            stream_rdr, offset, _parse_value_, value_count, value_offset,
-            _IfdEntry__init_, tag_code, value_
-        )
-
     @pytest.fixture
     def _IfdEntry__init_(self, request):
         return initializer_mock(request, _IfdEntry)
 
     @pytest.fixture
-    def _parse_value_(self, request, value_):
-        return method_mock(
-            request, _IfdEntry, '_parse_value', return_value=value_
-        )
+    def _parse_value_(self, request):
+        return method_mock(request, _IfdEntry, '_parse_value',  autospec=False)
 
     @pytest.fixture
     def value_(self, request):
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index f5b7ac3f7..ae5b269b5 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.opc.package module
-"""
+"""Unit test suite for docx.opc.package module"""
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -18,8 +16,15 @@
 from docx.opc.rel import _Relationship, Relationships
 
 from ..unitutil.mock import (
-    call, class_mock, instance_mock, loose_mock, method_mock, Mock, patch,
-    PropertyMock, property_mock
+    call,
+    class_mock,
+    instance_mock,
+    loose_mock,
+    method_mock,
+    Mock,
+    patch,
+    PropertyMock,
+    property_mock,
 )
 
 
@@ -124,16 +129,17 @@ def it_provides_access_to_the_core_properties_part_to_help(
         assert core_properties_part is core_properties_part_
 
     def it_creates_a_default_core_props_part_if_none_present(
-            self, default_core_props_fixture):
-        opc_package, CorePropertiesPart_, core_properties_part_ = (
-            default_core_props_fixture
-        )
+        self, part_related_by_, CorePropertiesPart_, relate_to_, core_properties_part_
+    ):
+        part_related_by_.side_effect = KeyError
+        CorePropertiesPart_.default.return_value = core_properties_part_
+        opc_package = OpcPackage()
 
         core_properties_part = opc_package._core_properties_part
 
         CorePropertiesPart_.default.assert_called_once_with(opc_package)
-        opc_package.relate_to.assert_called_once_with(
-            core_properties_part_, RT.CORE_PROPERTIES
+        relate_to_.assert_called_once_with(
+            opc_package, core_properties_part_, RT.CORE_PROPERTIES
         )
         assert core_properties_part is core_properties_part_
 
@@ -155,15 +161,6 @@ def core_props_part_fixture(
         part_related_by_.return_value = core_properties_part_
         return opc_package, core_properties_part_
 
-    @pytest.fixture
-    def default_core_props_fixture(
-            self, part_related_by_, CorePropertiesPart_, relate_to_,
-            core_properties_part_):
-        opc_package = OpcPackage()
-        part_related_by_.side_effect = KeyError
-        CorePropertiesPart_.default.return_value = core_properties_part_
-        return opc_package, CorePropertiesPart_, core_properties_part_
-
     @pytest.fixture
     def relate_to_part_fixture_(self, request, pkg, rels_, reltype):
         rId = 'rId99'
@@ -279,15 +276,19 @@ def Unmarshaller_(self, request):
 class DescribeUnmarshaller(object):
 
     def it_can_unmarshal_from_a_pkg_reader(
-            self, pkg_reader_, pkg_, part_factory_, _unmarshal_parts,
-            _unmarshal_relationships, parts_dict_):
-        # exercise ---------------------
+        self,
+        pkg_reader_,
+        pkg_,
+        part_factory_,
+        _unmarshal_parts_,
+        _unmarshal_relationships_,
+        parts_dict_,
+    ):
+        _unmarshal_parts_.return_value = parts_dict_
         Unmarshaller.unmarshal(pkg_reader_, pkg_, part_factory_)
-        # verify -----------------------
-        _unmarshal_parts.assert_called_once_with(
-            pkg_reader_, pkg_, part_factory_
-        )
-        _unmarshal_relationships.assert_called_once_with(
+
+        _unmarshal_parts_.assert_called_once_with(pkg_reader_, pkg_, part_factory_)
+        _unmarshal_relationships_.assert_called_once_with(
             pkg_reader_, pkg_, parts_dict_
         )
         for part in parts_dict_.values():
@@ -412,12 +413,11 @@ def reltypes_(self, request):
         return reltype_, reltype_2_
 
     @pytest.fixture
-    def _unmarshal_parts(self, request, parts_dict_):
-        return method_mock(
-            request, Unmarshaller, '_unmarshal_parts',
-            return_value=parts_dict_
-        )
+    def _unmarshal_parts_(self, request):
+        return method_mock(request, Unmarshaller, '_unmarshal_parts', autospec=False)
 
     @pytest.fixture
-    def _unmarshal_relationships(self, request):
-        return method_mock(request, Unmarshaller, '_unmarshal_relationships')
+    def _unmarshal_relationships_(self, request):
+        return method_mock(
+            request, Unmarshaller, '_unmarshal_relationships', autospec=False
+        )
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index 4721e5be4..cc60beaae 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.opc.part module
-"""
+"""Unit test suite for docx.opc.part module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -18,19 +14,25 @@
 
 from ..unitutil.cxml import element
 from ..unitutil.mock import (
-    class_mock, cls_attr_mock, function_mock, initializer_mock,
-    instance_mock, loose_mock, Mock
+    ANY,
+    class_mock,
+    cls_attr_mock,
+    function_mock,
+    initializer_mock,
+    instance_mock,
+    loose_mock,
+    Mock,
 )
 
 
 class DescribePart(object):
 
-    def it_can_be_constructed_by_PartFactory(self, load_fixture):
-        partname_, content_type_, blob_, package_, __init_ = load_fixture
+    def it_can_be_constructed_by_PartFactory(
+        self, partname_, content_type_, blob_, package_, __init_
+    ):
         part = Part.load(partname_, content_type_, blob_, package_)
-        __init_.assert_called_once_with(
-            partname_, content_type_, blob_, package_
-        )
+
+        __init_.assert_called_once_with(ANY, partname_, content_type_, blob_, package_)
         assert isinstance(part, Part)
 
     def it_knows_its_partname(self, partname_get_fixture):
@@ -73,12 +75,6 @@ def content_type_fixture(self):
         part = Part(None, content_type, None, None)
         return part, content_type
 
-    @pytest.fixture
-    def load_fixture(
-            self, request, partname_, content_type_, blob_, package_,
-            __init_):
-        return (partname_, content_type_, blob_, package_, __init_)
-
     @pytest.fixture
     def package_get_fixture(self, package_):
         part = Part(None, None, None, package_)
@@ -437,15 +433,14 @@ def reltype_2_(self, request):
 
 class DescribeXmlPart(object):
 
-    def it_can_be_constructed_by_PartFactory(self, load_fixture):
-        partname_, content_type_, blob_, package_ = load_fixture[:4]
-        element_, parse_xml_, __init_ = load_fixture[4:]
-        # exercise ---------------------
+    def it_can_be_constructed_by_PartFactory(
+        self, partname_, content_type_, blob_, package_, element_, parse_xml_, __init_
+    ):
         part = XmlPart.load(partname_, content_type_, blob_, package_)
-        # verify -----------------------
+
         parse_xml_.assert_called_once_with(blob_)
         __init_.assert_called_once_with(
-            partname_, content_type_, element_, package_
+            ANY, partname_, content_type_, element_, package_
         )
         assert isinstance(part, XmlPart)
 
@@ -466,15 +461,6 @@ def blob_fixture(self, request, element_, serialize_part_xml_):
         xml_part = XmlPart(None, None, element_, None)
         return xml_part, element_, serialize_part_xml_
 
-    @pytest.fixture
-    def load_fixture(
-            self, request, partname_, content_type_, blob_, package_,
-            element_, parse_xml_, __init_):
-        return (
-            partname_, content_type_, blob_, package_, element_, parse_xml_,
-            __init_
-        )
-
     @pytest.fixture
     def part_fixture(self):
         return XmlPart(None, None, None, None)
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index eaf5d8c9d..96885efcb 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -1,51 +1,58 @@
 # encoding: utf-8
 
-"""
-Test suite for opc.pkgreader module
-"""
+"""Unit test suite for docx.opc.pkgreader module"""
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import pytest
 
-from docx.opc.constants import (
-    CONTENT_TYPE as CT, RELATIONSHIP_TARGET_MODE as RTM
-)
+from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TARGET_MODE as RTM
 from docx.opc.packuri import PackURI
 from docx.opc.phys_pkg import _ZipPkgReader
 from docx.opc.pkgreader import (
-    _ContentTypeMap, PackageReader, _SerializedPart, _SerializedRelationship,
-    _SerializedRelationships
+    _ContentTypeMap,
+    PackageReader,
+    _SerializedPart,
+    _SerializedRelationship,
+    _SerializedRelationships,
 )
 
 from .unitdata.types import a_Default, a_Types, an_Override
 from ..unitutil.mock import (
-    call, class_mock, function_mock, initializer_mock, instance_mock,
-    loose_mock, method_mock, Mock, patch
+    ANY,
+    call,
+    class_mock,
+    function_mock,
+    initializer_mock,
+    instance_mock,
+    loose_mock,
+    method_mock,
+    Mock,
+    patch,
 )
 
 
 class DescribePackageReader(object):
 
     def it_can_construct_from_pkg_file(
-            self, init, PhysPkgReader_, from_xml, _srels_for,
-            _load_serialized_parts):
-        # mockery ----------------------
+        self, _init_, PhysPkgReader_, from_xml, _srels_for, _load_serialized_parts
+    ):
         phys_reader = PhysPkgReader_.return_value
         content_types = from_xml.return_value
         pkg_srels = _srels_for.return_value
         sparts = _load_serialized_parts.return_value
         pkg_file = Mock(name='pkg_file')
-        # exercise ---------------------
+
         pkg_reader = PackageReader.from_file(pkg_file)
-        # verify -----------------------
+
         PhysPkgReader_.assert_called_once_with(pkg_file)
         from_xml.assert_called_once_with(phys_reader.content_types_xml)
         _srels_for.assert_called_once_with(phys_reader, '/')
-        _load_serialized_parts.assert_called_once_with(phys_reader, pkg_srels,
-                                                       content_types)
+        _load_serialized_parts.assert_called_once_with(
+            phys_reader, pkg_srels, content_types
+        )
         phys_reader.close.assert_called_once_with()
-        init.assert_called_once_with(content_types, pkg_srels, sparts)
+        _init_.assert_called_once_with(ANY, content_types, pkg_srels, sparts)
         assert isinstance(pkg_reader, PackageReader)
 
     def it_can_iterate_over_the_serialized_parts(self, iter_sparts_fixture):
@@ -186,10 +193,10 @@ def content_types_(self, request):
 
     @pytest.fixture
     def from_xml(self, request):
-        return method_mock(request, _ContentTypeMap, 'from_xml')
+        return method_mock(request, _ContentTypeMap, 'from_xml', autospec=False)
 
     @pytest.fixture
-    def init(self, request):
+    def _init_(self, request):
         return initializer_mock(request, PackageReader)
 
     @pytest.fixture
@@ -204,7 +211,9 @@ def iter_sparts_fixture(
 
     @pytest.fixture
     def _load_serialized_parts(self, request):
-        return method_mock(request, PackageReader, '_load_serialized_parts')
+        return method_mock(
+            request, PackageReader, '_load_serialized_parts', autospec=False
+        )
 
     @pytest.fixture
     def partnames_(self, request):
@@ -252,11 +261,11 @@ def sparts_(
 
     @pytest.fixture
     def _srels_for(self, request):
-        return method_mock(request, PackageReader, '_srels_for')
+        return method_mock(request, PackageReader, '_srels_for', autospec=False)
 
     @pytest.fixture
     def _walk_phys_parts(self, request):
-        return method_mock(request, PackageReader, '_walk_phys_parts')
+        return method_mock(request, PackageReader, '_walk_phys_parts', autospec=False)
 
 
 class Describe_ContentTypeMap(object):
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 7ddbabe3d..61d8ba1d8 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.oxml.text module.
-"""
+"""Test suite for the docx.oxml.text module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -55,10 +51,19 @@ def tc_raise_fixture(self, request):
 
 class DescribeCT_Tc(object):
 
-    def it_can_merge_to_another_tc(self, merge_fixture):
-        tc, other_tc, top_tr_, top_tc_, left, height, width = merge_fixture
+    def it_can_merge_to_another_tc(
+        self, tr_, _span_dimensions_, _tbl_, _grow_to_, top_tc_
+    ):
+        top_tr_ = tr_
+        tc, other_tc = element('w:tc'), element('w:tc')
+        top, left, height, width = 0, 1, 2, 3
+        _span_dimensions_.return_value = top, left, height, width
+        _tbl_.return_value.tr_lst = [tr_]
+        tr_.tc_at_grid_col.return_value = top_tc_
+
         merged_tc = tc.merge(other_tc)
-        tc._span_dimensions.assert_called_once_with(other_tc)
+
+        _span_dimensions_.assert_called_once_with(tc, other_tc)
         top_tr_.tc_at_grid_col.assert_called_once_with(left)
         top_tc_._grow_to.assert_called_once_with(width, height)
         assert merged_tc is top_tc_
@@ -83,11 +88,19 @@ def it_can_grow_itself_to_help_merge(self, grow_to_fixture):
         tc._grow_to(width, height, top_tc)
         assert tc._span_to_width.call_args_list == expected_calls
 
-    def it_can_extend_its_horz_span_to_help_merge(self, span_width_fixture):
-        tc, grid_width, top_tc, vMerge, expected_calls = span_width_fixture
-        tc._span_to_width(grid_width, top_tc, vMerge)
-        tc._move_content_to.assert_called_once_with(top_tc)
-        assert tc._swallow_next_tc.call_args_list == expected_calls
+    def it_can_extend_its_horz_span_to_help_merge(
+        self, top_tc_, grid_span_, _move_content_to_, _swallow_next_tc_
+    ):
+        grid_span_.side_effect = [1, 3, 4]
+        grid_width, vMerge = 4, 'continue'
+        tc = element('w:tc')
+
+        tc._span_to_width(grid_width, top_tc_, vMerge)
+
+        _move_content_to_.assert_called_once_with(tc, top_tc_)
+        assert _swallow_next_tc_.call_args_list == [
+            call(tc, grid_width, top_tc_), call(tc, grid_width, top_tc_)
+        ]
         assert tc.vMerge == vMerge
 
     def it_can_swallow_the_next_tc_help_merge(self, swallow_fixture):
@@ -182,16 +195,6 @@ def grow_to_fixture(self, request, _span_to_width_):
         ][start:end]
         return tc, width, height, None, expected_calls
 
-    @pytest.fixture
-    def merge_fixture(
-            self, tr_, _span_dimensions_, _tbl_, _grow_to_, top_tc_):
-        tc, other_tc = element('w:tc'), element('w:tc')
-        top, left, height, width = 0, 1, 2, 3
-        _span_dimensions_.return_value = top, left, height, width
-        _tbl_.return_value.tr_lst = [tr_]
-        tr_.tc_at_grid_col.return_value = top_tc_
-        return tc, other_tc, tr_, top_tc_, left, height, width
-
     @pytest.fixture(params=[
         ('w:tc/w:p',             'w:tc/w:p',
          'w:tc/w:p',             'w:tc/w:p'),
@@ -248,18 +251,6 @@ def span_raise_fixture(self, request):
         tc_2 = tbl.tr_lst[row_2].tc_lst[col_2]
         return tc, tc_2
 
-    @pytest.fixture
-    def span_width_fixture(
-            self, top_tc_, grid_span_, _move_content_to_, _swallow_next_tc_):
-        tc = element('w:tc')
-        grid_span_.side_effect = [1, 3, 4]
-        grid_width, vMerge = 4, 'continue'
-        expected_calls = [
-            call(grid_width, top_tc_),
-            call(grid_width, top_tc_)
-        ]
-        return tc, grid_width, top_tc_, vMerge, expected_calls
-
     @pytest.fixture(params=[
         ('w:tr/(w:tc/w:p,w:tc/w:p)',                              0, 2,
          'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))'),
@@ -317,7 +308,7 @@ def _span_dimensions_(self, request):
 
     @pytest.fixture
     def _span_to_width_(self, request):
-        return method_mock(request, CT_Tc, '_span_to_width')
+        return method_mock(request, CT_Tc, '_span_to_width', autospec=False)
 
     def _snippet_tbl(self, idx):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 0c35756f1..cdecfe01f 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -2,7 +2,7 @@
 
 """Test suite for the docx.parts.document module"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -35,15 +35,20 @@ def it_can_save_the_package_to_a_file(self, save_fixture):
         document.save(file_)
         document._package.save.assert_called_once_with(file_)
 
-    def it_can_get_or_add_an_image(self, get_image_fixture):
-        document_part, path, image_part_, rId_, image_ = get_image_fixture
+    def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
+        path = 'foobar.png'
+        package_.image_parts.get_or_add_image_part.return_value = image_part_
+        relate_to_.return_value = "rId42"
+        image_part_.image = image_
+        document_part = DocumentPart(None, None, None, package_)
 
         rId, image = document_part.get_or_add_image(path)
 
         image_parts = document_part._package.image_parts
         image_parts.get_or_add_image_part.assert_called_once_with(path)
-        document_part.relate_to.assert_called_once_with(image_part_, RT.IMAGE)
-        assert (rId, image) == (rId_, image_)
+        relate_to_.assert_called_once_with(document_part, image_part_, RT.IMAGE)
+        assert rId == "rId42"
+        assert image is image_
 
     def it_provides_access_to_the_document_settings(self, settings_fixture):
         document_part, settings_ = settings_fixture
@@ -67,32 +72,46 @@ def it_provides_access_to_the_inline_shapes_in_the_document(
         InlineShapes_.assert_called_once_with(body_elm, document)
         assert inline_shapes is InlineShapes_.return_value
 
-    def it_provides_access_to_the_numbering_part(self, nmprt_get_fixture):
-        document_part, numbering_part_ = nmprt_get_fixture
+    def it_provides_access_to_the_numbering_part(
+        self, part_related_by_, numbering_part_
+    ):
+        part_related_by_.return_value = numbering_part_
+        document_part = DocumentPart(None, None, None, None)
+
         numbering_part = document_part.numbering_part
-        document_part.part_related_by.assert_called_once_with(RT.NUMBERING)
+
+        part_related_by_.assert_called_once_with(document_part, RT.NUMBERING)
         assert numbering_part is numbering_part_
 
-    def it_creates_numbering_part_if_not_present(self, nmprt_create_fixture):
-        document_part, NumberingPart_, numbering_part_ = nmprt_create_fixture
+    def it_creates_numbering_part_if_not_present(
+        self, part_related_by_, relate_to_, NumberingPart_, numbering_part_
+    ):
+        part_related_by_.side_effect = KeyError
+        NumberingPart_.new.return_value = numbering_part_
+        document_part = DocumentPart(None, None, None, None)
+
         numbering_part = document_part.numbering_part
+
         NumberingPart_.new.assert_called_once_with()
-        document_part.relate_to.assert_called_once_with(
-            numbering_part_, RT.NUMBERING
-        )
+        relate_to_.assert_called_once_with(document_part, numbering_part_, RT.NUMBERING)
         assert numbering_part is numbering_part_
 
     def it_knows_the_next_available_xml_id(self, next_id_fixture):
         document, expected_id = next_id_fixture
         assert document.next_id == expected_id
 
-    def it_can_create_a_new_pic_inline(self, new_pic_fixture):
-        document_part, path, width, height = new_pic_fixture[:4]
-        image_, expected_xml = new_pic_fixture[4:]
+    def it_can_create_a_new_pic_inline(self, image_, get_or_add_image_, next_id_prop_):
+        path, width, height, rId = 'foo/bar.png', 111, 222, 'rId42'
+        expected_xml = snippet_text('inline')
+        get_or_add_image_.return_value = rId, image_
+        image_.scaled_dimensions.return_value = 444, 888
+        image_.filename = 'bar.png'
+        next_id_prop_.return_value = 24
+        document_part = DocumentPart(None, None, None, None)
 
         inline = document_part.new_pic_inline(path, width, height)
 
-        document_part.get_or_add_image.assert_called_once_with(path)
+        get_or_add_image_.assert_called_once_with(document_part, path)
         image_.scaled_dimensions.assert_called_once_with(width, height)
         assert inline.xml == expected_xml
 
@@ -116,40 +135,51 @@ def it_can_get_the_id_of_a_style(self, get_style_id_fixture):
         assert style_id is style_id_
 
     def it_provides_access_to_its_settings_part_to_help(
-            self, settings_part_get_fixture):
-        document_part, settings_part_ = settings_part_get_fixture
+        self, part_related_by_, settings_part_
+    ):
+        part_related_by_.return_value = settings_part_
+        document_part = DocumentPart(None, None, None, None)
+
         settings_part = document_part._settings_part
-        document_part.part_related_by.assert_called_once_with(RT.SETTINGS)
+
+        part_related_by_.assert_called_once_with(document_part, RT.SETTINGS)
         assert settings_part is settings_part_
 
     def it_creates_default_settings_part_if_not_present_to_help(
-            self, settings_part_create_fixture):
-        document_part, SettingsPart_, settings_part_ = (
-            settings_part_create_fixture
-        )
+        self, package_, part_related_by_, SettingsPart_, settings_part_, relate_to_
+    ):
+        part_related_by_.side_effect = KeyError
+        SettingsPart_.default.return_value = settings_part_
+        document_part = DocumentPart(None, None, None, package_)
+
         settings_part = document_part._settings_part
 
-        SettingsPart_.default.assert_called_once_with(document_part.package)
-        document_part.relate_to.assert_called_once_with(
-            settings_part_, RT.SETTINGS
-        )
+        SettingsPart_.default.assert_called_once_with(package_)
+        relate_to_.assert_called_once_with(document_part, settings_part_, RT.SETTINGS)
         assert settings_part is settings_part_
 
     def it_provides_access_to_its_styles_part_to_help(
-            self, styles_part_get_fixture):
-        document_part, styles_part_ = styles_part_get_fixture
+        self, part_related_by_, styles_part_
+    ):
+        part_related_by_.return_value = styles_part_
+        document_part = DocumentPart(None, None, None, None)
+
         styles_part = document_part._styles_part
-        document_part.part_related_by.assert_called_once_with(RT.STYLES)
+
+        part_related_by_.assert_called_once_with(document_part, RT.STYLES)
         assert styles_part is styles_part_
 
     def it_creates_default_styles_part_if_not_present_to_help(
-            self, styles_part_create_fixture):
-        document_part, StylesPart_, styles_part_ = styles_part_create_fixture
+        self, package_, part_related_by_, StylesPart_, styles_part_, relate_to_
+    ):
+        part_related_by_.side_effect = KeyError
+        StylesPart_.default.return_value = styles_part_
+        document_part = DocumentPart(None, None, None, package_)
+
         styles_part = document_part._styles_part
-        StylesPart_.default.assert_called_once_with(document_part.package)
-        document_part.relate_to.assert_called_once_with(
-            styles_part_, RT.STYLES
-        )
+
+        StylesPart_.default.assert_called_once_with(package_)
+        relate_to_.assert_called_once_with(document_part, styles_part_, RT.STYLES)
         assert styles_part is styles_part_
 
     # fixtures -------------------------------------------------------
@@ -160,17 +190,6 @@ def core_props_fixture(self, package_, core_properties_):
         package_.core_properties = core_properties_
         return document_part, core_properties_
 
-    @pytest.fixture
-    def get_image_fixture(self, package_, image_part_, image_, relate_to_):
-        document_part = DocumentPart(None, None, None, package_)
-        path, rId_ = 'foobar.png', 'rId42'
-
-        package_.image_parts.get_or_add_image_part.return_value = image_part_
-        relate_to_.return_value = rId_
-        image_part_.image = image_
-
-        return document_part, path, image_part_, rId_, image_
-
     @pytest.fixture
     def get_style_fixture(self, styles_prop_, style_):
         document_part = DocumentPart(None, None, None, None)
@@ -216,33 +235,6 @@ def next_id_fixture(self, request):
         document = DocumentPart(None, None, document_elm, None)
         return document, expected_id
 
-    @pytest.fixture
-    def new_pic_fixture(self, image_, get_or_add_image_, next_id_prop_):
-        document_part = DocumentPart(None, None, None, None)
-        path, width, height, rId = 'foo/bar.png', 111, 222, 'rId42'
-        expected_xml = snippet_text('inline')
-
-        get_or_add_image_.return_value = rId, image_
-        image_.scaled_dimensions.return_value = 444, 888
-        image_.filename = 'bar.png'
-        next_id_prop_.return_value = 24
-
-        return document_part, path, width, height, image_, expected_xml
-
-    @pytest.fixture
-    def nmprt_create_fixture(self, part_related_by_, relate_to_,
-                             NumberingPart_, numbering_part_):
-        document_part = DocumentPart(None, None, None, None)
-        part_related_by_.side_effect = KeyError
-        NumberingPart_.new.return_value = numbering_part_
-        return document_part, NumberingPart_, numbering_part_
-
-    @pytest.fixture
-    def nmprt_get_fixture(self, part_related_by_, numbering_part_):
-        document_part = DocumentPart(None, None, None, None)
-        part_related_by_.return_value = numbering_part_
-        return document_part, numbering_part_
-
     @pytest.fixture
     def save_fixture(self, package_):
         document_part = DocumentPart(None, None, None, package_)
@@ -257,21 +249,6 @@ def settings_fixture(self, _settings_part_prop_, settings_part_,
         settings_part_.settings = settings_
         return document_part, settings_
 
-    @pytest.fixture
-    def settings_part_create_fixture(
-            self, package_, part_related_by_, SettingsPart_, settings_part_,
-            relate_to_):
-        document_part = DocumentPart(None, None, None, package_)
-        part_related_by_.side_effect = KeyError
-        SettingsPart_.default.return_value = settings_part_
-        return document_part, SettingsPart_, settings_part_
-
-    @pytest.fixture
-    def settings_part_get_fixture(self, part_related_by_, settings_part_):
-        document_part = DocumentPart(None, None, None, None)
-        part_related_by_.return_value = settings_part_
-        return document_part, settings_part_
-
     @pytest.fixture
     def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
         document_part = DocumentPart(None, None, None, None)
@@ -279,21 +256,6 @@ def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
         styles_part_.styles = styles_
         return document_part, styles_
 
-    @pytest.fixture
-    def styles_part_create_fixture(
-            self, package_, part_related_by_, StylesPart_, styles_part_,
-            relate_to_):
-        document_part = DocumentPart(None, None, None, package_)
-        part_related_by_.side_effect = KeyError
-        StylesPart_.default.return_value = styles_part_
-        return document_part, StylesPart_, styles_part_
-
-    @pytest.fixture
-    def styles_part_get_fixture(self, part_related_by_, styles_part_):
-        document_part = DocumentPart(None, None, None, None)
-        part_related_by_.return_value = styles_part_
-        return document_part, styles_part_
-
     # fixture components ---------------------------------------------
 
     @pytest.fixture
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
index 177301345..1ab2490be 100644
--- a/tests/parts/test_image.py
+++ b/tests/parts/test_image.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.parts.image module
-"""
+"""Unit test suite for docx.parts.image module"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -16,31 +14,30 @@
 from docx.parts.image import ImagePart
 
 from ..unitutil.file import test_file
-from ..unitutil.mock import initializer_mock, instance_mock, method_mock
+from ..unitutil.mock import ANY, initializer_mock, instance_mock, method_mock
 
 
 class DescribeImagePart(object):
 
-    def it_is_used_by_PartFactory_to_construct_image_part(self, load_fixture):
-        # fixture ----------------------
-        image_part_load_, partname_, blob_, package_, image_part_ = (
-            load_fixture
-        )
+    def it_is_used_by_PartFactory_to_construct_image_part(
+        self, image_part_load_, partname_, blob_, package_, image_part_
+    ):
         content_type = CT.JPEG
         reltype = RT.IMAGE
-        # exercise ---------------------
+        image_part_load_.return_value = image_part_
+
         part = PartFactory(partname_, content_type, reltype, blob_, package_)
-        # verify -----------------------
+
         image_part_load_.assert_called_once_with(
             partname_, content_type, blob_, package_
         )
         assert part is image_part_
 
-    def it_can_construct_from_an_Image_instance(self, from_image_fixture):
-        image_, partname_, ImagePart__init__ = from_image_fixture
+    def it_can_construct_from_an_Image_instance(self, image_, partname_, _init_):
         image_part = ImagePart.from_image(image_, partname_)
-        ImagePart__init__.assert_called_once_with(
-            partname_, image_.content_type, image_.blob, image_
+
+        _init_.assert_called_once_with(
+            ANY, partname_, image_.content_type, image_.blob, image_
         )
         assert isinstance(image_part, ImagePart)
 
@@ -95,16 +92,12 @@ def filename_fixture(self, request, image_):
             expected_filename = image_.filename
         return image_part, expected_filename
 
-    @pytest.fixture
-    def from_image_fixture(self, image_, partname_, ImagePart__init__):
-        return image_, partname_, ImagePart__init__
-
     @pytest.fixture
     def image_(self, request):
         return instance_mock(request, Image)
 
     @pytest.fixture
-    def ImagePart__init__(self, request):
+    def _init_(self, request):
         return initializer_mock(request, ImagePart)
 
     @pytest.fixture
@@ -112,15 +105,8 @@ def image_part_(self, request):
         return instance_mock(request, ImagePart)
 
     @pytest.fixture
-    def image_part_load_(self, request, image_part_):
-        return method_mock(
-            request, ImagePart, 'load', return_value=image_part_
-        )
-
-    @pytest.fixture
-    def load_fixture(
-            self, image_part_load_, partname_, blob_, package_, image_part_):
-        return image_part_load_, partname_, blob_, package_, image_part_
+    def image_part_load_(self, request):
+        return method_mock(request, ImagePart, 'load', autospec=False)
 
     @pytest.fixture
     def package_(self, request):
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index b870a3e72..12c6b1d27 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.parts.settings module
-"""
+"""Unit test suite for the docx.parts.settings module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -23,12 +19,16 @@
 
 class DescribeSettingsPart(object):
 
-    def it_is_used_by_loader_to_construct_settings_part(self, load_fixture):
-        partname, content_type, blob, package_, settings_part_ = load_fixture
+    def it_is_used_by_loader_to_construct_settings_part(
+        self, load_, package_, settings_part_
+    ):
+        partname, blob = 'partname', 'blob'
+        content_type = CT.WML_SETTINGS
+        load_.return_value = settings_part_
+
         part = PartFactory(partname, content_type, None, blob, package_)
-        SettingsPart.load.assert_called_once_with(
-            partname, content_type, blob, package_
-        )
+
+        load_.assert_called_once_with(partname, content_type, blob, package_)
         assert part is settings_part_
 
     def it_provides_access_to_its_settings(self, settings_fixture):
@@ -48,13 +48,6 @@ def it_constructs_a_default_settings_part_to_help(self):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def load_fixture(self, load_, package_, settings_part_):
-        partname, blob = 'partname', 'blob'
-        content_type = CT.WML_SETTINGS
-        load_.return_value = settings_part_
-        return partname, content_type, blob, package_, settings_part_
-
     @pytest.fixture
     def settings_fixture(self, Settings_, settings_):
         settings_elm = element('w:settings')
@@ -65,7 +58,7 @@ def settings_fixture(self, Settings_, settings_):
 
     @pytest.fixture
     def load_(self, request):
-        return method_mock(request, SettingsPart, 'load')
+        return method_mock(request, SettingsPart, 'load', autospec=False)
 
     @pytest.fixture
     def package_(self, request):
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index 50b8952f9..650acf342 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.styles.styles module
-"""
+"""Unit test suite for the docx.styles.styles module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -85,25 +81,55 @@ def it_can_get_the_default_style_for_a_type(self, default_fixture):
         assert StyleFactory_.call_args_list == StyleFactory_calls
         assert style is style_
 
-    def it_can_get_a_style_of_type_by_id(self, get_by_id_fixture):
-        styles, style_id, style_type = get_by_id_fixture[:3]
-        default_calls, _get_by_id_calls, style_ = get_by_id_fixture[3:]
+    def it_can_get_a_style_of_type_by_id(self, _get_by_id_, style_):
+        style_id, style_type = 42, 7
+        _get_by_id_.return_value = style_
+        styles = Styles(None)
 
         style = styles.get_by_id(style_id, style_type)
 
-        assert styles.default.call_args_list == default_calls
-        assert styles._get_by_id.call_args_list == _get_by_id_calls
+        _get_by_id_.assert_called_once_with(styles, style_id, style_type)
         assert style is style_
 
-    def it_can_get_a_style_id(self, get_style_id_fixture):
-        styles, style_or_name, style_type = get_style_id_fixture[:3]
-        style_calls, name_calls, style_id_ = get_style_id_fixture[3:]
+    def but_it_returns_the_default_style_for_style_id_None(self, default_, style_):
+        style_type = 17
+        default_.return_value = style_
+        styles = Styles(None)
 
-        style_id = styles.get_style_id(style_or_name, style_type)
+        style = styles.get_by_id(None, style_type)
 
-        assert styles._get_style_id_from_style.call_args_list == style_calls
-        assert styles._get_style_id_from_name.call_args_list == name_calls
-        assert style_id is style_id_
+        default_.assert_called_once_with(styles, style_type)
+        assert style is style_
+
+    def it_can_get_a_style_id_from_a_style(self, _get_style_id_from_style_):
+        style = BaseStyle(None)
+        style_type = 22
+        _get_style_id_from_style_.return_value = "StyleId"
+        styles = Styles(None)
+
+        style_id = styles.get_style_id(style, style_type)
+
+        _get_style_id_from_style_.assert_called_once_with(styles, style, style_type)
+        assert style_id == "StyleId"
+
+    def and_it_can_get_a_style_id_from_a_style_name(self, _get_style_id_from_name_):
+        style_type = 22
+        _get_style_id_from_name_.return_value = "StyleId"
+        styles = Styles(None)
+
+        style_id = styles.get_style_id("Style Name", style_type)
+
+        _get_style_id_from_name_.assert_called_once_with(
+            styles, "Style Name", style_type
+        )
+        assert style_id == "StyleId"
+
+    def but_it_returns_None_for_a_style_or_name_of_None(self):
+        styles = Styles(None)
+
+        style_id = styles.get_style_id(None, style_type=22)
+
+        assert style_id is None
 
     def it_gets_a_style_by_id_to_help(self, _get_by_id_fixture):
         styles, style_id, style_type, default_calls = _get_by_id_fixture[:4]
@@ -115,15 +141,18 @@ def it_gets_a_style_by_id_to_help(self, _get_by_id_fixture):
         assert StyleFactory_.call_args_list == StyleFactory_calls
         assert style is style_
 
-    def it_gets_a_style_id_from_a_name_to_help(self, id_name_fixture):
-        styles, style_name, style_type, style_, style_id_ = id_name_fixture
+    def it_gets_a_style_id_from_a_name_to_help(
+        self, _getitem_, _get_style_id_from_style_, style_
+    ):
+        style_name, style_type, style_id_ = 'Foo Bar', 1, 'FooBar'
+        _getitem_.return_value = style_
+        _get_style_id_from_style_.return_value = style_id_
+        styles = Styles(None)
 
         style_id = styles._get_style_id_from_name(style_name, style_type)
 
-        styles.__getitem__.assert_called_once_with(style_name)
-        styles._get_style_id_from_style.assert_called_once_with(
-            style_, style_type
-        )
+        styles.__getitem__.assert_called_once_with(styles, style_name)
+        _get_style_id_from_style_.assert_called_once_with(styles, style_, style_type)
         assert style_id is style_id_
 
     def it_gets_a_style_id_from_a_style_to_help(self, id_style_fixture):
@@ -131,7 +160,7 @@ def it_gets_a_style_id_from_a_style_to_help(self, id_style_fixture):
 
         style_id = styles._get_style_id_from_style(style_, style_type)
 
-        styles.default.assert_called_once_with(style_type)
+        styles.default.assert_called_once_with(styles, style_type)
         assert style_id is style_id_
 
     def it_raises_on_style_type_mismatch(self, id_style_raises_fixture):
@@ -190,41 +219,6 @@ def default_fixture(self, request, StyleFactory_, style_):
             expected_value
         )
 
-    @pytest.fixture(params=[None, 'Foo'])
-    def get_by_id_fixture(self, request, default_, _get_by_id_, style_):
-        style_id, style_type = request.param, 1
-        styles = Styles(None)
-        default_calls = [call(style_type)] if style_id is None else []
-        _get_by_id_calls = (
-            [] if style_id is None else [call(style_id, style_type)]
-        )
-        default_.return_value = _get_by_id_.return_value = style_
-        return (
-            styles, style_id, style_type, default_calls, _get_by_id_calls,
-            style_
-        )
-
-    @pytest.fixture(params=[None, BaseStyle(None), 'Style Name'])
-    def get_style_id_fixture(self, request, _get_style_id_from_style_,
-                             _get_style_id_from_name_):
-        style_or_name, style_type = request.param, 1
-        styles = Styles(None)
-        style_calls = (
-            [call(style_or_name, style_type)]
-            if isinstance(style_or_name, BaseStyle) else []
-        )
-        name_calls = (
-            [call(style_or_name, style_type)]
-            if style_or_name == 'Style Name' else []
-        )
-        style_id_ = None if style_or_name is None else 'StyleName'
-        _get_style_id_from_style_.return_value = style_id_
-        _get_style_id_from_name_.return_value = style_id_
-        return (
-            styles, style_or_name, style_type, style_calls, name_calls,
-            style_id_
-        )
-
     @pytest.fixture(params=[
         ('w:styles/w:style{w:type=paragraph,w:styleId=Foo}', 'Foo',
          WD_STYLE_TYPE.PARAGRAPH),
@@ -238,7 +232,7 @@ def _get_by_id_fixture(self, request, default_, StyleFactory_, style_):
         styles_elm = element(styles_cxml)
         style_elm = styles_elm[0]
         styles = Styles(styles_elm)
-        default_calls = [] if style_id == 'Foo' else [call(style_type)]
+        default_calls = [] if style_id == 'Foo' else [call(styles, style_type)]
         StyleFactory_calls = [call(style_elm)] if style_id == 'Foo' else []
         default_.return_value = StyleFactory_.return_value = style_
         return (
@@ -279,14 +273,6 @@ def get_raises_fixture(self, request):
         styles = Styles(element(styles_cxml))
         return styles, 'bar'
 
-    @pytest.fixture
-    def id_name_fixture(self, _getitem_, _get_style_id_from_style_, style_):
-        styles = Styles(None)
-        style_name, style_type, style_id_ = 'Foo Bar', 1, 'FooBar'
-        _getitem_.return_value = style_
-        _get_style_id_from_style_.return_value = style_id_
-        return styles, style_name, style_type, style_, style_id_
-
     @pytest.fixture(params=[True, False])
     def id_style_fixture(self, request, default_, style_):
         style_is_default = request.param
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 6d4f43c21..5bc9bab3f 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.blkcntnr (block item container) module
-"""
+"""Test suite for the docx.blkcntnr (block item container) module"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -20,16 +18,17 @@
 
 class DescribeBlockItemContainer(object):
 
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        blkcntnr, text, style, paragraph_, add_run_calls = (
-            add_paragraph_fixture
-        )
-        new_paragraph = blkcntnr.add_paragraph(text, style)
+    def it_can_add_a_paragraph(self, add_paragraph_fixture, _add_paragraph_):
+        text, style, paragraph_, add_run_calls = add_paragraph_fixture
+        _add_paragraph_.return_value = paragraph_
+        blkcntnr = BlockItemContainer(None, None)
+
+        paragraph = blkcntnr.add_paragraph(text, style)
 
-        blkcntnr._add_paragraph.assert_called_once_with()
-        assert new_paragraph.add_run.call_args_list == add_run_calls
-        assert new_paragraph.style == style
-        assert new_paragraph is paragraph_
+        _add_paragraph_.assert_called_once_with(blkcntnr)
+        assert paragraph.add_run.call_args_list == add_run_calls
+        assert paragraph.style == style
+        assert paragraph is paragraph_
 
     def it_can_add_a_table(self, add_table_fixture):
         blkcntnr, rows, cols, width, expected_xml = add_table_fixture
@@ -78,14 +77,11 @@ def it_adds_a_paragraph_to_help(self, _add_paragraph_fixture):
         ('',    'Bar'),
         ('Foo', 'Bar'),
     ])
-    def add_paragraph_fixture(self, request, _add_paragraph_, paragraph_,
-                              add_run_):
-        blkcntnr = BlockItemContainer(None, None)
+    def add_paragraph_fixture(self, request, paragraph_):
         text, style = request.param
-        _add_paragraph_.return_value = paragraph_
-        add_run_calls = [call(text)] if text else []
         paragraph_.style = None
-        return blkcntnr, text, style, paragraph_, add_run_calls
+        add_run_calls = [call(text)] if text else []
+        return text, style, paragraph_, add_run_calls
 
     @pytest.fixture
     def _add_paragraph_fixture(self, request):
@@ -131,10 +127,6 @@ def tables_fixture(self, request):
     def _add_paragraph_(self, request):
         return method_mock(request, BlockItemContainer, '_add_paragraph')
 
-    @pytest.fixture
-    def add_run_(self, request):
-        return method_mock(request, Paragraph, 'add_run')
-
     @pytest.fixture
     def paragraph_(self, request):
         return instance_mock(request, Paragraph)
diff --git a/tests/test_document.py b/tests/test_document.py
index c1cb060ec..3ccac0ed9 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.document module
-"""
+"""Unit test suite for the docx.document module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -32,10 +28,14 @@
 
 class DescribeDocument(object):
 
-    def it_can_add_a_heading(self, add_heading_fixture):
-        document, text, level, style, paragraph_ = add_heading_fixture
-        paragraph = document.add_heading(text, level)
-        document.add_paragraph.assert_called_once_with(text, style)
+    def it_can_add_a_heading(self, add_heading_fixture, add_paragraph_, paragraph_):
+        level, style = add_heading_fixture
+        add_paragraph_.return_value = paragraph_
+        document = Document(None, None)
+
+        paragraph = document.add_heading("Spam vs. Bacon", level)
+
+        add_paragraph_.assert_called_once_with(document, "Spam vs. Bacon", style)
         assert paragraph is paragraph_
 
     def it_raises_on_heading_level_out_of_range(self):
@@ -45,10 +45,14 @@ def it_raises_on_heading_level_out_of_range(self):
         with pytest.raises(ValueError):
             document.add_heading(level=10)
 
-    def it_can_add_a_page_break(self, add_page_break_fixture):
-        document, paragraph_, run_ = add_page_break_fixture
+    def it_can_add_a_page_break(self, add_paragraph_, paragraph_, run_):
+        add_paragraph_.return_value = paragraph_
+        paragraph_.add_run.return_value = run_
+        document = Document(None, None)
+
         paragraph = document.add_page_break()
-        document.add_paragraph.assert_called_once_with()
+
+        add_paragraph_.assert_called_once_with(document)
         paragraph_.add_run.assert_called_once_with()
         run_.add_break.assert_called_once_with(WD_BREAK.PAGE)
         assert paragraph is paragraph_
@@ -145,19 +149,9 @@ def it_determines_block_width_to_help(self, block_width_fixture):
         (2, 'Heading 2'),
         (9, 'Heading 9'),
     ])
-    def add_heading_fixture(self, request, add_paragraph_, paragraph_):
+    def add_heading_fixture(self, request):
         level, style = request.param
-        document = Document(None, None)
-        text = 'Spam vs. Bacon'
-        add_paragraph_.return_value = paragraph_
-        return document, text, level, style, paragraph_
-
-    @pytest.fixture
-    def add_page_break_fixture(self, add_paragraph_, paragraph_, run_):
-        document = Document(None, None)
-        add_paragraph_.return_value = paragraph_
-        paragraph_.add_run.return_value = run_
-        return document, paragraph_, run_
+        return level, style
 
     @pytest.fixture(params=[
         ('',         None),
diff --git a/tests/test_package.py b/tests/test_package.py
index 35812e924..7c158db04 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for docx.package module
-"""
+"""Unit test suite for docx.package module"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -29,124 +27,104 @@ def it_gathers_package_image_parts_after_unmarshalling(self):
 
 class DescribeImageParts(object):
 
-    def it_can_get_a_matching_image_part(self, get_image_part_fixture):
-        image_parts, image_descriptor, image_part_ = get_image_part_fixture
-        image_part = image_parts.get_or_add_image_part(image_descriptor)
+    def it_can_get_a_matching_image_part(
+        self, Image_, image_, _get_by_sha1_, image_part_
+    ):
+        Image_.from_file.return_value = image_
+        image_.sha1 = "f005ba11"
+        _get_by_sha1_.return_value = image_part_
+        image_parts = ImageParts()
+
+        image_part = image_parts.get_or_add_image_part("image.jpg")
+
+        Image_.from_file.assert_called_once_with("image.jpg")
+        _get_by_sha1_.assert_called_once_with(image_parts, "f005ba11")
         assert image_part is image_part_
 
-    def it_can_add_a_new_image_part(self, add_image_part_fixture):
-        image_parts, image_descriptor, image_, image_part_ = (
-            add_image_part_fixture
-        )
-        image_part = image_parts.get_or_add_image_part(image_descriptor)
-        image_parts._add_image_part.assert_called_once_with(image_)
+    def but_it_adds_a_new_image_part_when_match_fails(
+        self, Image_, image_, _get_by_sha1_, _add_image_part_, image_part_
+    ):
+        Image_.from_file.return_value = image_
+        image_.sha1 = "fa1afe1"
+        _get_by_sha1_.return_value = None
+        _add_image_part_.return_value = image_part_
+        image_parts = ImageParts()
+
+        image_part = image_parts.get_or_add_image_part("image.png")
+
+        Image_.from_file.assert_called_once_with("image.png")
+        _get_by_sha1_.assert_called_once_with(image_parts, "fa1afe1")
+        _add_image_part_.assert_called_once_with(image_parts, image_)
         assert image_part is image_part_
 
-    def it_knows_the_next_available_image_partname(
-            self, next_partname_fixture):
+    def it_knows_the_next_available_image_partname(self, next_partname_fixture):
         image_parts, ext, expected_partname = next_partname_fixture
         assert image_parts._next_image_partname(ext) == expected_partname
 
     def it_can_really_add_a_new_image_part(
-            self, really_add_image_part_fixture):
-        image_parts, image_, ImagePart_, partname_, image_part_ = (
-            really_add_image_part_fixture
-        )
+        self, _next_image_partname_, partname_, image_, ImagePart_, image_part_
+    ):
+        _next_image_partname_.return_value = partname_
+        ImagePart_.from_image.return_value = image_part_
+        image_parts = ImageParts()
+
         image_part = image_parts._add_image_part(image_)
+
         ImagePart_.from_image.assert_called_once_with(image_, partname_)
         assert image_part in image_parts
         assert image_part is image_part_
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def _add_image_part_(self, request, new_image_part_):
-        return method_mock(
-            request, ImageParts, '_add_image_part',
-            return_value=new_image_part_
-        )
+    @pytest.fixture(params=[((2, 3), 1), ((1, 3), 2), ((1, 2), 3)])
+    def next_partname_fixture(self, request):
 
-    @pytest.fixture
-    def add_image_part_fixture(
-            self, Image_, _add_image_part_, image_descriptor_, image_,
-            new_image_part_,):
-        image_parts = ImageParts()
-        return image_parts, image_descriptor_, image_, new_image_part_
+        def image_part_with_partname_(n):
+            partname = image_partname(n)
+            return instance_mock(request, ImagePart, partname=partname)
 
-    @pytest.fixture
-    def get_image_part_fixture(self, Image_, image_part_, image_descriptor_):
+        def image_partname(n):
+            return PackURI('/word/media/image%d.png' % n)
+
+        existing_partname_numbers, expected_partname_number = request.param
         image_parts = ImageParts()
-        image_parts.append(image_part_)
-        return image_parts, image_descriptor_, image_part_
+        for n in existing_partname_numbers:
+            image_part_ = image_part_with_partname_(n)
+            image_parts.append(image_part_)
+        ext = 'png'
+        expected_image_partname = image_partname(expected_partname_number)
+        return image_parts, ext, expected_image_partname
 
-    @pytest.fixture
-    def Image_(self, request, image_):
-        Image_ = class_mock(request, 'docx.package.Image')
-        Image_.from_file.return_value = image_
-        return Image_
+    # fixture components ---------------------------------------------
 
     @pytest.fixture
-    def image_(self, request, sha1):
-        image_ = instance_mock(request, Image)
-        image_.sha1 = sha1
-        return image_
+    def _add_image_part_(self, request):
+        return method_mock(request, ImageParts, '_add_image_part')
 
     @pytest.fixture
-    def image_descriptor_(self, request):
-        return instance_mock(request, str)
+    def _get_by_sha1_(self, request):
+        return method_mock(request, ImageParts, '_get_by_sha1')
 
     @pytest.fixture
-    def ImagePart_(self, request, image_part_):
-        ImagePart_ = class_mock(request, 'docx.package.ImagePart')
-        ImagePart_.from_image.return_value = image_part_
-        return ImagePart_
+    def Image_(self, request):
+        return class_mock(request, 'docx.package.Image')
 
     @pytest.fixture
-    def image_part_(self, request, sha1):
-        image_part_ = instance_mock(request, ImagePart)
-        image_part_.sha1 = sha1
-        return image_part_
-
-    def _image_part_with_partname_(self, request, n):
-        partname = self._image_partname(n)
-        return instance_mock(request, ImagePart, partname=partname)
+    def image_(self, request):
+        return instance_mock(request, Image)
 
-    def _image_partname(self, n):
-        return PackURI('/word/media/image%d.png' % n)
+    @pytest.fixture
+    def ImagePart_(self, request):
+        return class_mock(request, 'docx.package.ImagePart')
 
     @pytest.fixture
-    def new_image_part_(self, request):
+    def image_part_(self, request):
         return instance_mock(request, ImagePart)
 
     @pytest.fixture
     def _next_image_partname_(self, request):
         return method_mock(request, ImageParts, '_next_image_partname')
 
-    @pytest.fixture(params=[((2, 3), 1), ((1, 3), 2), ((1, 2), 3)])
-    def next_partname_fixture(self, request):
-        existing_partname_numbers, expected_partname_number = request.param
-        image_parts = ImageParts()
-        for n in existing_partname_numbers:
-            image_part_ = self._image_part_with_partname_(request, n)
-            image_parts.append(image_part_)
-        ext = 'png'
-        expected_image_partname = self._image_partname(
-            expected_partname_number
-        )
-        return image_parts, ext, expected_image_partname
-
     @pytest.fixture
     def partname_(self, request):
         return instance_mock(request, PackURI)
-
-    @pytest.fixture
-    def really_add_image_part_fixture(
-            self, _next_image_partname_, partname_, image_, ImagePart_,
-            image_part_):
-        image_parts = ImageParts()
-        _next_image_partname_.return_value = partname_
-        return image_parts, image_, ImagePart_, partname_, image_part_
-
-    @pytest.fixture
-    def sha1(self):
-        return 'F008AH'
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index 95f0add2b..b8313e61e 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.text.paragraph module
-"""
+"""Unit test suite for the docx.text.paragraph module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_ALIGN_PARAGRAPH
@@ -87,12 +83,12 @@ def it_can_add_a_run_to_itself(self, add_run_fixture):
             style_prop_.assert_called_once_with(style)
 
     def it_can_insert_a_paragraph_before_itself(self, insert_before_fixture):
-        paragraph, text, style, paragraph_, add_run_calls = (
-            insert_before_fixture
-        )
+        text, style, paragraph_, add_run_calls = insert_before_fixture
+        paragraph = Paragraph(None, None)
+
         new_paragraph = paragraph.insert_paragraph_before(text, style)
 
-        paragraph._insert_paragraph_before.assert_called_once_with()
+        paragraph._insert_paragraph_before.assert_called_once_with(paragraph)
         assert new_paragraph.add_run.call_args_list == add_run_calls
         assert new_paragraph.style == style
         assert new_paragraph is paragraph_
@@ -166,16 +162,12 @@ def clear_fixture(self, request):
         (None,  'Bar'),
         ('Foo', 'Bar'),
     ])
-    def insert_before_fixture(self, request, _insert_paragraph_before_,
-                              add_run_):
-        paragraph = Paragraph(None, None)
-        paragraph_ = _insert_paragraph_before_.return_value
+    def insert_before_fixture(self, request, _insert_paragraph_before_, add_run_):
         text, style = request.param
+        paragraph_ = _insert_paragraph_before_.return_value
         add_run_calls = [] if text is None else [call(text)]
         paragraph_.style = None
-        return (
-            paragraph, text, style, paragraph_, add_run_calls
-        )
+        return text, style, paragraph_, add_run_calls
 
     @pytest.fixture(params=[
         ('w:body/w:p{id=42}', 'w:body/(w:p,w:p{id=42})')
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
index 0893833ff..828382e7e 100644
--- a/tests/unitutil/mock.py
+++ b/tests/unitutil/mock.py
@@ -1,17 +1,15 @@
 # encoding: utf-8
 
-"""
-Utility functions wrapping the excellent *mock* library.
-"""
+"""Utility functions wrapping the excellent *mock* library"""
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import sys
 
 if sys.version_info >= (3, 3):
     from unittest import mock  # noqa
-    from unittest.mock import call, MagicMock  # noqa
-    from unittest.mock import create_autospec, Mock, patch, PropertyMock
+    from unittest.mock import ANY, call, MagicMock  # noqa
+    from unittest.mock import create_autospec, Mock, mock_open, patch, PropertyMock
 else:
     import mock  # noqa
     from mock import ANY, call, MagicMock  # noqa
@@ -19,8 +17,8 @@
 
 
 def class_mock(request, q_class_name, autospec=True, **kwargs):
-    """
-    Return a mock patching the class with qualified name *q_class_name*.
+    """Return mock patching class with qualified name *q_class_name*.
+
     The mock is autospec'ed based on the patched class unless the optional
     argument *autospec* is set to False. Any other keyword arguments are
     passed through to Mock(). Patch is reversed after calling test returns.
@@ -41,22 +39,24 @@ def cls_attr_mock(request, cls, attr_name, name=None, **kwargs):
     return _patch.start()
 
 
-def function_mock(request, q_function_name, **kwargs):
-    """
-    Return a mock patching the function with qualified name
-    *q_function_name*. Patch is reversed after calling test returns.
+def function_mock(request, q_function_name, autospec=True, **kwargs):
+    """Return mock patching function with qualified name *q_function_name*.
+
+    Patch is reversed after calling test returns.
     """
-    _patch = patch(q_function_name, **kwargs)
+    _patch = patch(q_function_name, autospec=autospec, **kwargs)
     request.addfinalizer(_patch.stop)
     return _patch.start()
 
 
-def initializer_mock(request, cls):
-    """
-    Return a mock for the __init__ method on *cls* where the patch is
-    reversed after pytest uses it.
+def initializer_mock(request, cls, autospec=True, **kwargs):
+    """Return mock for __init__() method on *cls*.
+
+    The patch is reversed after pytest uses it.
     """
-    _patch = patch.object(cls, '__init__', return_value=None)
+    _patch = patch.object(
+        cls, "__init__", autospec=autospec, return_value=None, **kwargs
+    )
     request.addfinalizer(_patch.stop)
     return _patch.start()
 
@@ -86,12 +86,22 @@ def loose_mock(request, name=None, **kwargs):
     return Mock(name=name, **kwargs)
 
 
-def method_mock(request, cls, method_name, **kwargs):
+def method_mock(request, cls, method_name, autospec=True, **kwargs):
+    """Return mock for method *method_name* on *cls*.
+
+    The patch is reversed after pytest uses it.
     """
-    Return a mock for method *method_name* on *cls* where the patch is
-    reversed after pytest uses it.
+    _patch = patch.object(cls, method_name, autospec=autospec, **kwargs)
+    request.addfinalizer(_patch.stop)
+    return _patch.start()
+
+
+def open_mock(request, module_name, **kwargs):
+    """
+    Return a mock for the builtin `open()` method in *module_name*.
     """
-    _patch = patch.object(cls, method_name, **kwargs)
+    target = '%s.open' % module_name
+    _patch = patch(target, mock_open(), create=True, **kwargs)
     request.addfinalizer(_patch.stop)
     return _patch.start()
 
diff --git a/tox.ini b/tox.ini
index 76f1ce0fd..4032b8ec0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ max-line-length = 88
 norecursedirs = doc docx *.egg-info features .git ref _scratch .tox
 python_files = test_*.py
 python_classes = Test Describe
-python_functions = it_ they_
+python_functions = it_ they_ and_it_ but_it_
 
 [tox]
 envlist = py26, py27, py33, py34, py35

From fdca6ea2b16d739f391d1eb0000726a77aec9ad8 Mon Sep 17 00:00:00 2001
From: eupharis <dan@highwaterlabs.com>
Date: Sun, 23 Dec 2018 10:31:21 -0800
Subject: [PATCH 168/367] docs: update header/footer analysis

---
 docs/dev/analysis/features/header.rst   | 102 +++++++++++++++---------
 docs/dev/analysis/features/settings.rst |  60 ++++++++++++++
 2 files changed, 125 insertions(+), 37 deletions(-)

diff --git a/docs/dev/analysis/features/header.rst b/docs/dev/analysis/features/header.rst
index 5eac6f5de..e259a2d53 100644
--- a/docs/dev/analysis/features/header.rst
+++ b/docs/dev/analysis/features/header.rst
@@ -3,39 +3,54 @@
 Header and Footer
 =================
 
-In a WordprocessingML document, a page header is text that is separated from
-the main body of text and appears at the top of a printed page. The page
-headers in a document are often the same from page to page, with only small
-differences in content, such as a section title or page number. Such a header
-is also known as a running head.
-
-In book-printed documents, where pages are intended to be bound on the long
-edge and presented side-by-side, the header on a right-hand (recto) page is
-often different than that on a left-hand (verso) page. Supporting this
-difference gives rise to the option to have an even-page header that differs
-from the default odd-page header in a document.
-
-A page footer is analogous in every way to a page header except that it
-appears at the bottom of a page. It should not be confused with a footnote,
-which is not uniform between pages. For brevity's sake, the term *header* is
-often used below to refer to what may be either a header or footer object,
-trusting the reader to understand its applicability to both object types.
-
-In WordprocessingML, a header or footer appears within the margin area of
-a page. With a few exceptions, a header or footer may contain all the types
-of content that can appear in the main body, including text and images. Each
-header and footer has access to the styles defined in ``/word/styles.xml``.
-
-Each section has its own set of headers and footers, although a section can
-be configured to "inherit" headers and footers from the prior section. Each
-section can have three header definitions, the default header, even header,
-and first page header. When different even/odd headers are not enabled, the
-default header appears on both even and odd numbered pages. If even/odd
-headers are enabled, the default header is used for odd pages.
-A corresponding set of three footer definitions are also possible. All
+In a WordprocessingML document, a page header is text that is separated from the main
+body of text and appears at the top of a printed page. The page headers in a document
+are often the same from page to page, with only small differences in content, such as
+a section title or page number. Such a header is also known as a running head.
+
+A page footer is analogous in every way to a page header except that it appears at the
+bottom of a page. It should not be confused with a footnote, which is not uniform
+between pages. For brevity's sake, the term *header* is often used here to refer to what
+may be either a header or footer object, trusting the reader to understand its
+applicability to both object types.
+
+In book-printed documents, where pages are printed on both sides, when opened, the front
+or *recto* side of each page appears to the right of the bound edge and the back or
+*verso* side of each page appears on the left. The first printed page receives the
+page-number "1", and is always a recto page. Because pages are numbered consecutively,
+each recto page receives an *odd* page number and each verso page receives an *even*
+page number.
+
+The header appearing on a recto page often differs from that on a verso page. Supporting
+this difference gives rise to the option to have an even-page header that differs from
+the default odd-page header in a document. This "both odd-and-even headers" option is
+applied at the document level and affects all sections of the document.
+
+The header appearing on the first page of a section (e.g. a chapter) may differ from
+that appearing on subsequent pages. Supporting this difference gives rise to the option
+to set a distinct first-page header. This "different first-page-header" option is
+applied at the section level and may differ from section-to-section in the document.
+
+In WordprocessingML, a header or footer appears within the margin area of a page. With
+a few exceptions, a header or footer may contain all the types of content that can
+appear in the main body, including text and images. Each header and footer has access to
+the styles defined in ``/word/styles.xml``.
+
+Each section has its own set of headers and footers, although a section can be
+configured to "inherit" headers and footers from the prior section. Each section can
+have three header definitions, the default header, even header, and first page header.
+When different even/odd headers are not enabled, the default header appears on both even
+and odd numbered pages. If even/odd headers are enabled, the default header is used for
+odd pages. A corresponding set of three footer definitions are also possible. All
 header/footer definitions are optional.
 
 
+Open Questions
+--------------
+
+* What about a continuous section break? What is the header/footer behavior there?
+
+
 Candidate Protocol
 ------------------
 
@@ -96,12 +111,12 @@ Conversely, an existing header is deleted from a section by assigning True to
     >>> header.is_linked_to_previous
     True
 
-The document settings object has a read/write
-`.odd_and_even_pages_header_footer` property that indicates verso and recto
-pages will have a different header. An existing even page header definition is
-preserved when `.odd_and_even_pages_header_footer` is False; it is simply not
-rendered by Word. Assigning `True` to `.odd_and_even_pages_header_footer`
-does not automatically create a new even header definition::
+The document settings object has a read/write `.odd_and_even_pages_header_footer`
+property that indicates verso and recto pages will have a different header. Any existing
+even page header definitions are preserved when `.odd_and_even_pages_header_footer` is
+False; they are simply not rendered by Word. Assigning `True` to
+`.odd_and_even_pages_header_footer` does not automatically create new even header
+definitions::
 
     >>> document.settings.odd_and_even_pages_header_footer
     False
@@ -174,6 +189,19 @@ Distinct first, even, and odd page headers::
        ...
    </w:sectPr>
 
+A header part::
+
+   <w:hdr>
+     <w:p>
+       <w:pPr>
+         <w:pStyle w:val="Header"/>
+       </w:pPr>
+       <w:r>
+         <w:t>Header for section-1</w:t>
+       </w:r>
+     </w:p>
+   </w:hdr>
+
 
 Word Behavior
 -------------
@@ -250,7 +278,7 @@ Schema Excerpt
     </xsd:complexType>
 
     <xsd:complexType name="CT_HdrFtrRef">
-      <xsd:attribute  ref="r:id"                  use="required"/>
+      <xsd:attribute ref="r:id" use="required"/>
       <xsd:attribute name="type" type="ST_HdrFtr" use="required"/>
     </xsd:complexType>
 
diff --git a/docs/dev/analysis/features/settings.rst b/docs/dev/analysis/features/settings.rst
index 0db461e17..46c816fba 100644
--- a/docs/dev/analysis/features/settings.rst
+++ b/docs/dev/analysis/features/settings.rst
@@ -25,6 +25,66 @@ Candidate Protocol
   <docx.settings.Settings object at 0xdeadbeef4>
 
 
+Specimen XML
+------------
+
+.. highlight:: xml
+
+Default `settings.xml` part for a new document in Word 2016::
+
+  <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+  <w:settings
+      xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
+      xmlns:mc="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:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
+      xmlns:v="urn:schemas-microsoft-com:vml"
+      xmlns:w10="urn:schemas-microsoft-com:office:word"
+      xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
+      xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
+      xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid"
+      xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex"
+      xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+      mc:Ignorable="w14 w15 w16se w16cid"
+      >
+    <w:zoom w:percent="150"/>
+    <w:defaultTabStop w:val="720"/>
+    <w:characterSpacingControl w:val="doNotCompress"/>
+    <w:compat>
+      <w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="15"/>
+      <w:compatSetting w:name="overrideTableStyleFontSizeAndJustification" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+      <w:compatSetting w:name="enableOpenTypeFeatures" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+      <w:compatSetting w:name="doNotFlipMirrorIndents" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+      <w:compatSetting w:name="differentiateMultirowTableHeaders" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+      <w:compatSetting w:name="useWord2013TrackBottomHyphenation" w:uri="http://schemas.microsoft.com/office/word" w:val="0"/>
+    </w:compat>
+    <w:rsids>
+      <w:rsidRoot w:val="005968A6"/>
+      <w:rsid w:val="00480A2E"/>
+      <w:rsid w:val="005968A6"/>
+    </w:rsids>
+    <m:mathPr>
+      <m:mathFont m:val="Cambria Math"/>
+      <m:brkBin m:val="before"/>
+      <m:brkBinSub m:val="--"/>
+      <m:smallFrac m:val="0"/>
+      <m:dispDef/>
+      <m:lMargin m:val="0"/>
+      <m:rMargin m:val="0"/>
+      <m:defJc m:val="centerGroup"/>
+      <m:wrapIndent m:val="1440"/>
+      <m:intLim m:val="subSup"/>
+      <m:naryLim m:val="undOvr"/>
+    </m:mathPr>
+    <w:themeFontLang w:val="en-US"/>
+    <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
+    <w:decimalSymbol w:val="."/>
+    <w:listSeparator w:val=","/>
+    <w15:chartTrackingRefBased/>
+    <w15:docId w15:val="{3E989880-FF70-7C4D-8D4E-02DC7E104B81}"/>
+  </w:settings>
+
 Schema Excerpts
 ---------------
 

From 0502dd71782e8b2674b2b5674b6f97c0eaf8cbf9 Mon Sep 17 00:00:00 2001
From: eupharis <dan@highwaterlabs.com>
Date: Fri, 28 Dec 2018 14:09:49 -0800
Subject: [PATCH 169/367] docs: add user docs for header/footer

---
 docs/_static/img/hdrftr-01.png | Bin 0 -> 56762 bytes
 docs/_static/img/hdrftr-02.png | Bin 0 -> 16218 bytes
 docs/conf.py                   |   4 +-
 docs/index.rst                 |   1 +
 docs/user/hdrftr.rst           | 173 +++++++++++++++++++++++++++++++++
 5 files changed, 177 insertions(+), 1 deletion(-)
 create mode 100644 docs/_static/img/hdrftr-01.png
 create mode 100644 docs/_static/img/hdrftr-02.png
 create mode 100644 docs/user/hdrftr.rst

diff --git a/docs/_static/img/hdrftr-01.png b/docs/_static/img/hdrftr-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5309ef2a3dd7f151e67c616ba8e54eeb5208942b
GIT binary patch
literal 56762
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
F_%DH0zdZl|

literal 0
HcmV?d00001

diff --git a/docs/_static/img/hdrftr-02.png b/docs/_static/img/hdrftr-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..01af2981a1db4b92db8570194e6c3088f9755d3f
GIT binary patch
literal 16218
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
JUYWi9{{TSISE2v_

literal 0
HcmV?d00001

diff --git a/docs/conf.py b/docs/conf.py
index 7a09401ae..e70f8bafe 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -20,7 +20,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 
-from docx import __version__
+from docx import __version__  # noqa
 
 
 # -- General configuration ---------------------------------------------------
@@ -107,6 +107,8 @@
 
 .. |Font| replace:: :class:`.Font`
 
+.. |_Header| replace:: :class:`._Header`
+
 .. |Inches| replace:: :class:`.Inches`
 
 .. |InlineShape| replace:: :class:`.InlineShape`
diff --git a/docs/index.rst b/docs/index.rst
index 0dd00e956..cdb8b5455 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -76,6 +76,7 @@ User Guide
    user/documents
    user/text
    user/sections
+   user/hdrftr
    user/api-concepts
    user/styles-understanding
    user/styles-using
diff --git a/docs/user/hdrftr.rst b/docs/user/hdrftr.rst
new file mode 100644
index 000000000..b80420b8a
--- /dev/null
+++ b/docs/user/hdrftr.rst
@@ -0,0 +1,173 @@
+.. _hdrftr:
+
+Working with Headers and Footers
+================================
+
+Word supports *page headers* and *page footers*. A page header is text that appears in
+the top margin area of each page, separated from the main body of text, and usually
+conveying context information, such as the document title, author, creation date, or the
+page number. The page headers in a document are the same from page to page, with only
+small differences in content, such as a changing section title or page number. A page
+header is also known as a *running head*.
+
+A *page footer* is analogous in every way to a page header except that it appears at the
+bottom of a page. It should not be confused with a footnote, which is not uniform
+between pages. For brevity's sake, the term *header* is often used here to refer to what
+may be either a header or footer object, trusting the reader to understand its
+applicability to both object types.
+
+
+Accessing the header for a section
+----------------------------------
+
+Headers and footers are linked to a *section*; this allows each section to have
+a distinct header and/or footer. For example, a landscape section might have a wider
+header than a portrait section.
+
+Each section object has a ``.header`` property providing access to a |_Header| object
+for that section::
+
+    >>> document = Document()
+    >>> section = document.sections[0]
+    >>> header = section.header
+    >>> header
+    <docx.section._Header object at 0x...>
+
+A |_Header| object is *always* present on ``Section.header``, even when no header is
+defined for that section. The presence of an actual header definition is indicated by
+``_Header.is_linked_to_previous``::
+
+    >>> header.is_linked_to_previous
+    True
+
+A value of ``True`` indicates the |_Header| object contains no header definition and the
+section will display the same header as the previous section. This "inheritance"
+behavior is recursive, such that a "linked" header actually gets its definition from the
+first prior section having a header definition. This "linked" state is indicated as
+*"Same as previous"* in the Word UI.
+
+A new document does not have a header (on the single section it contains) and so
+``.is_linked_to_previous`` is ``True`` in that case. Note this case may be a bit
+counterintuitive in that there *is no previous section header* to link to. In
+this "no previous header" case, no header is displayed.
+
+
+Adding a header (simple case)
+-----------------------------
+
+A header can be added to a new document simply by editing the content of the |_Header|
+object. A |_Header| object is a "story" container and its content is edited just like
+a |Document| object. Note that like a new document, a new header already contains
+a single (empty) paragraph::
+
+    >>> paragraph = header.paragraphs[0]
+    >>> paragraph.text = "Title of my document"
+
+.. image:: /_static/img/hdrftr-01.png
+   :scale: 50%
+
+Note also that the act of adding content (or even just accessing ``header.paragraphs``)
+added a header definition and changed the state of ``.is_linked_to_previous``::
+
+    >>> header.is_linked_to_previous
+    False
+
+
+Adding "zoned" header content
+-----------------------------
+
+A header with multiple "zones" is often accomplished using carefully placed tab stops.
+The required tab-stops for a center and right-aligned "zone" are part of the latent
+``Header`` style in Word, but that style is not present in the default ``python-docx``
+template and will need to be added::
+
+    >>> from docx.enum.style import WD_STYLE_TYPE
+    >>> from docx.enum.text import WD_TAB_ALIGNMENT
+    >>> styles = document.styles
+    >>> style = styles.add_style("Header", WD_STYLE_TYPE.PARAGRAPH)
+    >>> style.base_style = styles["Normal"]
+    >>> tab_stops = style.paragraph_format.tab_stops
+    >>> tab_stops.add_tab_stop(Inches(3.25), WD_TAB_ALIGNMENT.CENTER)
+    >>> tab_stops.add_tab_stop(Inches(6.5), WD_TAB_ALIGNMENT.RIGHT)
+
+If you're using a custom template rather than the `python-docx` default, it probably
+makes sense to define that style in your template.
+
+Once the ``Header`` style is present, tabs are used to separate left, center, and
+right-aligned header content::
+
+    >>> paragraph = header.paragraphs[0]
+    >>> paragraph.text = "Left Text\tCenter Text\tRight Text"
+    >>> paragraph.style = document.styles["Header"]
+
+.. image:: /_static/img/hdrftr-02.png
+   :scale: 75%
+
+
+Removing a header
+-----------------
+
+An unwanted header can be removed by assigning ``True`` to its
+``.is_linked_to_previous`` attribute::
+
+    >>> header.is_linked_to_previous = True
+    >>> header.is_linked_to_previous
+    True
+
+The content for a header is irreversably deleted when ``True`` is assigned to
+``.is_linked_to_previous``.
+
+
+Understanding headers in a multi-section document
+-------------------------------------------------
+
+The "just start editing" approach works fine for the simple case, but to make sense of
+header behaviors in a multi-section document, a few simple concepts will be helpful.
+Here they are in a nutshell:
+
+1. Each section can have its own header definition (but doesn't have to).
+
+2. A section that lacks a header definition inherits the header of the section before
+   it. The ``_Header.is_linked_to_previous`` property simply reflects the presence of
+   a header definition, ``False`` when a definition is present and ``True`` when not.
+
+3. Lacking a header definition is the default state. A new document has no defined
+   header and neither does a newly-inserted section. ``.is_linked_to_previous`` reports
+   ``True`` in both those cases.
+
+4. The content of a ``_Header`` object is its own content if it has a header definition.
+   If not, its content is that of the first prior section that *does* have a header
+   definition. If no sections have a header definition, a new one is added on the first
+   section and all other sections inherit that one. This adding of a header definition
+   happens the first time header content is accessed, perhaps by referencing
+   ``header.paragraphs``.
+
+
+Adding a header definition (general case)
+-----------------------------------------
+
+An explicit header definition can be given to a section that lacks one by assigning
+``False`` to its ``.is_linked_to_previous`` property::
+
+    >>> header.is_linked_to_previous
+    True
+    >>> header.is_linked_to_previous = False
+    >>> header.is_linked_to_previous
+    False
+
+The newly added header definition contains a single empty paragraph. Note that leaving
+the header this way is occasionally useful as it effectively "turns-off" a header for
+that section and those after it until the next section with a defined header.
+
+Assigning ``False`` to ``.is_linked_to_previous`` on a header that already has a header
+definition does nothing.
+
+
+Inherited content is automatically located
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Editing the content of a header edits the content of the *source* header, taking into
+account any "inheritance". So for example, if the section 2 header inherits from section
+1 and you edit the section 2 header, you actually change the contents of the section
+1 header. A new header definition is not added for section 2 unless you first explicitly
+assign ``False`` to its ``.is_linked_to_previous`` property.

From 6037572de5bf400257755ca591e0dbb697a574a3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 30 Dec 2018 14:29:05 -0800
Subject: [PATCH 170/367] build: remove 2.6 testing on travis

Python 2.6 seems to be no longer supported on travis.ci so we're letting
it drop here. We're retaining testing on 2.6 in tox for now though.
---
 .travis.yml |  1 -
 tox.ini     | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd69637be..105c42594 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ python:
   - "3.6"
   - "3.5"
   - "2.7"
-  - "2.6"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
 # command to run tests, e.g. python setup.py test
diff --git a/tox.ini b/tox.ini
index 4032b8ec0..4f75c628e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,13 +12,12 @@ python_classes = Test Describe
 python_functions = it_ they_ and_it_ but_it_
 
 [tox]
-envlist = py26, py27, py33, py34, py35
+envlist = py26, py27, py34, py35, py36
 
 [testenv]
 deps =
     behave
     lxml
-    mock
     pyparsing
     pytest
 
@@ -35,16 +34,10 @@ deps =
     pyparsing
     pytest
 
-[testenv:py33]
-deps =
-    behave
-    lxml
-    pyparsing
-    pytest
-
-[testenv:py34]
+[testenv:py27]
 deps =
     behave
     lxml
+    mock
     pyparsing
     pytest

From 5720a8865658e0b715bca142f53746fb16241c41 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 30 Dec 2018 14:33:50 -0800
Subject: [PATCH 171/367] rfctr: blacken selected items

In preparation for moving to Python Black for standardized code layout,
get the custom element mappings closer to Black style layout.
---
 docx/__init__.py      | 10 ++++++--
 docx/oxml/__init__.py | 53 +++++++++++++++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/docx/__init__.py b/docx/__init__.py
index 7083abe56..0b88607a9 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -32,6 +32,12 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_type_for[CT.WML_STYLES] = StylesPart
 
 del (
-    CT, CorePropertiesPart, DocumentPart, NumberingPart, PartFactory,
-    StylesPart, part_class_selector
+    CT,
+    CorePropertiesPart,
+    DocumentPart,
+    NumberingPart,
+    PartFactory,
+    SettingsPart,
+    StylesPart,
+    part_class_selector,
 )
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index c9e895a7e..dc4793251 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -85,16 +85,24 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
 from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
-register_element_cls('w:pgMar',  CT_PageMar)
-register_element_cls('w:pgSz',   CT_PageSz)
+register_element_cls('w:pgMar', CT_PageMar)
+register_element_cls('w:pgSz', CT_PageSz)
 register_element_cls('w:sectPr', CT_SectPr)
-register_element_cls('w:type',   CT_SectType)
+register_element_cls('w:type', CT_SectType)
 
 from .shape import (  # noqa
-    CT_Blip, CT_BlipFillProperties, CT_GraphicalObject,
-    CT_GraphicalObjectData, CT_Inline, CT_NonVisualDrawingProps, CT_Picture,
-    CT_PictureNonVisual, CT_Point2D, CT_PositiveSize2D, CT_ShapeProperties,
-    CT_Transform2D
+    CT_Blip,
+    CT_BlipFillProperties,
+    CT_GraphicalObject,
+    CT_GraphicalObjectData,
+    CT_Inline,
+    CT_NonVisualDrawingProps,
+    CT_Picture,
+    CT_PictureNonVisual,
+    CT_Point2D,
+    CT_PositiveSize2D,
+    CT_ShapeProperties,
+    CT_Transform2D,
 )
 register_element_cls('a:blip',        CT_Blip)
 register_element_cls('a:ext',         CT_PositiveSize2D)
@@ -126,8 +134,19 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:unhideWhenUsed', CT_OnOff)
 
 from .table import (  # noqa
-    CT_Height, CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType,
-    CT_TblPr, CT_TblWidth, CT_Tc, CT_TcPr, CT_TrPr, CT_VerticalJc, CT_VMerge
+    CT_Height,
+    CT_Row,
+    CT_Tbl,
+    CT_TblGrid,
+    CT_TblGridCol,
+    CT_TblLayoutType,
+    CT_TblPr,
+    CT_TblWidth,
+    CT_Tc,
+    CT_TcPr,
+    CT_TrPr,
+    CT_VMerge,
+    CT_VerticalJc,
 )
 register_element_cls('w:bidiVisual', CT_OnOff)
 register_element_cls('w:gridCol',    CT_TblGridCol)
@@ -147,8 +166,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:vMerge',     CT_VMerge)
 
 from .text.font import (  # noqa
-    CT_Color, CT_Fonts, CT_Highlight, CT_HpsMeasure, CT_RPr, CT_Underline,
-    CT_VerticalAlignRun
+    CT_Color,
+    CT_Fonts,
+    CT_Highlight,
+    CT_HpsMeasure,
+    CT_RPr,
+    CT_Underline,
+    CT_VerticalAlignRun,
 )
 register_element_cls('w:b',          CT_OnOff)
 register_element_cls('w:bCs',        CT_OnOff)
@@ -183,7 +207,12 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:p', CT_P)
 
 from .text.parfmt import (  # noqa
-    CT_Ind, CT_Jc, CT_PPr, CT_Spacing, CT_TabStop, CT_TabStops
+    CT_Ind,
+    CT_Jc,
+    CT_PPr,
+    CT_Spacing,
+    CT_TabStop,
+    CT_TabStops,
 )
 register_element_cls('w:ind',             CT_Ind)
 register_element_cls('w:jc',              CT_Jc)

From fd1d3369df702a51e0a42d29bb42dd2cdc64249b Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 31 Dec 2018 19:49:28 -0800
Subject: [PATCH 172/367] rfctr: modernize formatting

---
 docs/conf.py          |  2 ++
 docx/document.py      |  5 +----
 docx/oxml/section.py  | 41 ++++++++++++++++-------------------------
 docx/package.py       | 19 +++++++------------
 docx/section.py       | 18 ++++++++----------
 docx/settings.py      | 16 ++++++----------
 tests/test_section.py |  6 ++----
 7 files changed, 42 insertions(+), 65 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index e70f8bafe..a8913291f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -109,6 +109,8 @@
 
 .. |_Header| replace:: :class:`._Header`
 
+.. |ImageParts| replace:: :class:`.ImageParts`
+
 .. |Inches| replace:: :class:`.Inches`
 
 .. |InlineShape| replace:: :class:`.InlineShape`
diff --git a/docx/document.py b/docx/document.py
index a2842595a..478ba4e5c 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -136,10 +136,7 @@ def save(self, path_or_stream):
 
     @property
     def sections(self):
-        """
-        A |Sections| object providing access to each section in this
-        document.
-        """
+        """|Sections| object providing access to each section in this document."""
         return Sections(self._element)
 
     @property
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index cf76b67ed..d264d5e5c 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -1,16 +1,14 @@
 # encoding: utf-8
 
-"""
-Section-related custom element classes.
-"""
+"""Section-related custom element classes"""
 
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from copy import deepcopy
 
-from ..enum.section import WD_ORIENTATION, WD_SECTION_START
-from .simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
-from .xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrOne
+from docx.enum.section import WD_ORIENTATION, WD_SECTION_START
+from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
+from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrOne
 
 
 class CT_PageMar(BaseOxmlElement):
@@ -38,25 +36,18 @@ class CT_PageSz(BaseOxmlElement):
 
 
 class CT_SectPr(BaseOxmlElement):
-    """
-    ``<w:sectPr>`` element, the container element for section properties.
-    """
-    __child_sequence__ = (
-        'w:footnotePr', 'w:endnotePr', 'w:type', 'w:pgSz', 'w:pgMar',
-        'w:paperSrc', 'w:pgBorders', 'w:lnNumType', 'w:pgNumType', 'w:cols',
-        'w:formProt', 'w:vAlign', 'w:noEndnote', 'w:titlePg',
-        'w:textDirection', 'w:bidi', 'w:rtlGutter', 'w:docGrid',
-        'w:printerSettings', 'w:sectPrChange',
+    """`w:sectPr` element, the container element for section properties"""
+
+    _tag_seq = (
+        'w:footnotePr', 'w:endnotePr', 'w:type', 'w:pgSz', 'w:pgMar', 'w:paperSrc',
+        'w:pgBorders', 'w:lnNumType', 'w:pgNumType', 'w:cols', 'w:formProt', 'w:vAlign',
+        'w:noEndnote', 'w:titlePg', 'w:textDirection', 'w:bidi', 'w:rtlGutter',
+        'w:docGrid', 'w:printerSettings', 'w:sectPrChange',
     )
-    type = ZeroOrOne('w:type', successors=(
-        __child_sequence__[__child_sequence__.index('w:type')+1:]
-    ))
-    pgSz = ZeroOrOne('w:pgSz', successors=(
-        __child_sequence__[__child_sequence__.index('w:pgSz')+1:]
-    ))
-    pgMar = ZeroOrOne('w:pgMar', successors=(
-        __child_sequence__[__child_sequence__.index('w:pgMar')+1:]
-    ))
+    type = ZeroOrOne("w:type", successors=_tag_seq[3:])
+    pgSz = ZeroOrOne("w:pgSz", successors=_tag_seq[4:])
+    pgMar = ZeroOrOne("w:pgMar", successors=_tag_seq[5:])
+    del _tag_seq
 
     @property
     def bottom_margin(self):
diff --git a/docx/package.py b/docx/package.py
index 65e319845..529c18ea1 100644
--- a/docx/package.py
+++ b/docx/package.py
@@ -13,27 +13,22 @@
 
 
 class Package(OpcPackage):
-    """
-    Customizations specific to a WordprocessingML package.
-    """
+    """Customizations specific to a WordprocessingML package"""
+
     def after_unmarshal(self):
-        """
-        Called by loading code after all parts and relationships have been
-        loaded, to afford the opportunity for any required post-processing.
+        """Called by loading code after all parts and relationships have been loaded.
+
+        This method affords the opportunity for any required post-processing.
         """
         self._gather_image_parts()
 
     @lazyproperty
     def image_parts(self):
-        """
-        Collection of all image parts in this package.
-        """
+        """|ImageParts| collection object for this package."""
         return ImageParts()
 
     def _gather_image_parts(self):
-        """
-        Load the image part collection with all the image parts in package.
-        """
+        """Load the image part collection with all the image parts in package."""
         for rel in self.iter_rels():
             if rel.is_external:
                 continue
diff --git a/docx/section.py b/docx/section.py
index 16221243b..d27406ec1 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -1,19 +1,18 @@
 # encoding: utf-8
 
-"""
-The |Section| object and related proxy classes.
-"""
+"""The |Section| object and related proxy classes"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from collections import Sequence
 
 
 class Sections(Sequence):
+    """Sequence of |Section| objects corresponding to the sections in the document.
+
+    Supports ``len()``, iteration, and indexed access.
     """
-    Sequence of |Section| objects corresponding to the sections in the
-    document. Supports ``len()``, iteration, and indexed access.
-    """
+
     def __init__(self, document_elm):
         super(Sections, self).__init__()
         self._document_elm = document_elm
@@ -34,9 +33,8 @@ def __len__(self):
 
 
 class Section(object):
-    """
-    Document section, providing access to section and page setup settings.
-    """
+    """Document section, providing access to section and page-setup settings."""
+
     def __init__(self, sectPr):
         super(Section, self).__init__()
         self._sectPr = sectPr
diff --git a/docx/settings.py b/docx/settings.py
index 737146697..f8318d809 100644
--- a/docx/settings.py
+++ b/docx/settings.py
@@ -1,20 +1,16 @@
 # encoding: utf-8
 
-"""
-Settings object, providing access to document-level settings.
-"""
+"""Settings object, providing access to document-level settings"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .shared import ElementProxy
+from docx.shared import ElementProxy
 
 
 class Settings(ElementProxy):
-    """
-    Provides access to document-level settings for a document. Accessed using
-    the :attr:`.Document.settings` property.
+    """Provides access to document-level settings for a document.
+
+    Accessed using the :attr:`.Document.settings` property.
     """
 
     __slots__ = ()
diff --git a/tests/test_section.py b/tests/test_section.py
index a497aa727..4b05bcedc 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -1,10 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.section module
-"""
+"""Unit test suite for the docx.section module"""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 

From a93373aad04668f01540e8523ac5384a7a391c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 15:02:01 -0800
Subject: [PATCH 173/367] acpt: add scenarios for headers and footers

---
 features/hdr-header-footer.feature            |  70 +++++++++++++
 ...tion-props.feature => sct-section.feature} |  12 +++
 features/steps/hdrftr.py                      |  93 ++++++++++++++++++
 features/steps/section.py                     |  19 ++++
 .../steps/test_files/hdr-header-footer.docx   | Bin 0 -> 18079 bytes
 5 files changed, 194 insertions(+)
 create mode 100644 features/hdr-header-footer.feature
 rename features/{sct-section-props.feature => sct-section.feature} (93%)
 create mode 100644 features/steps/hdrftr.py
 create mode 100644 features/steps/test_files/hdr-header-footer.docx

diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
new file mode 100644
index 000000000..93feab67f
--- /dev/null
+++ b/features/hdr-header-footer.feature
@@ -0,0 +1,70 @@
+Feature: Header and footer behaviors
+  In order to control the appearance of page headers and footers
+  As a developer using python-docx
+  I need properties and methods on _Header and _Footer objects
+
+
+  @wip
+  Scenario Outline: _Header.is_linked_to_previous getter
+    Given a _Header object <with-or-no> header definition as header
+     Then header.is_linked_to_previous is <value>
+
+    Examples: _Header.is_linked_to_previous states
+      | with-or-no | value |
+      | with a     | False |
+      | with no    | True  |
+
+
+  @wip
+  Scenario Outline: _Header.is_linked_to_previous setter
+    Given a _Header object <with-or-no> header definition as header
+     When I assign <value> to header.is_linked_to_previous
+     Then header.is_linked_to_previous is <value>
+
+    Examples: _Header.is_linked_to_previous state changes
+      | with-or-no | value |
+      | with a     | True  |
+      | with no    | False |
+      | with a     | False |
+      | with no    | True  |
+
+
+  @wip
+  Scenario: _Header inherits content
+    Given a _Header object with a header definition as header
+      And the next _Header object with no header definition as header_2
+     Then header_2.paragraphs[0].text == header.paragraphs[0].text
+      And header_2.is_linked_to_previous is True
+
+
+  @wip
+  Scenario Outline: _Footer.is_linked_to_previous getter
+    Given a _Footer object <with-or-no> footer definition as footer
+     Then footer.is_linked_to_previous is <value>
+
+    Examples: _Footer.is_linked_to_previous states
+      | with-or-no | value |
+      | with a     | False |
+      | with no    | True  |
+
+
+  @wip
+  Scenario Outline: _Footer.is_linked_to_previous setter
+    Given a _Footer object <with-or-no> footer definition as footer
+     When I assign <value> to footer.is_linked_to_previous
+     Then footer.is_linked_to_previous is <value>
+
+    Examples: _Footer.is_linked_to_previous state changes
+      | with-or-no | value |
+      | with a     | True  |
+      | with no    | False |
+      | with a     | False |
+      | with no    | True  |
+
+
+  @wip
+  Scenario: _Footer inherits content
+    Given a _Footer object with a footer definition as footer
+      And the next _Footer object with no footer definition as footer_2
+     Then footer_2.paragraphs[0].text == footer.paragraphs[0].text
+      And footer_2.is_linked_to_previous is True
diff --git a/features/sct-section-props.feature b/features/sct-section.feature
similarity index 93%
rename from features/sct-section-props.feature
rename to features/sct-section.feature
index 412d93f02..f08268915 100644
--- a/features/sct-section-props.feature
+++ b/features/sct-section.feature
@@ -4,6 +4,18 @@ Feature: Access and change section properties
   I need a way to get and set the properties of a section
 
 
+  @wip
+  Scenario: Section.footer
+    Given a Section object as section
+     Then section.footer is a _Footer object
+
+
+  @wip
+  Scenario: Section.header
+    Given a Section object as section
+     Then section.header is a _Header object
+
+
   Scenario Outline: Get section start type
     Given a section having start type <start-type>
      Then the reported section start type is <start-type>
diff --git a/features/steps/hdrftr.py b/features/steps/hdrftr.py
new file mode 100644
index 000000000..8d8082e78
--- /dev/null
+++ b/features/steps/hdrftr.py
@@ -0,0 +1,93 @@
+# encoding: utf-8
+
+"""Step implementations for header and footer-related features"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+from behave import given, then, when
+
+from docx import Document
+
+from helpers import test_docx
+
+
+# given ====================================================
+
+@given("a _Footer object {with_or_no} footer definition as footer")
+def given_a_Footer_object_with_or_no_footer_definition(context, with_or_no):
+    section_idx = {"with a": 0, "with no": 1}[with_or_no]
+    context.sections = Document(test_docx("hdr-header-footer")).sections
+    context.footer = context.sections[section_idx].footer
+
+
+@given("a _Header object {with_or_no} header definition as header")
+def given_a_Header_object_with_or_no_header_definition(context, with_or_no):
+    section_idx = {"with a": 0, "with no": 1}[with_or_no]
+    context.sections = Document(test_docx("hdr-header-footer")).sections
+    context.header = context.sections[section_idx].header
+
+
+@given("the next _Footer object with no footer definition as footer_2")
+def given_the_next_Footer_object_with_no_footer_definition(context):
+    context.footer_2 = context.sections[1].footer
+
+
+@given("the next _Header object with no header definition as header_2")
+def given_the_next_Header_object_with_no_header_definition(context):
+    context.header_2 = context.sections[1].header
+
+
+# when =====================================================
+
+@when("I assign {value} to header.is_linked_to_previous")
+def when_I_assign_value_to_header_is_linked_to_previous(context, value):
+    context.header.is_linked_to_previous = eval(value)
+
+
+@when("I assign {value} to footer.is_linked_to_previous")
+def when_I_assign_value_to_footer_is_linked_to_previous(context, value):
+    context.footer.is_linked_to_previous = eval(value)
+
+
+# then =====================================================
+
+@then("footer.is_linked_to_previous is {value}")
+def then_footer_is_linked_to_previous_is_value(context, value):
+    actual = context.footer.is_linked_to_previous
+    expected = eval(value)
+    assert actual == expected, "footer.is_linked_to_previous is %s" % actual
+
+
+@then("footer_2.paragraphs[0].text == footer.paragraphs[0].text")
+def then_footer_2_text_eq_footer_text(context):
+    actual = context.footer_2.paragraphs[0].text
+    expected = context.footer.paragraphs[0].text
+    assert actual == expected, "footer_2.paragraphs[0].text == %s" % actual
+
+
+@then("footer_2.is_linked_to_previous is {value}")
+def then_footer_2_is_linked_to_previous_is_value(context, value):
+    actual = context.footer_2.is_linked_to_previous
+    expected = eval(value)
+    assert actual == expected, "footer_2.is_linked_to_previous is %s" % actual
+
+
+@then("header.is_linked_to_previous is {value}")
+def then_header_is_linked_to_previous_is_value(context, value):
+    actual = context.header.is_linked_to_previous
+    expected = eval(value)
+    assert actual == expected, "header.is_linked_to_previous is %s" % actual
+
+
+@then("header_2.is_linked_to_previous is {value}")
+def then_header_2_is_linked_to_previous_is_value(context, value):
+    actual = context.header_2.is_linked_to_previous
+    expected = eval(value)
+    assert actual == expected, "header_2.is_linked_to_previous is %s" % actual
+
+
+@then("header_2.paragraphs[0].text == header.paragraphs[0].text")
+def then_header_2_text_eq_header_text(context):
+    actual = context.header_2.paragraphs[0].text
+    expected = context.header.paragraphs[0].text
+    assert actual == expected, "header_2.paragraphs[0].text == %s" % actual
diff --git a/features/steps/section.py b/features/steps/section.py
index 496e0f17f..a1522c95c 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -18,6 +18,11 @@
 
 # given ====================================================
 
+@given("a Section object as section")
+def given_a_Section_object_as_section(context):
+    context.section = Document(test_docx("sct-section-props")).sections[-1]
+
+
 @given('a section collection containing 3 sections')
 def given_a_section_collection_containing_3_sections(context):
     document = Document(test_docx('doc-access-sections'))
@@ -137,6 +142,20 @@ def then_len_sections_is_3(context):
     )
 
 
+@then("section.footer is a _Footer object")
+def then_section_footer_is_a_Footer_object(context):
+    actual = type(context.section.footer).__name__
+    expected = "_Footer"
+    assert actual == expected, "section.footer is a %s object" % actual
+
+
+@then("section.header is a _Header object")
+def then_section_header_is_a_Header_object(context):
+    actual = type(context.section.header).__name__
+    expected = "_Header"
+    assert actual == expected, "section.header is a %s object" % actual
+
+
 @then('the reported {margin_side} margin is {inches} inches')
 def then_the_reported_margin_is_inches(context, margin_side, inches):
     prop_name = {
diff --git a/features/steps/test_files/hdr-header-footer.docx b/features/steps/test_files/hdr-header-footer.docx
new file mode 100644
index 0000000000000000000000000000000000000000..30db282f3896fd9fcb2738fd3f08f5f2059ed579
GIT binary patch
literal 18079
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

literal 0
HcmV?d00001


From 8097e39c6a5df2f440b1ee21efd974038a0c963d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 19:12:37 -0800
Subject: [PATCH 174/367] rfctr: Sections gets document_part

To access header and footer parts, Section will need the document part
and the source for that will be its Sections parent proxy. Add
document_part as construction parameter for Sections and modify tests to
suit.
---
 docx/document.py       |  2 +-
 docx/section.py        | 14 ++++----
 tests/test_document.py | 21 +++++------
 tests/test_section.py  | 80 ++++++++++++++++++++++++++----------------
 4 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/docx/document.py b/docx/document.py
index 478ba4e5c..356f8cffa 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -137,7 +137,7 @@ def save(self, path_or_stream):
     @property
     def sections(self):
         """|Sections| object providing access to each section in this document."""
-        return Sections(self._element)
+        return Sections(self._element, self._part)
 
     @property
     def settings(self):
diff --git a/docx/section.py b/docx/section.py
index d27406ec1..6e3bfd7f5 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -13,16 +13,15 @@ class Sections(Sequence):
     Supports ``len()``, iteration, and indexed access.
     """
 
-    def __init__(self, document_elm):
+    def __init__(self, document_elm, document_part):
         super(Sections, self).__init__()
         self._document_elm = document_elm
+        self._document_part = document_part
 
     def __getitem__(self, key):
         if isinstance(key, slice):
-            sectPr_lst = self._document_elm.sectPr_lst[key]
-            return [Section(sectPr) for sectPr in sectPr_lst]
-        sectPr = self._document_elm.sectPr_lst[key]
-        return Section(sectPr)
+            return [Section(sectPr) for sectPr in self._document_elm.sectPr_lst[key]]
+        return Section(self._document_elm.sectPr_lst[key])
 
     def __iter__(self):
         for sectPr in self._document_elm.sectPr_lst:
@@ -33,7 +32,10 @@ def __len__(self):
 
 
 class Section(object):
-    """Document section, providing access to section and page-setup settings."""
+    """Document section, providing access to section and page setup settings.
+
+    Also provides access to headers and footers.
+    """
 
     def __init__(self, sectPr):
         super(Section, self).__init__()
diff --git a/tests/test_document.py b/tests/test_document.py
index 3ccac0ed9..7a0fb2704 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -21,9 +21,7 @@
 from docx.text.run import Run
 
 from .unitutil.cxml import element, xml
-from .unitutil.mock import (
-    class_mock, instance_mock, method_mock, property_mock
-)
+from .unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
 class DescribeDocument(object):
@@ -106,10 +104,14 @@ def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
         paragraphs = document.paragraphs
         assert paragraphs is paragraphs_
 
-    def it_provides_access_to_its_sections(self, sections_fixture):
-        document, Sections_, sections_ = sections_fixture
+    def it_provides_access_to_its_sections(self, document_part_, Sections_, sections_):
+        document_elm = element('w:document')
+        Sections_.return_value = sections_
+        document = Document(document_elm, document_part_)
+
         sections = document.sections
-        Sections_.assert_called_once_with(document._element)
+
+        Sections_.assert_called_once_with(document_elm, document_part_)
         assert sections is sections_
 
     def it_provides_access_to_its_settings(self, settings_fixture):
@@ -245,13 +247,6 @@ def save_fixture(self, document_part_):
         file_ = 'foobar.docx'
         return document, file_
 
-    @pytest.fixture
-    def sections_fixture(self, Sections_, sections_):
-        document_elm = element('w:document')
-        document = Document(document_elm, None)
-        Sections_.return_value = sections_
-        return document, Sections_, sections_
-
     @pytest.fixture
     def settings_fixture(self, document_part_, settings_):
         document = Document(None, document_part_)
diff --git a/tests/test_section.py b/tests/test_section.py
index 4b05bcedc..bb04afae5 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -7,54 +7,74 @@
 import pytest
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
+from docx.parts.document import DocumentPart
 from docx.section import Section, Sections
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
+from .unitutil.mock import call, class_mock, instance_mock
 
 
 class DescribeSections(object):
 
-    def it_knows_how_many_sections_it_contains(self, len_fixture):
-        sections, expected_len = len_fixture
-        assert len(sections) == expected_len
+    def it_knows_how_many_sections_it_contains(self):
+        sections = Sections(
+            element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)"), None
+        )
+        assert len(sections) == 2
 
-    def it_can_iterate_over_its_Section_instances(self, iter_fixture):
-        sections, expected_count = iter_fixture
-        section_count = 0
-        for section in sections:
-            section_count += 1
-            assert isinstance(section, Section)
-        assert section_count == expected_count
+    def it_can_iterate_over_its_Section_instances(self, Section_, section_):
+        document_elm = element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)")
+        sectPrs = document_elm.xpath("//w:sectPr")
+        Section_.return_value = section_
+        sections = Sections(document_elm, None)
 
-    def it_can_access_its_Section_instances_by_index(self, index_fixture):
-        sections, indicies = index_fixture
-        assert len(sections[0:2]) == 2
-        for index in indicies:
-            assert isinstance(sections[index], Section)
+        section_lst = [s for s in sections]
 
-    # fixtures -------------------------------------------------------
+        assert Section_.call_args_list == [call(sectPrs[0]), call(sectPrs[1])]
+        assert section_lst == [section_, section_]
 
-    @pytest.fixture
-    def index_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, [0, 1]
+    def it_can_access_its_Section_instances_by_index(self, Section_, section_):
+        document_elm = element(
+            "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
+        )
+        sectPrs = document_elm.xpath("//w:sectPr")
+        Section_.return_value = section_
+        sections = Sections(document_elm, None)
 
-    @pytest.fixture
-    def iter_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, 2
+        section_lst = [sections[idx] for idx in range(3)]
 
-    @pytest.fixture
-    def len_fixture(self, document_elm):
-        sections = Sections(document_elm)
-        return sections, 2
+        assert Section_.call_args_list == [
+            call(sectPrs[0]), call(sectPrs[1]), call(sectPrs[2])
+        ]
+        assert section_lst == [section_, section_, section_]
+
+    def it_can_access_its_Section_instances_by_slice(self, Section_, section_):
+        document_elm = element(
+            "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
+        )
+        sectPrs = document_elm.xpath("//w:sectPr")
+        Section_.return_value = section_
+        sections = Sections(document_elm, None)
+
+        section_lst = sections[1:9]
+
+        assert Section_.call_args_list == [call(sectPrs[1]), call(sectPrs[2])]
+        assert section_lst == [section_, section_]
 
     # fixture components ---------------------------------------------
 
     @pytest.fixture
-    def document_elm(self):
-        return element('w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)')
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
+    @pytest.fixture
+    def Section_(self, request):
+        return class_mock(request, "docx.section.Section")
+
+    @pytest.fixture
+    def section_(self, request):
+        return instance_mock(request, Section)
 
 
 class DescribeSection(object):

From 7c6465238ed25646c9a61efc51536fbe00d659db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 20:09:21 -0800
Subject: [PATCH 175/367] rfctr: Section gets document_part

* Modernize section unit test fixtures while in there.
---
 docx/document.py       |   2 +-
 docx/section.py        |  12 ++--
 tests/test_document.py |  19 +++---
 tests/test_section.py  | 134 +++++++++++++++++++++++++++--------------
 4 files changed, 108 insertions(+), 59 deletions(-)

diff --git a/docx/document.py b/docx/document.py
index 356f8cffa..6493c458b 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -80,7 +80,7 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         """
         new_sectPr = self._element.body.add_section_break()
         new_sectPr.start_type = start_type
-        return Section(new_sectPr)
+        return Section(new_sectPr, self._part)
 
     def add_table(self, rows, cols, style=None):
         """
diff --git a/docx/section.py b/docx/section.py
index 6e3bfd7f5..da19f0590 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -20,12 +20,15 @@ def __init__(self, document_elm, document_part):
 
     def __getitem__(self, key):
         if isinstance(key, slice):
-            return [Section(sectPr) for sectPr in self._document_elm.sectPr_lst[key]]
-        return Section(self._document_elm.sectPr_lst[key])
+            return [
+                Section(sectPr, self._document_part)
+                for sectPr in self._document_elm.sectPr_lst[key]
+            ]
+        return Section(self._document_elm.sectPr_lst[key], self._document_part)
 
     def __iter__(self):
         for sectPr in self._document_elm.sectPr_lst:
-            yield Section(sectPr)
+            yield Section(sectPr, self._document_part)
 
     def __len__(self):
         return len(self._document_elm.sectPr_lst)
@@ -37,9 +40,10 @@ class Section(object):
     Also provides access to headers and footers.
     """
 
-    def __init__(self, sectPr):
+    def __init__(self, sectPr, document_part):
         super(Section, self).__init__()
         self._sectPr = sectPr
+        self._document_part = document_part
 
     @property
     def bottom_margin(self):
diff --git a/tests/test_document.py b/tests/test_document.py
index 7a0fb2704..0de469c38 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -67,15 +67,18 @@ def it_can_add_a_picture(self, add_picture_fixture):
         run_.add_picture.assert_called_once_with(path, width, height)
         assert picture is picture_
 
-    def it_can_add_a_section(self, add_section_fixture):
-        document, start_type, Section_ = add_section_fixture[:3]
-        section_, expected_xml = add_section_fixture[3:]
+    def it_can_add_a_section(
+        self, add_section_fixture, Section_, section_, document_part_
+    ):
+        document_elm, start_type, expected_xml = add_section_fixture
+        Section_.return_value = section_
+        document = Document(document_elm, document_part_)
 
         section = document.add_section(start_type)
 
         assert document.element.xml == expected_xml
         sectPr = document.element.xpath('w:body/w:sectPr')[0]
-        Section_.assert_called_once_with(sectPr)
+        Section_.assert_called_once_with(sectPr, document_part_)
         assert section is section_
 
     def it_can_add_a_table(self, add_table_fixture):
@@ -182,16 +185,14 @@ def add_picture_fixture(self, request, add_paragraph_, run_, picture_):
         ('w:sectPr/w:type{w:val=oddPage}',  WD_SECTION.NEW_PAGE,
          'w:sectPr'),
     ])
-    def add_section_fixture(self, request, Section_):
+    def add_section_fixture(self, request):
         sentinel, start_type, new_sentinel = request.param
-        document_cxml = 'w:document/w:body/(w:p,%s)' % sentinel
-        document = Document(element(document_cxml), None)
+        document_elm = element('w:document/w:body/(w:p,%s)' % sentinel)
         expected_xml = xml(
             'w:document/w:body/(w:p,w:p/w:pPr/%s,%s)' %
             (sentinel, new_sentinel)
         )
-        section_ = Section_.return_value
-        return document, start_type, Section_, section_, expected_xml
+        return document_elm, start_type, expected_xml
 
     @pytest.fixture
     def add_table_fixture(self, _block_width_prop_, body_prop_, table_):
diff --git a/tests/test_section.py b/tests/test_section.py
index bb04afae5..57d539720 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -23,43 +23,55 @@ def it_knows_how_many_sections_it_contains(self):
         )
         assert len(sections) == 2
 
-    def it_can_iterate_over_its_Section_instances(self, Section_, section_):
+    def it_can_iterate_over_its_Section_instances(
+        self, Section_, section_, document_part_
+    ):
         document_elm = element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)")
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
-        sections = Sections(document_elm, None)
+        sections = Sections(document_elm, document_part_)
 
         section_lst = [s for s in sections]
 
-        assert Section_.call_args_list == [call(sectPrs[0]), call(sectPrs[1])]
+        assert Section_.call_args_list == [
+            call(sectPrs[0], document_part_), call(sectPrs[1], document_part_)
+        ]
         assert section_lst == [section_, section_]
 
-    def it_can_access_its_Section_instances_by_index(self, Section_, section_):
+    def it_can_access_its_Section_instances_by_index(
+        self, Section_, section_, document_part_
+    ):
         document_elm = element(
             "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
         )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
-        sections = Sections(document_elm, None)
+        sections = Sections(document_elm, document_part_)
 
         section_lst = [sections[idx] for idx in range(3)]
 
         assert Section_.call_args_list == [
-            call(sectPrs[0]), call(sectPrs[1]), call(sectPrs[2])
+            call(sectPrs[0], document_part_),
+            call(sectPrs[1], document_part_),
+            call(sectPrs[2], document_part_),
         ]
         assert section_lst == [section_, section_, section_]
 
-    def it_can_access_its_Section_instances_by_slice(self, Section_, section_):
+    def it_can_access_its_Section_instances_by_slice(
+        self, Section_, section_, document_part_
+    ):
         document_elm = element(
             "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
         )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
-        sections = Sections(document_elm, None)
+        sections = Sections(document_elm, document_part_)
 
         section_lst = sections[1:9]
 
-        assert Section_.call_args_list == [call(sectPrs[1]), call(sectPrs[2])]
+        assert Section_.call_args_list == [
+            call(sectPrs[1], document_part_), call(sectPrs[2], document_part_)
+        ]
         assert section_lst == [section_, section_]
 
     # fixture components ---------------------------------------------
@@ -80,51 +92,83 @@ def section_(self, request):
 class DescribeSection(object):
 
     def it_knows_its_start_type(self, start_type_get_fixture):
-        section, expected_start_type = start_type_get_fixture
-        assert section.start_type is expected_start_type
+        sectPr, expected_start_type = start_type_get_fixture
+        section = Section(sectPr, None)
+
+        start_type = section.start_type
+
+        assert start_type is expected_start_type
 
     def it_can_change_its_start_type(self, start_type_set_fixture):
-        section, new_start_type, expected_xml = start_type_set_fixture
+        sectPr, new_start_type, expected_xml = start_type_set_fixture
+        section = Section(sectPr, None)
+
         section.start_type = new_start_type
+
         assert section._sectPr.xml == expected_xml
 
     def it_knows_its_page_width(self, page_width_get_fixture):
-        section, expected_page_width = page_width_get_fixture
-        assert section.page_width == expected_page_width
+        sectPr, expected_page_width = page_width_get_fixture
+        section = Section(sectPr, None)
+
+        page_width = section.page_width
+
+        assert page_width == expected_page_width
 
     def it_can_change_its_page_width(self, page_width_set_fixture):
-        section, new_page_width, expected_xml = page_width_set_fixture
+        sectPr, new_page_width, expected_xml = page_width_set_fixture
+        section = Section(sectPr, None)
+
         section.page_width = new_page_width
+
         assert section._sectPr.xml == expected_xml
 
     def it_knows_its_page_height(self, page_height_get_fixture):
-        section, expected_page_height = page_height_get_fixture
-        assert section.page_height == expected_page_height
+        sectPr, expected_page_height = page_height_get_fixture
+        section = Section(sectPr, None)
+
+        page_height = section.page_height
+
+        assert page_height == expected_page_height
 
     def it_can_change_its_page_height(self, page_height_set_fixture):
-        section, new_page_height, expected_xml = page_height_set_fixture
+        sectPr, new_page_height, expected_xml = page_height_set_fixture
+        section = Section(sectPr, None)
+
         section.page_height = new_page_height
+
         assert section._sectPr.xml == expected_xml
 
     def it_knows_its_page_orientation(self, orientation_get_fixture):
-        section, expected_orientation = orientation_get_fixture
-        assert section.orientation is expected_orientation
+        sectPr, expected_orientation = orientation_get_fixture
+        section = Section(sectPr, None)
+
+        orientation = section.orientation
+
+        assert orientation is expected_orientation
 
     def it_can_change_its_orientation(self, orientation_set_fixture):
-        section, new_orientation, expected_xml = orientation_set_fixture
+        sectPr, new_orientation, expected_xml = orientation_set_fixture
+        section = Section(sectPr, None)
+
         section.orientation = new_orientation
+
         assert section._sectPr.xml == expected_xml
 
     def it_knows_its_page_margins(self, margins_get_fixture):
-        section, margin_prop_name, expected_value = margins_get_fixture
+        sectPr, margin_prop_name, expected_value = margins_get_fixture
+        section = Section(sectPr, None)
+
         value = getattr(section, margin_prop_name)
+
         assert value == expected_value
 
     def it_can_change_its_page_margins(self, margins_set_fixture):
-        section, margin_prop_name, new_value, expected_xml = (
-            margins_set_fixture
-        )
+        sectPr, margin_prop_name, new_value, expected_xml = margins_set_fixture
+        section = Section(sectPr, None)
+
         setattr(section, margin_prop_name, new_value)
+
         assert section._sectPr.xml == expected_xml
 
     # fixtures -------------------------------------------------------
@@ -142,8 +186,8 @@ def it_can_change_its_page_margins(self, margins_set_fixture):
     ])
     def margins_get_fixture(self, request):
         sectPr_cxml, margin_prop_name, expected_value = request.param
-        section = Section(element(sectPr_cxml))
-        return section, margin_prop_name, expected_value
+        sectPr = element(sectPr_cxml)
+        return sectPr, margin_prop_name, expected_value
 
     @pytest.fixture(params=[
         ('w:sectPr', 'left_margin',     Inches(1),
@@ -166,9 +210,9 @@ def margins_get_fixture(self, request):
     ])
     def margins_set_fixture(self, request):
         sectPr_cxml, property_name, new_value, expected_cxml = request.param
-        section = Section(element(sectPr_cxml))
+        sectPr = element(sectPr_cxml)
         expected_xml = xml(expected_cxml)
-        return section, property_name, new_value, expected_xml
+        return sectPr, property_name, new_value, expected_xml
 
     @pytest.fixture(params=[
         ('w:sectPr/w:pgSz{w:orient=landscape}', WD_ORIENT.LANDSCAPE),
@@ -178,8 +222,8 @@ def margins_set_fixture(self, request):
     ])
     def orientation_get_fixture(self, request):
         sectPr_cxml, expected_orientation = request.param
-        section = Section(element(sectPr_cxml))
-        return section, expected_orientation
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_orientation
 
     @pytest.fixture(params=[
         (WD_ORIENT.LANDSCAPE, 'w:sectPr/w:pgSz{w:orient=landscape}'),
@@ -188,9 +232,9 @@ def orientation_get_fixture(self, request):
     ])
     def orientation_set_fixture(self, request):
         new_orientation, expected_cxml = request.param
-        section = Section(element('w:sectPr'))
+        sectPr = element('w:sectPr')
         expected_xml = xml(expected_cxml)
-        return section, new_orientation, expected_xml
+        return sectPr, new_orientation, expected_xml
 
     @pytest.fixture(params=[
         ('w:sectPr/w:pgSz{w:h=2880}', Inches(2)),
@@ -199,8 +243,8 @@ def orientation_set_fixture(self, request):
     ])
     def page_height_get_fixture(self, request):
         sectPr_cxml, expected_page_height = request.param
-        section = Section(element(sectPr_cxml))
-        return section, expected_page_height
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_page_height
 
     @pytest.fixture(params=[
         (None,      'w:sectPr/w:pgSz'),
@@ -208,9 +252,9 @@ def page_height_get_fixture(self, request):
     ])
     def page_height_set_fixture(self, request):
         new_page_height, expected_cxml = request.param
-        section = Section(element('w:sectPr'))
+        sectPr = element('w:sectPr')
         expected_xml = xml(expected_cxml)
-        return section, new_page_height, expected_xml
+        return sectPr, new_page_height, expected_xml
 
     @pytest.fixture(params=[
         ('w:sectPr/w:pgSz{w:w=1440}', Inches(1)),
@@ -219,8 +263,8 @@ def page_height_set_fixture(self, request):
     ])
     def page_width_get_fixture(self, request):
         sectPr_cxml, expected_page_width = request.param
-        section = Section(element(sectPr_cxml))
-        return section, expected_page_width
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_page_width
 
     @pytest.fixture(params=[
         (None,      'w:sectPr/w:pgSz'),
@@ -228,9 +272,9 @@ def page_width_get_fixture(self, request):
     ])
     def page_width_set_fixture(self, request):
         new_page_width, expected_cxml = request.param
-        section = Section(element('w:sectPr'))
+        sectPr = element('w:sectPr')
         expected_xml = xml(expected_cxml)
-        return section, new_page_width, expected_xml
+        return sectPr, new_page_width, expected_xml
 
     @pytest.fixture(params=[
         ('w:sectPr',                          WD_SECTION.NEW_PAGE),
@@ -243,8 +287,8 @@ def page_width_set_fixture(self, request):
     ])
     def start_type_get_fixture(self, request):
         sectPr_cxml, expected_start_type = request.param
-        section = Section(element(sectPr_cxml))
-        return section, expected_start_type
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_start_type
 
     @pytest.fixture(params=[
         ('w:sectPr/w:type{w:val=oddPage}',    WD_SECTION.EVEN_PAGE,
@@ -262,6 +306,6 @@ def start_type_get_fixture(self, request):
     ])
     def start_type_set_fixture(self, request):
         initial_cxml, new_start_type, expected_cxml = request.param
-        section = Section(element(initial_cxml))
+        sectPr = element(initial_cxml)
         expected_xml = xml(expected_cxml)
-        return section, new_start_type, expected_xml
+        return sectPr, new_start_type, expected_xml

From d3b8eb705236ba553f26e85268d5e35745ae3ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 21:03:44 -0800
Subject: [PATCH 176/367] sect: add Section.footer

---
 docs/conf.py                 |  2 ++
 docx/section.py              | 20 ++++++++++++++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 28 +++++++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index a8913291f..f997ac188 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -107,6 +107,8 @@
 
 .. |Font| replace:: :class:`.Font`
 
+.. |_Footer| replace:: :class:`._Footer`
+
 .. |_Header| replace:: :class:`._Header`
 
 .. |ImageParts| replace:: :class:`.ImageParts`
diff --git a/docx/section.py b/docx/section.py
index da19f0590..4fc6d906d 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -6,6 +6,9 @@
 
 from collections import Sequence
 
+from docx.blkcntnr import BlockItemContainer
+from docx.shared import lazyproperty
+
 
 class Sections(Sequence):
     """Sequence of |Section| objects corresponding to the sections in the document.
@@ -57,6 +60,15 @@ def bottom_margin(self):
     def bottom_margin(self, value):
         self._sectPr.bottom_margin = value
 
+    @lazyproperty
+    def footer(self):
+        """|_Footer| object representing default page footer for this section.
+
+        The default footer is used for odd-numbered pages when separate odd/even footers
+        are enabled. It is used for both odd and even-numbered pages otherwise.
+        """
+        return _Footer(self._sectPr, self._document_part)
+
     @property
     def footer_distance(self):
         """
@@ -187,3 +199,11 @@ def top_margin(self):
     @top_margin.setter
     def top_margin(self, value):
         self._sectPr.top_margin = value
+
+
+class _Footer(BlockItemContainer):
+    """Page footer."""
+
+    def __init__(self, sectPr, document_part):
+        self._sectPr = sectPr
+        self._document_part = document_part
diff --git a/features/sct-section.feature b/features/sct-section.feature
index f08268915..8863a6500 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -4,7 +4,6 @@ Feature: Access and change section properties
   I need a way to get and set the properties of a section
 
 
-  @wip
   Scenario: Section.footer
     Given a Section object as section
      Then section.footer is a _Footer object
diff --git a/tests/test_section.py b/tests/test_section.py
index 57d539720..3e9f859d5 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -8,7 +8,7 @@
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
-from docx.section import Section, Sections
+from docx.section import _Footer, Section, Sections
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
@@ -91,6 +91,18 @@ def section_(self, request):
 
 class DescribeSection(object):
 
+    def it_provides_access_to_its_default_footer(
+        self, document_part_, _Footer_, footer_
+    ):
+        sectPr = element('w:sectPr')
+        _Footer_.return_value = footer_
+        section = Section(sectPr, document_part_)
+
+        footer = section.footer
+
+        _Footer_.assert_called_once_with(sectPr, document_part_)
+        assert footer is footer_
+
     def it_knows_its_start_type(self, start_type_get_fixture):
         sectPr, expected_start_type = start_type_get_fixture
         section = Section(sectPr, None)
@@ -309,3 +321,17 @@ def start_type_set_fixture(self, request):
         sectPr = element(initial_cxml)
         expected_xml = xml(expected_cxml)
         return sectPr, new_start_type, expected_xml
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
+    @pytest.fixture
+    def _Footer_(self, request):
+        return class_mock(request, "docx.section._Footer")
+
+    @pytest.fixture
+    def footer_(self, request):
+        return instance_mock(request, _Footer)

From e8d43a2578dae527a3940c04b8763f86ef11a8e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 21:13:51 -0800
Subject: [PATCH 177/367] sect: add Section.header

---
 docx/section.py              | 17 +++++++++++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 22 +++++++++++++++++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index 4fc6d906d..b64c5c9b8 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -96,6 +96,15 @@ def gutter(self):
     def gutter(self, value):
         self._sectPr.gutter = value
 
+    @lazyproperty
+    def header(self):
+        """|_Header| object representing default page header for this section.
+
+        The default header is used for odd-numbered pages when separate odd/even headers
+        are enabled. It is used for both odd and even-numbered pages otherwise.
+        """
+        return _Header(self._sectPr, self._document_part)
+
     @property
     def header_distance(self):
         """
@@ -207,3 +216,11 @@ class _Footer(BlockItemContainer):
     def __init__(self, sectPr, document_part):
         self._sectPr = sectPr
         self._document_part = document_part
+
+
+class _Header(BlockItemContainer):
+    """Page header."""
+
+    def __init__(self, sectPr, document_part):
+        self._sectPr = sectPr
+        self._document_part = document_part
diff --git a/features/sct-section.feature b/features/sct-section.feature
index 8863a6500..64ccd03c4 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -9,7 +9,6 @@ Feature: Access and change section properties
      Then section.footer is a _Footer object
 
 
-  @wip
   Scenario: Section.header
     Given a Section object as section
      Then section.header is a _Header object
diff --git a/tests/test_section.py b/tests/test_section.py
index 3e9f859d5..d3ceb41b9 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -8,7 +8,7 @@
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
-from docx.section import _Footer, Section, Sections
+from docx.section import _Footer, _Header, Section, Sections
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
@@ -103,6 +103,18 @@ def it_provides_access_to_its_default_footer(
         _Footer_.assert_called_once_with(sectPr, document_part_)
         assert footer is footer_
 
+    def it_provides_access_to_its_default_header(
+        self, document_part_, _Header_, header_
+    ):
+        sectPr = element('w:sectPr')
+        _Header_.return_value = header_
+        section = Section(sectPr, document_part_)
+
+        header = section.header
+
+        _Header_.assert_called_once_with(sectPr, document_part_)
+        assert header is header_
+
     def it_knows_its_start_type(self, start_type_get_fixture):
         sectPr, expected_start_type = start_type_get_fixture
         section = Section(sectPr, None)
@@ -335,3 +347,11 @@ def _Footer_(self, request):
     @pytest.fixture
     def footer_(self, request):
         return instance_mock(request, _Footer)
+
+    @pytest.fixture
+    def _Header_(self, request):
+        return class_mock(request, "docx.section._Header")
+
+    @pytest.fixture
+    def header_(self, request):
+        return instance_mock(request, _Header)

From 4ad97ed7fcfe7b29521cb8bf6187d97234bf72c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 21:27:43 -0800
Subject: [PATCH 178/367] hdr: add _Header.is_linked_to_previous

---
 docx/section.py       | 19 +++++++++++++++++++
 tests/test_section.py | 29 ++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index b64c5c9b8..32dbfd46f 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -224,3 +224,22 @@ class _Header(BlockItemContainer):
     def __init__(self, sectPr, document_part):
         self._sectPr = sectPr
         self._document_part = document_part
+
+    @property
+    def is_linked_to_previous(self):
+        """True if this header uses the header definition of the preceding section.
+
+        False if this header has an explicit definition.
+
+        Assigning ``True`` to this property removes any header definition for this
+        section, causing it to "inherit" the header definition of the prior section.
+        Assigning ``False`` causes a new, empty header definition to be added for this
+        section, but only if no existing definition is present.
+        """
+        # ---absence of a header (definition) part indicates "linked" behavior---
+        return not self._has_header_part
+
+    @property
+    def _has_header_part(self):
+        """True if a header is explicitly defined for this section."""
+        raise NotImplementedError
diff --git a/tests/test_section.py b/tests/test_section.py
index d3ceb41b9..15f4075de 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -12,7 +12,7 @@
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
-from .unitutil.mock import call, class_mock, instance_mock
+from .unitutil.mock import call, class_mock, instance_mock, property_mock
 
 
 class DescribeSections(object):
@@ -355,3 +355,30 @@ def _Header_(self, request):
     @pytest.fixture
     def header_(self, request):
         return instance_mock(request, _Header)
+
+
+class Describe_Header(object):
+
+    def it_knows_when_its_linked_to_the_previous_header(
+        self, is_linked_fixture, _has_header_part_prop_
+    ):
+        has_header_part, expected_value = is_linked_fixture
+        _has_header_part_prop_.return_value = has_header_part
+        header = _Header(None, None)
+
+        is_linked = header.is_linked_to_previous
+
+        assert is_linked is expected_value
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[(False, True), (True, False)])
+    def is_linked_fixture(self, request):
+        has_header_part, expected_value = request.param
+        return has_header_part, expected_value
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _has_header_part_prop_(self, request):
+        return property_mock(request, _Header, "_has_header_part")

From 801e3fb920cd1a41c3cd2b17dde7c468d378aeef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Sun, 30 Dec 2018 22:02:20 -0800
Subject: [PATCH 179/367] hdr: add _Header._has_header_part

---
 docx/enum/section.py               | 27 +++++++++++++++++++++++++++
 docx/oxml/section.py               | 17 +++++++++++++++--
 docx/section.py                    |  4 +++-
 features/hdr-header-footer.feature |  1 -
 tests/test_section.py              | 18 ++++++++++++++++++
 5 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/docx/enum/section.py b/docx/enum/section.py
index b16ddbe72..381e81877 100644
--- a/docx/enum/section.py
+++ b/docx/enum/section.py
@@ -9,6 +9,33 @@
 from .base import alias, XmlEnumeration, XmlMappedEnumMember
 
 
+@alias('WD_HEADER_FOOTER')
+class WD_HEADER_FOOTER_INDEX(XmlEnumeration):
+    """
+    alias: **WD_HEADER_FOOTER**
+
+    Specifies one of the three possible header/footer definitions for a section.
+
+    For internal use only; not part of the python-docx API.
+    """
+
+    __ms_name__ = "WdHeaderFooterIndex"
+
+    __url__ = "https://docs.microsoft.com/en-us/office/vba/api/word.wdheaderfooterindex"
+
+    __members__ = (
+        XmlMappedEnumMember(
+            "PRIMARY", 1, "default", "Header for odd pages or all if no even header."
+        ),
+        XmlMappedEnumMember(
+            "FIRST_PAGE", 2, "first", "Header for first page of section."
+        ),
+        XmlMappedEnumMember(
+            "EVEN_PAGE", 3, "even", "Header for even pages of recto/verso section."
+        ),
+    )
+
+
 @alias('WD_ORIENT')
 class WD_ORIENTATION(XmlEnumeration):
     """
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index d264d5e5c..6085a0b95 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -6,9 +6,13 @@
 
 from copy import deepcopy
 
-from docx.enum.section import WD_ORIENTATION, WD_SECTION_START
+from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION_START
 from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
-from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrOne
+from docx.oxml.xmlchemy import (
+    BaseOxmlElement,
+    OptionalAttribute,
+    ZeroOrOne,
+)
 
 
 class CT_PageMar(BaseOxmlElement):
@@ -93,6 +97,15 @@ def footer(self, value):
         pgMar = self.get_or_add_pgMar()
         pgMar.footer = value
 
+    def get_headerReference(self, type_):
+        """Return headerReference element of *type_* or None if not present."""
+        matching_headerReferences = self.xpath(
+            "./w:headerReference[@w:type='%s']" % WD_HEADER_FOOTER.to_xml(type_)
+        )
+        if len(matching_headerReferences) == 0:
+            return None
+        return matching_headerReferences[0]
+
     @property
     def gutter(self):
         """
diff --git a/docx/section.py b/docx/section.py
index 32dbfd46f..f2bf9de55 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -7,6 +7,7 @@
 from collections import Sequence
 
 from docx.blkcntnr import BlockItemContainer
+from docx.enum.section import WD_HEADER_FOOTER
 from docx.shared import lazyproperty
 
 
@@ -242,4 +243,5 @@ def is_linked_to_previous(self):
     @property
     def _has_header_part(self):
         """True if a header is explicitly defined for this section."""
-        raise NotImplementedError
+        headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        return False if headerReference is None else True
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index 93feab67f..e6aa045f8 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -4,7 +4,6 @@ Feature: Header and footer behaviors
   I need properties and methods on _Header and _Footer objects
 
 
-  @wip
   Scenario Outline: _Header.is_linked_to_previous getter
     Given a _Header object <with-or-no> header definition as header
      Then header.is_linked_to_previous is <value>
diff --git a/tests/test_section.py b/tests/test_section.py
index 15f4075de..f2c7373e5 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -370,8 +370,26 @@ def it_knows_when_its_linked_to_the_previous_header(
 
         assert is_linked is expected_value
 
+    def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
+        sectPr, expected_value = has_header_part_fixture
+        header = _Header(sectPr, None)
+
+        has_header_part = header._has_header_part
+
+        assert has_header_part is expected_value
+
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=default}", True)
+        ]
+    )
+    def has_header_part_fixture(self, request):
+        sectPr_cxml, expected_value = request.param
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_value
+
     @pytest.fixture(params=[(False, True), (True, False)])
     def is_linked_fixture(self, request):
         has_header_part, expected_value = request.param

From e573716a25912adeadf333f68cf02066347c0650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Mon, 31 Dec 2018 13:51:43 -0800
Subject: [PATCH 180/367] hdr: add _Header.is_linked_to_previous setter

---
 docx/section.py       | 19 +++++++++++++++++++
 tests/test_section.py | 44 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index f2bf9de55..1d4aea943 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -240,6 +240,25 @@ def is_linked_to_previous(self):
         # ---absence of a header (definition) part indicates "linked" behavior---
         return not self._has_header_part
 
+    @is_linked_to_previous.setter
+    def is_linked_to_previous(self, value):
+        new_state = bool(value)
+        # ---do nothing when value is not being changed---
+        if new_state == self.is_linked_to_previous:
+            return
+        if new_state is True:
+            self._drop_header_part()
+        else:
+            self._add_header_part()
+
+    def _add_header_part(self):
+        """Return newly-added header part."""
+        raise NotImplementedError
+
+    def _drop_header_part(self):
+        """Remove header definition associated with this section."""
+        raise NotImplementedError
+
     @property
     def _has_header_part(self):
         """True if a header is explicitly defined for this section."""
diff --git a/tests/test_section.py b/tests/test_section.py
index f2c7373e5..e39ac112d 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -12,7 +12,7 @@
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
-from .unitutil.mock import call, class_mock, instance_mock, property_mock
+from .unitutil.mock import call, class_mock, instance_mock, method_mock, property_mock
 
 
 class DescribeSections(object):
@@ -360,9 +360,9 @@ def header_(self, request):
 class Describe_Header(object):
 
     def it_knows_when_its_linked_to_the_previous_header(
-        self, is_linked_fixture, _has_header_part_prop_
+        self, is_linked_get_fixture, _has_header_part_prop_
     ):
-        has_header_part, expected_value = is_linked_fixture
+        has_header_part, expected_value = is_linked_get_fixture
         _has_header_part_prop_.return_value = has_header_part
         header = _Header(None, None)
 
@@ -370,6 +370,22 @@ def it_knows_when_its_linked_to_the_previous_header(
 
         assert is_linked is expected_value
 
+    def it_can_change_whether_it_is_linked_to_previous_header(
+        self,
+        is_linked_set_fixture,
+        _has_header_part_prop_,
+        _drop_header_part_,
+        _add_header_part_,
+    ):
+        has_header_part, new_value, drop_calls, add_calls = is_linked_set_fixture
+        _has_header_part_prop_.return_value = has_header_part
+        header = _Header(None, None)
+
+        header.is_linked_to_previous = new_value
+
+        assert _drop_header_part_.call_args_list == [call(header)] * drop_calls
+        assert _add_header_part_.call_args_list == [call(header)] * add_calls
+
     def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
         sectPr, expected_value = has_header_part_fixture
         header = _Header(sectPr, None)
@@ -391,12 +407,32 @@ def has_header_part_fixture(self, request):
         return sectPr, expected_value
 
     @pytest.fixture(params=[(False, True), (True, False)])
-    def is_linked_fixture(self, request):
+    def is_linked_get_fixture(self, request):
         has_header_part, expected_value = request.param
         return has_header_part, expected_value
 
+    @pytest.fixture(
+        params=[
+            (False, True, 0, 0),
+            (True, False, 0, 0),
+            (True, True, 1, 0),
+            (False, False, 0, 1),
+        ]
+    )
+    def is_linked_set_fixture(self, request):
+        has_header_part, new_value, drop_calls, add_calls = request.param
+        return has_header_part, new_value, drop_calls, add_calls
+
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def _add_header_part_(self, request):
+        return method_mock(request, _Header, "_add_header_part", autospec=True)
+
+    @pytest.fixture
+    def _drop_header_part_(self, request):
+        return method_mock(request, _Header, "_drop_header_part", autospec=True)
+
     @pytest.fixture
     def _has_header_part_prop_(self, request):
         return property_mock(request, _Header, "_has_header_part")

From 383ebd1286081f10f6110266e43828afed2d7f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Mon, 31 Dec 2018 15:37:12 -0800
Subject: [PATCH 181/367] hdr: add _Header._drop_header_part()

---
 docx/oxml/__init__.py  |  3 ++-
 docx/oxml/section.py   | 17 ++++++++++++-
 docx/parts/document.py |  4 +++
 docx/section.py        |  3 ++-
 tests/test_section.py  | 13 ++++++++++
 tests/text/test_run.py | 13 ++++++----
 tests/unitutil/cxml.py | 56 ++++++++++++++++++++++++++++--------------
 7 files changed, 83 insertions(+), 26 deletions(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index dc4793251..d28d5dd25 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -84,7 +84,8 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:numbering',     CT_Numbering)
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
-from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
+from .section import CT_HdrFtrRef, CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
+register_element_cls('w:headerReference', CT_HdrFtrRef)
 register_element_cls('w:pgMar', CT_PageMar)
 register_element_cls('w:pgSz', CT_PageSz)
 register_element_cls('w:sectPr', CT_SectPr)
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 6085a0b95..bddf1188a 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -7,14 +7,22 @@
 from copy import deepcopy
 
 from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION_START
-from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
+from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure, XsdString
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OptionalAttribute,
+    RequiredAttribute,
     ZeroOrOne,
 )
 
 
+class CT_HdrFtrRef(BaseOxmlElement):
+    """`w:headerReference` and `w:footerReference` elements"""
+
+    type_ = RequiredAttribute('w:type', WD_HEADER_FOOTER)
+    rId = RequiredAttribute('r:id', XsdString)
+
+
 class CT_PageMar(BaseOxmlElement):
     """
     ``<w:pgMar>`` element, defining page margins.
@@ -157,6 +165,13 @@ def left_margin(self, value):
         pgMar = self.get_or_add_pgMar()
         pgMar.left = value
 
+    def remove_headerReference(self, type_):
+        """Return rId of w:headerReference child of *type_* after removing it."""
+        headerReference = self.get_headerReference(type_)
+        rId = headerReference.rId
+        self.remove(headerReference)
+        return rId
+
     @property
     def right_margin(self):
         """
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 1a85741a6..fa34a64d3 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -39,6 +39,10 @@ def document(self):
         """
         return Document(self._element, self)
 
+    def drop_header_part(self, rId):
+        """Remove related header part identified by *rId*."""
+        raise NotImplementedError
+
     def get_or_add_image(self, image_descriptor):
         """
         Return an (rId, image) 2-tuple for the image identified by
diff --git a/docx/section.py b/docx/section.py
index 1d4aea943..d752be58d 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -257,7 +257,8 @@ def _add_header_part(self):
 
     def _drop_header_part(self):
         """Remove header definition associated with this section."""
-        raise NotImplementedError
+        rId = self._sectPr.remove_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        self._document_part.drop_header_part(rId)
 
     @property
     def _has_header_part(self):
diff --git a/tests/test_section.py b/tests/test_section.py
index e39ac112d..136612b4d 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -386,6 +386,15 @@ def it_can_change_whether_it_is_linked_to_previous_header(
         assert _drop_header_part_.call_args_list == [call(header)] * drop_calls
         assert _add_header_part_.call_args_list == [call(header)] * add_calls
 
+    def it_can_drop_the_related_header_part_to_help(self, document_part_):
+        sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId42}")
+        header = _Header(sectPr, document_part_)
+
+        header._drop_header_part()
+
+        assert sectPr.xml == xml("w:sectPr{r:a=b}")
+        document_part_.drop_header_part.assert_called_once_with("rId42")
+
     def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
         sectPr, expected_value = has_header_part_fixture
         header = _Header(sectPr, None)
@@ -429,6 +438,10 @@ def is_linked_set_fixture(self, request):
     def _add_header_part_(self, request):
         return method_mock(request, _Header, "_add_header_part", autospec=True)
 
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
     @pytest.fixture
     def _drop_header_part_(self, request):
         return method_mock(request, _Header, "_drop_header_part", autospec=True)
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index f8e88dd48..cc4d97029 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -69,9 +69,12 @@ def it_provides_access_to_its_font(self, font_fixture):
         Font_.assert_called_once_with(run._element)
         assert font is font_
 
-    def it_can_add_text(self, add_text_fixture):
-        run, text_str, expected_xml, Text_ = add_text_fixture
+    def it_can_add_text(self, add_text_fixture, Text_):
+        r, text_str, expected_xml = add_text_fixture
+        run = Run(r, None)
+
         _text = run.add_text(text_str)
+
         assert run._r.xml == expected_xml
         assert _text is Text_.return_value
 
@@ -159,11 +162,11 @@ def add_tab_fixture(self, request):
         ('w:r',          'fo ', 'w:r/w:t{xml:space=preserve}"fo "'),
         ('w:r',          'f o', 'w:r/w:t"f o"'),
     ])
-    def add_text_fixture(self, request, Text_):
+    def add_text_fixture(self, request):
         r_cxml, text, expected_cxml = request.param
-        run = Run(element(r_cxml), None)
+        r = element(r_cxml)
         expected_xml = xml(expected_cxml)
-        return run, text, expected_xml, Text_
+        return r, text, expected_xml
 
     @pytest.fixture(params=[
         ('w:r/w:rPr',                  'bold',   None),
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index 4e4858de3..f583a3c99 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -1,16 +1,27 @@
 # encoding: utf-8
 
-"""
-Parser for Compact XML Expression Language (CXEL) ('see-ex-ell'), a compact
-XML specification language I made up that's useful for producing XML element
-trees suitable for unit testing.
+"""Parser for Compact XML Expression Language (CXEL) ('see-ex-ell').
+
+CXEL is a compact XML specification language I made up that's useful for producing XML
+element trees suitable for unit testing.
 """
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from pyparsing import (
-    alphas, alphanums, Combine, dblQuotedString, delimitedList, Forward,
-    Group, Literal, Optional, removeQuotes, stringEnd, Suppress, Word
+    alphas,
+    alphanums,
+    Combine,
+    dblQuotedString,
+    delimitedList,
+    Forward,
+    Group,
+    Literal,
+    Optional,
+    removeQuotes,
+    stringEnd,
+    Suppress,
+    Word,
 )
 
 from docx.oxml import parse_xml
@@ -105,16 +116,25 @@ def is_root(self, value):
         self._is_root = bool(value)
 
     @property
-    def nspfx(self):
+    def local_nspfxs(self):
         """
-        The namespace prefix of this element, the empty string (``''``) if
-        the tag is in the default namespace.
+        The namespace prefixes local to this element, both on the tagname and
+        all of its attributes. An empty string (``''``) is used to represent
+        the default namespace for an element tag having no prefix.
         """
-        tagname = self._tagname
-        idx = tagname.find(':')
-        if idx == -1:
-            return ''
-        return tagname[:idx]
+        def nspfx(name, is_element=False):
+            idx = name.find(':')
+            if idx == -1:
+                return '' if is_element else None
+            return name[:idx]
+
+        nspfxs = [nspfx(self._tagname, True)]
+        for name, val in self._attrs:
+            pfx = nspfx(name)
+            if pfx is None or pfx in nspfxs or pfx == "xml":
+                continue
+            nspfxs.append(pfx)
+        return nspfxs
 
     @property
     def nspfxs(self):
@@ -129,7 +149,7 @@ def merge(seq, seq_2):
                     continue
                 seq.append(item)
 
-        nspfxs = [self.nspfx]
+        nspfxs = self.local_nspfxs
         for child in self._children:
             merge(nspfxs, child.nspfxs)
         return nspfxs
@@ -223,12 +243,12 @@ def grammar():
 
     # np:tagName ---------------------------------
     nspfx = Word(alphas)
-    local_name = Word(alphas)
+    local_name = Word(alphanums)
     tagname = Combine(nspfx + colon + local_name)
 
     # np:attr_name=attr_val ----------------------
     attr_name = Word(alphas + ':')
-    attr_val = Word(alphanums + ' -.%')
+    attr_val = Word(alphanums + ' %-./:_')
     attr_def = Group(attr_name + equal + attr_val)
     attr_list = open_brace + delimitedList(attr_def) + close_brace
 

From d5a03da9c0623264e52f97c58d32286186eba138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Mon, 31 Dec 2018 15:49:24 -0800
Subject: [PATCH 182/367] hdr: add DocumentPart.drop_header_part()

---
 docx/parts/document.py       |  2 +-
 tests/parts/test_document.py | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index fa34a64d3..50e663910 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -41,7 +41,7 @@ def document(self):
 
     def drop_header_part(self, rId):
         """Remove related header part identified by *rId*."""
-        raise NotImplementedError
+        self.drop_rel(rId)
 
     def get_or_add_image(self, image_descriptor):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index cdecfe01f..2bf58a6dc 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -30,6 +30,13 @@
 
 class DescribeDocumentPart(object):
 
+    def it_can_drop_a_specified_header_part(self, drop_rel_):
+        document_part = DocumentPart(None, None, None, None)
+
+        document_part.drop_header_part("rId42")
+
+        drop_rel_.assert_called_once_with(document_part, "rId42")
+
     def it_can_save_the_package_to_a_file(self, save_fixture):
         document, file_ = save_fixture
         document.save(file_)
@@ -262,6 +269,10 @@ def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)
 
+    @pytest.fixture
+    def drop_rel_(self, request):
+        return method_mock(request, DocumentPart, "drop_rel", autospec=True)
+
     @pytest.fixture
     def get_or_add_image_(self, request):
         return method_mock(request, DocumentPart, 'get_or_add_image')

From 2afbbb6b87f6ef5d1bb8ddec918734227c64721b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Mon, 31 Dec 2018 16:11:59 -0800
Subject: [PATCH 183/367] hdr: add _Header._add_header_part()

---
 docx/oxml/section.py   | 12 ++++++++++++
 docx/parts/document.py |  4 ++++
 docx/parts/hdrftr.py   | 11 +++++++++++
 docx/section.py        |  4 +++-
 tests/test_section.py  | 18 ++++++++++++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 docx/parts/hdrftr.py

diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index bddf1188a..122c9ce6b 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -12,6 +12,7 @@
     BaseOxmlElement,
     OptionalAttribute,
     RequiredAttribute,
+    ZeroOrMore,
     ZeroOrOne,
 )
 
@@ -56,11 +57,22 @@ class CT_SectPr(BaseOxmlElement):
         'w:noEndnote', 'w:titlePg', 'w:textDirection', 'w:bidi', 'w:rtlGutter',
         'w:docGrid', 'w:printerSettings', 'w:sectPrChange',
     )
+    headerReference = ZeroOrMore("w:headerReference", successors=_tag_seq)
     type = ZeroOrOne("w:type", successors=_tag_seq[3:])
     pgSz = ZeroOrOne("w:pgSz", successors=_tag_seq[4:])
     pgMar = ZeroOrOne("w:pgMar", successors=_tag_seq[5:])
     del _tag_seq
 
+    def add_headerReference(self, type_, rId):
+        """Return newly added CT_HdrFtrRef element of *type_* with *rId*.
+
+        The element tag is `w:headerReference`.
+        """
+        headerReference = self._add_headerReference()
+        headerReference.type_ = type_
+        headerReference.rId = rId
+        return headerReference
+
     @property
     def bottom_margin(self):
         """
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 50e663910..2fcd68cf8 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -24,6 +24,10 @@ class DocumentPart(XmlPart):
     objects provides access to this part object for that purpose.
     """
 
+    def add_header_part(self):
+        """Return (header_part, rId) pair for newly-created header part."""
+        raise NotImplementedError
+
     @property
     def core_properties(self):
         """
diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
new file mode 100644
index 000000000..8d54b8eb8
--- /dev/null
+++ b/docx/parts/hdrftr.py
@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+"""Header and footer part objects"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+from docx.opc.part import XmlPart
+
+
+class HeaderPart(XmlPart):
+    """Definition of a section header."""
diff --git a/docx/section.py b/docx/section.py
index d752be58d..8ab99f272 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -253,7 +253,9 @@ def is_linked_to_previous(self, value):
 
     def _add_header_part(self):
         """Return newly-added header part."""
-        raise NotImplementedError
+        header_part, rId = self._document_part.add_header_part()
+        self._sectPr.add_headerReference(WD_HEADER_FOOTER.PRIMARY, rId)
+        return header_part
 
     def _drop_header_part(self):
         """Remove header definition associated with this section."""
diff --git a/tests/test_section.py b/tests/test_section.py
index 136612b4d..85f5aa205 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -8,6 +8,7 @@
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
+from docx.parts.hdrftr import HeaderPart
 from docx.section import _Footer, _Header, Section, Sections
 from docx.shared import Inches
 
@@ -386,6 +387,19 @@ def it_can_change_whether_it_is_linked_to_previous_header(
         assert _drop_header_part_.call_args_list == [call(header)] * drop_calls
         assert _add_header_part_.call_args_list == [call(header)] * add_calls
 
+    def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
+        sectPr = element("w:sectPr{r:a=b}")
+        document_part_.add_header_part.return_value = header_part_, "rId3"
+        header = _Header(sectPr, document_part_)
+
+        header_part = header._add_header_part()
+
+        document_part_.add_header_part.assert_called_once_with()
+        assert sectPr.xml == xml(
+            "w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId3}"
+        )
+        assert header_part is header_part_
+
     def it_can_drop_the_related_header_part_to_help(self, document_part_):
         sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId42}")
         header = _Header(sectPr, document_part_)
@@ -449,3 +463,7 @@ def _drop_header_part_(self, request):
     @pytest.fixture
     def _has_header_part_prop_(self, request):
         return property_mock(request, _Header, "_has_header_part")
+
+    @pytest.fixture
+    def header_part_(self, request):
+        return instance_mock(request, HeaderPart)

From 3512601ffb55d4b190250ddd2c7c9df912fadc94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Mon, 31 Dec 2018 16:43:41 -0800
Subject: [PATCH 184/367] hdr: add DocumentPart.add_header_part()

---
 docx/parts/document.py       |  5 ++++-
 docx/parts/hdrftr.py         |  5 +++++
 tests/parts/test_document.py | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 2fcd68cf8..31e740543 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -8,6 +8,7 @@
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
 from docx.oxml.shape import CT_Inline
+from docx.parts.hdrftr import HeaderPart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
 from docx.parts.styles import StylesPart
@@ -26,7 +27,9 @@ class DocumentPart(XmlPart):
 
     def add_header_part(self):
         """Return (header_part, rId) pair for newly-created header part."""
-        raise NotImplementedError
+        header_part = HeaderPart.new(self.package)
+        rId = self.relate_to(header_part, RT.HEADER)
+        return header_part, rId
 
     @property
     def core_properties(self):
diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index 8d54b8eb8..5bd3ff336 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -9,3 +9,8 @@
 
 class HeaderPart(XmlPart):
     """Definition of a section header."""
+
+    @classmethod
+    def new(cls, package):
+        """Return newly created header part."""
+        raise NotImplementedError
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 2bf58a6dc..a2b317c99 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -11,6 +11,7 @@
 from docx.opc.coreprops import CoreProperties
 from docx.package import Package
 from docx.parts.document import DocumentPart
+from docx.parts.hdrftr import HeaderPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -30,6 +31,18 @@
 
 class DescribeDocumentPart(object):
 
+    def it_can_add_a_header_part(self, package_, HeaderPart_, header_part_, relate_to_):
+        HeaderPart_.new.return_value = header_part_
+        relate_to_.return_value = "rId7"
+        document_part = DocumentPart(None, None, None, package_)
+
+        header_part, rId = document_part.add_header_part()
+
+        HeaderPart_.new.assert_called_once_with(package_)
+        relate_to_.assert_called_once_with(document_part, header_part_, RT.HEADER)
+        assert header_part is header_part_
+        assert rId == "rId7"
+
     def it_can_drop_a_specified_header_part(self, drop_rel_):
         document_part = DocumentPart(None, None, None, None)
 
@@ -277,6 +290,14 @@ def drop_rel_(self, request):
     def get_or_add_image_(self, request):
         return method_mock(request, DocumentPart, 'get_or_add_image')
 
+    @pytest.fixture
+    def HeaderPart_(self, request):
+        return class_mock(request, 'docx.parts.document.HeaderPart')
+
+    @pytest.fixture
+    def header_part_(self, request):
+        return instance_mock(request, HeaderPart)
+
     @pytest.fixture
     def image_(self, request):
         return instance_mock(request, Image)

From 4ed8545b76b000c190dc8c4530f49fb3f04dfefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Zoric=CC=8Ca=CC=81k?= <1ondrej.zoricak@gmail.com>
Date: Mon, 31 Dec 2018 17:17:14 -0800
Subject: [PATCH 185/367] hdr: add HeaderPart.new()

---
 docx/opc/package.py          | 10 +++++++
 docx/parts/hdrftr.py         | 10 +++++++
 tests/parts/test_document.py |  6 ++---
 tests/parts/test_hdrftr.py   | 52 ++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 tests/parts/test_hdrftr.py

diff --git a/docx/opc/package.py b/docx/opc/package.py
index 177f5503c..c2db80709 100644
--- a/docx/opc/package.py
+++ b/docx/opc/package.py
@@ -108,6 +108,16 @@ def main_document_part(self):
         """
         return self.part_related_by(RT.OFFICE_DOCUMENT)
 
+    def next_partname(self, template):
+        """Return a |PackURI| instance representing partname matching *template*.
+
+        The returned part-name has the next available numeric suffix to distinguish it
+        from other parts of its type. *template* is a printf (%)-style template string
+        containing a single replacement item, a '%d' to be used to insert the integer
+        portion of the partname. Example: "/word/header%d.xml"
+        """
+        raise NotImplementedError
+
     @classmethod
     def open(cls, pkg_file):
         """
diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index 5bd3ff336..b211cbeb5 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -4,7 +4,9 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.part import XmlPart
+from docx.oxml import parse_xml
 
 
 class HeaderPart(XmlPart):
@@ -13,4 +15,12 @@ class HeaderPart(XmlPart):
     @classmethod
     def new(cls, package):
         """Return newly created header part."""
+        partname = package.next_partname("/word/header%d.xml")
+        content_type = CT.WML_HEADER
+        element = parse_xml(cls._default_header_xml())
+        return cls(partname, content_type, element, package)
+
+    @classmethod
+    def _default_header_xml(cls):
+        """Return bytes containing XML for a default header part."""
         raise NotImplementedError
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index a2b317c99..6d86a4e9b 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-"""Test suite for the docx.parts.document module"""
+"""Unit test suite for the docx.parts.document module"""
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
@@ -24,9 +24,7 @@
 from ..oxml.parts.unitdata.document import a_body, a_document
 from ..oxml.unitdata.text import a_p
 from ..unitutil.file import snippet_text
-from ..unitutil.mock import (
-    instance_mock, class_mock, method_mock, property_mock
-)
+from ..unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
 class DescribeDocumentPart(object):
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
new file mode 100644
index 000000000..5c9511bfe
--- /dev/null
+++ b/tests/parts/test_hdrftr.py
@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+"""Unit test suite for the docx.parts.hdrftr module"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import pytest
+
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.package import Package
+from docx.parts.hdrftr import HeaderPart
+
+from ..unitutil.cxml import element
+from ..unitutil.mock import function_mock, initializer_mock, instance_mock, method_mock
+
+
+class DescribeHeaderPart(object):
+
+    def it_can_create_a_new_header_part(
+        self, package_, _default_header_xml_, parse_xml_, _init_
+    ):
+        hdr = element("w:hdr")
+        package_.next_partname.return_value = "/word/header42.xml"
+        _default_header_xml_.return_value = "<w:hdr>"
+        parse_xml_.return_value = hdr
+
+        header_part = HeaderPart.new(package_)
+
+        package_.next_partname.assert_called_once_with("/word/header%d.xml")
+        _default_header_xml_.assert_called_once_with()
+        parse_xml_.assert_called_once_with("<w:hdr>")
+        _init_.assert_called_once_with(
+            header_part, "/word/header42.xml", CT.WML_HEADER, hdr, package_
+        )
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _default_header_xml_(self, request):
+        return method_mock(request, HeaderPart, "_default_header_xml", autospec=False)
+
+    @pytest.fixture
+    def _init_(self, request):
+        return initializer_mock(request, HeaderPart, autospec=True)
+
+    @pytest.fixture
+    def package_(self, request):
+        return instance_mock(request, Package)
+
+    @pytest.fixture
+    def parse_xml_(self, request):
+        return function_mock(request, "docx.parts.hdrftr.parse_xml")

From 05895d37f13e12cfd6b96064a3a358808813df61 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 14:17:51 -0800
Subject: [PATCH 186/367] pkg: add OpcPackage.next_partname()

---
 docx/opc/package.py       | 37 +++++++++++++++++-----------------
 tests/opc/test_package.py | 42 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/docx/opc/package.py b/docx/opc/package.py
index c2db80709..7ba87bab5 100644
--- a/docx/opc/package.py
+++ b/docx/opc/package.py
@@ -1,27 +1,24 @@
 # encoding: utf-8
 
-"""
-The :mod:`pptx.packaging` module coheres around the concerns of reading and
-writing presentations to and from a .pptx file.
-"""
+"""Objects that implement reading and writing OPC packages."""
 
-from __future__ import absolute_import, print_function, unicode_literals
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .constants import RELATIONSHIP_TYPE as RT
-from .packuri import PACKAGE_URI
-from .part import PartFactory
-from .parts.coreprops import CorePropertiesPart
-from .pkgreader import PackageReader
-from .pkgwriter import PackageWriter
-from .rel import Relationships
-from .shared import lazyproperty
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
+from docx.opc.packuri import PACKAGE_URI, PackURI
+from docx.opc.part import PartFactory
+from docx.opc.parts.coreprops import CorePropertiesPart
+from docx.opc.pkgreader import PackageReader
+from docx.opc.pkgwriter import PackageWriter
+from docx.opc.rel import Relationships
+from docx.opc.shared import lazyproperty
 
 
 class OpcPackage(object):
-    """
-    Main API class for |python-opc|. A new instance is constructed by calling
-    the :meth:`open` class method with a path to a package file or file-like
-    object containing one.
+    """Main API class for |python-opc|.
+
+    A new instance is constructed by calling the :meth:`open` class method with a path
+    to a package file or file-like object containing one.
     """
 
     def __init__(self):
@@ -116,7 +113,11 @@ def next_partname(self, template):
         containing a single replacement item, a '%d' to be used to insert the integer
         portion of the partname. Example: "/word/header%d.xml"
         """
-        raise NotImplementedError
+        partnames = {part.partname for part in self.iter_parts()}
+        for n in range(1, len(partnames) + 2):
+            candidate_partname = template % n
+            if candidate_partname not in partnames:
+                return PackURI(candidate_partname)
 
     @classmethod
     def open(cls, pkg_file):
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index ae5b269b5..8b2de5728 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -9,7 +9,7 @@
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
 from docx.opc.package import OpcPackage, Unmarshaller
-from docx.opc.packuri import PACKAGE_URI
+from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.part import Part
 from docx.opc.parts.coreprops import CorePropertiesPart
 from docx.opc.pkgreader import PackageReader
@@ -101,6 +101,20 @@ def it_can_iterate_over_parts_by_walking_rels_graph(self):
         assert part2 in pkg.iter_parts()
         assert len([p for p in pkg.iter_parts()]) == 2
 
+    def it_can_find_the_next_available_vector_partname(
+        self, next_partname_fixture, iter_parts_, PackURI_, packuri_
+    ):
+        """A vector partname is one with a numeric suffix, like header42.xml."""
+        parts_, expected_value = next_partname_fixture
+        iter_parts_.return_value = iter(parts_)
+        PackURI_.return_value = packuri_
+        package = OpcPackage()
+
+        partname = package.next_partname(template="/foo/bar/baz%d.xml")
+
+        PackURI_.assert_called_once_with(expected_value)
+        assert partname is packuri_
+
     def it_can_find_a_part_related_by_reltype(self, related_part_fixture_):
         pkg, reltype, related_part_ = related_part_fixture_
         related_part = pkg.part_related_by(reltype)
@@ -161,6 +175,20 @@ def core_props_part_fixture(
         part_related_by_.return_value = core_properties_part_
         return opc_package, core_properties_part_
 
+    @pytest.fixture(
+        params=[((), 1), ((1,), 2), ((1, 2), 3), ((2, 3), 1), ((1, 3), 2)]
+    )
+    def next_partname_fixture(self, request, iter_parts_):
+        existing_partname_ns, next_partname_n = request.param
+        parts_ = [
+            instance_mock(
+                request, Part, name="part[%d]" % idx, partname="/foo/bar/baz%d.xml" % n
+            )
+            for idx, n in enumerate(existing_partname_ns)
+        ]
+        expected_value = "/foo/bar/baz%d.xml" % next_partname_n
+        return parts_, expected_value
+
     @pytest.fixture
     def relate_to_part_fixture_(self, request, pkg, rels_, reltype):
         rId = 'rId99'
@@ -196,10 +224,22 @@ def core_properties_part_(self, request):
     def _core_properties_part_prop_(self, request):
         return property_mock(request, OpcPackage, '_core_properties_part')
 
+    @pytest.fixture
+    def iter_parts_(self, request):
+        return method_mock(request, OpcPackage, "iter_parts")
+
     @pytest.fixture
     def PackageReader_(self, request):
         return class_mock(request, 'docx.opc.package.PackageReader')
 
+    @pytest.fixture
+    def PackURI_(self, request):
+        return class_mock(request, "docx.opc.package.PackURI")
+
+    @pytest.fixture
+    def packuri_(self, request):
+        return instance_mock(request, PackURI)
+
     @pytest.fixture
     def PackageWriter_(self, request):
         return class_mock(request, 'docx.opc.package.PackageWriter')

From b0f81bc39d58a9725f008eebca48d79aa4d70e43 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 14:33:03 -0800
Subject: [PATCH 187/367] hdr: add HeaderPart._default_header_xml()

---
 docx/parts/hdrftr.py               |  9 ++++++++-
 docx/templates/default-header.xml  | 27 +++++++++++++++++++++++++++
 features/hdr-header-footer.feature |  1 -
 tests/parts/test_hdrftr.py         |  9 +++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 docx/templates/default-header.xml

diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index b211cbeb5..68b42b82a 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -4,6 +4,8 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+import os
+
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.part import XmlPart
 from docx.oxml import parse_xml
@@ -23,4 +25,9 @@ def new(cls, package):
     @classmethod
     def _default_header_xml(cls):
         """Return bytes containing XML for a default header part."""
-        raise NotImplementedError
+        path = os.path.join(
+            os.path.split(__file__)[0], '..', 'templates', 'default-header.xml'
+        )
+        with open(path, 'rb') as f:
+            xml_bytes = f.read()
+        return xml_bytes
diff --git a/docx/templates/default-header.xml b/docx/templates/default-header.xml
new file mode 100644
index 000000000..df6848c0c
--- /dev/null
+++ b/docx/templates/default-header.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:hdr
+    xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main"
+    xmlns:mv="urn:schemas-microsoft-com:mac:vml"
+    xmlns:o="urn:schemas-microsoft-com:office:office"
+    xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+    xmlns:v="urn:schemas-microsoft-com:vml"
+    xmlns:w10="urn:schemas-microsoft-com:office:word"
+    xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
+    xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+    xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
+    xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"
+    xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
+    xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
+    xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"
+    xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk"
+    xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
+    mc:Ignorable="w14 wp14"
+    >
+  <w:p>
+    <w:pPr>
+      <w:pStyle w:val="Header"/>
+    </w:pPr>
+  </w:p>
+</w:hdr>
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index e6aa045f8..1654db774 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -14,7 +14,6 @@ Feature: Header and footer behaviors
       | with no    | True  |
 
 
-  @wip
   Scenario Outline: _Header.is_linked_to_previous setter
     Given a _Header object <with-or-no> header definition as header
      When I assign <value> to header.is_linked_to_previous
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index 5c9511bfe..296fb9339 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -33,6 +33,15 @@ def it_can_create_a_new_header_part(
             header_part, "/word/header42.xml", CT.WML_HEADER, hdr, package_
         )
 
+    def it_loads_default_header_XML_from_a_template_to_help(self):
+        # ---tests integration with OS---
+        xml_bytes = HeaderPart._default_header_xml()
+
+        assert xml_bytes.startswith(
+            b"<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n<w:hdr\n"
+        )
+        assert len(xml_bytes) == 1395
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture

From e6d234c3b0bd478b26a4b4467ceec6a07ea835ba Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 14:51:48 -0800
Subject: [PATCH 188/367] hdr: add _Header._element

---
 docx/section.py       | 16 ++++++++++++++++
 tests/test_section.py | 21 +++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index 8ab99f272..6316a54cb 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -262,6 +262,22 @@ def _drop_header_part(self):
         rId = self._sectPr.remove_headerReference(WD_HEADER_FOOTER.PRIMARY)
         self._document_part.drop_header_part(rId)
 
+    @property
+    def _element(self):
+        """`w:hdr` element, root of header part."""
+        return self._get_or_add_header_part().element
+
+    def _get_or_add_header_part(self):
+        """Return |HeaderPart| object for this header.
+
+        If this header inherits its content, the header part for the prior header is
+        returned; this process continue recursively until a header is found. If this
+        header cannot inherit (it belongs to the first section), a new header part is
+        created for the first section and returned.
+        """
+        # ---note this method is called recursively to access inherited headers---
+        raise NotImplementedError
+
     @property
     def _has_header_part(self):
         """True if a header is explicitly defined for this section."""
diff --git a/tests/test_section.py b/tests/test_section.py
index 85f5aa205..087799734 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -409,6 +409,19 @@ def it_can_drop_the_related_header_part_to_help(self, document_part_):
         assert sectPr.xml == xml("w:sectPr{r:a=b}")
         document_part_.drop_header_part.assert_called_once_with("rId42")
 
+    def it_provides_access_to_the_hdr_element_to_help(
+        self, _get_or_add_header_part_, header_part_
+    ):
+        hdr = element("w:hdr")
+        _get_or_add_header_part_.return_value = header_part_
+        header_part_.element = hdr
+        header = _Header(None, None)
+
+        hdr_elm = header._element
+
+        _get_or_add_header_part_.assert_called_once_with(header)
+        assert hdr_elm is hdr
+
     def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
         sectPr, expected_value = has_header_part_fixture
         header = _Header(sectPr, None)
@@ -450,7 +463,7 @@ def is_linked_set_fixture(self, request):
 
     @pytest.fixture
     def _add_header_part_(self, request):
-        return method_mock(request, _Header, "_add_header_part", autospec=True)
+        return method_mock(request, _Header, "_add_header_part")
 
     @pytest.fixture
     def document_part_(self, request):
@@ -458,7 +471,11 @@ def document_part_(self, request):
 
     @pytest.fixture
     def _drop_header_part_(self, request):
-        return method_mock(request, _Header, "_drop_header_part", autospec=True)
+        return method_mock(request, _Header, "_drop_header_part")
+
+    @pytest.fixture
+    def _get_or_add_header_part_(self, request):
+        return method_mock(request, _Header, "_get_or_add_header_part")
 
     @pytest.fixture
     def _has_header_part_prop_(self, request):

From ce6afd410ecb27ad01114d08c365218667103c6f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 17:20:27 -0800
Subject: [PATCH 189/367] hdr: add _Header._get_or_add_header_part()

---
 docx/section.py       | 20 +++++++++++++++-
 tests/test_section.py | 53 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index 6316a54cb..32f6483c5 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -276,10 +276,28 @@ def _get_or_add_header_part(self):
         created for the first section and returned.
         """
         # ---note this method is called recursively to access inherited headers---
-        raise NotImplementedError
+        # ---case-1: header does not inherit---
+        if self._has_header_part:
+            return self._header_part
+        prior_header = self._prior_header
+        # ---case-2: header inherits and belongs to second-or-later section---
+        if prior_header is not None:
+            return prior_header._get_or_add_header_part()
+        # ---case-3: header inherits, but is first header---
+        return self._add_header_part()
 
     @property
     def _has_header_part(self):
         """True if a header is explicitly defined for this section."""
         headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
         return False if headerReference is None else True
+
+    @property
+    def _header_part(self):
+        """|HeaderPart| object containing content of this header."""
+        raise NotImplementedError
+
+    @property
+    def _prior_header(self):
+        """|_Header| proxy on prior sectPr element or None if this is first section."""
+        raise NotImplementedError
diff --git a/tests/test_section.py b/tests/test_section.py
index 087799734..5dd864a11 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -422,6 +422,47 @@ def it_provides_access_to_the_hdr_element_to_help(
         _get_or_add_header_part_.assert_called_once_with(header)
         assert hdr_elm is hdr
 
+    def it_gets_the_header_part_when_it_has_one(
+        self, _has_header_part_prop_, _header_part_prop_, header_part_
+    ):
+        _has_header_part_prop_.return_value = True
+        _header_part_prop_.return_value = header_part_
+        header = _Header(None, None)
+
+        header_part = header._get_or_add_header_part()
+
+        assert header_part is header_part_
+
+    def but_it_gets_the_prior_header_part_when_it_is_linked(
+        self, _has_header_part_prop_, _prior_header_prop_, prior_header_, header_part_
+    ):
+        _has_header_part_prop_.return_value = False
+        _prior_header_prop_.return_value = prior_header_
+        prior_header_._get_or_add_header_part.return_value = header_part_
+        header = _Header(None, None)
+
+        header_part = header._get_or_add_header_part()
+
+        prior_header_._get_or_add_header_part.assert_called_once_with()
+        assert header_part is header_part_
+
+    def and_it_adds_the_header_part_when_it_is_linked_and_the_first_section(
+        self,
+        _has_header_part_prop_,
+        _prior_header_prop_,
+        _add_header_part_,
+        header_part_
+    ):
+        _has_header_part_prop_.return_value = False
+        _prior_header_prop_.return_value = None
+        _add_header_part_.return_value = header_part_
+        header = _Header(None, None)
+
+        header_part = header._get_or_add_header_part()
+
+        _add_header_part_.assert_called_once_with(header)
+        assert header_part is header_part_
+
     def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
         sectPr, expected_value = has_header_part_fixture
         header = _Header(sectPr, None)
@@ -484,3 +525,15 @@ def _has_header_part_prop_(self, request):
     @pytest.fixture
     def header_part_(self, request):
         return instance_mock(request, HeaderPart)
+
+    @pytest.fixture
+    def _header_part_prop_(self, request):
+        return property_mock(request, _Header, "_header_part")
+
+    @pytest.fixture
+    def prior_header_(self, request):
+        return instance_mock(request, _Header)
+
+    @pytest.fixture
+    def _prior_header_prop_(self, request):
+        return property_mock(request, _Header, "_prior_header")

From 9e2b32d0d4aca429c930d7a80524c6b5b214a091 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 17:38:20 -0800
Subject: [PATCH 190/367] hdr: add _Header._prior_header

---
 docx/oxml/section.py  |  7 +++++++
 docx/section.py       |  6 +++++-
 tests/test_section.py | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 122c9ce6b..6f6bd5bed 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -250,6 +250,13 @@ def page_width(self, value):
         pgSz = self.get_or_add_pgSz()
         pgSz.w = value
 
+    @property
+    def preceding_sectPr(self):
+        """sectPr immediately preceding this one or None if this is the first."""
+        # ---[1] predicate returns list of zero or one value---
+        preceding_sectPrs = self.xpath("./preceding::w:sectPr[1]")
+        return preceding_sectPrs[0] if len(preceding_sectPrs) > 0 else None
+
     @property
     def start_type(self):
         """
diff --git a/docx/section.py b/docx/section.py
index 32f6483c5..a8088549a 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -300,4 +300,8 @@ def _header_part(self):
     @property
     def _prior_header(self):
         """|_Header| proxy on prior sectPr element or None if this is first section."""
-        raise NotImplementedError
+        preceding_sectPr = self._sectPr.preceding_sectPr
+        return (
+            None if preceding_sectPr is None
+            else _Header(preceding_sectPr, self._document_part)
+        )
diff --git a/tests/test_section.py b/tests/test_section.py
index 5dd864a11..04e005cdf 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -471,6 +471,29 @@ def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
 
         assert has_header_part is expected_value
 
+    def it_provides_access_to_the_prior_Header_to_help(
+        self, request, document_part_, header_
+    ):
+        doc_elm = element("w:document/(w:sectPr,w:sectPr)")
+        prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
+        header = _Header(sectPr, document_part_)
+        # ---mock must occur after construction of "real" header---
+        _Header_ = class_mock(request, "docx.section._Header", return_value=header_)
+
+        prior_header = header._prior_header
+
+        _Header_.assert_called_once_with(prior_sectPr, document_part_)
+        assert prior_header is header_
+
+    def but_it_returns_None_when_its_the_first_header(self):
+        doc_elm = element("w:document/w:sectPr")
+        sectPr = doc_elm[0]
+        header = _Header(sectPr, None)
+
+        prior_header = header._prior_header
+
+        assert prior_header is None
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(
@@ -522,6 +545,10 @@ def _get_or_add_header_part_(self, request):
     def _has_header_part_prop_(self, request):
         return property_mock(request, _Header, "_has_header_part")
 
+    @pytest.fixture
+    def header_(self, request):
+        return instance_mock(request, _Header)
+
     @pytest.fixture
     def header_part_(self, request):
         return instance_mock(request, HeaderPart)

From c55f4ed0c5007173f2fea336f84d1dbb4c968524 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 19:08:18 -0800
Subject: [PATCH 191/367] hdr: add _Header._header_part

---
 docx/parts/document.py |  4 ++++
 docx/section.py        |  3 ++-
 tests/test_section.py  | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 31e740543..d910dd3aa 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -82,6 +82,10 @@ def get_style_id(self, style_or_name, style_type):
         """
         return self.styles.get_style_id(style_or_name, style_type)
 
+    def header_part(self, rId):
+        """Return |HeaderPart| related by *rId*."""
+        raise NotImplementedError
+
     @lazyproperty
     def inline_shapes(self):
         """
diff --git a/docx/section.py b/docx/section.py
index a8088549a..e09bc3fd1 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -295,7 +295,8 @@ def _has_header_part(self):
     @property
     def _header_part(self):
         """|HeaderPart| object containing content of this header."""
-        raise NotImplementedError
+        headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        return self._document_part.header_part(headerReference.rId)
 
     @property
     def _prior_header(self):
diff --git a/tests/test_section.py b/tests/test_section.py
index 04e005cdf..d96306104 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -471,6 +471,18 @@ def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
 
         assert has_header_part is expected_value
 
+    def it_provides_access_to_its_header_part_to_help(
+        self, document_part_, header_part_
+    ):
+        sectPr = element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}")
+        document_part_.header_part.return_value = header_part_
+        header = _Header(sectPr, document_part_)
+
+        header_part = header._header_part
+
+        document_part_.header_part.assert_called_once_with("rId8")
+        assert header_part is header_part_
+
     def it_provides_access_to_the_prior_Header_to_help(
         self, request, document_part_, header_
     ):

From 5e60b9780323e3543e04df1335173af76cef6c67 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 19:52:36 -0800
Subject: [PATCH 192/367] hdr: add DocumentPart.header_part()

---
 docx/parts/document.py       |  2 +-
 tests/parts/test_document.py | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index d910dd3aa..93c21166b 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -84,7 +84,7 @@ def get_style_id(self, style_or_name, style_type):
 
     def header_part(self, rId):
         """Return |HeaderPart| related by *rId*."""
-        raise NotImplementedError
+        return self.related_parts[rId]
 
     @lazyproperty
     def inline_shapes(self):
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 6d86a4e9b..405db9889 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -48,6 +48,18 @@ def it_can_drop_a_specified_header_part(self, drop_rel_):
 
         drop_rel_.assert_called_once_with(document_part, "rId42")
 
+    def it_provides_access_to_a_header_part_by_rId(
+        self, related_parts_prop_, related_parts_, header_part_
+    ):
+        related_parts_prop_.return_value = related_parts_
+        related_parts_.__getitem__.return_value = header_part_
+        document_part = DocumentPart(None, None, None, None)
+
+        header_part = document_part.header_part("rId11")
+
+        related_parts_.__getitem__.assert_called_once_with("rId11")
+        assert header_part is header_part_
+
     def it_can_save_the_package_to_a_file(self, save_fixture):
         document, file_ = save_fixture
         document.save(file_)
@@ -336,6 +348,14 @@ def part_related_by_(self, request):
     def relate_to_(self, request):
         return method_mock(request, DocumentPart, 'relate_to')
 
+    @pytest.fixture
+    def related_parts_(self, request):
+        return instance_mock(request, dict)
+
+    @pytest.fixture
+    def related_parts_prop_(self, request):
+        return property_mock(request, DocumentPart, 'related_parts')
+
     @pytest.fixture
     def SettingsPart_(self, request):
         return class_mock(request, 'docx.parts.document.SettingsPart')

From f31cb07b41f7fbe74f14251194b757dfc7cc3303 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 1 Jan 2019 20:16:07 -0800
Subject: [PATCH 193/367] hdr: add PartFactory loads HeaderPart

---
 docx/__init__.py                   |  3 +++
 docx/oxml/__init__.py              | 20 ++++++++++++++------
 docx/oxml/section.py               |  7 +++++++
 features/hdr-header-footer.feature |  1 -
 tests/parts/test_hdrftr.py         | 25 ++++++++++++++++++++++++-
 5 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/docx/__init__.py b/docx/__init__.py
index 0b88607a9..d30d22fe9 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -12,6 +12,7 @@
 from docx.opc.parts.coreprops import CorePropertiesPart
 
 from docx.parts.document import DocumentPart
+from docx.parts.hdrftr import HeaderPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -27,6 +28,7 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_class_selector = part_class_selector
 PartFactory.part_type_for[CT.OPC_CORE_PROPERTIES] = CorePropertiesPart
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
+PartFactory.part_type_for[CT.WML_HEADER] = HeaderPart
 PartFactory.part_type_for[CT.WML_NUMBERING] = NumberingPart
 PartFactory.part_type_for[CT.WML_SETTINGS] = SettingsPart
 PartFactory.part_type_for[CT.WML_STYLES] = StylesPart
@@ -35,6 +37,7 @@ def part_class_selector(content_type, reltype):
     CT,
     CorePropertiesPart,
     DocumentPart,
+    HeaderPart,
     NumberingPart,
     PartFactory,
     SettingsPart,
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index d28d5dd25..67cf53677 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -84,12 +84,20 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:numbering',     CT_Numbering)
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
-from .section import CT_HdrFtrRef, CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType  # noqa
-register_element_cls('w:headerReference', CT_HdrFtrRef)
-register_element_cls('w:pgMar', CT_PageMar)
-register_element_cls('w:pgSz', CT_PageSz)
-register_element_cls('w:sectPr', CT_SectPr)
-register_element_cls('w:type', CT_SectType)
+from .section import (  # noqa
+    CT_HdrFtr,
+    CT_HdrFtrRef,
+    CT_PageMar,
+    CT_PageSz,
+    CT_SectPr,
+    CT_SectType,
+)
+register_element_cls("w:hdr", CT_HdrFtr)
+register_element_cls("w:headerReference", CT_HdrFtrRef)
+register_element_cls("w:pgMar", CT_PageMar)
+register_element_cls("w:pgSz", CT_PageSz)
+register_element_cls("w:sectPr", CT_SectPr)
+register_element_cls("w:type", CT_SectType)
 
 from .shape import (  # noqa
     CT_Blip,
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 6f6bd5bed..006e886b1 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -17,6 +17,13 @@
 )
 
 
+class CT_HdrFtr(BaseOxmlElement):
+    """`w:hdr` and `w:ftr`, the root element for header and footer part respectively"""
+
+    p = ZeroOrMore('w:p', successors=())
+    tbl = ZeroOrMore('w:tbl', successors=())
+
+
 class CT_HdrFtrRef(BaseOxmlElement):
     """`w:headerReference` and `w:footerReference` elements"""
 
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index 1654db774..9ef0e4970 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -27,7 +27,6 @@ Feature: Header and footer behaviors
       | with no    | True  |
 
 
-  @wip
   Scenario: _Header inherits content
     Given a _Header object with a header definition as header
       And the next _Header object with no header definition as header_2
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index 296fb9339..c923a351a 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -6,7 +6,8 @@
 
 import pytest
 
-from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.part import PartFactory
 from docx.package import Package
 from docx.parts.hdrftr import HeaderPart
 
@@ -16,6 +17,20 @@
 
 class DescribeHeaderPart(object):
 
+    def it_is_used_by_loader_to_construct_header_part(
+        self, package_, HeaderPart_load_, header_part_
+    ):
+        partname = "header1.xml"
+        content_type = CT.WML_HEADER
+        reltype = RT.HEADER
+        blob = "<w:hdr/>"
+        HeaderPart_load_.return_value = header_part_
+
+        part = PartFactory(partname, content_type, reltype, blob, package_)
+
+        HeaderPart_load_.assert_called_once_with(partname, content_type, blob, package_)
+        assert part is header_part_
+
     def it_can_create_a_new_header_part(
         self, package_, _default_header_xml_, parse_xml_, _init_
     ):
@@ -48,6 +63,14 @@ def it_loads_default_header_XML_from_a_template_to_help(self):
     def _default_header_xml_(self, request):
         return method_mock(request, HeaderPart, "_default_header_xml", autospec=False)
 
+    @pytest.fixture
+    def HeaderPart_load_(self, request):
+        return method_mock(request, HeaderPart, "load", autospec=False)
+
+    @pytest.fixture
+    def header_part_(self, request):
+        return instance_mock(request, HeaderPart)
+
     @pytest.fixture
     def _init_(self, request):
         return initializer_mock(request, HeaderPart, autospec=True)

From f75b6c1756393f321b4444885c210dc78bfdfecb Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 11:33:41 -0800
Subject: [PATCH 194/367] hdr: extract _BaseHeaderFooter

Extract _BaseHeaderFooter as a common base class for _Header and _Footer
to which common behaviors can be abstracted.
---
 docx/section.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index e09bc3fd1..ad9a3abc3 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -211,20 +211,20 @@ def top_margin(self, value):
         self._sectPr.top_margin = value
 
 
-class _Footer(BlockItemContainer):
-    """Page footer."""
+class _BaseHeaderFooter(BlockItemContainer):
+    """Base class for header and footer classes"""
 
     def __init__(self, sectPr, document_part):
         self._sectPr = sectPr
         self._document_part = document_part
 
 
-class _Header(BlockItemContainer):
-    """Page header."""
+class _Footer(_BaseHeaderFooter):
+    """Page footer."""
 
-    def __init__(self, sectPr, document_part):
-        self._sectPr = sectPr
-        self._document_part = document_part
+
+class _Header(_BaseHeaderFooter):
+    """Page header."""
 
     @property
     def is_linked_to_previous(self):

From 14bbaf2a7fc737b5ad333fe803e9092c70116c67 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 11:55:57 -0800
Subject: [PATCH 195/367] hdr: add _BaseHeaderFooter.is_linked_to_p.. getter

---
 docx/section.py       | 19 +++++++++++++++++++
 tests/test_section.py | 29 ++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index ad9a3abc3..001dc8f63 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -218,6 +218,25 @@ def __init__(self, sectPr, document_part):
         self._sectPr = sectPr
         self._document_part = document_part
 
+    @property
+    def is_linked_to_previous(self):
+        """True if this header/footer uses the definition from the preceding section.
+
+        False if this header/footer has an explicit definition.
+
+        Assigning ``True`` to this property removes the header/footer definition for
+        this section, causing it to "inherit" the corresponding definition of the prior
+        section. Assigning ``False`` causes a new, empty definition to be added for this
+        section, but only if no definition is already present.
+        """
+        # ---absence of a header/footer part indicates "linked" behavior---
+        return not self._has_definition
+
+    @property
+    def _has_definition(self):
+        """True if this header/footer has a related part containing its definition."""
+        raise NotImplementedError("must be implemented by each subclass")
+
 
 class _Footer(_BaseHeaderFooter):
     """Page footer."""
diff --git a/tests/test_section.py b/tests/test_section.py
index d96306104..6c79d9d05 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -9,7 +9,7 @@
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import HeaderPart
-from docx.section import _Footer, _Header, Section, Sections
+from docx.section import _BaseHeaderFooter, _Footer, _Header, Section, Sections
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
@@ -358,6 +358,33 @@ def header_(self, request):
         return instance_mock(request, _Header)
 
 
+class Describe_BaseHeaderFooter(object):
+
+    def it_knows_when_its_linked_to_the_previous_header(
+        self, is_linked_get_fixture, _has_definition_prop_
+    ):
+        has_definition, expected_value = is_linked_get_fixture
+        _has_definition_prop_.return_value = has_definition
+        header = _BaseHeaderFooter(None, None)
+
+        is_linked = header.is_linked_to_previous
+
+        assert is_linked is expected_value
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[(False, True), (True, False)])
+    def is_linked_get_fixture(self, request):
+        has_definition, expected_value = request.param
+        return has_definition, expected_value
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _has_definition_prop_(self, request):
+        return property_mock(request, _BaseHeaderFooter, "_has_definition")
+
+
 class Describe_Header(object):
 
     def it_knows_when_its_linked_to_the_previous_header(

From eb48298834a635c6ab632919bc7003e8e2bc4a93 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 12:21:26 -0800
Subject: [PATCH 196/367] hdr: add _Footer._has_definition

---
 docx/oxml/section.py               |  8 ++++++++
 docx/section.py                    |  6 ++++++
 features/hdr-header-footer.feature |  1 -
 tests/test_section.py              | 23 +++++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 006e886b1..185286d77 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -124,6 +124,14 @@ def footer(self, value):
         pgMar = self.get_or_add_pgMar()
         pgMar.footer = value
 
+    def get_footerReference(self, type_):
+        """Return footerReference element of *type_* or None if not present."""
+        path = "./w:footerReference[@w:type='%s']" % WD_HEADER_FOOTER.to_xml(type_)
+        footerReferences = self.xpath(path)
+        if not footerReferences:
+            return None
+        return footerReferences[0]
+
     def get_headerReference(self, type_):
         """Return headerReference element of *type_* or None if not present."""
         matching_headerReferences = self.xpath(
diff --git a/docx/section.py b/docx/section.py
index 001dc8f63..0c64e20a7 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -241,6 +241,12 @@ def _has_definition(self):
 class _Footer(_BaseHeaderFooter):
     """Page footer."""
 
+    @property
+    def _has_definition(self):
+        """True if a footer is defined for this section."""
+        footerReference = self._sectPr.get_footerReference(WD_HEADER_FOOTER.PRIMARY)
+        return False if footerReference is None else True
+
 
 class _Header(_BaseHeaderFooter):
     """Page header."""
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index 9ef0e4970..b6eb2d064 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -34,7 +34,6 @@ Feature: Header and footer behaviors
       And header_2.is_linked_to_previous is True
 
 
-  @wip
   Scenario Outline: _Footer.is_linked_to_previous getter
     Given a _Footer object <with-or-no> footer definition as footer
      Then footer.is_linked_to_previous is <value>
diff --git a/tests/test_section.py b/tests/test_section.py
index 6c79d9d05..529398abc 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -385,6 +385,29 @@ def _has_definition_prop_(self, request):
         return property_mock(request, _BaseHeaderFooter, "_has_definition")
 
 
+class Describe_Footer(object):
+
+    def it_knows_when_it_has_a_definition_to_help(self, has_definition_fixture):
+        sectPr, expected_value = has_definition_fixture
+        footer = _Footer(sectPr, None)
+
+        has_definition = footer._has_definition
+
+        assert has_definition is expected_value
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", False), ("w:sectPr/w:footerReference{w:type=default}", True)
+        ]
+    )
+    def has_definition_fixture(self, request):
+        sectPr_cxml, expected_value = request.param
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_value
+
+
 class Describe_Header(object):
 
     def it_knows_when_its_linked_to_the_previous_header(

From c16e55e792ed1d8c65f411c8755fcffcbf9bd846 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 12:38:51 -0800
Subject: [PATCH 197/367] hdr: add _BaseHeaderFooter.is_linked_to_p.. setter

---
 docx/section.py       | 19 +++++++++++++++++++
 tests/test_section.py | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index 0c64e20a7..83a5162f9 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -232,6 +232,25 @@ def is_linked_to_previous(self):
         # ---absence of a header/footer part indicates "linked" behavior---
         return not self._has_definition
 
+    @is_linked_to_previous.setter
+    def is_linked_to_previous(self, value):
+        new_state = bool(value)
+        # ---do nothing when value is not being changed---
+        if new_state == self.is_linked_to_previous:
+            return
+        if new_state is True:
+            self._drop_definition()
+        else:
+            self._add_definition()
+
+    def _add_definition(self):
+        """Return newly-added header/footer part."""
+        raise NotImplementedError("must be implemented by each subclass")
+
+    def _drop_definition(self):
+        """Remove header/footer part containing the definition of this header/footer."""
+        raise NotImplementedError("must be implemented by each subclass")
+
     @property
     def _has_definition(self):
         """True if this header/footer has a related part containing its definition."""
diff --git a/tests/test_section.py b/tests/test_section.py
index 529398abc..0e020d59a 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -360,7 +360,7 @@ def header_(self, request):
 
 class Describe_BaseHeaderFooter(object):
 
-    def it_knows_when_its_linked_to_the_previous_header(
+    def it_knows_when_its_linked_to_the_previous_header_or_footer(
         self, is_linked_get_fixture, _has_definition_prop_
     ):
         has_definition, expected_value = is_linked_get_fixture
@@ -371,6 +371,22 @@ def it_knows_when_its_linked_to_the_previous_header(
 
         assert is_linked is expected_value
 
+    def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
+        self,
+        is_linked_set_fixture,
+        _has_definition_prop_,
+        _drop_definition_,
+        _add_definition_,
+    ):
+        has_definition, new_value, drop_calls, add_calls = is_linked_set_fixture
+        _has_definition_prop_.return_value = has_definition
+        header = _BaseHeaderFooter(None, None)
+
+        header.is_linked_to_previous = new_value
+
+        assert _drop_definition_.call_args_list == [call(header)] * drop_calls
+        assert _add_definition_.call_args_list == [call(header)] * add_calls
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[(False, True), (True, False)])
@@ -378,8 +394,28 @@ def is_linked_get_fixture(self, request):
         has_definition, expected_value = request.param
         return has_definition, expected_value
 
+    @pytest.fixture(
+        params=[
+            (False, True, 0, 0),
+            (True, False, 0, 0),
+            (True, True, 1, 0),
+            (False, False, 0, 1),
+        ]
+    )
+    def is_linked_set_fixture(self, request):
+        has_definition, new_value, drop_calls, add_calls = request.param
+        return has_definition, new_value, drop_calls, add_calls
+
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def _add_definition_(self, request):
+        return method_mock(request, _BaseHeaderFooter, "_add_definition")
+
+    @pytest.fixture
+    def _drop_definition_(self, request):
+        return method_mock(request, _BaseHeaderFooter, "_drop_definition")
+
     @pytest.fixture
     def _has_definition_prop_(self, request):
         return property_mock(request, _BaseHeaderFooter, "_has_definition")

From 3f62ffc667ec7e0bdbba3f29f3b62d8f84eca629 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 12:59:08 -0800
Subject: [PATCH 198/367] hdr: extract _Header.is_linked_to_previous

_Header can now rely on _BaseHeaderFooter for this behavior.
---
 docx/section.py       | 35 +++--------------
 tests/test_section.py | 88 ++++++++++---------------------------------
 2 files changed, 25 insertions(+), 98 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index 83a5162f9..988d38dda 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -270,38 +270,13 @@ def _has_definition(self):
 class _Header(_BaseHeaderFooter):
     """Page header."""
 
-    @property
-    def is_linked_to_previous(self):
-        """True if this header uses the header definition of the preceding section.
-
-        False if this header has an explicit definition.
-
-        Assigning ``True`` to this property removes any header definition for this
-        section, causing it to "inherit" the header definition of the prior section.
-        Assigning ``False`` causes a new, empty header definition to be added for this
-        section, but only if no existing definition is present.
-        """
-        # ---absence of a header (definition) part indicates "linked" behavior---
-        return not self._has_header_part
-
-    @is_linked_to_previous.setter
-    def is_linked_to_previous(self, value):
-        new_state = bool(value)
-        # ---do nothing when value is not being changed---
-        if new_state == self.is_linked_to_previous:
-            return
-        if new_state is True:
-            self._drop_header_part()
-        else:
-            self._add_header_part()
-
-    def _add_header_part(self):
+    def _add_definition(self):
         """Return newly-added header part."""
         header_part, rId = self._document_part.add_header_part()
         self._sectPr.add_headerReference(WD_HEADER_FOOTER.PRIMARY, rId)
         return header_part
 
-    def _drop_header_part(self):
+    def _drop_definition(self):
         """Remove header definition associated with this section."""
         rId = self._sectPr.remove_headerReference(WD_HEADER_FOOTER.PRIMARY)
         self._document_part.drop_header_part(rId)
@@ -321,17 +296,17 @@ def _get_or_add_header_part(self):
         """
         # ---note this method is called recursively to access inherited headers---
         # ---case-1: header does not inherit---
-        if self._has_header_part:
+        if self._has_definition:
             return self._header_part
         prior_header = self._prior_header
         # ---case-2: header inherits and belongs to second-or-later section---
         if prior_header is not None:
             return prior_header._get_or_add_header_part()
         # ---case-3: header inherits, but is first header---
-        return self._add_header_part()
+        return self._add_definition()
 
     @property
-    def _has_header_part(self):
+    def _has_definition(self):
         """True if a header is explicitly defined for this section."""
         headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
         return False if headerReference is None else True
diff --git a/tests/test_section.py b/tests/test_section.py
index 0e020d59a..57b36c285 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -446,39 +446,12 @@ def has_definition_fixture(self, request):
 
 class Describe_Header(object):
 
-    def it_knows_when_its_linked_to_the_previous_header(
-        self, is_linked_get_fixture, _has_header_part_prop_
-    ):
-        has_header_part, expected_value = is_linked_get_fixture
-        _has_header_part_prop_.return_value = has_header_part
-        header = _Header(None, None)
-
-        is_linked = header.is_linked_to_previous
-
-        assert is_linked is expected_value
-
-    def it_can_change_whether_it_is_linked_to_previous_header(
-        self,
-        is_linked_set_fixture,
-        _has_header_part_prop_,
-        _drop_header_part_,
-        _add_header_part_,
-    ):
-        has_header_part, new_value, drop_calls, add_calls = is_linked_set_fixture
-        _has_header_part_prop_.return_value = has_header_part
-        header = _Header(None, None)
-
-        header.is_linked_to_previous = new_value
-
-        assert _drop_header_part_.call_args_list == [call(header)] * drop_calls
-        assert _add_header_part_.call_args_list == [call(header)] * add_calls
-
     def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_header_part.return_value = header_part_, "rId3"
         header = _Header(sectPr, document_part_)
 
-        header_part = header._add_header_part()
+        header_part = header._add_definition()
 
         document_part_.add_header_part.assert_called_once_with()
         assert sectPr.xml == xml(
@@ -490,7 +463,7 @@ def it_can_drop_the_related_header_part_to_help(self, document_part_):
         sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId42}")
         header = _Header(sectPr, document_part_)
 
-        header._drop_header_part()
+        header._drop_definition()
 
         assert sectPr.xml == xml("w:sectPr{r:a=b}")
         document_part_.drop_header_part.assert_called_once_with("rId42")
@@ -509,9 +482,9 @@ def it_provides_access_to_the_hdr_element_to_help(
         assert hdr_elm is hdr
 
     def it_gets_the_header_part_when_it_has_one(
-        self, _has_header_part_prop_, _header_part_prop_, header_part_
+        self, _has_definition_prop_, _header_part_prop_, header_part_
     ):
-        _has_header_part_prop_.return_value = True
+        _has_definition_prop_.return_value = True
         _header_part_prop_.return_value = header_part_
         header = _Header(None, None)
 
@@ -520,9 +493,9 @@ def it_gets_the_header_part_when_it_has_one(
         assert header_part is header_part_
 
     def but_it_gets_the_prior_header_part_when_it_is_linked(
-        self, _has_header_part_prop_, _prior_header_prop_, prior_header_, header_part_
+        self, _has_definition_prop_, _prior_header_prop_, prior_header_, header_part_
     ):
-        _has_header_part_prop_.return_value = False
+        _has_definition_prop_.return_value = False
         _prior_header_prop_.return_value = prior_header_
         prior_header_._get_or_add_header_part.return_value = header_part_
         header = _Header(None, None)
@@ -534,28 +507,28 @@ def but_it_gets_the_prior_header_part_when_it_is_linked(
 
     def and_it_adds_the_header_part_when_it_is_linked_and_the_first_section(
         self,
-        _has_header_part_prop_,
+        _has_definition_prop_,
         _prior_header_prop_,
-        _add_header_part_,
+        _add_definition_,
         header_part_
     ):
-        _has_header_part_prop_.return_value = False
+        _has_definition_prop_.return_value = False
         _prior_header_prop_.return_value = None
-        _add_header_part_.return_value = header_part_
+        _add_definition_.return_value = header_part_
         header = _Header(None, None)
 
         header_part = header._get_or_add_header_part()
 
-        _add_header_part_.assert_called_once_with(header)
+        _add_definition_.assert_called_once_with(header)
         assert header_part is header_part_
 
-    def it_knows_when_it_has_a_header_part_to_help(self, has_header_part_fixture):
-        sectPr, expected_value = has_header_part_fixture
+    def it_knows_when_it_has_a_header_part_to_help(self, has_definition_fixture):
+        sectPr, expected_value = has_definition_fixture
         header = _Header(sectPr, None)
 
-        has_header_part = header._has_header_part
+        has_definition = header._has_definition
 
-        assert has_header_part is expected_value
+        assert has_definition is expected_value
 
     def it_provides_access_to_its_header_part_to_help(
         self, document_part_, header_part_
@@ -599,49 +572,28 @@ def but_it_returns_None_when_its_the_first_header(self):
             ("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=default}", True)
         ]
     )
-    def has_header_part_fixture(self, request):
+    def has_definition_fixture(self, request):
         sectPr_cxml, expected_value = request.param
         sectPr = element(sectPr_cxml)
         return sectPr, expected_value
 
-    @pytest.fixture(params=[(False, True), (True, False)])
-    def is_linked_get_fixture(self, request):
-        has_header_part, expected_value = request.param
-        return has_header_part, expected_value
-
-    @pytest.fixture(
-        params=[
-            (False, True, 0, 0),
-            (True, False, 0, 0),
-            (True, True, 1, 0),
-            (False, False, 0, 1),
-        ]
-    )
-    def is_linked_set_fixture(self, request):
-        has_header_part, new_value, drop_calls, add_calls = request.param
-        return has_header_part, new_value, drop_calls, add_calls
-
     # fixture components ---------------------------------------------
 
     @pytest.fixture
-    def _add_header_part_(self, request):
-        return method_mock(request, _Header, "_add_header_part")
+    def _add_definition_(self, request):
+        return method_mock(request, _Header, "_add_definition")
 
     @pytest.fixture
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)
 
-    @pytest.fixture
-    def _drop_header_part_(self, request):
-        return method_mock(request, _Header, "_drop_header_part")
-
     @pytest.fixture
     def _get_or_add_header_part_(self, request):
         return method_mock(request, _Header, "_get_or_add_header_part")
 
     @pytest.fixture
-    def _has_header_part_prop_(self, request):
-        return property_mock(request, _Header, "_has_header_part")
+    def _has_definition_prop_(self, request):
+        return property_mock(request, _Header, "_has_definition")
 
     @pytest.fixture
     def header_(self, request):

From e6c64a0e55fd4ce30434f8b6dac1c2840ebd16e1 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 13:19:52 -0800
Subject: [PATCH 199/367] hdr: add _Footer._drop_definition()

---
 docx/oxml/__init__.py |  1 +
 docx/oxml/section.py  | 55 ++++++++++++++++++++++++-------------------
 docx/section.py       |  5 ++++
 tests/test_section.py | 15 ++++++++++++
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 67cf53677..e2837f06a 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -92,6 +92,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_SectPr,
     CT_SectType,
 )
+register_element_cls("w:footerReference", CT_HdrFtrRef)
 register_element_cls("w:hdr", CT_HdrFtr)
 register_element_cls("w:headerReference", CT_HdrFtrRef)
 register_element_cls("w:pgMar", CT_PageMar)
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 185286d77..34bc2c032 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -192,30 +192,6 @@ def left_margin(self, value):
         pgMar = self.get_or_add_pgMar()
         pgMar.left = value
 
-    def remove_headerReference(self, type_):
-        """Return rId of w:headerReference child of *type_* after removing it."""
-        headerReference = self.get_headerReference(type_)
-        rId = headerReference.rId
-        self.remove(headerReference)
-        return rId
-
-    @property
-    def right_margin(self):
-        """
-        The value of the ``w:right`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
-        pgMar = self.pgMar
-        if pgMar is None:
-            return None
-        return pgMar.right
-
-    @right_margin.setter
-    def right_margin(self, value):
-        pgMar = self.get_or_add_pgMar()
-        pgMar.right = value
-
     @property
     def orientation(self):
         """
@@ -272,6 +248,37 @@ def preceding_sectPr(self):
         preceding_sectPrs = self.xpath("./preceding::w:sectPr[1]")
         return preceding_sectPrs[0] if len(preceding_sectPrs) > 0 else None
 
+    def remove_footerReference(self, type_):
+        """Return rId of w:footerReference child of *type_* after removing it."""
+        footerReference = self.get_footerReference(type_)
+        rId = footerReference.rId
+        self.remove(footerReference)
+        return rId
+
+    def remove_headerReference(self, type_):
+        """Return rId of w:headerReference child of *type_* after removing it."""
+        headerReference = self.get_headerReference(type_)
+        rId = headerReference.rId
+        self.remove(headerReference)
+        return rId
+
+    @property
+    def right_margin(self):
+        """
+        The value of the ``w:right`` attribute in the ``<w:pgMar>`` child
+        element, as a |Length| object, or |None| if either the element or the
+        attribute is not present.
+        """
+        pgMar = self.pgMar
+        if pgMar is None:
+            return None
+        return pgMar.right
+
+    @right_margin.setter
+    def right_margin(self, value):
+        pgMar = self.get_or_add_pgMar()
+        pgMar.right = value
+
     @property
     def start_type(self):
         """
diff --git a/docx/section.py b/docx/section.py
index 988d38dda..1a731ea77 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -260,6 +260,11 @@ def _has_definition(self):
 class _Footer(_BaseHeaderFooter):
     """Page footer."""
 
+    def _drop_definition(self):
+        """Remove footer definition (footer part) associated with this section."""
+        rId = self._sectPr.remove_footerReference(WD_HEADER_FOOTER.PRIMARY)
+        self._document_part.drop_rel(rId)
+
     @property
     def _has_definition(self):
         """True if a footer is defined for this section."""
diff --git a/tests/test_section.py b/tests/test_section.py
index 57b36c285..595f6e47f 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -423,6 +423,15 @@ def _has_definition_prop_(self, request):
 
 class Describe_Footer(object):
 
+    def it_can_drop_the_related_footer_part_to_help(self, document_part_):
+        sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId42}")
+        footer = _Footer(sectPr, document_part_)
+
+        footer._drop_definition()
+
+        assert sectPr.xml == xml("w:sectPr{r:a=b}")
+        document_part_.drop_rel.assert_called_once_with("rId42")
+
     def it_knows_when_it_has_a_definition_to_help(self, has_definition_fixture):
         sectPr, expected_value = has_definition_fixture
         footer = _Footer(sectPr, None)
@@ -443,6 +452,12 @@ def has_definition_fixture(self, request):
         sectPr = element(sectPr_cxml)
         return sectPr, expected_value
 
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
 
 class Describe_Header(object):
 

From 100654a89a6bbb5250fa30528046d93f1bb7730a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 13:30:21 -0800
Subject: [PATCH 200/367] hdr: add _Footer._add_definition()

---
 docx/oxml/section.py   | 11 +++++++++++
 docx/parts/document.py |  4 ++++
 docx/parts/hdrftr.py   |  4 ++++
 docx/section.py        |  6 ++++++
 tests/test_section.py  | 19 ++++++++++++++++++-
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 34bc2c032..1c2bc1a57 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -65,11 +65,22 @@ class CT_SectPr(BaseOxmlElement):
         'w:docGrid', 'w:printerSettings', 'w:sectPrChange',
     )
     headerReference = ZeroOrMore("w:headerReference", successors=_tag_seq)
+    footerReference = ZeroOrMore("w:footerReference", successors=_tag_seq)
     type = ZeroOrOne("w:type", successors=_tag_seq[3:])
     pgSz = ZeroOrOne("w:pgSz", successors=_tag_seq[4:])
     pgMar = ZeroOrOne("w:pgMar", successors=_tag_seq[5:])
     del _tag_seq
 
+    def add_footerReference(self, type_, rId):
+        """Return newly added CT_HdrFtrRef element of *type_* with *rId*.
+
+        The element tag is `w:footerReference`.
+        """
+        footerReference = self._add_footerReference()
+        footerReference.type_ = type_
+        footerReference.rId = rId
+        return footerReference
+
     def add_headerReference(self, type_, rId):
         """Return newly added CT_HdrFtrRef element of *type_* with *rId*.
 
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 93c21166b..add761491 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -25,6 +25,10 @@ class DocumentPart(XmlPart):
     objects provides access to this part object for that purpose.
     """
 
+    def add_footer_part(self):
+        """Return (footer_part, rId) pair for newly-created footer part."""
+        raise NotImplementedError
+
     def add_header_part(self):
         """Return (header_part, rId) pair for newly-created header part."""
         header_part = HeaderPart.new(self.package)
diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index 68b42b82a..b6400fa82 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -11,6 +11,10 @@
 from docx.oxml import parse_xml
 
 
+class FooterPart(XmlPart):
+    """Definition of a section footer."""
+
+
 class HeaderPart(XmlPart):
     """Definition of a section header."""
 
diff --git a/docx/section.py b/docx/section.py
index 1a731ea77..cd6be5150 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -260,6 +260,12 @@ def _has_definition(self):
 class _Footer(_BaseHeaderFooter):
     """Page footer."""
 
+    def _add_definition(self):
+        """Return newly-added footer part."""
+        footer_part, rId = self._document_part.add_footer_part()
+        self._sectPr.add_footerReference(WD_HEADER_FOOTER.PRIMARY, rId)
+        return footer_part
+
     def _drop_definition(self):
         """Remove footer definition (footer part) associated with this section."""
         rId = self._sectPr.remove_footerReference(WD_HEADER_FOOTER.PRIMARY)
diff --git a/tests/test_section.py b/tests/test_section.py
index 595f6e47f..7adff0f8b 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -8,7 +8,7 @@
 
 from docx.enum.section import WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
-from docx.parts.hdrftr import HeaderPart
+from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.section import _BaseHeaderFooter, _Footer, _Header, Section, Sections
 from docx.shared import Inches
 
@@ -423,6 +423,19 @@ def _has_definition_prop_(self, request):
 
 class Describe_Footer(object):
 
+    def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
+        sectPr = element("w:sectPr{r:a=b}")
+        document_part_.add_footer_part.return_value = footer_part_, "rId3"
+        footer = _Footer(sectPr, document_part_)
+
+        footer_part = footer._add_definition()
+
+        document_part_.add_footer_part.assert_called_once_with()
+        assert sectPr.xml == xml(
+            "w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId3}"
+        )
+        assert footer_part is footer_part_
+
     def it_can_drop_the_related_footer_part_to_help(self, document_part_):
         sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId42}")
         footer = _Footer(sectPr, document_part_)
@@ -458,6 +471,10 @@ def has_definition_fixture(self, request):
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)
 
+    @pytest.fixture
+    def footer_part_(self, request):
+        return instance_mock(request, FooterPart)
+
 
 class Describe_Header(object):
 

From 7f4e820cbd06a3246aad9e2aa37e97eef290d604 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 13:39:58 -0800
Subject: [PATCH 201/367] hdr: add DocumentPart.add_footer_part()

---
 docx/parts/document.py       |  6 ++++--
 docx/parts/hdrftr.py         |  5 +++++
 tests/parts/test_document.py | 22 +++++++++++++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index add761491..964e4a88a 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -8,7 +8,7 @@
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
 from docx.oxml.shape import CT_Inline
-from docx.parts.hdrftr import HeaderPart
+from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
 from docx.parts.styles import StylesPart
@@ -27,7 +27,9 @@ class DocumentPart(XmlPart):
 
     def add_footer_part(self):
         """Return (footer_part, rId) pair for newly-created footer part."""
-        raise NotImplementedError
+        footer_part = FooterPart.new(self.package)
+        rId = self.relate_to(footer_part, RT.FOOTER)
+        return footer_part, rId
 
     def add_header_part(self):
         """Return (header_part, rId) pair for newly-created header part."""
diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index b6400fa82..d452d67ff 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -14,6 +14,11 @@
 class FooterPart(XmlPart):
     """Definition of a section footer."""
 
+    @classmethod
+    def new(cls, package):
+        """Return newly created footer part."""
+        raise NotImplementedError
+
 
 class HeaderPart(XmlPart):
     """Definition of a section header."""
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 405db9889..adeb1059d 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -11,7 +11,7 @@
 from docx.opc.coreprops import CoreProperties
 from docx.package import Package
 from docx.parts.document import DocumentPart
-from docx.parts.hdrftr import HeaderPart
+from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -29,6 +29,18 @@
 
 class DescribeDocumentPart(object):
 
+    def it_can_add_a_footer_part(self, package_, FooterPart_, footer_part_, relate_to_):
+        FooterPart_.new.return_value = footer_part_
+        relate_to_.return_value = "rId12"
+        document_part = DocumentPart(None, None, None, package_)
+
+        footer_part, rId = document_part.add_footer_part()
+
+        FooterPart_.new.assert_called_once_with(package_)
+        relate_to_.assert_called_once_with(document_part, footer_part_, RT.FOOTER)
+        assert footer_part is footer_part_
+        assert rId == "rId12"
+
     def it_can_add_a_header_part(self, package_, HeaderPart_, header_part_, relate_to_):
         HeaderPart_.new.return_value = header_part_
         relate_to_.return_value = "rId7"
@@ -296,6 +308,14 @@ def core_properties_(self, request):
     def drop_rel_(self, request):
         return method_mock(request, DocumentPart, "drop_rel", autospec=True)
 
+    @pytest.fixture
+    def FooterPart_(self, request):
+        return class_mock(request, 'docx.parts.document.FooterPart')
+
+    @pytest.fixture
+    def footer_part_(self, request):
+        return instance_mock(request, FooterPart)
+
     @pytest.fixture
     def get_or_add_image_(self, request):
         return method_mock(request, DocumentPart, 'get_or_add_image')

From 64e9836ad5bdeca68e9314bc47237823190d4510 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 13:52:10 -0800
Subject: [PATCH 202/367] hdr: add FooterPart.new()

---
 docx/parts/hdrftr.py       |  8 ++++++++
 tests/parts/test_hdrftr.py | 42 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index d452d67ff..90b08a714 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -17,6 +17,14 @@ class FooterPart(XmlPart):
     @classmethod
     def new(cls, package):
         """Return newly created footer part."""
+        partname = package.next_partname("/word/footer%d.xml")
+        content_type = CT.WML_FOOTER
+        element = parse_xml(cls._default_footer_xml())
+        return cls(partname, content_type, element, package)
+
+    @classmethod
+    def _default_footer_xml(cls):
+        """Return bytes containing XML for a default footer part."""
         raise NotImplementedError
 
 
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index c923a351a..d47cc5b0f 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -9,12 +9,50 @@
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
 from docx.opc.part import PartFactory
 from docx.package import Package
-from docx.parts.hdrftr import HeaderPart
+from docx.parts.hdrftr import FooterPart, HeaderPart
 
 from ..unitutil.cxml import element
 from ..unitutil.mock import function_mock, initializer_mock, instance_mock, method_mock
 
 
+class DescribeFooterPart(object):
+
+    def it_can_create_a_new_footer_part(
+        self, package_, _default_footer_xml_, parse_xml_, _init_
+    ):
+        ftr = element("w:ftr")
+        package_.next_partname.return_value = "/word/footer24.xml"
+        _default_footer_xml_.return_value = "<w:ftr>"
+        parse_xml_.return_value = ftr
+
+        footer_part = FooterPart.new(package_)
+
+        package_.next_partname.assert_called_once_with("/word/footer%d.xml")
+        _default_footer_xml_.assert_called_once_with()
+        parse_xml_.assert_called_once_with("<w:ftr>")
+        _init_.assert_called_once_with(
+            footer_part, "/word/footer24.xml", CT.WML_FOOTER, ftr, package_
+        )
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _default_footer_xml_(self, request):
+        return method_mock(request, FooterPart, "_default_footer_xml", autospec=False)
+
+    @pytest.fixture
+    def _init_(self, request):
+        return initializer_mock(request, FooterPart)
+
+    @pytest.fixture
+    def package_(self, request):
+        return instance_mock(request, Package)
+
+    @pytest.fixture
+    def parse_xml_(self, request):
+        return function_mock(request, "docx.parts.hdrftr.parse_xml")
+
+
 class DescribeHeaderPart(object):
 
     def it_is_used_by_loader_to_construct_header_part(
@@ -73,7 +111,7 @@ def header_part_(self, request):
 
     @pytest.fixture
     def _init_(self, request):
-        return initializer_mock(request, HeaderPart, autospec=True)
+        return initializer_mock(request, HeaderPart)
 
     @pytest.fixture
     def package_(self, request):

From 11e0fb3ba846032f1f1022ae9fe13e089fbc3fd8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 14:00:09 -0800
Subject: [PATCH 203/367] hdr: add FooterPart._default_footer_xml()

---
 docx/parts/hdrftr.py               |  7 ++++++-
 docx/templates/default-footer.xml  | 27 +++++++++++++++++++++++++++
 features/hdr-header-footer.feature |  1 -
 tests/parts/test_hdrftr.py         |  9 +++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 docx/templates/default-footer.xml

diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index 90b08a714..890988e42 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -25,7 +25,12 @@ def new(cls, package):
     @classmethod
     def _default_footer_xml(cls):
         """Return bytes containing XML for a default footer part."""
-        raise NotImplementedError
+        path = os.path.join(
+            os.path.split(__file__)[0], '..', 'templates', 'default-footer.xml'
+        )
+        with open(path, 'rb') as f:
+            xml_bytes = f.read()
+        return xml_bytes
 
 
 class HeaderPart(XmlPart):
diff --git a/docx/templates/default-footer.xml b/docx/templates/default-footer.xml
new file mode 100644
index 000000000..944ae1a68
--- /dev/null
+++ b/docx/templates/default-footer.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:ftr
+    xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main"
+    xmlns:mv="urn:schemas-microsoft-com:mac:vml"
+    xmlns:o="urn:schemas-microsoft-com:office:office"
+    xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+    xmlns:v="urn:schemas-microsoft-com:vml"
+    xmlns:w10="urn:schemas-microsoft-com:office:word"
+    xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
+    xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+    xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
+    xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"
+    xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
+    xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
+    xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"
+    xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk"
+    xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
+    mc:Ignorable="w14 wp14"
+    >
+  <w:p>
+    <w:pPr>
+      <w:pStyle w:val="Footer"/>
+    </w:pPr>
+  </w:p>
+</w:ftr>
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index b6eb2d064..03ec6fe1c 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -44,7 +44,6 @@ Feature: Header and footer behaviors
       | with no    | True  |
 
 
-  @wip
   Scenario Outline: _Footer.is_linked_to_previous setter
     Given a _Footer object <with-or-no> footer definition as footer
      When I assign <value> to footer.is_linked_to_previous
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index d47cc5b0f..dfe697735 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -34,6 +34,15 @@ def it_can_create_a_new_footer_part(
             footer_part, "/word/footer24.xml", CT.WML_FOOTER, ftr, package_
         )
 
+    def it_loads_default_footer_XML_from_a_template_to_help(self):
+        # ---tests integration with OS---
+        xml_bytes = FooterPart._default_footer_xml()
+
+        assert xml_bytes.startswith(
+            b"<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n<w:ftr\n"
+        )
+        assert len(xml_bytes) == 1395
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture

From c8c62497ca78a3ce2d17e87db0f9d6a13894a2c4 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 17:14:46 -0800
Subject: [PATCH 204/367] hdr: add _BaseHeaderFooter._element

---
 docx/section.py       | 23 ++++++++++++++-------
 tests/test_section.py | 48 +++++++++++++++++++++++++------------------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index cd6be5150..298d6bdb1 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -251,6 +251,20 @@ def _drop_definition(self):
         """Remove header/footer part containing the definition of this header/footer."""
         raise NotImplementedError("must be implemented by each subclass")
 
+    @property
+    def _element(self):
+        """`w:hdr` or `w:ftr` element, root of header/footer part."""
+        return self._get_or_add_definition().element
+
+    def _get_or_add_definition(self):
+        """Return HeaderPart or FooterPart object for this section.
+
+        If this header/footer inherits its content, the part for the prior header/footer
+        is returned. If the definition cannot be inherited (it belongs to the first
+        section), a new definition is added and then returned.
+        """
+        raise NotImplementedError
+
     @property
     def _has_definition(self):
         """True if this header/footer has a related part containing its definition."""
@@ -292,12 +306,7 @@ def _drop_definition(self):
         rId = self._sectPr.remove_headerReference(WD_HEADER_FOOTER.PRIMARY)
         self._document_part.drop_header_part(rId)
 
-    @property
-    def _element(self):
-        """`w:hdr` element, root of header part."""
-        return self._get_or_add_header_part().element
-
-    def _get_or_add_header_part(self):
+    def _get_or_add_definition(self):
         """Return |HeaderPart| object for this header.
 
         If this header inherits its content, the header part for the prior header is
@@ -312,7 +321,7 @@ def _get_or_add_header_part(self):
         prior_header = self._prior_header
         # ---case-2: header inherits and belongs to second-or-later section---
         if prior_header is not None:
-            return prior_header._get_or_add_header_part()
+            return prior_header._get_or_add_definition()
         # ---case-3: header inherits, but is first header---
         return self._add_definition()
 
diff --git a/tests/test_section.py b/tests/test_section.py
index 7adff0f8b..35229ab25 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -387,6 +387,19 @@ def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
         assert _drop_definition_.call_args_list == [call(header)] * drop_calls
         assert _add_definition_.call_args_list == [call(header)] * add_calls
 
+    def it_provides_access_to_the_hdr_or_ftr_element_to_help(
+        self, _get_or_add_definition_, header_part_
+    ):
+        hdr = element("w:hdr")
+        _get_or_add_definition_.return_value = header_part_
+        header_part_.element = hdr
+        header = _BaseHeaderFooter(None, None)
+
+        hdr_elm = header._element
+
+        _get_or_add_definition_.assert_called_once_with(header)
+        assert hdr_elm is hdr
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[(False, True), (True, False)])
@@ -416,10 +429,18 @@ def _add_definition_(self, request):
     def _drop_definition_(self, request):
         return method_mock(request, _BaseHeaderFooter, "_drop_definition")
 
+    @pytest.fixture
+    def _get_or_add_definition_(self, request):
+        return method_mock(request, _BaseHeaderFooter, "_get_or_add_definition")
+
     @pytest.fixture
     def _has_definition_prop_(self, request):
         return property_mock(request, _BaseHeaderFooter, "_has_definition")
 
+    @pytest.fixture
+    def header_part_(self, request):
+        return instance_mock(request, HeaderPart)
+
 
 class Describe_Footer(object):
 
@@ -500,19 +521,6 @@ def it_can_drop_the_related_header_part_to_help(self, document_part_):
         assert sectPr.xml == xml("w:sectPr{r:a=b}")
         document_part_.drop_header_part.assert_called_once_with("rId42")
 
-    def it_provides_access_to_the_hdr_element_to_help(
-        self, _get_or_add_header_part_, header_part_
-    ):
-        hdr = element("w:hdr")
-        _get_or_add_header_part_.return_value = header_part_
-        header_part_.element = hdr
-        header = _Header(None, None)
-
-        hdr_elm = header._element
-
-        _get_or_add_header_part_.assert_called_once_with(header)
-        assert hdr_elm is hdr
-
     def it_gets_the_header_part_when_it_has_one(
         self, _has_definition_prop_, _header_part_prop_, header_part_
     ):
@@ -520,7 +528,7 @@ def it_gets_the_header_part_when_it_has_one(
         _header_part_prop_.return_value = header_part_
         header = _Header(None, None)
 
-        header_part = header._get_or_add_header_part()
+        header_part = header._get_or_add_definition()
 
         assert header_part is header_part_
 
@@ -529,12 +537,12 @@ def but_it_gets_the_prior_header_part_when_it_is_linked(
     ):
         _has_definition_prop_.return_value = False
         _prior_header_prop_.return_value = prior_header_
-        prior_header_._get_or_add_header_part.return_value = header_part_
+        prior_header_._get_or_add_definition.return_value = header_part_
         header = _Header(None, None)
 
-        header_part = header._get_or_add_header_part()
+        header_part = header._get_or_add_definition()
 
-        prior_header_._get_or_add_header_part.assert_called_once_with()
+        prior_header_._get_or_add_definition.assert_called_once_with()
         assert header_part is header_part_
 
     def and_it_adds_the_header_part_when_it_is_linked_and_the_first_section(
@@ -549,7 +557,7 @@ def and_it_adds_the_header_part_when_it_is_linked_and_the_first_section(
         _add_definition_.return_value = header_part_
         header = _Header(None, None)
 
-        header_part = header._get_or_add_header_part()
+        header_part = header._get_or_add_definition()
 
         _add_definition_.assert_called_once_with(header)
         assert header_part is header_part_
@@ -620,8 +628,8 @@ def document_part_(self, request):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def _get_or_add_header_part_(self, request):
-        return method_mock(request, _Header, "_get_or_add_header_part")
+    def _get_or_add_definition_(self, request):
+        return method_mock(request, _Header, "_get_or_add_definition")
 
     @pytest.fixture
     def _has_definition_prop_(self, request):

From bd7d13c72474953ee97875a977e4fa1d04aa5b28 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 17:46:59 -0800
Subject: [PATCH 205/367] hdr: add _BaseHeaderFooter._get_or_add_definition()

---
 docx/section.py       |  63 ++++++++++--------
 tests/test_section.py | 150 ++++++++++++++++++++----------------------
 2 files changed, 105 insertions(+), 108 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index 298d6bdb1..77364bfdf 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -247,6 +247,11 @@ def _add_definition(self):
         """Return newly-added header/footer part."""
         raise NotImplementedError("must be implemented by each subclass")
 
+    @property
+    def _definition(self):
+        """|HeaderPart| or |FooterPart| object containing header/footer content."""
+        raise NotImplementedError("must be implemented by each subclass")
+
     def _drop_definition(self):
         """Remove header/footer part containing the definition of this header/footer."""
         raise NotImplementedError("must be implemented by each subclass")
@@ -260,16 +265,35 @@ def _get_or_add_definition(self):
         """Return HeaderPart or FooterPart object for this section.
 
         If this header/footer inherits its content, the part for the prior header/footer
-        is returned. If the definition cannot be inherited (it belongs to the first
-        section), a new definition is added and then returned.
+        is returned; this process continue recursively until a definition is found. If
+        the definition cannot be inherited (because the header/footer belongs to the
+        first section), a new definition is added for that first section and then
+        returned.
         """
-        raise NotImplementedError
+        # ---note this method is called recursively to access inherited definitions---
+        # ---case-1: definition is not inherited---
+        if self._has_definition:
+            return self._definition
+        # ---case-2: definition is inherited and belongs to second-or-later section---
+        prior_headerfooter = self._prior_headerfooter
+        if prior_headerfooter:
+            return prior_headerfooter._get_or_add_definition()
+        # ---case-3: definition is inherited, but belongs to first section---
+        return self._add_definition()
 
     @property
     def _has_definition(self):
         """True if this header/footer has a related part containing its definition."""
         raise NotImplementedError("must be implemented by each subclass")
 
+    @property
+    def _prior_headerfooter(self):
+        """|_Header| or |_Footer| proxy on prior sectPr element.
+
+        Returns None if this is first section.
+        """
+        raise NotImplementedError("must be implemented by each subclass")
+
 
 class _Footer(_BaseHeaderFooter):
     """Page footer."""
@@ -301,30 +325,17 @@ def _add_definition(self):
         self._sectPr.add_headerReference(WD_HEADER_FOOTER.PRIMARY, rId)
         return header_part
 
+    @property
+    def _definition(self):
+        """|HeaderPart| object containing content of this header."""
+        headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        return self._document_part.header_part(headerReference.rId)
+
     def _drop_definition(self):
         """Remove header definition associated with this section."""
         rId = self._sectPr.remove_headerReference(WD_HEADER_FOOTER.PRIMARY)
         self._document_part.drop_header_part(rId)
 
-    def _get_or_add_definition(self):
-        """Return |HeaderPart| object for this header.
-
-        If this header inherits its content, the header part for the prior header is
-        returned; this process continue recursively until a header is found. If this
-        header cannot inherit (it belongs to the first section), a new header part is
-        created for the first section and returned.
-        """
-        # ---note this method is called recursively to access inherited headers---
-        # ---case-1: header does not inherit---
-        if self._has_definition:
-            return self._header_part
-        prior_header = self._prior_header
-        # ---case-2: header inherits and belongs to second-or-later section---
-        if prior_header is not None:
-            return prior_header._get_or_add_definition()
-        # ---case-3: header inherits, but is first header---
-        return self._add_definition()
-
     @property
     def _has_definition(self):
         """True if a header is explicitly defined for this section."""
@@ -332,13 +343,7 @@ def _has_definition(self):
         return False if headerReference is None else True
 
     @property
-    def _header_part(self):
-        """|HeaderPart| object containing content of this header."""
-        headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
-        return self._document_part.header_part(headerReference.rId)
-
-    @property
-    def _prior_header(self):
+    def _prior_headerfooter(self):
         """|_Header| proxy on prior sectPr element or None if this is first section."""
         preceding_sectPr = self._sectPr.preceding_sectPr
         return (
diff --git a/tests/test_section.py b/tests/test_section.py
index 35229ab25..2f6c267bc 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -400,6 +400,51 @@ def it_provides_access_to_the_hdr_or_ftr_element_to_help(
         _get_or_add_definition_.assert_called_once_with(header)
         assert hdr_elm is hdr
 
+    def it_gets_the_definition_when_it_has_one(
+        self, _has_definition_prop_, _definition_prop_, header_part_
+    ):
+        _has_definition_prop_.return_value = True
+        _definition_prop_.return_value = header_part_
+        header = _BaseHeaderFooter(None, None)
+
+        header_part = header._get_or_add_definition()
+
+        assert header_part is header_part_
+
+    def but_it_gets_the_prior_definition_when_it_is_linked(
+        self,
+        _has_definition_prop_,
+        _prior_headerfooter_prop_,
+        prior_headerfooter_,
+        header_part_,
+    ):
+        _has_definition_prop_.return_value = False
+        _prior_headerfooter_prop_.return_value = prior_headerfooter_
+        prior_headerfooter_._get_or_add_definition.return_value = header_part_
+        header = _BaseHeaderFooter(None, None)
+
+        header_part = header._get_or_add_definition()
+
+        prior_headerfooter_._get_or_add_definition.assert_called_once_with()
+        assert header_part is header_part_
+
+    def and_it_adds_a_definition_when_it_is_linked_and_the_first_section(
+        self,
+        _has_definition_prop_,
+        _prior_headerfooter_prop_,
+        _add_definition_,
+        header_part_
+    ):
+        _has_definition_prop_.return_value = False
+        _prior_headerfooter_prop_.return_value = None
+        _add_definition_.return_value = header_part_
+        header = _BaseHeaderFooter(None, None)
+
+        header_part = header._get_or_add_definition()
+
+        _add_definition_.assert_called_once_with(header)
+        assert header_part is header_part_
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[(False, True), (True, False)])
@@ -425,6 +470,10 @@ def is_linked_set_fixture(self, request):
     def _add_definition_(self, request):
         return method_mock(request, _BaseHeaderFooter, "_add_definition")
 
+    @pytest.fixture
+    def _definition_prop_(self, request):
+        return property_mock(request, _BaseHeaderFooter, "_definition")
+
     @pytest.fixture
     def _drop_definition_(self, request):
         return method_mock(request, _BaseHeaderFooter, "_drop_definition")
@@ -441,6 +490,14 @@ def _has_definition_prop_(self, request):
     def header_part_(self, request):
         return instance_mock(request, HeaderPart)
 
+    @pytest.fixture
+    def prior_headerfooter_(self, request):
+        return instance_mock(request, _BaseHeaderFooter)
+
+    @pytest.fixture
+    def _prior_headerfooter_prop_(self, request):
+        return property_mock(request, _BaseHeaderFooter, "_prior_headerfooter")
+
 
 class Describe_Footer(object):
 
@@ -512,6 +569,18 @@ def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
         )
         assert header_part is header_part_
 
+    def it_provides_access_to_its_header_part_to_help(
+        self, document_part_, header_part_
+    ):
+        sectPr = element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}")
+        document_part_.header_part.return_value = header_part_
+        header = _Header(sectPr, document_part_)
+
+        header_part = header._definition
+
+        document_part_.header_part.assert_called_once_with("rId8")
+        assert header_part is header_part_
+
     def it_can_drop_the_related_header_part_to_help(self, document_part_):
         sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId42}")
         header = _Header(sectPr, document_part_)
@@ -521,47 +590,6 @@ def it_can_drop_the_related_header_part_to_help(self, document_part_):
         assert sectPr.xml == xml("w:sectPr{r:a=b}")
         document_part_.drop_header_part.assert_called_once_with("rId42")
 
-    def it_gets_the_header_part_when_it_has_one(
-        self, _has_definition_prop_, _header_part_prop_, header_part_
-    ):
-        _has_definition_prop_.return_value = True
-        _header_part_prop_.return_value = header_part_
-        header = _Header(None, None)
-
-        header_part = header._get_or_add_definition()
-
-        assert header_part is header_part_
-
-    def but_it_gets_the_prior_header_part_when_it_is_linked(
-        self, _has_definition_prop_, _prior_header_prop_, prior_header_, header_part_
-    ):
-        _has_definition_prop_.return_value = False
-        _prior_header_prop_.return_value = prior_header_
-        prior_header_._get_or_add_definition.return_value = header_part_
-        header = _Header(None, None)
-
-        header_part = header._get_or_add_definition()
-
-        prior_header_._get_or_add_definition.assert_called_once_with()
-        assert header_part is header_part_
-
-    def and_it_adds_the_header_part_when_it_is_linked_and_the_first_section(
-        self,
-        _has_definition_prop_,
-        _prior_header_prop_,
-        _add_definition_,
-        header_part_
-    ):
-        _has_definition_prop_.return_value = False
-        _prior_header_prop_.return_value = None
-        _add_definition_.return_value = header_part_
-        header = _Header(None, None)
-
-        header_part = header._get_or_add_definition()
-
-        _add_definition_.assert_called_once_with(header)
-        assert header_part is header_part_
-
     def it_knows_when_it_has_a_header_part_to_help(self, has_definition_fixture):
         sectPr, expected_value = has_definition_fixture
         header = _Header(sectPr, None)
@@ -570,18 +598,6 @@ def it_knows_when_it_has_a_header_part_to_help(self, has_definition_fixture):
 
         assert has_definition is expected_value
 
-    def it_provides_access_to_its_header_part_to_help(
-        self, document_part_, header_part_
-    ):
-        sectPr = element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}")
-        document_part_.header_part.return_value = header_part_
-        header = _Header(sectPr, document_part_)
-
-        header_part = header._header_part
-
-        document_part_.header_part.assert_called_once_with("rId8")
-        assert header_part is header_part_
-
     def it_provides_access_to_the_prior_Header_to_help(
         self, request, document_part_, header_
     ):
@@ -591,7 +607,7 @@ def it_provides_access_to_the_prior_Header_to_help(
         # ---mock must occur after construction of "real" header---
         _Header_ = class_mock(request, "docx.section._Header", return_value=header_)
 
-        prior_header = header._prior_header
+        prior_header = header._prior_headerfooter
 
         _Header_.assert_called_once_with(prior_sectPr, document_part_)
         assert prior_header is header_
@@ -601,7 +617,7 @@ def but_it_returns_None_when_its_the_first_header(self):
         sectPr = doc_elm[0]
         header = _Header(sectPr, None)
 
-        prior_header = header._prior_header
+        prior_header = header._prior_headerfooter
 
         assert prior_header is None
 
@@ -619,22 +635,10 @@ def has_definition_fixture(self, request):
 
     # fixture components ---------------------------------------------
 
-    @pytest.fixture
-    def _add_definition_(self, request):
-        return method_mock(request, _Header, "_add_definition")
-
     @pytest.fixture
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)
 
-    @pytest.fixture
-    def _get_or_add_definition_(self, request):
-        return method_mock(request, _Header, "_get_or_add_definition")
-
-    @pytest.fixture
-    def _has_definition_prop_(self, request):
-        return property_mock(request, _Header, "_has_definition")
-
     @pytest.fixture
     def header_(self, request):
         return instance_mock(request, _Header)
@@ -642,15 +646,3 @@ def header_(self, request):
     @pytest.fixture
     def header_part_(self, request):
         return instance_mock(request, HeaderPart)
-
-    @pytest.fixture
-    def _header_part_prop_(self, request):
-        return property_mock(request, _Header, "_header_part")
-
-    @pytest.fixture
-    def prior_header_(self, request):
-        return instance_mock(request, _Header)
-
-    @pytest.fixture
-    def _prior_header_prop_(self, request):
-        return property_mock(request, _Header, "_prior_header")

From c77cae043b7d5966b316f92c251a18ba4e262cd3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 17:59:15 -0800
Subject: [PATCH 206/367] hdr: add _Footer._prior_headerfooter

---
 docx/section.py       |  9 +++++++++
 tests/test_section.py | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/docx/section.py b/docx/section.py
index 77364bfdf..e3bb85a85 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -315,6 +315,15 @@ def _has_definition(self):
         footerReference = self._sectPr.get_footerReference(WD_HEADER_FOOTER.PRIMARY)
         return False if footerReference is None else True
 
+    @property
+    def _prior_headerfooter(self):
+        """|_Footer| proxy on prior sectPr element or None if this is first section."""
+        preceding_sectPr = self._sectPr.preceding_sectPr
+        return (
+            None if preceding_sectPr is None
+            else _Footer(preceding_sectPr, self._document_part)
+        )
+
 
 class _Header(_BaseHeaderFooter):
     """Page header."""
diff --git a/tests/test_section.py b/tests/test_section.py
index 2f6c267bc..99e990298 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -531,6 +531,29 @@ def it_knows_when_it_has_a_definition_to_help(self, has_definition_fixture):
 
         assert has_definition is expected_value
 
+    def it_provides_access_to_the_prior_Footer_to_help(
+        self, request, document_part_, footer_
+    ):
+        doc_elm = element("w:document/(w:sectPr,w:sectPr)")
+        prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
+        footer = _Footer(sectPr, document_part_)
+        # ---mock must occur after construction of "real" footer---
+        _Footer_ = class_mock(request, "docx.section._Footer", return_value=footer_)
+
+        prior_footer = footer._prior_headerfooter
+
+        _Footer_.assert_called_once_with(prior_sectPr, document_part_)
+        assert prior_footer is footer_
+
+    def but_it_returns_None_when_its_the_first_footer(self):
+        doc_elm = element("w:document/w:sectPr")
+        sectPr = doc_elm[0]
+        footer = _Footer(sectPr, None)
+
+        prior_footer = footer._prior_headerfooter
+
+        assert prior_footer is None
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(
@@ -549,6 +572,10 @@ def has_definition_fixture(self, request):
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)
 
+    @pytest.fixture
+    def footer_(self, request):
+        return instance_mock(request, _Footer)
+
     @pytest.fixture
     def footer_part_(self, request):
         return instance_mock(request, FooterPart)

From bacf9fd5cbafa7d24a3252fd76c422923f72f28f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 19:18:38 -0800
Subject: [PATCH 207/367] hdr: add _Footer._definition

---
 docx/parts/document.py |  4 ++++
 docx/section.py        |  6 ++++++
 tests/test_section.py  | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 964e4a88a..27dd8aeb6 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -56,6 +56,10 @@ def drop_header_part(self, rId):
         """Remove related header part identified by *rId*."""
         self.drop_rel(rId)
 
+    def footer_part(self, rId):
+        """Return |FooterPart| related by *rId*."""
+        raise NotImplementedError
+
     def get_or_add_image(self, image_descriptor):
         """
         Return an (rId, image) 2-tuple for the image identified by
diff --git a/docx/section.py b/docx/section.py
index e3bb85a85..714465874 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -304,6 +304,12 @@ def _add_definition(self):
         self._sectPr.add_footerReference(WD_HEADER_FOOTER.PRIMARY, rId)
         return footer_part
 
+    @property
+    def _definition(self):
+        """|FooterPart| object containing content of this footer."""
+        footerReference = self._sectPr.get_footerReference(WD_HEADER_FOOTER.PRIMARY)
+        return self._document_part.footer_part(footerReference.rId)
+
     def _drop_definition(self):
         """Remove footer definition (footer part) associated with this section."""
         rId = self._sectPr.remove_footerReference(WD_HEADER_FOOTER.PRIMARY)
diff --git a/tests/test_section.py b/tests/test_section.py
index 99e990298..b4d34574e 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -514,6 +514,18 @@ def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
         )
         assert footer_part is footer_part_
 
+    def it_provides_access_to_its_footer_part_to_help(
+        self, document_part_, footer_part_
+    ):
+        sectPr = element("w:sectPr/w:footerReference{w:type=default,r:id=rId3}")
+        document_part_.footer_part.return_value = footer_part_
+        footer = _Footer(sectPr, document_part_)
+
+        footer_part = footer._definition
+
+        document_part_.footer_part.assert_called_once_with("rId3")
+        assert footer_part is footer_part_
+
     def it_can_drop_the_related_footer_part_to_help(self, document_part_):
         sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId42}")
         footer = _Footer(sectPr, document_part_)

From 47d7e4b24a3e558bf9a247bd7767bb080ecea201 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 19:42:57 -0800
Subject: [PATCH 208/367] hdr: add DocumentPart.footer_part()

---
 docx/parts/document.py       |  2 +-
 tests/parts/test_document.py | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index 27dd8aeb6..fa55fb2b0 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -58,7 +58,7 @@ def drop_header_part(self, rId):
 
     def footer_part(self, rId):
         """Return |FooterPart| related by *rId*."""
-        raise NotImplementedError
+        return self.related_parts[rId]
 
     def get_or_add_image(self, image_descriptor):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index adeb1059d..33eb7fa79 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -60,6 +60,18 @@ def it_can_drop_a_specified_header_part(self, drop_rel_):
 
         drop_rel_.assert_called_once_with(document_part, "rId42")
 
+    def it_provides_access_to_a_footer_part_by_rId(
+        self, related_parts_prop_, related_parts_, footer_part_
+    ):
+        related_parts_prop_.return_value = related_parts_
+        related_parts_.__getitem__.return_value = footer_part_
+        document_part = DocumentPart(None, None, None, None)
+
+        footer_part = document_part.footer_part("rId9")
+
+        related_parts_.__getitem__.assert_called_once_with("rId9")
+        assert footer_part is footer_part_
+
     def it_provides_access_to_a_header_part_by_rId(
         self, related_parts_prop_, related_parts_, header_part_
     ):

From 0c90ce39dd6a39a36e5dde5bc27c64090cbe4349 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 2 Jan 2019 19:45:38 -0800
Subject: [PATCH 209/367] hdr: add PartFactory loads FooterPart

---
 docx/__init__.py                   |  4 +++-
 docx/oxml/__init__.py              |  1 +
 features/hdr-header-footer.feature |  1 -
 tests/parts/test_hdrftr.py         | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/docx/__init__.py b/docx/__init__.py
index d30d22fe9..153856fef 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -12,7 +12,7 @@
 from docx.opc.parts.coreprops import CorePropertiesPart
 
 from docx.parts.document import DocumentPart
-from docx.parts.hdrftr import HeaderPart
+from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -28,6 +28,7 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_class_selector = part_class_selector
 PartFactory.part_type_for[CT.OPC_CORE_PROPERTIES] = CorePropertiesPart
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
+PartFactory.part_type_for[CT.WML_FOOTER] = FooterPart
 PartFactory.part_type_for[CT.WML_HEADER] = HeaderPart
 PartFactory.part_type_for[CT.WML_NUMBERING] = NumberingPart
 PartFactory.part_type_for[CT.WML_SETTINGS] = SettingsPart
@@ -37,6 +38,7 @@ def part_class_selector(content_type, reltype):
     CT,
     CorePropertiesPart,
     DocumentPart,
+    FooterPart,
     HeaderPart,
     NumberingPart,
     PartFactory,
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index e2837f06a..1d88f5927 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -93,6 +93,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_SectType,
 )
 register_element_cls("w:footerReference", CT_HdrFtrRef)
+register_element_cls("w:ftr", CT_HdrFtr)
 register_element_cls("w:hdr", CT_HdrFtr)
 register_element_cls("w:headerReference", CT_HdrFtrRef)
 register_element_cls("w:pgMar", CT_PageMar)
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index 03ec6fe1c..f14beaf41 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -57,7 +57,6 @@ Feature: Header and footer behaviors
       | with no    | True  |
 
 
-  @wip
   Scenario: _Footer inherits content
     Given a _Footer object with a footer definition as footer
       And the next _Footer object with no footer definition as footer_2
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index dfe697735..205738036 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -17,6 +17,20 @@
 
 class DescribeFooterPart(object):
 
+    def it_is_used_by_loader_to_construct_footer_part(
+        self, package_, FooterPart_load_, footer_part_
+    ):
+        partname = "footer1.xml"
+        content_type = CT.WML_FOOTER
+        reltype = RT.FOOTER
+        blob = "<w:ftr/>"
+        FooterPart_load_.return_value = footer_part_
+
+        part = PartFactory(partname, content_type, reltype, blob, package_)
+
+        FooterPart_load_.assert_called_once_with(partname, content_type, blob, package_)
+        assert part is footer_part_
+
     def it_can_create_a_new_footer_part(
         self, package_, _default_footer_xml_, parse_xml_, _init_
     ):
@@ -49,6 +63,14 @@ def it_loads_default_footer_XML_from_a_template_to_help(self):
     def _default_footer_xml_(self, request):
         return method_mock(request, FooterPart, "_default_footer_xml", autospec=False)
 
+    @pytest.fixture
+    def footer_part_(self, request):
+        return instance_mock(request, FooterPart)
+
+    @pytest.fixture
+    def FooterPart_load_(self, request):
+        return method_mock(request, FooterPart, "load", autospec=False)
+
     @pytest.fixture
     def _init_(self, request):
         return initializer_mock(request, FooterPart)

From e52d32f7446f334f0d046f5c782a45ff1db4527d Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 11:44:19 -0800
Subject: [PATCH 210/367] acpt: add header /footer content insert scenarios

---
 features/hdr-header-footer.feature | 28 +++++++++++++++
 features/steps/hdrftr.py           | 58 ++++++++++++++++++++++++++----
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index f14beaf41..969695af0 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -34,6 +34,20 @@ Feature: Header and footer behaviors
       And header_2.is_linked_to_previous is True
 
 
+  @wip
+  Scenario: _Header text accepts style assignment
+    Given a _Header object with a header definition as header
+     When I assign "Normal" to header.paragraphs[0].style
+     Then header.paragraphs[0].style.name == "Normal"
+
+
+  @wip
+  Scenario: _Header allows image insertion
+    Given a _Run object from a header as run
+     When I call run.add_picture()
+     Then I can't detect the image but no exception is raised
+
+
   Scenario Outline: _Footer.is_linked_to_previous getter
     Given a _Footer object <with-or-no> footer definition as footer
      Then footer.is_linked_to_previous is <value>
@@ -62,3 +76,17 @@ Feature: Header and footer behaviors
       And the next _Footer object with no footer definition as footer_2
      Then footer_2.paragraphs[0].text == footer.paragraphs[0].text
       And footer_2.is_linked_to_previous is True
+
+
+  @wip
+  Scenario: _Footer text accepts style assignment
+    Given a _Footer object with a footer definition as footer
+     When I assign "Normal" to footer.paragraphs[0].style
+     Then footer.paragraphs[0].style.name == "Normal"
+
+
+  @wip
+  Scenario: _Footer allows image insertion
+    Given a _Run object from a footer as run
+     When I call run.add_picture()
+     Then I can't detect the image but no exception is raised
diff --git a/features/steps/hdrftr.py b/features/steps/hdrftr.py
index 8d8082e78..786673dbd 100644
--- a/features/steps/hdrftr.py
+++ b/features/steps/hdrftr.py
@@ -8,7 +8,7 @@
 
 from docx import Document
 
-from helpers import test_docx
+from helpers import test_docx, test_file
 
 
 # given ====================================================
@@ -27,6 +27,18 @@ def given_a_Header_object_with_or_no_header_definition(context, with_or_no):
     context.header = context.sections[section_idx].header
 
 
+@given("a _Run object from a footer as run")
+def given_a_Run_object_from_a_footer_as_run(context):
+    footer = Document(test_docx("hdr-header-footer")).sections[0].footer
+    context.run = footer.paragraphs[0].add_run()
+
+
+@given("a _Run object from a header as run")
+def given_a_Run_object_from_a_header_as_run(context):
+    header = Document(test_docx("hdr-header-footer")).sections[0].header
+    context.run = header.paragraphs[0].add_run()
+
+
 @given("the next _Footer object with no footer definition as footer_2")
 def given_the_next_Footer_object_with_no_footer_definition(context):
     context.footer_2 = context.sections[1].footer
@@ -39,6 +51,16 @@ def given_the_next_Header_object_with_no_header_definition(context):
 
 # when =====================================================
 
+@when("I assign \"Normal\" to footer.paragraphs[0].style")
+def when_I_assign_Body_Text_to_footer_style(context):
+    context.footer.paragraphs[0].style = "Normal"
+
+
+@when("I assign \"Normal\" to header.paragraphs[0].style")
+def when_I_assign_Body_Text_to_header_style(context):
+    context.header.paragraphs[0].style = "Normal"
+
+
 @when("I assign {value} to header.is_linked_to_previous")
 def when_I_assign_value_to_header_is_linked_to_previous(context, value):
     context.header.is_linked_to_previous = eval(value)
@@ -49,6 +71,11 @@ def when_I_assign_value_to_footer_is_linked_to_previous(context, value):
     context.footer.is_linked_to_previous = eval(value)
 
 
+@when("I call run.add_picture()")
+def when_I_call_run_add_picture(context):
+    context.run.add_picture(test_file("test.png"))
+
+
 # then =====================================================
 
 @then("footer.is_linked_to_previous is {value}")
@@ -58,11 +85,11 @@ def then_footer_is_linked_to_previous_is_value(context, value):
     assert actual == expected, "footer.is_linked_to_previous is %s" % actual
 
 
-@then("footer_2.paragraphs[0].text == footer.paragraphs[0].text")
-def then_footer_2_text_eq_footer_text(context):
-    actual = context.footer_2.paragraphs[0].text
-    expected = context.footer.paragraphs[0].text
-    assert actual == expected, "footer_2.paragraphs[0].text == %s" % actual
+@then("footer.paragraphs[0].style.name == \"Normal\"")
+def then_footer_paragraphs_0_style_name_eq_Normal(context):
+    actual = context.footer.paragraphs[0].style.name
+    expected = "Normal"
+    assert actual == expected, "footer.paragraphs[0].style.name is %s" % actual
 
 
 @then("footer_2.is_linked_to_previous is {value}")
@@ -72,6 +99,13 @@ def then_footer_2_is_linked_to_previous_is_value(context, value):
     assert actual == expected, "footer_2.is_linked_to_previous is %s" % actual
 
 
+@then("footer_2.paragraphs[0].text == footer.paragraphs[0].text")
+def then_footer_2_text_eq_footer_text(context):
+    actual = context.footer_2.paragraphs[0].text
+    expected = context.footer.paragraphs[0].text
+    assert actual == expected, "footer_2.paragraphs[0].text == %s" % actual
+
+
 @then("header.is_linked_to_previous is {value}")
 def then_header_is_linked_to_previous_is_value(context, value):
     actual = context.header.is_linked_to_previous
@@ -79,6 +113,13 @@ def then_header_is_linked_to_previous_is_value(context, value):
     assert actual == expected, "header.is_linked_to_previous is %s" % actual
 
 
+@then("header.paragraphs[0].style.name == \"Normal\"")
+def then_header_paragraphs_0_style_name_eq_Normal(context):
+    actual = context.header.paragraphs[0].style.name
+    expected = "Normal"
+    assert actual == expected, "header.paragraphs[0].style.name is %s" % actual
+
+
 @then("header_2.is_linked_to_previous is {value}")
 def then_header_2_is_linked_to_previous_is_value(context, value):
     actual = context.header_2.is_linked_to_previous
@@ -91,3 +132,8 @@ def then_header_2_text_eq_header_text(context):
     actual = context.header_2.paragraphs[0].text
     expected = context.header.paragraphs[0].text
     assert actual == expected, "header_2.paragraphs[0].text == %s" % actual
+
+
+@then("I can't detect the image but no exception is raised")
+def then_I_cant_detect_the_image_but_no_exception_is_raised(context):
+    pass

From faccb45568c8002c258eeb9d8ca0064c6bbd7350 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 11:58:32 -0800
Subject: [PATCH 211/367] hdr: add _BaseHeaderFooter.part

---
 docx/section.py       | 11 +++++++++++
 tests/test_section.py | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/docx/section.py b/docx/section.py
index 714465874..ce5fa00db 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -243,6 +243,17 @@ def is_linked_to_previous(self, value):
         else:
             self._add_definition()
 
+    @property
+    def part(self):
+        """The |HeaderPart| or |FooterPart| for this header/footer.
+
+        This overrides `BlockItemContainer.part` and is required to support image
+        insertion and perhaps other content like hyperlinks.
+        """
+        # ---should not appear in documentation;
+        # ---not an interface property, even though public
+        return self._get_or_add_definition()
+
     def _add_definition(self):
         """Return newly-added header/footer part."""
         raise NotImplementedError("must be implemented by each subclass")
diff --git a/tests/test_section.py b/tests/test_section.py
index b4d34574e..944ad8a84 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -387,6 +387,18 @@ def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
         assert _drop_definition_.call_args_list == [call(header)] * drop_calls
         assert _add_definition_.call_args_list == [call(header)] * add_calls
 
+    def it_provides_access_to_the_header_or_footer_part_for_BlockItemContainer(
+        self, _get_or_add_definition_, header_part_
+    ):
+        # ---this override fulfills part of the BlockItemContainer subclass interface---
+        _get_or_add_definition_.return_value = header_part_
+        header = _BaseHeaderFooter(None, None)
+
+        header_part = header.part
+
+        _get_or_add_definition_.assert_called_once_with(header)
+        assert header_part is header_part_
+
     def it_provides_access_to_the_hdr_or_ftr_element_to_help(
         self, _get_or_add_definition_, header_part_
     ):

From 004ac14e943c261c573623c0ac9b93576495fdb0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 12:11:59 -0800
Subject: [PATCH 212/367] hdr: add BaseStoryPart.get_style_id()

---
 docx/parts/hdrftr.py         |  6 ++--
 docx/parts/story.py          | 31 ++++++++++++++++++
 tests/parts/test_document.py | 63 +++++++++++++-----------------------
 tests/parts/test_story.py    | 44 +++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 44 deletions(-)
 create mode 100644 docx/parts/story.py
 create mode 100644 tests/parts/test_story.py

diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index 890988e42..549805b2a 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -7,11 +7,11 @@
 import os
 
 from docx.opc.constants import CONTENT_TYPE as CT
-from docx.opc.part import XmlPart
 from docx.oxml import parse_xml
+from docx.parts.story import BaseStoryPart
 
 
-class FooterPart(XmlPart):
+class FooterPart(BaseStoryPart):
     """Definition of a section footer."""
 
     @classmethod
@@ -33,7 +33,7 @@ def _default_footer_xml(cls):
         return xml_bytes
 
 
-class HeaderPart(XmlPart):
+class HeaderPart(BaseStoryPart):
     """Definition of a section header."""
 
     @classmethod
diff --git a/docx/parts/story.py b/docx/parts/story.py
new file mode 100644
index 000000000..4b86b5e9a
--- /dev/null
+++ b/docx/parts/story.py
@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+"""|BaseStoryPart| and related objects"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+from docx.opc.part import XmlPart
+from docx.shared import lazyproperty
+
+
+class BaseStoryPart(XmlPart):
+    """Base class for story parts.
+
+    A story part is one that can contain textual content, such as the document-part and
+    header or footer parts. These all share content behaviors like `.paragraphs`,
+    `.add_paragraph()`, `.add_table()` etc.
+    """
+
+    def get_style_id(self, style_or_name, style_type):
+        """Return str style_id for *style_or_name* of *style_type*.
+
+        Returns |None| if the style resolves to the default style for *style_type* or if
+        *style_or_name* is itself |None|. Raises if *style_or_name* is a style of the
+        wrong type or names a style not present in the document.
+        """
+        return self._document_part.get_style_id(style_or_name, style_type)
+
+    @lazyproperty
+    def _document_part(self):
+        """|DocumentPart| object for this package."""
+        raise NotImplementedError
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 33eb7fa79..b1d966a18 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -6,6 +6,7 @@
 
 import pytest
 
+from docx.enum.style import WD_STYLE_TYPE
 from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
@@ -19,7 +20,6 @@
 from docx.settings import Settings
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
-from docx.text.paragraph import Paragraph
 
 from ..oxml.parts.unitdata.document import a_body, a_document
 from ..oxml.unitdata.text import a_p
@@ -137,7 +137,7 @@ def it_provides_access_to_the_numbering_part(
         part_related_by_.assert_called_once_with(document_part, RT.NUMBERING)
         assert numbering_part is numbering_part_
 
-    def it_creates_numbering_part_if_not_present(
+    def and_it_creates_a_numbering_part_if_not_present(
         self, part_related_by_, relate_to_, NumberingPart_, numbering_part_
     ):
         part_related_by_.side_effect = KeyError
@@ -169,24 +169,25 @@ def it_can_create_a_new_pic_inline(self, image_, get_or_add_image_, next_id_prop
         image_.scaled_dimensions.assert_called_once_with(width, height)
         assert inline.xml == expected_xml
 
-    def it_can_get_a_style_by_id(self, get_style_fixture):
-        document_part, style_id, style_type, style_ = get_style_fixture
-        style = document_part.get_style(style_id, style_type)
-        document_part.styles.get_by_id.assert_called_once_with(
-            style_id, style_type
-        )
+    def it_can_get_a_style_by_id(self, styles_prop_, styles_, style_):
+        styles_prop_.return_value = styles_
+        styles_.get_by_id.return_value = style_
+        document_part = DocumentPart(None, None, None, None)
+
+        style = document_part.get_style("BodyText", WD_STYLE_TYPE.PARAGRAPH)
+
+        styles_.get_by_id.assert_called_once_with("BodyText", WD_STYLE_TYPE.PARAGRAPH)
         assert style is style_
 
-    def it_can_get_the_id_of_a_style(self, get_style_id_fixture):
-        document_part, style_or_name, style_type, style_id_ = (
-            get_style_id_fixture
-        )
-        style_id = document_part.get_style_id(style_or_name, style_type)
+    def it_can_get_the_id_of_a_style(self, style_, styles_prop_, styles_):
+        styles_prop_.return_value = styles_
+        styles_.get_style_id.return_value = "BodyCharacter"
+        document_part = DocumentPart(None, None, None, None)
 
-        document_part.styles.get_style_id.assert_called_once_with(
-            style_or_name, style_type
-        )
-        assert style_id is style_id_
+        style_id = document_part.get_style_id(style_, WD_STYLE_TYPE.CHARACTER)
+
+        styles_.get_style_id.assert_called_once_with(style_, WD_STYLE_TYPE.CHARACTER)
+        assert style_id == "BodyCharacter"
 
     def it_provides_access_to_its_settings_part_to_help(
         self, part_related_by_, settings_part_
@@ -199,7 +200,7 @@ def it_provides_access_to_its_settings_part_to_help(
         part_related_by_.assert_called_once_with(document_part, RT.SETTINGS)
         assert settings_part is settings_part_
 
-    def it_creates_default_settings_part_if_not_present_to_help(
+    def and_it_creates_a_default_settings_part_if_not_present(
         self, package_, part_related_by_, SettingsPart_, settings_part_, relate_to_
     ):
         part_related_by_.side_effect = KeyError
@@ -223,7 +224,7 @@ def it_provides_access_to_its_styles_part_to_help(
         part_related_by_.assert_called_once_with(document_part, RT.STYLES)
         assert styles_part is styles_part_
 
-    def it_creates_default_styles_part_if_not_present_to_help(
+    def and_it_creates_a_default_styles_part_if_not_present(
         self, package_, part_related_by_, StylesPart_, styles_part_, relate_to_
     ):
         part_related_by_.side_effect = KeyError
@@ -244,20 +245,6 @@ def core_props_fixture(self, package_, core_properties_):
         package_.core_properties = core_properties_
         return document_part, core_properties_
 
-    @pytest.fixture
-    def get_style_fixture(self, styles_prop_, style_):
-        document_part = DocumentPart(None, None, None, None)
-        style_id, style_type = 'Foobar', 1
-        styles_prop_.return_value.get_by_id.return_value = style_
-        return document_part, style_id, style_type, style_
-
-    @pytest.fixture
-    def get_style_id_fixture(self, styles_prop_):
-        document_part = DocumentPart(None, None, None, None)
-        style_or_name, style_type, style_id_ = 'Foo Bar', 1, 'FooBar'
-        styles_prop_.return_value.get_style_id.return_value = style_id_
-        return document_part, style_or_name, style_type, style_id_
-
     @pytest.fixture
     def inline_shapes_fixture(self, request, InlineShapes_):
         document_elm = (
@@ -364,10 +351,6 @@ def NumberingPart_(self, request):
     def numbering_part_(self, request):
         return instance_mock(request, NumberingPart)
 
-    @pytest.fixture
-    def p_(self, request):
-        return instance_mock(request, Paragraph)
-
     @pytest.fixture
     def package_(self, request):
         return instance_mock(request, Package)
@@ -421,10 +404,8 @@ def styles_part_(self, request):
         return instance_mock(request, StylesPart)
 
     @pytest.fixture
-    def styles_prop_(self, request, styles_):
-        return property_mock(
-            request, DocumentPart, 'styles', return_value=styles_
-        )
+    def styles_prop_(self, request):
+        return property_mock(request, DocumentPart, 'styles')
 
     @pytest.fixture
     def _styles_part_prop_(self, request):
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
new file mode 100644
index 000000000..f4e74a061
--- /dev/null
+++ b/tests/parts/test_story.py
@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+"""Unit test suite for the docx.parts.story module"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import pytest
+
+from docx.enum.style import WD_STYLE_TYPE
+from docx.parts.document import DocumentPart
+from docx.parts.story import BaseStoryPart
+from docx.styles.style import BaseStyle
+
+from ..unitutil.mock import instance_mock, property_mock
+
+
+class DescribeBaseStoryPart(object):
+
+    def it_can_get_a_style_id_by_style_or_name_and_type(
+        self, _document_part_prop_, document_part_, style_
+    ):
+        style_type = WD_STYLE_TYPE.PARAGRAPH
+        _document_part_prop_.return_value = document_part_
+        document_part_.get_style_id.return_value = "BodyText"
+        story_part = BaseStoryPart(None, None, None, None)
+
+        style_id = story_part.get_style_id(style_, style_type)
+
+        document_part_.get_style_id.assert_called_once_with(style_, style_type)
+        assert style_id == "BodyText"
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def document_part_(self, request):
+        return instance_mock(request, DocumentPart)
+
+    @pytest.fixture
+    def _document_part_prop_(self, request):
+        return property_mock(request, BaseStoryPart, "_document_part")
+
+    @pytest.fixture
+    def style_(self, request):
+        return instance_mock(request, BaseStyle)

From f1ca510b9f7414ea673360203e127e083fe26df1 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 12:32:15 -0800
Subject: [PATCH 213/367] hdr: add BaseStoryPart._document_part

---
 docx/parts/story.py       |  2 +-
 tests/parts/test_story.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docx/parts/story.py b/docx/parts/story.py
index 4b86b5e9a..9f8e82b25 100644
--- a/docx/parts/story.py
+++ b/docx/parts/story.py
@@ -28,4 +28,4 @@ def get_style_id(self, style_or_name, style_type):
     @lazyproperty
     def _document_part(self):
         """|DocumentPart| object for this package."""
-        raise NotImplementedError
+        return self.package.main_document_part
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index f4e74a061..b70f1b17a 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -7,6 +7,7 @@
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
+from docx.package import Package
 from docx.parts.document import DocumentPart
 from docx.parts.story import BaseStoryPart
 from docx.styles.style import BaseStyle
@@ -29,6 +30,14 @@ def it_can_get_a_style_id_by_style_or_name_and_type(
         document_part_.get_style_id.assert_called_once_with(style_, style_type)
         assert style_id == "BodyText"
 
+    def it_knows_the_main_document_part_to_help(self, package_, document_part_):
+        package_.main_document_part = document_part_
+        story_part = BaseStoryPart(None, None, None, package_)
+
+        document_part = story_part._document_part
+
+        assert document_part is document_part_
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
@@ -39,6 +48,10 @@ def document_part_(self, request):
     def _document_part_prop_(self, request):
         return property_mock(request, BaseStoryPart, "_document_part")
 
+    @pytest.fixture
+    def package_(self, request):
+        return instance_mock(request, Package)
+
     @pytest.fixture
     def style_(self, request):
         return instance_mock(request, BaseStyle)

From db72fe732af58259f537f4234e39fe6a863f6970 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 12:38:22 -0800
Subject: [PATCH 214/367] hdr: add BaseStoryPart.get_style()

---
 docx/parts/story.py                |  8 ++++++++
 features/hdr-header-footer.feature |  2 --
 tests/parts/test_story.py          | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docx/parts/story.py b/docx/parts/story.py
index 9f8e82b25..c9b73f912 100644
--- a/docx/parts/story.py
+++ b/docx/parts/story.py
@@ -16,6 +16,14 @@ class BaseStoryPart(XmlPart):
     `.add_paragraph()`, `.add_table()` etc.
     """
 
+    def get_style(self, style_id, style_type):
+        """Return the style in this document matching *style_id*.
+
+        Returns the default style for *style_type* if *style_id* is |None| or does not
+        match a defined style of *style_type*.
+        """
+        return self._document_part.get_style(style_id, style_type)
+
     def get_style_id(self, style_or_name, style_type):
         """Return str style_id for *style_or_name* of *style_type*.
 
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index 969695af0..7c5e8cc9f 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -34,7 +34,6 @@ Feature: Header and footer behaviors
       And header_2.is_linked_to_previous is True
 
 
-  @wip
   Scenario: _Header text accepts style assignment
     Given a _Header object with a header definition as header
      When I assign "Normal" to header.paragraphs[0].style
@@ -78,7 +77,6 @@ Feature: Header and footer behaviors
       And footer_2.is_linked_to_previous is True
 
 
-  @wip
   Scenario: _Footer text accepts style assignment
     Given a _Footer object with a footer definition as footer
      When I assign "Normal" to footer.paragraphs[0].style
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index b70f1b17a..970232b17 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -17,6 +17,20 @@
 
 class DescribeBaseStoryPart(object):
 
+    def it_can_get_a_style_by_id_and_type(
+        self, _document_part_prop_, document_part_, style_
+    ):
+        style_id = "BodyText"
+        style_type = WD_STYLE_TYPE.PARAGRAPH
+        _document_part_prop_.return_value = document_part_
+        document_part_.get_style.return_value = style_
+        story_part = BaseStoryPart(None, None, None, None)
+
+        style = story_part.get_style(style_id, style_type)
+
+        document_part_.get_style.assert_called_once_with(style_id, style_type)
+        assert style is style_
+
     def it_can_get_a_style_id_by_style_or_name_and_type(
         self, _document_part_prop_, document_part_, style_
     ):

From 7f32a65fce83d1ba7c94b5a2ab8d532a96ed41a6 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 12:52:34 -0800
Subject: [PATCH 215/367] hdr: add BaseStoryPart.new_pic_inline()

This is essentially migrated "up" from DocumentPart, which now
subclasses BaseStoryPart.
---
 docx/parts/document.py       | 16 ++--------------
 docx/parts/story.py          | 32 ++++++++++++++++++++++++++++++++
 tests/parts/test_document.py | 24 ------------------------
 tests/parts/test_story.py    | 30 +++++++++++++++++++++++++++++-
 tests/text/test_run.py       |  8 ++------
 5 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index fa55fb2b0..26ce2bd5c 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -6,17 +6,16 @@
 
 from docx.document import Document
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
-from docx.opc.part import XmlPart
-from docx.oxml.shape import CT_Inline
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
+from docx.parts.story import BaseStoryPart
 from docx.parts.styles import StylesPart
 from docx.shape import InlineShapes
 from docx.shared import lazyproperty
 
 
-class DocumentPart(XmlPart):
+class DocumentPart(BaseStoryPart):
     """Main document part of a WordprocessingML (WML) package, aka a .docx file.
 
     Acts as broker to other parts such as image, core properties, and style parts. It
@@ -104,17 +103,6 @@ def inline_shapes(self):
         """
         return InlineShapes(self._element.body, self)
 
-    def new_pic_inline(self, image_descriptor, width, height):
-        """Return a newly-created `w:inline` element.
-
-        The element contains the image specified by *image_descriptor* and is scaled
-        based on the values of *width* and *height*.
-        """
-        rId, image = self.get_or_add_image(image_descriptor)
-        cx, cy = image.scaled_dimensions(width, height)
-        shape_id, filename = self.next_id, image.filename
-        return CT_Inline.new_pic_inline(shape_id, rId, filename, cx, cy)
-
     @property
     def next_id(self):
         """Next available positive integer id value in this document.
diff --git a/docx/parts/story.py b/docx/parts/story.py
index c9b73f912..a09f235b3 100644
--- a/docx/parts/story.py
+++ b/docx/parts/story.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.opc.part import XmlPart
+from docx.oxml.shape import CT_Inline
 from docx.shared import lazyproperty
 
 
@@ -16,6 +17,16 @@ class BaseStoryPart(XmlPart):
     `.add_paragraph()`, `.add_table()` etc.
     """
 
+    def get_or_add_image(self, image_descriptor):
+        """Return (rId, image) pair for image identified by *image_descriptor*.
+
+        *rId* is the str key (often like "rId7") for the relationship between this story
+        part and the image part, reused if already present, newly created if not.
+        *image* is an |Image| instance providing access to the properties of the image,
+        such as dimensions and image type.
+        """
+        raise NotImplementedError
+
     def get_style(self, style_id, style_type):
         """Return the style in this document matching *style_id*.
 
@@ -33,6 +44,27 @@ def get_style_id(self, style_or_name, style_type):
         """
         return self._document_part.get_style_id(style_or_name, style_type)
 
+    def new_pic_inline(self, image_descriptor, width, height):
+        """Return a newly-created `w:inline` element.
+
+        The element contains the image specified by *image_descriptor* and is scaled
+        based on the values of *width* and *height*.
+        """
+        rId, image = self.get_or_add_image(image_descriptor)
+        cx, cy = image.scaled_dimensions(width, height)
+        shape_id, filename = self.next_id, image.filename
+        return CT_Inline.new_pic_inline(shape_id, rId, filename, cx, cy)
+
+    @property
+    def next_id(self):
+        """Next available positive integer id value in this story XML document.
+
+        The value is determined by incrementing the maximum existing id value. Gaps in
+        the existing id sequence are not filled. The id attribute value is unique in the
+        document, without regard to the element type it appears on.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def _document_part(self):
         """|DocumentPart| object for this package."""
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index b1d966a18..2c3c08df0 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -23,7 +23,6 @@
 
 from ..oxml.parts.unitdata.document import a_body, a_document
 from ..oxml.unitdata.text import a_p
-from ..unitutil.file import snippet_text
 from ..unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
@@ -154,21 +153,6 @@ def it_knows_the_next_available_xml_id(self, next_id_fixture):
         document, expected_id = next_id_fixture
         assert document.next_id == expected_id
 
-    def it_can_create_a_new_pic_inline(self, image_, get_or_add_image_, next_id_prop_):
-        path, width, height, rId = 'foo/bar.png', 111, 222, 'rId42'
-        expected_xml = snippet_text('inline')
-        get_or_add_image_.return_value = rId, image_
-        image_.scaled_dimensions.return_value = 444, 888
-        image_.filename = 'bar.png'
-        next_id_prop_.return_value = 24
-        document_part = DocumentPart(None, None, None, None)
-
-        inline = document_part.new_pic_inline(path, width, height)
-
-        get_or_add_image_.assert_called_once_with(document_part, path)
-        image_.scaled_dimensions.assert_called_once_with(width, height)
-        assert inline.xml == expected_xml
-
     def it_can_get_a_style_by_id(self, styles_prop_, styles_, style_):
         styles_prop_.return_value = styles_
         styles_.get_by_id.return_value = style_
@@ -315,10 +299,6 @@ def FooterPart_(self, request):
     def footer_part_(self, request):
         return instance_mock(request, FooterPart)
 
-    @pytest.fixture
-    def get_or_add_image_(self, request):
-        return method_mock(request, DocumentPart, 'get_or_add_image')
-
     @pytest.fixture
     def HeaderPart_(self, request):
         return class_mock(request, 'docx.parts.document.HeaderPart')
@@ -339,10 +319,6 @@ def image_part_(self, request):
     def InlineShapes_(self, request):
         return class_mock(request, 'docx.parts.document.InlineShapes')
 
-    @pytest.fixture
-    def next_id_prop_(self, request):
-        return property_mock(request, DocumentPart, 'next_id')
-
     @pytest.fixture
     def NumberingPart_(self, request):
         return class_mock(request, 'docx.parts.document.NumberingPart')
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index 970232b17..331ae36be 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -7,12 +7,14 @@
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
+from docx.image.image import Image
 from docx.package import Package
 from docx.parts.document import DocumentPart
 from docx.parts.story import BaseStoryPart
 from docx.styles.style import BaseStyle
 
-from ..unitutil.mock import instance_mock, property_mock
+from ..unitutil.file import snippet_text
+from ..unitutil.mock import instance_mock, method_mock, property_mock
 
 
 class DescribeBaseStoryPart(object):
@@ -44,6 +46,20 @@ def it_can_get_a_style_id_by_style_or_name_and_type(
         document_part_.get_style_id.assert_called_once_with(style_, style_type)
         assert style_id == "BodyText"
 
+    def it_can_create_a_new_pic_inline(self, get_or_add_image_, image_, next_id_prop_):
+        get_or_add_image_.return_value = "rId42", image_
+        image_.scaled_dimensions.return_value = 444, 888
+        image_.filename = "bar.png"
+        next_id_prop_.return_value = 24
+        expected_xml = snippet_text("inline")
+        story_part = BaseStoryPart(None, None, None, None)
+
+        inline = story_part.new_pic_inline("foo/bar.png", width=100, height=200)
+
+        get_or_add_image_.assert_called_once_with(story_part, "foo/bar.png")
+        image_.scaled_dimensions.assert_called_once_with(100, 200)
+        assert inline.xml == expected_xml
+
     def it_knows_the_main_document_part_to_help(self, package_, document_part_):
         package_.main_document_part = document_part_
         story_part = BaseStoryPart(None, None, None, package_)
@@ -62,6 +78,18 @@ def document_part_(self, request):
     def _document_part_prop_(self, request):
         return property_mock(request, BaseStoryPart, "_document_part")
 
+    @pytest.fixture
+    def get_or_add_image_(self, request):
+        return method_mock(request, BaseStoryPart, "get_or_add_image")
+
+    @pytest.fixture
+    def image_(self, request):
+        return instance_mock(request, Image)
+
+    @pytest.fixture
+    def next_id_prop_(self, request):
+        return property_mock(request, BaseStoryPart, "next_id")
+
     @pytest.fixture
     def package_(self, request):
         return instance_mock(request, Package)
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index cc4d97029..ae23c641c 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -1,12 +1,8 @@
 # encoding: utf-8
 
-"""
-Test suite for the docx.text.run module
-"""
+"""Test suite for the docx.text.run module"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE

From 002e37fbb577e4cea36fa7679441631f9ba40465 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 13:10:01 -0800
Subject: [PATCH 216/367] hdr: add BaseStoryPart.get_or_add_image()

Also extract Package.get_or_add_image_part() to avoid BaseStoryPart and
others having to know about ImageParts.
---
 docx/package.py              |  8 ++++++++
 docx/parts/document.py       | 14 --------------
 docx/parts/story.py          |  5 ++++-
 tests/parts/test_document.py | 25 -------------------------
 tests/parts/test_story.py    | 23 +++++++++++++++++++++++
 tests/test_package.py        | 28 +++++++++++++++++++++++++++-
 6 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/docx/package.py b/docx/package.py
index 529c18ea1..9f5ccc667 100644
--- a/docx/package.py
+++ b/docx/package.py
@@ -22,6 +22,14 @@ def after_unmarshal(self):
         """
         self._gather_image_parts()
 
+    def get_or_add_image_part(self, image_descriptor):
+        """Return |ImagePart| containing image specified by *image_descriptor*.
+
+        The image-part is newly created if a matching one is not already present in the
+        collection.
+        """
+        return self.image_parts.get_or_add_image_part(image_descriptor)
+
     @lazyproperty
     def image_parts(self):
         """|ImageParts| collection object for this package."""
diff --git a/docx/parts/document.py b/docx/parts/document.py
index 26ce2bd5c..a3717b855 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -59,20 +59,6 @@ def footer_part(self, rId):
         """Return |FooterPart| related by *rId*."""
         return self.related_parts[rId]
 
-    def get_or_add_image(self, image_descriptor):
-        """
-        Return an (rId, image) 2-tuple for the image identified by
-        *image_descriptor*. *image* is an |Image| instance providing access
-        to the properties of the image, such as dimensions and image type.
-        *rId* is the key for the relationship between this document part and
-        the image part, reused if already present, newly created if not.
-        """
-        image_part = self._package.image_parts.get_or_add_image_part(
-            image_descriptor
-        )
-        rId = self.relate_to(image_part, RT.IMAGE)
-        return rId, image_part.image
-
     def get_style(self, style_id, style_type):
         """
         Return the style in this document matching *style_id*. Returns the
diff --git a/docx/parts/story.py b/docx/parts/story.py
index a09f235b3..61de8279c 100644
--- a/docx/parts/story.py
+++ b/docx/parts/story.py
@@ -4,6 +4,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
 from docx.oxml.shape import CT_Inline
 from docx.shared import lazyproperty
@@ -25,7 +26,9 @@ def get_or_add_image(self, image_descriptor):
         *image* is an |Image| instance providing access to the properties of the image,
         such as dimensions and image type.
         """
-        raise NotImplementedError
+        image_part = self._package.get_or_add_image_part(image_descriptor)
+        rId = self.relate_to(image_part, RT.IMAGE)
+        return rId, image_part.image
 
     def get_style(self, style_id, style_type):
         """Return the style in this document matching *style_id*.
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 2c3c08df0..cff61248a 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -7,13 +7,11 @@
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
-from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
 from docx.package import Package
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
-from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
 from docx.parts.styles import StylesPart
@@ -88,21 +86,6 @@ def it_can_save_the_package_to_a_file(self, save_fixture):
         document.save(file_)
         document._package.save.assert_called_once_with(file_)
 
-    def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
-        path = 'foobar.png'
-        package_.image_parts.get_or_add_image_part.return_value = image_part_
-        relate_to_.return_value = "rId42"
-        image_part_.image = image_
-        document_part = DocumentPart(None, None, None, package_)
-
-        rId, image = document_part.get_or_add_image(path)
-
-        image_parts = document_part._package.image_parts
-        image_parts.get_or_add_image_part.assert_called_once_with(path)
-        relate_to_.assert_called_once_with(document_part, image_part_, RT.IMAGE)
-        assert rId == "rId42"
-        assert image is image_
-
     def it_provides_access_to_the_document_settings(self, settings_fixture):
         document_part, settings_ = settings_fixture
         settings = document_part.settings
@@ -307,14 +290,6 @@ def HeaderPart_(self, request):
     def header_part_(self, request):
         return instance_mock(request, HeaderPart)
 
-    @pytest.fixture
-    def image_(self, request):
-        return instance_mock(request, Image)
-
-    @pytest.fixture
-    def image_part_(self, request):
-        return instance_mock(request, ImagePart)
-
     @pytest.fixture
     def InlineShapes_(self, request):
         return class_mock(request, 'docx.parts.document.InlineShapes')
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index 331ae36be..f1f97312c 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -8,8 +8,10 @@
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.image.image import Image
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.package import Package
 from docx.parts.document import DocumentPart
+from docx.parts.image import ImagePart
 from docx.parts.story import BaseStoryPart
 from docx.styles.style import BaseStyle
 
@@ -19,6 +21,19 @@
 
 class DescribeBaseStoryPart(object):
 
+    def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
+        package_.get_or_add_image_part.return_value = image_part_
+        relate_to_.return_value = "rId42"
+        image_part_.image = image_
+        story_part = BaseStoryPart(None, None, None, package_)
+
+        rId, image = story_part.get_or_add_image("image.png")
+
+        package_.get_or_add_image_part.assert_called_once_with("image.png")
+        relate_to_.assert_called_once_with(story_part, image_part_, RT.IMAGE)
+        assert rId == "rId42"
+        assert image is image_
+
     def it_can_get_a_style_by_id_and_type(
         self, _document_part_prop_, document_part_, style_
     ):
@@ -86,6 +101,10 @@ def get_or_add_image_(self, request):
     def image_(self, request):
         return instance_mock(request, Image)
 
+    @pytest.fixture
+    def image_part_(self, request):
+        return instance_mock(request, ImagePart)
+
     @pytest.fixture
     def next_id_prop_(self, request):
         return property_mock(request, BaseStoryPart, "next_id")
@@ -94,6 +113,10 @@ def next_id_prop_(self, request):
     def package_(self, request):
         return instance_mock(request, Package)
 
+    @pytest.fixture
+    def relate_to_(self, request):
+        return method_mock(request, BaseStoryPart, "relate_to")
+
     @pytest.fixture
     def style_(self, request):
         return instance_mock(request, BaseStyle)
diff --git a/tests/test_package.py b/tests/test_package.py
index 7c158db04..c4df206ad 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -12,11 +12,23 @@
 from docx.parts.image import ImagePart
 
 from .unitutil.file import docx_path
-from .unitutil.mock import class_mock, instance_mock, method_mock
+from .unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
 class DescribePackage(object):
 
+    def it_can_get_or_add_an_image_part_containing_a_specified_image(
+        self, image_parts_prop_, image_parts_, image_part_
+    ):
+        image_parts_prop_.return_value = image_parts_
+        image_parts_.get_or_add_image_part.return_value = image_part_
+        package = Package()
+
+        image_part = package.get_or_add_image_part("image.png")
+
+        image_parts_.get_or_add_image_part.assert_called_once_with("image.png")
+        assert image_part is image_part_
+
     def it_gathers_package_image_parts_after_unmarshalling(self):
         package = Package.open(docx_path('having-images'))
         image_parts = package.image_parts
@@ -24,6 +36,20 @@ def it_gathers_package_image_parts_after_unmarshalling(self):
         for image_part in image_parts:
             assert isinstance(image_part, ImagePart)
 
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def image_part_(self, request):
+        return instance_mock(request, ImagePart)
+
+    @pytest.fixture
+    def image_parts_(self, request):
+        return instance_mock(request, ImageParts)
+
+    @pytest.fixture
+    def image_parts_prop_(self, request):
+        return property_mock(request, Package, "image_parts")
+
 
 class DescribeImageParts(object):
 

From 3923fe8610b421cae66a0ccbf537430cbced942f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 13:19:00 -0800
Subject: [PATCH 217/367] hdr: add BaseStoryPart.next_id

---
 docx/parts/document.py             | 14 --------------
 docx/parts/story.py                |  6 +++++-
 features/hdr-header-footer.feature |  2 --
 tests/parts/test_document.py       | 26 --------------------------
 tests/parts/test_story.py          | 29 +++++++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/docx/parts/document.py b/docx/parts/document.py
index a3717b855..59d0b7a71 100644
--- a/docx/parts/document.py
+++ b/docx/parts/document.py
@@ -89,20 +89,6 @@ def inline_shapes(self):
         """
         return InlineShapes(self._element.body, self)
 
-    @property
-    def next_id(self):
-        """Next available positive integer id value in this document.
-
-        Calculated by incrementing maximum existing id value. Gaps in the
-        existing id sequence are not filled. The id attribute value is unique
-        in the document, without regard to the element type it appears on.
-        """
-        id_str_lst = self._element.xpath('//@id')
-        used_ids = [int(id_str) for id_str in id_str_lst if id_str.isdigit()]
-        if not used_ids:
-            return 1
-        return max(used_ids) + 1
-
     @lazyproperty
     def numbering_part(self):
         """
diff --git a/docx/parts/story.py b/docx/parts/story.py
index 61de8279c..129b8f1cc 100644
--- a/docx/parts/story.py
+++ b/docx/parts/story.py
@@ -66,7 +66,11 @@ def next_id(self):
         the existing id sequence are not filled. The id attribute value is unique in the
         document, without regard to the element type it appears on.
         """
-        raise NotImplementedError
+        id_str_lst = self._element.xpath('//@id')
+        used_ids = [int(id_str) for id_str in id_str_lst if id_str.isdigit()]
+        if not used_ids:
+            return 1
+        return max(used_ids) + 1
 
     @lazyproperty
     def _document_part(self):
diff --git a/features/hdr-header-footer.feature b/features/hdr-header-footer.feature
index 7c5e8cc9f..eb2bb00d6 100644
--- a/features/hdr-header-footer.feature
+++ b/features/hdr-header-footer.feature
@@ -40,7 +40,6 @@ Feature: Header and footer behaviors
      Then header.paragraphs[0].style.name == "Normal"
 
 
-  @wip
   Scenario: _Header allows image insertion
     Given a _Run object from a header as run
      When I call run.add_picture()
@@ -83,7 +82,6 @@ Feature: Header and footer behaviors
      Then footer.paragraphs[0].style.name == "Normal"
 
 
-  @wip
   Scenario: _Footer allows image insertion
     Given a _Run object from a footer as run
      When I call run.add_picture()
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index cff61248a..d6f0e7731 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -20,7 +20,6 @@
 from docx.styles.styles import Styles
 
 from ..oxml.parts.unitdata.document import a_body, a_document
-from ..oxml.unitdata.text import a_p
 from ..unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
@@ -132,10 +131,6 @@ def and_it_creates_a_numbering_part_if_not_present(
         relate_to_.assert_called_once_with(document_part, numbering_part_, RT.NUMBERING)
         assert numbering_part is numbering_part_
 
-    def it_knows_the_next_available_xml_id(self, next_id_fixture):
-        document, expected_id = next_id_fixture
-        assert document.next_id == expected_id
-
     def it_can_get_a_style_by_id(self, styles_prop_, styles_, style_):
         styles_prop_.return_value = styles_
         styles_.get_by_id.return_value = style_
@@ -222,27 +217,6 @@ def inline_shapes_fixture(self, request, InlineShapes_):
         document = DocumentPart(None, None, document_elm, None)
         return document, InlineShapes_, body_elm
 
-    @pytest.fixture(params=[
-        ((), 1),
-        ((1,), 2),
-        ((2,), 3),
-        ((1, 2, 3), 4),
-        ((1, 2, 4), 5),
-        ((0, 0), 1),
-        ((0, 0, 1, 3), 4),
-        (('foo', 1, 2), 3),
-        ((1, 'bar'), 2)
-    ])
-    def next_id_fixture(self, request):
-        existing_ids, expected_id = request.param
-        document_elm = a_document().with_nsdecls().element
-        for n in existing_ids:
-            p = a_p().with_nsdecls().element
-            p.set('id', str(n))
-            document_elm.append(p)
-        document = DocumentPart(None, None, document_elm, None)
-        return document, expected_id
-
     @pytest.fixture
     def save_fixture(self, package_):
         document_part = DocumentPart(None, None, None, package_)
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index f1f97312c..e42fc49ae 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -15,6 +15,7 @@
 from docx.parts.story import BaseStoryPart
 from docx.styles.style import BaseStyle
 
+from ..unitutil.cxml import element
 from ..unitutil.file import snippet_text
 from ..unitutil.mock import instance_mock, method_mock, property_mock
 
@@ -75,6 +76,14 @@ def it_can_create_a_new_pic_inline(self, get_or_add_image_, image_, next_id_prop
         image_.scaled_dimensions.assert_called_once_with(100, 200)
         assert inline.xml == expected_xml
 
+    def it_knows_the_next_available_xml_id(self, next_id_fixture):
+        story_element, expected_value = next_id_fixture
+        story_part = BaseStoryPart(None, None, story_element, None)
+
+        next_id = story_part.next_id
+
+        assert next_id == expected_value
+
     def it_knows_the_main_document_part_to_help(self, package_, document_part_):
         package_.main_document_part = document_part_
         story_part = BaseStoryPart(None, None, None, package_)
@@ -83,6 +92,26 @@ def it_knows_the_main_document_part_to_help(self, package_, document_part_):
 
         assert document_part is document_part_
 
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(
+        params=[
+            (("w:document"), 1),
+            (("w:document/w:p{id=1}"), 2),
+            (("w:document/w:p{id=2}"), 3),
+            (("w:hdr/(w:p{id=1},w:p{id=2},w:p{id=3})"), 4),
+            (("w:hdr/(w:p{id=1},w:p{id=2},w:p{id=4})"), 5),
+            (("w:hdr/(w:p{id=0},w:p{id=0})"), 1),
+            (("w:ftr/(w:p{id=0},w:p{id=0},w:p{id=1},w:p{id=3})"), 4),
+            (("w:ftr/(w:p{id=foo},w:p{id=1},w:p{id=2})"), 3),
+            (("w:ftr/(w:p{id=1},w:p{id=bar})"), 2),
+        ]
+    )
+    def next_id_fixture(self, request):
+        story_cxml, expected_value = request.param
+        story_element = element(story_cxml)
+        return story_element, expected_value
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture

From 1fd57deed6d4108daef33c5aae1b8f187b032136 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 23:29:04 -0800
Subject: [PATCH 218/367] acpt: add odd-even-page-headers scenarios

---
 features/doc-settings.feature                 |  30 ++++++++++++++--
 features/steps/settings.py                    |  34 ++++++++++++++----
 .../steps/test_files/doc-odd-even-hdrs.docx   | Bin 0 -> 17711 bytes
 3 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 features/steps/test_files/doc-odd-even-hdrs.docx

diff --git a/features/doc-settings.feature b/features/doc-settings.feature
index 612dfcc19..3eccbb57e 100644
--- a/features/doc-settings.feature
+++ b/features/doc-settings.feature
@@ -1,7 +1,8 @@
-Feature: Access to document settings
+Feature: Document.settings
   In order to operate on document-level settings
   As a developer using python-docx
-  I access to settings stored in the settings part
+  I need access to settings to the Settings object for the document
+  And I need properties and methods on Settings
 
 
   Scenario Outline: Access document settings
@@ -12,3 +13,28 @@ Feature: Access to document settings
       | a-or-no   |
       | a         |
       | no        |
+
+
+  @wip
+  Scenario Outline: Settings.odd_and_even_pages_header_footer getter
+    Given a Settings object <with-or-without> odd and even page headers as settings
+     Then settings.odd_and_even_pages_header_footer is <value>
+
+    Examples: Settings.odd_and_even_pages_header_footer states
+      | with-or-without | value |
+      | with            | True  |
+      | without         | False |
+
+
+  @wip
+  Scenario Outline: Settings.odd_and_even_pages_header_footer setter
+    Given a Settings object <with-or-without> odd and even page headers as settings
+     When I assign <value> to settings.odd_and_even_pages_header_footer
+     Then settings.odd_and_even_pages_header_footer is <value>
+
+    Examples: Settings.odd_and_even_pages_header_footer assignment cases
+      | with-or-without | value |
+      | with            | True  |
+      | with            | False |
+      | without         | True  |
+      | without         | False |
diff --git a/features/steps/settings.py b/features/steps/settings.py
index b818487b5..f770f8c19 100644
--- a/features/steps/settings.py
+++ b/features/steps/settings.py
@@ -1,14 +1,10 @@
 # encoding: utf-8
 
-"""
-Step implementations for document settings-related features
-"""
+"""Step implementations for document settings-related features"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from behave import given, then
+from behave import given, then, when
 
 from docx import Document
 from docx.settings import Settings
@@ -28,9 +24,33 @@ def given_a_document_having_no_settings_part(context):
     context.document = Document(test_docx('set-no-settings-part'))
 
 
+@given("a Settings object {with_or_without} odd and even page headers as settings")
+def given_a_Settings_object_with_or_without_odd_and_even_hdrs(context, with_or_without):
+    testfile_name = {
+        "with": "doc-odd-even-hdrs", "without": "sct-section-props"
+    }[with_or_without]
+    context.settings = Document(test_docx(testfile_name)).settings
+
+
+# when =====================================================
+
+@when("I assign {bool_val} to settings.odd_and_even_pages_header_footer")
+def when_I_assign_value_to_settings_odd_and_even_pages_header_footer(context, bool_val):
+    context.settings.odd_and_even_pages_header_footer = eval(bool_val)
+
+
 # then =====================================================
 
 @then('document.settings is a Settings object')
 def then_document_settings_is_a_Settings_object(context):
     document = context.document
     assert type(document.settings) is Settings
+
+
+@then("settings.odd_and_even_pages_header_footer is {bool_val}")
+def then_settings_odd_and_even_pages_header_footer_is(context, bool_val):
+    actual = context.settings.odd_and_even_pages_header_footer
+    expected = eval(bool_val)
+    assert actual == expected, (
+        "settings.odd_and_even_pages_header_footer is %s" % actual
+    )
diff --git a/features/steps/test_files/doc-odd-even-hdrs.docx b/features/steps/test_files/doc-odd-even-hdrs.docx
new file mode 100644
index 0000000000000000000000000000000000000000..576a7e9bac407e119b8f57bb31b6c00c89985416
GIT binary patch
literal 17711
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
ZOL=K<fJFH57!*{XT7VogdHdtj{{zb1JdFSV

literal 0
HcmV?d00001


From a46dd645f94ad8b3c53878d3dae1a0510661317b Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 23:36:30 -0800
Subject: [PATCH 219/367] hdr: add Settings.odd_and_even_pages_header_footer

Getter side.
---
 docx/oxml/__init__.py         |  4 +++
 docx/oxml/settings.py         | 57 +++++++++++++++++++++++++++++++++++
 docx/settings.py              |  8 +++++
 features/doc-settings.feature |  1 -
 tests/test_settings.py        | 40 ++++++++++++++++++++++++
 5 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 docx/oxml/settings.py
 create mode 100644 tests/test_settings.py

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 1d88f5927..d1c01c6f6 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -65,6 +65,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 # ===========================================================================
 
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
+register_element_cls("w:evenAndOddHeaders", CT_OnOff)
 
 
 from .coreprops import CT_CoreProperties  # noqa
@@ -101,6 +102,9 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls("w:sectPr", CT_SectPr)
 register_element_cls("w:type", CT_SectType)
 
+from .settings import CT_Settings  # noqa
+register_element_cls("w:settings", CT_Settings)
+
 from .shape import (  # noqa
     CT_Blip,
     CT_BlipFillProperties,
diff --git a/docx/oxml/settings.py b/docx/oxml/settings.py
new file mode 100644
index 000000000..fbd262f1a
--- /dev/null
+++ b/docx/oxml/settings.py
@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+"""Custom element classes related to document settings"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
+
+
+class CT_Settings(BaseOxmlElement):
+    """`w:settings` element, root element for the settings part"""
+
+    _tag_seq = (
+        "w:writeProtection", "w:view", "w:zoom", "w:removePersonalInformation",
+        "w:removeDateAndTime", "w:doNotDisplayPageBoundaries",
+        "w:displayBackgroundShape", "w:printPostScriptOverText",
+        "w:printFractionalCharacterWidth", "w:printFormsData", "w:embedTrueTypeFonts",
+        "w:embedSystemFonts", "w:saveSubsetFonts", "w:saveFormsData", "w:mirrorMargins",
+        "w:alignBordersAndEdges", "w:bordersDoNotSurroundHeader",
+        "w:bordersDoNotSurroundFooter", "w:gutterAtTop", "w:hideSpellingErrors",
+        "w:hideGrammaticalErrors", "w:activeWritingStyle", "w:proofState",
+        "w:formsDesign", "w:attachedTemplate", "w:linkStyles",
+        "w:stylePaneFormatFilter", "w:stylePaneSortMethod", "w:documentType",
+        "w:mailMerge", "w:revisionView", "w:trackRevisions", "w:doNotTrackMoves",
+        "w:doNotTrackFormatting", "w:documentProtection", "w:autoFormatOverride",
+        "w:styleLockTheme", "w:styleLockQFSet", "w:defaultTabStop", "w:autoHyphenation",
+        "w:consecutiveHyphenLimit", "w:hyphenationZone", "w:doNotHyphenateCaps",
+        "w:showEnvelope", "w:summaryLength", "w:clickAndTypeStyle",
+        "w:defaultTableStyle", "w:evenAndOddHeaders", "w:bookFoldRevPrinting",
+        "w:bookFoldPrinting", "w:bookFoldPrintingSheets",
+        "w:drawingGridHorizontalSpacing", "w:drawingGridVerticalSpacing",
+        "w:displayHorizontalDrawingGridEvery", "w:displayVerticalDrawingGridEvery",
+        "w:doNotUseMarginsForDrawingGridOrigin", "w:drawingGridHorizontalOrigin",
+        "w:drawingGridVerticalOrigin", "w:doNotShadeFormData", "w:noPunctuationKerning",
+        "w:characterSpacingControl", "w:printTwoOnOne", "w:strictFirstAndLastChars",
+        "w:noLineBreaksAfter", "w:noLineBreaksBefore", "w:savePreviewPicture",
+        "w:doNotValidateAgainstSchema", "w:saveInvalidXml", "w:ignoreMixedContent",
+        "w:alwaysShowPlaceholderText", "w:doNotDemarcateInvalidXml",
+        "w:saveXmlDataOnly", "w:useXSLTWhenSaving", "w:saveThroughXslt",
+        "w:showXMLTags", "w:alwaysMergeEmptyNamespace", "w:updateFields",
+        "w:hdrShapeDefaults", "w:footnotePr", "w:endnotePr", "w:compat", "w:docVars",
+        "w:rsids", "m:mathPr", "w:attachedSchema", "w:themeFontLang",
+        "w:clrSchemeMapping", "w:doNotIncludeSubdocsInStats",
+        "w:doNotAutoCompressPictures", "w:forceUpgrade", "w:captions",
+        "w:readModeInkLockDown", "w:smartTagType", "sl:schemaLibrary",
+        "w:shapeDefaults", "w:doNotEmbedSmartTags", "w:decimalSymbol", "w:listSeparator"
+    )
+    evenAndOddHeaders = ZeroOrOne("w:evenAndOddHeaders", successors=_tag_seq[48:])
+    del _tag_seq
+
+    @property
+    def evenAndOddHeaders_val(self):
+        """value of `w:evenAndOddHeaders/@w:val` or |None| if not present."""
+        evenAndOddHeaders = self.evenAndOddHeaders
+        if evenAndOddHeaders is None:
+            return False
+        return evenAndOddHeaders.val
diff --git a/docx/settings.py b/docx/settings.py
index f8318d809..1a2178a67 100644
--- a/docx/settings.py
+++ b/docx/settings.py
@@ -14,3 +14,11 @@ class Settings(ElementProxy):
     """
 
     __slots__ = ()
+
+    @property
+    def odd_and_even_pages_header_footer(self):
+        """True if this document has distinct odd and even page headers and footers.
+
+        Read/write.
+        """
+        return self._element.evenAndOddHeaders_val
diff --git a/features/doc-settings.feature b/features/doc-settings.feature
index 3eccbb57e..8ff839cc9 100644
--- a/features/doc-settings.feature
+++ b/features/doc-settings.feature
@@ -15,7 +15,6 @@ Feature: Document.settings
       | no        |
 
 
-  @wip
   Scenario Outline: Settings.odd_and_even_pages_header_footer getter
     Given a Settings object <with-or-without> odd and even page headers as settings
      Then settings.odd_and_even_pages_header_footer is <value>
diff --git a/tests/test_settings.py b/tests/test_settings.py
new file mode 100644
index 000000000..7507b9541
--- /dev/null
+++ b/tests/test_settings.py
@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+"""Unit test suite for the docx.settings module"""
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+import pytest
+
+from docx.settings import Settings
+
+from .unitutil.cxml import element
+
+
+class DescribeSettings(object):
+
+    def it_knows_when_the_document_has_distinct_odd_and_even_headers(
+        self, odd_and_even_get_fixture
+    ):
+        settings_elm, expected_value = odd_and_even_get_fixture
+        settings = Settings(settings_elm)
+
+        odd_and_even_pages_header_footer = settings.odd_and_even_pages_header_footer
+
+        assert odd_and_even_pages_header_footer is expected_value
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(
+        params=[
+            ("w:settings", False),
+            ("w:settings/w:evenAndOddHeaders", True),
+            ("w:settings/w:evenAndOddHeaders{w:val=0}", False),
+            ("w:settings/w:evenAndOddHeaders{w:val=1}", True),
+            ("w:settings/w:evenAndOddHeaders{w:val=true}", True),
+        ]
+    )
+    def odd_and_even_get_fixture(self, request):
+        settings_cxml, expected_value = request.param
+        settings_elm = element(settings_cxml)
+        return settings_elm, expected_value

From b48f860f1d6e7c15a101245dd3d42a55eeefc7e1 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 23:43:55 -0800
Subject: [PATCH 220/367] hdr: add Settings.odd_and_even_pages_head.. setter

Add some namespace-prefix mappings that arise for the first time in
headers.
---
 docx/oxml/ns.py               | 31 +++++++++++++++----------------
 docx/oxml/settings.py         |  7 +++++++
 docx/settings.py              |  4 ++++
 features/doc-settings.feature |  1 -
 tests/test_settings.py        | 30 +++++++++++++++++++++++++++++-
 5 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/docx/oxml/ns.py b/docx/oxml/ns.py
index e6f6a4acc..c240366da 100644
--- a/docx/oxml/ns.py
+++ b/docx/oxml/ns.py
@@ -8,22 +8,21 @@
 
 
 nsmap = {
-    'a':   ('http://schemas.openxmlformats.org/drawingml/2006/main'),
-    'c':   ('http://schemas.openxmlformats.org/drawingml/2006/chart'),
-    'cp':  ('http://schemas.openxmlformats.org/package/2006/metadata/core-pr'
-            'operties'),
-    'dc':  ('http://purl.org/dc/elements/1.1/'),
-    'dcmitype': ('http://purl.org/dc/dcmitype/'),
-    'dcterms':  ('http://purl.org/dc/terms/'),
-    'dgm': ('http://schemas.openxmlformats.org/drawingml/2006/diagram'),
-    'pic': ('http://schemas.openxmlformats.org/drawingml/2006/picture'),
-    'r':   ('http://schemas.openxmlformats.org/officeDocument/2006/relations'
-            'hips'),
-    'w':   ('http://schemas.openxmlformats.org/wordprocessingml/2006/main'),
-    'wp':  ('http://schemas.openxmlformats.org/drawingml/2006/wordprocessing'
-            'Drawing'),
-    'xml': ('http://www.w3.org/XML/1998/namespace'),
-    'xsi': ('http://www.w3.org/2001/XMLSchema-instance'),
+    "a": ("http://schemas.openxmlformats.org/drawingml/2006/main"),
+    "c": ("http://schemas.openxmlformats.org/drawingml/2006/chart"),
+    "cp": ("http://schemas.openxmlformats.org/package/2006/metadata/core-properties"),
+    "dc": ("http://purl.org/dc/elements/1.1/"),
+    "dcmitype": ("http://purl.org/dc/dcmitype/"),
+    "dcterms": ("http://purl.org/dc/terms/"),
+    "dgm": ("http://schemas.openxmlformats.org/drawingml/2006/diagram"),
+    "m": ("http://schemas.openxmlformats.org/officeDocument/2006/math"),
+    "pic": ("http://schemas.openxmlformats.org/drawingml/2006/picture"),
+    "r": ("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
+    "sl": ("http://schemas.openxmlformats.org/schemaLibrary/2006/main"),
+    "w": ("http://schemas.openxmlformats.org/wordprocessingml/2006/main"),
+    "wp": ("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"),
+    "xml": ("http://www.w3.org/XML/1998/namespace"),
+    "xsi": ("http://www.w3.org/2001/XMLSchema-instance"),
 }
 
 pfxmap = dict((value, key) for key, value in nsmap.items())
diff --git a/docx/oxml/settings.py b/docx/oxml/settings.py
index fbd262f1a..fd319ad70 100644
--- a/docx/oxml/settings.py
+++ b/docx/oxml/settings.py
@@ -55,3 +55,10 @@ def evenAndOddHeaders_val(self):
         if evenAndOddHeaders is None:
             return False
         return evenAndOddHeaders.val
+
+    @evenAndOddHeaders_val.setter
+    def evenAndOddHeaders_val(self, value):
+        if value in [None, False]:
+            self._remove_evenAndOddHeaders()
+        else:
+            self.get_or_add_evenAndOddHeaders().val = value
diff --git a/docx/settings.py b/docx/settings.py
index 1a2178a67..502c9d4db 100644
--- a/docx/settings.py
+++ b/docx/settings.py
@@ -22,3 +22,7 @@ def odd_and_even_pages_header_footer(self):
         Read/write.
         """
         return self._element.evenAndOddHeaders_val
+
+    @odd_and_even_pages_header_footer.setter
+    def odd_and_even_pages_header_footer(self, value):
+        self._element.evenAndOddHeaders_val = value
diff --git a/features/doc-settings.feature b/features/doc-settings.feature
index 8ff839cc9..89d812f83 100644
--- a/features/doc-settings.feature
+++ b/features/doc-settings.feature
@@ -25,7 +25,6 @@ Feature: Document.settings
       | without         | False |
 
 
-  @wip
   Scenario Outline: Settings.odd_and_even_pages_header_footer setter
     Given a Settings object <with-or-without> odd and even page headers as settings
      When I assign <value> to settings.odd_and_even_pages_header_footer
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 7507b9541..5873ffa1d 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -8,7 +8,7 @@
 
 from docx.settings import Settings
 
-from .unitutil.cxml import element
+from .unitutil.cxml import element, xml
 
 
 class DescribeSettings(object):
@@ -23,6 +23,16 @@ def it_knows_when_the_document_has_distinct_odd_and_even_headers(
 
         assert odd_and_even_pages_header_footer is expected_value
 
+    def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
+        self, odd_and_even_set_fixture
+    ):
+        settings_elm, value, expected_xml = odd_and_even_set_fixture
+        settings = Settings(settings_elm)
+
+        settings.odd_and_even_pages_header_footer = value
+
+        assert settings_elm.xml == expected_xml
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(
@@ -38,3 +48,21 @@ def odd_and_even_get_fixture(self, request):
         settings_cxml, expected_value = request.param
         settings_elm = element(settings_cxml)
         return settings_elm, expected_value
+
+    @pytest.fixture(
+        params=[
+            ("w:settings", True, "w:settings/w:evenAndOddHeaders"),
+            ("w:settings/w:evenAndOddHeaders", False, "w:settings"),
+            (
+                "w:settings/w:evenAndOddHeaders{w:val=1}",
+                True,
+                "w:settings/w:evenAndOddHeaders"
+            ),
+            ("w:settings/w:evenAndOddHeaders{w:val=off}", False, "w:settings"),
+        ]
+    )
+    def odd_and_even_set_fixture(self, request):
+        settings_cxml, value, expected_cxml = request.param
+        settings_elm = element(settings_cxml)
+        expected_xml = xml(expected_cxml)
+        return settings_elm, value, expected_xml

From 1db743cbf2cec42951a7524ed94f811176187606 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 4 Jan 2019 23:51:51 -0800
Subject: [PATCH 221/367] acpt: add scenarios for Section.diff_first_page..

Add scenarios for Section.different_first_page_header_footer.
---
 features/sct-section.feature                  |  25 ++++++++++++++++++
 features/steps/section.py                     |  20 ++++++++++++++
 .../test_files/sct-first-page-hdrftr.docx     | Bin 0 -> 14849 bytes
 3 files changed, 45 insertions(+)
 create mode 100644 features/steps/test_files/sct-first-page-hdrftr.docx

diff --git a/features/sct-section.feature b/features/sct-section.feature
index 64ccd03c4..5e4e5d2f9 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -4,6 +4,31 @@ Feature: Access and change section properties
   I need a way to get and set the properties of a section
 
 
+  @wip
+  Scenario Outline: Section.different_first_page_header_footer getter
+    Given a Section object <with-or-without> a distinct first-page header as section
+     Then section.different_first_page_header_footer is <value>
+
+    Examples: Section.different_first_page_header_footer states
+      | with-or-without | value |
+      | with            | True  |
+      | without         | False |
+
+
+  @wip
+  Scenario Outline: Section.different_first_page_header_footer setter
+    Given a Section object <with-or-without> a distinct first-page header as section
+     When I assign <value> to section.different_first_page_header_footer
+     Then section.different_first_page_header_footer is <value>
+
+    Examples: Section.different_first_page_header_footer assignment cases
+      | with-or-without | value |
+      | with            | True  |
+      | with            | False |
+      | without         | True  |
+      | without         | False |
+
+
   Scenario: Section.footer
     Given a Section object as section
      Then section.footer is a _Footer object
diff --git a/features/steps/section.py b/features/steps/section.py
index a1522c95c..5ccbe173d 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -23,6 +23,12 @@ def given_a_Section_object_as_section(context):
     context.section = Document(test_docx("sct-section-props")).sections[-1]
 
 
+@given("a Section object {with_or_without} a distinct first-page header as section")
+def given_a_Section_object_with_or_without_first_page_header(context, with_or_without):
+    section_idx = {"with": 1, "without": 0}[with_or_without]
+    context.section = Document(test_docx("sct-first-page-hdrftr")).sections[section_idx]
+
+
 @given('a section collection containing 3 sections')
 def given_a_section_collection_containing_3_sections(context):
     document = Document(test_docx('doc-access-sections'))
@@ -66,6 +72,11 @@ def given_a_section_having_known_orientation(context, orientation):
 
 # when =====================================================
 
+@when("I assign {bool_val} to section.different_first_page_header_footer")
+def when_I_assign_value_to_section_different_first_page_hdrftr(context, bool_val):
+    context.section.different_first_page_header_footer = eval(bool_val)
+
+
 @when('I set the {margin_side} margin to {inches} inches')
 def when_I_set_the_margin_side_length(context, margin_side, inches):
     prop_name = {
@@ -142,6 +153,15 @@ def then_len_sections_is_3(context):
     )
 
 
+@then("section.different_first_page_header_footer is {bool_val}")
+def then_section_different_first_page_header_footer_is(context, bool_val):
+    actual = context.section.different_first_page_header_footer
+    expected = eval(bool_val)
+    assert actual == expected, (
+        "section.different_first_page_header_footer is %s" % actual
+    )
+
+
 @then("section.footer is a _Footer object")
 def then_section_footer_is_a_Footer_object(context):
     actual = type(context.section.footer).__name__
diff --git a/features/steps/test_files/sct-first-page-hdrftr.docx b/features/steps/test_files/sct-first-page-hdrftr.docx
new file mode 100644
index 0000000000000000000000000000000000000000..400da40a7167f342f3a3381b0c1e11d36eb69856
GIT binary patch
literal 14849
zcmeIZbyOY6);^58ySoMmu0eu30fM``yN2KdcXxujyA#~q2^`#=5bSp{Gr5z=o%OBn
z|M&J<r}}hPKh<^mJbTyfT~EnNgF|3|K!L!3fPj#Kcp0X@^#KI|p@9YgK?i{W(-gL~
zaWb}X(p7S|Gj`N|?PhI7k_!PwlMMm}y#9aN|KTUlmoOsN%Y-6&C-Eq}%^<bv;)`Oj
z3>ihKl<W1;@*Q4SU&Hai(OC+cd4Rk*igh1VEUV)g--kh>ca6rV<=xQMvco|`A4T;(
zD=*W(zvcIdJX6Dv$DxF?Br$#iW5v_lfj8lbBqU;iu9!&P;yLa=nu9@Fjf9}gawP4`
zb}fAx@Q5P)HLv??qO>InLcf}O)zCLomg-kb9?R2bseQtzYS;3dD(bZ8<Cq$7pLulg
zZx|?T(9jf5J%uW?n{uG~qo|Y;vcU1y=olgv;Br&WzmZ8DZs8wcs;X2-DN+?$N7^mZ
z&!A~|@9efEpn#RTt5aC#V=NPV^Vx=Jq9f7D%)LE{gcd=&2A$+`C9~4In8*KueI*w?
zs=<c!uoyAlf({mb_-XU&>ZfRb`LDrA)I||KDFWXcAH&J^3>4lH?`2n?2E1+gl=Ga~
ziSC*9K4zBtY96v>>4~_&yQziFSq9zZt3npPxiy)37N0<o4kYBE1jk0FW86C+<z8OE
zLFE5ow?r{`jc33bIiOj>1MODV!Pv@?@%4}LfA;!+*hqi*>1DCq7QIXeZ_oUn{HNL#
zmb-EC<QNSnS8$e~VKgOW&{q~M7M`DY7Z<^_5A?-Hrf1?NJsi`;oWI6vpW`JeBZjua
z&fn|wYCg2Nfg}XB<ukj@+ifAF?cSO^4U<dK4*Q3xV}?%PLB)IvNgnG$-+3i+yHf~n
zPDVR1Ye-R>muauOaF_gnH9LiQZr(yd(-XRcPqZV5uw@+g1DuIKbrLH>bX3oJjdq{X
zVO$eSgaz#lJ)RX4BV~GwK^Yw0dE3;XM_y;)mrsH8usN`w7$3Y$w9qu3_d<7Z1vt(~
z)$4ROZSm8!1+Rdk*MHlG1+Nh?8L);M5(I<*1P0XA*1?GJPa`q1HFUNH4sk!mwx0$A
z3LM~oSO4GM>f(QK@O<`Y*}O`H_yMyF0mycMAz=!@AQ92MXPJuZ`=YYfqYf49cSK`@
zwOZbH+SjoC4S0~!fB?~t`6>+ae(jhOs(17?6beIf<S-n5#-)#!2KQhY6bnXaE>$s(
zf^=%aY`hLOBTydZhI}9`Nm6M#v2?Oy(CQr{cy5Ul@HV?d^a7XR^HNN;Dz7_npt%M#
zRh2b+;$91QyyZddri)M-l!YEwO2w0?k_^qj2NaT42n%_2?_!3m2AqHzQhk4WD&)sT
zf|(57TQTl+uRiGYU<&8?B{&*NG`rfLyQ|^$3*)m7croJ(hY^3akn9!cF(z@3>>^|F
z0d_CNJqeMJQ1ns8T7Y#kdZG4to`2E{kQo2XF>lGX_eS6#AX>;EAgI7A{@~cJ>{?Bd
zwq4;u`FI9-D*(fD0w!xVGy!KHYCQwRO|M6B(wr@M2pWbQT}ODg;7TKv*lMAn4hwgz
zL!pp<zuS!)+T!srIHEUDNBdbVXljQBA(<o=i%c^pOTfELEx@;0O<qf?J8{!D<^1G^
zxU%9FHo<5lr3#cJK=L+}zIRn4fy78+oQor=jYI=4Wm%exJJwtSCFoZ1Jw{Zn!p-M8
zicy@ZJEAZ`4*dx7s3$We03XepuMjZ=mLo)(Von@Jq3hYA*ciwlf&uokq7f5fW6@V7
z;Hd~;zN&=NPB;h9-D5#9Td&Re!`V(_v3eyk9JbcLl0spVW%73yd*n?+4BMAV;6doD
z!kiVbZb3$;%DTS_SwXo$Xo!Om&(y*?_E8$|By(UiBQ$DI)IWbw*l5mld-^_aw$Fdz
znULn;SVShCnh*_7E2C3n7<`q(mOP3-cxozm?6x#`qC8uxow=N8<Mm2YkNEEB@oL)h
z+0lUQu$m0Xes&+wbH{=Ij!Q}3(oNn%E*Af0^)24pRnSq1soKx@K@(Jc;HlIEz2m(y
z_~G2=4Rd#|Jay_<Et-`X%H4=gDo&o-AK<dOOG;1c&_}P*-3P1v7<}WlU!yAmoMDLs
z5h3NF1na?0;Y!h(3g9a@i>eZ@zn;EYq_&&Qz8kS)OJy{fxdT+WJNGKKF`NvA&rF^g
zR0?1%FTULj*VZAu>(O?0R-OQ<WQSSu_X8n#Bf{9nP+ff|BVT~44f-v^#LeG}202_p
z&|hFF@>AzCF{$@3JR+*3lqa+kEAh+IZg9|1ij<*p3P<>20{juI_27OdyJJxIjAx=>
zt6!C&R8b>36p#HwL`NQLQcfYJqN*G9mLp?DO>iX%IKCamKwQifMeyDMSf-_~k6k?)
zS_k@6U)Vm`i1iySX-i7m0ZQq2Chg)Qc0{VZN>ZLIqYVvs^SdGRh;8g}=)1-x3w9!%
za}}s@H7HifYG68%rgQWbXh*6=&B&U?x``q9&~XdCw%ZmIGhN?w>^^iIe9a#=c}v_T
z65Y9BkTJh>)a9DZs#!R<!y3{#QB=y+Y`-@H4G*o!bQ0R~irSaE>1ju$qt^&vSs3#~
zqV?n^Nvw!D`mx|KiY<b{YDi@%1#w%zzUYae;~DDTOmgQ1{Xz&B5_Q0WfS~;}NfTRJ
zCmUNQW5*vJzbtVjGK~o(=#1`$F!~H#c#!}ru&g0M<3xLIjsN39vK|BfAP1@Y0}@3*
z-DgzNcIIzPSueN~IEnAx#CU3&(5teDbuWq&#VJv0*%(|OovfJo@*aiANK{aSO=YTI
z*L{C9R~IW*lzTN$2902zr#ORSJbnOUD9uV0LI^JxQS-{#umnQIe3-U3p9MDao3C!C
zc^*wI7RRI1cA}b7-;}n1hJgfZKjt~;OgPSf3j=u*F3XoFw<$<jsE=K}l9Qr=oOvcq
zigTcRKuat^GUo|*>TX_Qn*J=EicB7;J#Bzf94D8X_Em}%Hm;b(k83{_5v$J&!vjK3
zmcVC^+tpL=do7f3(<4qcOqm=6DitUCu3AyRj{dZ~QaBuWUf$Ebk*;JE((Qn_q5k)8
zK1}L#8ZcDaC)^zL!D=+-tQGGtUk6R=u~?F<Sjt(6u9wj{Pu6NZJM)zz=UDlAZxaI;
zFa0l%`nt~S$uPH!ro?-)JUOHwjPzSCvM19aIrrUt**;1_Gv&3JN^yn@vvm_!@dDIb
z@J*KWj&<ttbq>e8moC?egc{jC5TE3iKh=Ck*y!RhS#zgceCTU45$R1JF}tpb8IHaq
zzz{@okA~9m22+MF+)@?|Rxy2n)4^?S586pIHwbwT)h+LQnU}3olmjn7J~V-I|ICyA
z!Cgm{?l6a4S~8~fbTrDtjEG+#h`mo~%pAH+W6J|UL%T5|HEg&jHgY7lqeACJ<>19M
z2Ai{$>RXwiYUjTO8X=`O^@2dgH31p-pFzOb#_0bq;kddryrQjzE^i58{v@1z*R9vp
zgj>J<eI0g6qhY@Tr6ESR_cpVna?cKjSm%021lC|}<Y0i2R1FScvgo_giL6A?J|nUO
z!+G$4I)xnbaK$~Rfa-i&^u9>QLNWDv`yYf$Lo7tV9;R^Hg8p#xIU;vd<NPjRkg&R_
zf6Ds@;XwN-frN|48Myri;YfOZ5>Dw?!jU%plW_0lay5StE)3ro!v5T%K@H_9<_Ps8
zyZvK^=_=vJg9$u@%}c|NWK}$<BFU>V$%Z*-iGh;B3e3Y1;T8{5Lmlx%geON?{XN&8
zUd(D#*sx_<UO8B)K{d-y7ieYiXd&cx8!W$dS@2u@RJNqLpKaRuc;ul${C)}SVX*Rw
zu_o^?!cqQ7IDULeu#zfgUK)1OAw&-y5=6ae&{3K*^=U*vvTO)6{RCIyT2KlHjwgzB
zDYl2FZoL=hs|ALL4RKF%&rX_`KwG^zW!H7sTYlzB+9^9q7`%3?e3orKa8Y?-qIh4`
zjJMo9#cswkIm!>kUom6em@QhTPz7-rqsSyc3&53l<LPX^r?|%@-_Q-7VVpQ}5NEG9
z!H+eqXuZr!O%0xi(uZW;vAg`JDy=ovT~u0)<tT}*JZ+z%>N<C{f%o)6f00{D=dfbh
z`W^A#Jlyk1`4|h3Zx6uy4a!dsXJ)K#WbDBF!@qq7`nTo3{2Q5Wy<#`4Iubsrin78=
zduhuFxSO?bSp;$oqHp8bwn))*h0rY(=<&;y000+o(<`~#9ivHIC#ArKsL+KuCsX7d
z`r+j}k9tm*doIpU{T3~cV=xiN*+zL7g&_w>y@RB_St!eytY38=Zc?9YezwY+_N(_L
zl=H0_*#y|jEWGe}Ro{)u3Rbz*4&fEVx8(iv3ia7cBtf^(+=9);%JvE)QP&Vs0G@4!
z{wCyaQ8wuh^S06y;I&!~eNV-FyOg8Yh{eB)+lASGR?n&<5D$I$JjbP2nQqkCRlf-b
z<+?1jwOP7mD0w{6Edyc|f;~Zo{fsbbH)Rka&qz+-dngpm+?rC=r^uQ)P?o=sL0Be*
z_q3hMSWaEv;a(5-hT>VHX6~A#`BHg%@shwHCt)O@*{O*@+P}LjkU$rHi{{EjM?cs1
z<gycBu31<Ej#Ry|t-D))weU%SOHW*?Pn5Z@XT!2VjzUSl@w{kOi;@%1?PJ|Xb>ymS
z13k&caGo?2WSUB@$c><sMjY2f?NV%$mj;V_lbdcQwhNAB!-WUYduT84(&CmQIXhd{
zt9Vp!alg+)03CDbOh-Eic8s^U5OYZJ?-moXt$6BuHT_^iA#AXZO+$O^TEhi428y1{
zM_jj~A4+4SE_zieseQ(MlL#a;bI;P5Y*5$BE{w%)&eMX>ye7lF;leTP5V8cI>T}ai
z>0-+B=g=!&rwROPP>cF;T95tT`Ni@lzqD<anJ|LRs80mcI+kB|NzxEUz|67Dmb)sq
zK7lMS_gOrWuAqFodm{;>KdcgH7YB0t@QrU^4~LN$iACJgCS&qd_a;|Y2wlPZoCetE
zrz88iu0i(_#Z=2L=w91M0%iO@8d&y;8W0vcTRl|}rt4|RC<837i}9tq%UnDF12WRN
zocP^bv~{wQ7y*JeLuzA9j#aa+CAYJi=#hlqrxc~(QIfje^srd)3Dkw3TMWjp#sTA4
zL|`1NuqY~9AvPv)Py*h94*~XP983Hoj?Miejy?D@j*VRdTL_}VSv8|84z6^Orl>!A
z!wOcFqto_D>l-<fzq)^pP&=|6L<y^)+;l0dBboE?mE^L#lb@@~7wV_|GRE?O`sZs4
zjD~lQ^+x4Oat=GCgP(S|w}t4EU>#5GxZ|Px)xnp1F#2?M$J%-V_*Qm&24-61jNy+B
zU*dgI7RCjrf&`-oX;Do@iQ#=Jm$+i&15bMV6&+(%tM)*rL2{Aw`b8#UZE&19NQvZi
z><BuMSgn~(X;xGiM{j`y)4v(7W3$IUDL#41eFX3Db1rEak+W+|aUU!4B^RvuW?ovC
zZ_CZ)hbJTtRkZAT3ES#7T+mC`M2Vx+XV)sBi$(x(bicjw1i>j#ejjw|;KQs)n`wRH
zaWg>Rc9FRY`#fYm%s^F2$vsg-^x=l4>}o&7hP%WxhcUADa#V0?!J(y6q#;q|T~kZh
z^S@H8;o3BL8W_F}k$`|;{&ZnZX2#aWjDM7W__1Sk=`eh8ln&@i;-KackFkCIGWKbS
zOUnh0^?LuPc16pA@=WuowdH!IAiXRHScvp!VT9%#6d?rWzU^3I!z#&i;+R7sNmhoN
zz9?;f;BQnG=qPz^DQRh8bKKl|O6CzyhVO}u)Z|mOCrl4tOs3EuX!mBKuh$Znh!00K
zhCOY9r(X?wljY+AnvsMWSq*;qi7Sf7hGOT~tC?PmDZG!HqZf8m7AGnu;5G7yVPvGB
zt;|ThRK7was-zaRAahYWb4oO-3sSt4t7*R1+f7}vKs+3Uj!Gp%VIjkTnUe2l@Tl^q
z1f<LM`Weh`_`B}%kK`#RWSmw*pB+cuU=Lf8zJfP$bP#@OjMsz<FJxyJ=<Th~-n-Yy
zYn`tIRk8s<jR_h~svXUMu;F#fy?<RWZo+V$xJW=_t>JW+_T(|wwRgSHc&@GMjnD>_
zFKY`gKme73=$Ku1V7vLG)4ITUV=2FEWwn`>V6$O~=Y|+cBUzxiAG%QlUAk65iY~^e
zxoN$D&tWO;7W8T_moDL*kwV#*eIkG`h}j;QB%1hZ6E{DxkMJmz!RcJB6yYT2CN%nB
zL3H)QRf@qchk%2`TN<7y1vwr<yiet%Uj|Ug<xFY-I*{cyNSB9S!jhsgJH4(SMh2pE
z`M*0i-!`lo#|OAKa|(E0P0TQ6boxA8jK$fWxWx=~KJSz+_&nb09_9-kwVGCD33%Q-
zE%-b=_JN%_I3))YN8`Zn@$kFYRO4`%se=$--o<f+pbSYn#mQ$w(Bi^-kdT9Wd;8MV
zeDzqY0}vt|^gy+-b(*5AM}5;mgFn~6!0+PgH;b}A%B(1^zf?)4&hfVAp8(j9IvHuc
zSv<eg<M(f(=133>KuqPNZ6XNd>Yi3`v<j^jJ$_9Zq<uFS!rDzW-7K9>M5Yo)5G_oe
z%91le0o6%w1<}0`WPN+e#V2Nc`0#B|q-W{vYysN)-teSJt=z?7oG)xqtD-D5F{`@g
zG5U6--7};GqqyPKC>$yHUiy>mQ0D!ow|p%jvJ^>17Q&}w{g;FMX;7%4rYhqUpDq{a
z4B$vZ)6--$B$=)Piuk{QQU;!O2v=>MHfEiyL<b#%=9=uTx==8&P5}JmP#S2@E*B-L
zwdKmDrqY7N%+3sCrkL>zk5@YkdTUekufnhAU}}bqt!l@VjrvOtsny<=e-6bDGyKFP
z<U$-=_Hkm}fc%199*tb*^ZoZ(gcMLM=W2GH12c=yiam2V^>Iz428KR?8n$ACFm!X+
zw{F^Yy*_6S{cm^Ip$EU-CHnR~k2i3?omC@&PX>oj4q{mI3)y^@5h0{z;Ak9{9TiS%
z&S_J)?xS$Ggsf9|_(oiL>k9{%Lw?7wI8*F;+!d$9BRXVM+d<o7t-=lpFuXj#X7^@$
zXJgPLPCr?jx?5Iozp=n3x_4g|%Ux<T{tCBsP`t>fW=m86OoMNKN@J_1kRM&>phHW(
zjm~L_{OfU4FjLVR4YQ|cb1Xr}=5$|p?rG~_)_cg9sSg1rRWizzD53d>@?5M`*>=;t
zDr**g;{ZMmIq}lDIY(KPw=DR<J(lc9#;G#m_+!VQ>l*E+f!_s>LO;fO6QebMkwJ5Y
z|Fmmy&OmWJE*B`e(vzD%i(NCRD_z;OvrTd%v3jQ{hGK&<ZMajY^kHZ1{hd<`^O*Gl
z{fZ@BMIpf4U*z?w3|cc&_}9xt0)AuNM%E;}>v-A*b2d%l-i246thS+2llk^=#<kX<
z*~!_Cn$W)uL5#UUeGeE`3JH=NARNli5um6YZHo4$$i*lqoPHV*F*ub+6E53Zdm9(7
zSwFAj`6x0}PnVUsbFI2Q<i^rXuFe$etp8fsAcK!o&3TbP;!GT1xEDQs&j1m0nWk*q
z#f<7;J;uD*{B^vnDW)P(e9CPjmQX>&6jfuL=H4i?$JtYsx)FKI$x+qBr#Yopp8KG$
z@pL6{R^+ugmKMq3eBEADl<Ux*nz8$aUP8g?nAU>MPD`%l);6|Kq((!spe%EP{D_#W
zMWGtXcA{pm$rPdea$~p2Yze%9vg+abe3-S18!}lZ^4wv%R8DbEC03;09NiEb`u>!%
zOEY5zH#Om%;FmKG!7*g1ghT-vcjrn)i~BW?;-iO~!>&q|@9oRNOrhahC0P}G0mKhZ
z)n2xh1C8rz1Eq=&t07;E3y!|lV9lSMmey~%-XVdG@S4pAop`h^(9|ET=?@*<Y2>?1
z?k9YY$X+781@D|A;&;j*N4#yh>9R!7$QNUWk<!V_-EUmZFHkLYZZ~OUKW{-!Y6!}x
z>`>jEYjb%9rl9{jd02U_&awqe9>T)^^4{oZ?Brx_WBNy;qE2PS2ADkb*42CIp1gY1
zvZ$z-BeyBtCW&f`oe<_-Kru|!6ZTfoe$C*;J2>8qTUMS+bNdU`-e@{5l4+2~%O+i3
zo;W=ws@I_?b`EDx8wTd)O7Wd>?PX<K%yfuq2wY_0Iw;*)@6B0f`-Ul;C8C7|1csJz
zS-QuY@-%uFrRH9QV)!XNBs~TSVY~(hd?pIw<$gv;%V;Xd91&taE`;}$g{bc<6L^nk
zy~Lzw<BRH<heWjF(C&Q3g)#w+tm>gP#>tjP%+bk02!5r6=JAGxFG+}98RYJdOQb}&
z&K?gmynrT8($c&y+?%-mVxeeskl1}i@X_bp7u&c~Q+JTxPNU3<yLjPF4%sfZogpq*
z{pu*@j<}{X$w5ZYi2`-S<GApg^}dyoD_*D1x=ixXQp9R+-nttbyEN_y<@yP6MQ@;f
zHZ#g&?WEeWG)uJ=s+!`rtfJ3x$Ognt!Xtp(Q66fMBOaz$Fy%KuN{6CWoz<3$AfygR
zmdOTM&MLMGidKk%OGUvT+2h{D?;uGkS<qiWC3H2QXh{oZ=ukeRd4NXH<jC=aX~2vH
z_WO*?5aJ}KUFH=^wJ-9(f2jM?=FxEPyH`9r#mju$-&Zx<8Us#6z$|eU$6SMj$&q3~
z$=yj5?mH$He=X@b74s35Rx*%t*Tc~}+YNGPbcmA|FgKuL4i@f`{3rw=01x5_xJSp>
z-kto4Db^Bb=}B(dz@ie*W=WPG?b_z2;mvCLxuO~Z8p6T{aYyF!;tKDEfl~L#wb%#E
zz!y;CWM}|l-B7QV8N=d9&XQn-&k2<_1M&|1nPvX!7OT^+0()DVRNR-Qu-WWA64e7Y
z)Nvi5M1T>$W=Dutr0E&Grd@cj@$MW;`+T{KLX?_m_1m&&h=}=JZTN68QsUi!H*H-^
z*cY_1je+3ao!}V4@f9TPNL9u9>Y_@uef8Qi?6E7pjSJC?Qu<roybdX_p*vZMb+W;y
zlol-p&abA7rZv$j&R`uK=CGP;x0r_BWhbg;5#^7~L}z*zY+hQ=Y>;b;s9-z3NUvk#
zCN$Hcw28^i%&AvL6cACaWJJoCn=LAz-y3p%;W({cG_Vg|LVPtg^tM$Op=NPN?z&%&
zgUAS-It`(wZzxtUkw@La=uI*`T4n|`je8^8rH1^g+ol%6b5pWAk^~4FUV$nDH`CWV
z;b@S2i(PS_1DzI$vBId-DTm+CsHmyC^TNitRZG0#s(zQ!U=3IN6n@05*mTHjn(9=r
z(fiFIbKFMA2dy9`Yh8xS2daFVdc?gYU2AQ%@2vmj*86LRekE`+_g@^sTw+P|0?-+h
zJA;4#ClvmiO>lH_xB4@0xt$^HxWa`taHd(m;hR5mN*c2vrwEYYmTPm7O?ML;-$sau
z4rG@!yFWJ+cmgA#5VY_!@aO9|rmPmZjRI+TL1feYzO%4LA3@}<0GE;#al3IEL6$kd
zf_ne7v_G)6ljfRNRHl|$rL_BKb=@;ERZ0Bv+^Cz$A3rBOJR$*lc`1yQ6|t*a|BZ<#
z=_1{<%!>}2R~6s1W>77kAL|Yfj){D;B}-omS=y)cIoAW1`1m9voW5XRIHoow<lYo_
z0e6DVP~f#&NeBxga6bIC`8#j3cQq1Nf#L4zC32?by(7tks>x5}Aj2YBgNoxNjU}uN
zqEPvxcXy+@>Mc+N01#*pJG3x}0j}!s>KZ35$^rezq~uFVz(gKRn1I&CUX9+2Qq1h6
zNQr9<=#kG&H-E`j38Tl93AGHB{AaaQtlPXNqvzImcV)46#A>+k_Jw$PAu00brB`hj
z<n@8IH9SDqw#K#KQ)lyOWcdDjoJ5~lS(Mtds<oHV!P5R$v-`0?o9=#B+L5!Qjf=;z
zs81_sd!@x&nGtFiCJq&d0}X~_FLJKfrSHacG!65>R0A(QE5t1io9Y@rcEw5NbEHSy
zUgyjv2~^m^lfvgG*G@g$-HyOc^d(53Wxjc{>lkyM<(T<G<6iUpd?$^5a~q~M-~9dI
z{Ce>l9YY-B1hcLgVsSb5Ox~R={%4OfjWT4L(U;nQlNDym+APNcbjiBT2&OS{QlvW3
zgX@M2b=#Y@<3OItO-sW4{dy#)M-6Bm_j2%zj(Okp_IY1~-Adl*LG<TU7*rxCc~^U0
z3lT?N17SyA4IxKfML|biske^2zLC3bTR3AE0knSahZeB|<*JB1a@*5dJtJWNr<rIy
zO|7OMnNCjwi2K(vHhP;{XWVgIU2l;9r*iXdHnp>%6$zu47FEM0iYm=zZb}z>n{0`6
ziNzIWZXVMBNJ(l~CRvkO^b0+W(b2s%R09z_{w&p&=g@8X)K3pB@}l>XL06A4g(bX^
zYOyp#q*Y&)wcW%hC<@^D0gw}ha=435lS<pX!$($9C~5F6@A|jgg?PQB$s`rkAlXVw
zo3TETz#N8u2_#r&8ydXqRaHPDrbGP1KW9GtNo~VSXtXM50Sbz>jg2XJGr_kTff0cq
zO93$^A2lLA9~ChfxYtC_QUaKmi~RNJ9XOFwDwe!BEivqTX>JWuI=tHSUtvbQ<9-kS
zadReu&lGR1#%~SViaF}~9^g{8VtQ=PKeSERl9xQALQ&$}4jThMXBo553+?1DMp=Ow
zC80w{6w{^Bwu#oNFk;mHwl%ldl<KC=0<)a-2JIvu-?=uMu!2JcF{-K_<h7_m>`*qL
zG)nizwS!7)9NAU5CU={@<-DD`wJGKFt~!Mv-FsYt$<LdmNsx?6>bFeEPP8*h{1*X{
zT*YupeW`T!;DA`2*q2y_-7<^<mF2hBS%*og(|Py}IIB4;@t@NBZFSd;WIm&=!EGI$
z?piugW4DaXf(wH`Qj|)W7|D22of8Y(UuUr)@~Vp3JqyjQIOfg>L%EQ`P^AP>pp(UF
zn1pIYkLCp3;rpaWsZg-ht@v?rRw|{3aOp4Qsym^WN$-52PVj+I5e~YerVHR_6rn76
zgO=>LTvb;1vU_o^bSEoDVH(u2kih+7me|stip1%aQss-^A;Pq-G~*ws>o;!mHOSQk
zTzqaREIuLsTt^6TSHanJDDU*_d~4#;=vA0{#x&wrGzktrX_6(B;kxn5*qVVL@kRaK
zyi-Q~K^&rPTJGKlRZ=t-QyiQGYJ~7%L@2QxaBy<xuJboe1dHb@KMGH0Je(=CE?<Q&
zxChtooDv3r-%@`0EN$+EOqf`p%5Z++k|;@bjCMko)w!@Dg;!}qA?^J9n2DNBVr|wK
zn0`=*XSBZBC;M@BujqZx7Z?9Lhs$^Tl$NO`3Jqaj!)c`7(|#H+FQ+CjY<53ee$9F{
z`sFLtY61POV+vK<`Sp-(>EX_h-<Ml9zNXcMqq;p+dx6T_Aus2KjW6lPCv{p_$M`0#
z$cr4i)X;<`oV=*c4OTQ>$y?i1oz<WA5dk}_jD-D134K93_V1+KM&s5JkCZQicFcbq
zxbiVX$Z^uQUZ1C6BA5HxEn^Cl;!U7?6>2NgvDolgsgjh_uLzyj(S>q+M#~te?$7{f
zpLxgn;o-y9#fqWQcA?((cH#AW0`U}OmB6>WN!B-1=Ba@4(@YTe4f<S9<M9p4rS!&)
zrmwRvITe=mcEi#{^$ti6x=qW2EYJ4G88(k0>+S<l`xze}Lv&IGEhD8QKS-UeZi`>b
zDSm+9(d@<rO)Agkd#x$>5N!oXOS)vy^{Ojszn$Qmd{QV7rcNHZ4C4_dUf$O|TAmb=
zK`G=dJSG{i2A(NhK8H`PXp&!~C>o7SNkZ_?^FRbC*dLd%+gYEnBcr|goE-><YL+7e
zp;2Vg&h@rvl89Q#j2MW3Mg6r7#TV<9$d5~Da=@-ga)jVCivBva%xi)3TFER5{Z$<@
z5E1}`srYBt{<_g0{rT@MvSY(T!(c800^m-B1K?;$g#t1D)3-k%KMpCC^oS__)BBK$
zZ*@sD-i=FVfC&$ev&A!?gJF(C<U0i$Z0AMddaH!2xfk_-cZ&QX<;X-tsUCU6A~Nqu
z$7n4kjGdD#Z9cu#{`UA`>M0;fn)ur^<pX^{vkBZ+ac_oh?u5LGXjcZo7}r_Mg9=JD
zXCh}~-32rme{pTeg?$J2_o1ngAMI6B?ZfZ*cD0w5nS+H_6Y>a!xq7rymY4&;R}-QL
zdjS&Ed)7yQOn_5OOD6_OOV1Q(`gd4ueOT{$nE`nm?~GmQ>zmB1$%TjyV8dBD2<z1!
zFqV5iC?%KXj8;`3VV7imbY`c3XvWj)(MDA0t_Uh(Qtj;v0iM&-Cd^EK3LsGhmuV^`
zeYH4;g1KwKm7uSU2&<+l3^qRpPHn_UwF*3aY!L$I$gZ{ecU3gXw#7$SS9TG|R=nIE
zEyNO|x>8cmBMXVH7CbaREkveG;EnWDg_V*@$JFByRr7d{lL1)zk)$?4E(rEROUwvG
zi3CSo7DJ>ED$<jx(pi8K$_4WeLb_-7u-<F?)Y*>*U%nC^iRbVgiw8F2sWQ|z^Jo=)
z0CuX$V(7?1tA6(2XR+<dUZG*(_($RF=5UMdrxj6}$fNzUc&zAGmbU(-AmSqRWZwL7
zBI8H#K^0Jv&+(6fva-~EPO<Q35xW7rYw_4Wir+fnlqUnxO_xoDOIH$d>TR!Dmab~`
zZ3Nb58<NrZ`(PZ*+T6uVzpcuFVe*FG`v=vMyzlip<E&zmSIa8!Y;Sa^OE(gy`&&d~
zp4u56>dl+l`<Dr(aC(HlI69XtcGwL&(mZS}&c(gkt*>5zzHQT<XEP#XA89|CtQaU=
zvNf#ZS<ybAIWepKv^CCb0k*c#b*IwYs!_DeDw~#N_})ir?-LmB(#AInja1%RsQd=q
zbGCN<v2};d4fdVdlBJeT({<LWdhg{nmI+JU<kdsSa8CRguR4MDUEH%>%I~+iotzZT
zVCJ|sj?lxCF}ID@!mmr`7aNCd8vCE!#8|^+ayl&)z)$v#Y9BjDwQ2H?4~3=OF!Cpv
z^<7q09=tr<p4Zn!s;cyR3#cHAUXmUTyjEx&NTvC(J8IEC)<)T1SR~yAkCodjCj@ae
zJZ26@9VtS_4~ehnID2&RC5{!C@v&%vFQ;<x_O@D@c>_Wa!$x*h-!-%v_#i-{V<8^A
zu+yin+eR7JnwzPqi6bI~?da|dy!`8Aa{FvVCpEAp3OE6S@$((P)!5+uFL{CZ=`jm1
zW)zUGo;hbI4hv<9`ScY+w23-WIVa$K$7Mk#ETrhI%Z0Y97Cz@&Izm)KUPA#X3@-b9
z&>{`nbliAYiXS<ZG&?J{SB@O)=pd<2EKdf7Det-*m^(XC>y6<{u_b7;jAAe+C{v|u
z6yfp}tvEiW24i&XjRlb%#`iX<6agMM5D@eyhbqcy%`5vwnG?jRbaLfq)WGkI8esUH
z?_c?ikh!lfc2SqNi&)amlg5JXY9Y7SBG=ytjPCCu2w9RbvzsS}ad#BuIeahLH`)K-
zD=DDo1tk+v{(w7^m*cQY9GpYU%FWy+z9{Ki;HBjm>akN3-zm0zC<0B~-)nreN{SIH
z`T#2(>KdaFRD?9L%x#gCMdXnETtD>)e1-b&Y>Pti!n!l?!43l-EDBH#2vljwJJ{Me
zGV0se{g~APYG(f@0R$2*UGWbIU>o@bvchROdcdpD2C*W{t*$&pVb6wRS%b~RL~E2M
zPY%QY5}WNh)+53RD+EsBjG=XAk(1+BjC-P)ISF#+D`l5Shc+$=rp&OV0rps`_o#*+
zdM76I@Y4sP+4{pNth9ElrJhr(X*7>T(%-Kr7P{o1f6_BcF12K^2W)Ewb5w`rsxduE
zm|>Qr5JO%GUVP_!QdQz!dI)<s+?R|J4$R;rBlS6?9@A=`1;tk{(n2ekCcKo+6$jCr
z(%XjD69$FGR@&Y{Ta@o^!4w=6f!{V(2TRjyx>+})MJrDfu)x)Favsin_o4O!(c(3X
zd=TMqWA;o8c2@xkQC<GSfnN@Zp&*;!w_6c8l;h7#O$FC&SX5+H#9;FkS3R)=_;k~r
z5sV!UX&+E^$vcN62mR$v#^IMdo7Ln1ay(V!SeW<34B-%~GsLh33x(<{+28rE8mAcT
z1bAh2UhhJB7e;tH#(R3PKBE5{RjXP09PNNqJpob`^;fDI+Bz8jkE=kE{<Ve2YQO9G
zF%vEOh%9|3-k1ZG#EizQC20UA2GF)fmS1Wq;A6TyJK^Ba+U{w+x=3#<v`rh8bKfQG
zR#Pvcg%t<AczYovQJ)dpc+-=GGC}s<&p6PJwzw-+-NQ4^j_|6dtCW@vCti=Q@UzwE
zP5d#6vrO^Mo52)9ZlUJg0w!+Zq*R8v@UtZ>GYkl1HfSS1(!BcYN>5RTM2xniS?D-+
zFu(VMB+!A0L3z<SY7lWNrQouA*eTLwY+9nNChxM!j=O8<#dn$n*PcnA)H=#iOTR15
z>DZH)levYXu}YwOz-k*I>uz*aGu(X&YX%JplvITgKi`!pF41rCIQd3YQp42Kav-?N
z1e%CnJk@Sk%16V+V~CY>s?Ukm_nw`1*S0m2$u9n;Qz9>De`edtp%o8iA_cus#U<nJ
z;?cdG#2h0a>I2I6?lm5~fjb2Ph^!kI|NAh#4?168LgR7_s3-B*9<vXAB%}V@qYkA-
z`}YHB8V1a6|Dv?BaZ=JZu=<0itFbE<t3Q+|@ZQil4`s$@q{W{&+03!v^07(1LCRGc
zf)DlBmYr`;=!Vv1_t8RZJrwW*t|vx0rzcj|+s#Cgrb*S_PkHsz#E2~tCKu#(W^$@>
z#%J%D3?#7E<cfc~wt2drvDTfRccaKz*DDqk)jVru8IiA3bWC58OGPOwpIHsgvt$`t
zJM(s>EIVxqW}rDADAThN6%T)a`7+NAb3Yc^p4eabeN+-NWL^)RFw^Ww+^pTXbzGek
zwKuIE&n?xT+wk%Wq=dg6mi3A0CNm%c?N$69{Yjk%Bz+-hD14VxmkpjFJ4=oHeUQHc
zo{4+USA`L5sXCfY&VHT_WnYXk(oJUyUjSZO`M?s1w|NtiI<i*xyda#@s#?5z2w_tR
z4c%f8LoeP7WZFQ239~}oYEF1GX$+#n7<&;w@(U44@LOn|I_jq`!ajT?(f}%m+a_a7
zZ=-NbT~2%+8uun`C9H+JJjFhpg9nyZSG7I4WN6fcSH9$Ed+F#NCjQ{qa=iYD5+8;$
zdDX|p-b7+pVWz7=3FNX~Nk%sHWt<KIbR)Gk=r4UX2f6UKq1noPT!pr@9t+V~Z0w$Z
z3&Q^V*FnJ;fWgSWFBto2i$C}OvV2Tl`kxK_bLGlU;E#P1FfaPcI+ovo|CIFq3S0z=
z3I4wX{=c{MyKwvOws?UmzW<VO{|^6MWcoLJ0^u+CKP0EW<A0Y7{*4y|+S(tt|5ZTv
zJN$PA*x&GKpaAg?_%C{}-_gJ8d;UhF0wc~}(0{0Xen<Z<-S`{rg!LEtcOl2`P5eIb
z^>-8Qgnu>h>onN!@ZZzqf5Ssbf5QKhH2)p^dwl&jIFjKn@Nd!f?=Ac@ko+4D0<!lS
z1myRy@^|z<$M#>*vCO}qe~$FO!+-a=e>cF*_E+~!fXg@k<ALR+A%T|hV>$sDqz!0X
Jj2u6X{vVqFY1jY&

literal 0
HcmV?d00001


From 32c24d64f516ce2125cf9e317768d203fa4c2c65 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 00:00:22 -0800
Subject: [PATCH 222/367] hdr: add Section.different_first_page_header_footr

---
 docx/oxml/__init__.py        |  1 +
 docx/oxml/section.py         |  9 +++++++++
 docx/section.py              |  9 +++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 24 ++++++++++++++++++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index d1c01c6f6..093c1b45b 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -66,6 +66,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
 register_element_cls("w:evenAndOddHeaders", CT_OnOff)
+register_element_cls("w:titlePg", CT_OnOff)
 
 
 from .coreprops import CT_CoreProperties  # noqa
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 1c2bc1a57..1a43835db 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -69,6 +69,7 @@ class CT_SectPr(BaseOxmlElement):
     type = ZeroOrOne("w:type", successors=_tag_seq[3:])
     pgSz = ZeroOrOne("w:pgSz", successors=_tag_seq[4:])
     pgMar = ZeroOrOne("w:pgMar", successors=_tag_seq[5:])
+    titlePg = ZeroOrOne("w:titlePg", successors=_tag_seq[14:])
     del _tag_seq
 
     def add_footerReference(self, type_, rId):
@@ -310,6 +311,14 @@ def start_type(self, value):
         type = self.get_or_add_type()
         type.val = value
 
+    @property
+    def titlePg_val(self):
+        """Value of `w:titlePg/@val` or |None| if not present"""
+        titlePg = self.titlePg
+        if titlePg is None:
+            return False
+        return titlePg.val
+
     @property
     def top_margin(self):
         """
diff --git a/docx/section.py b/docx/section.py
index ce5fa00db..a1017b269 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -61,6 +61,15 @@ def bottom_margin(self):
     def bottom_margin(self, value):
         self._sectPr.bottom_margin = value
 
+    @property
+    def different_first_page_header_footer(self):
+        """True if this section displays a distinct first-page header and footer.
+
+        Read/write. The definition of the first-page header and footer are accessed
+        using :attr:`.first_page_header` and :attr:`.first_page_footer` respectively.
+        """
+        return self._sectPr.titlePg_val
+
     @lazyproperty
     def footer(self):
         """|_Footer| object representing default page footer for this section.
diff --git a/features/sct-section.feature b/features/sct-section.feature
index 5e4e5d2f9..576bd4949 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -4,7 +4,6 @@ Feature: Access and change section properties
   I need a way to get and set the properties of a section
 
 
-  @wip
   Scenario Outline: Section.different_first_page_header_footer getter
     Given a Section object <with-or-without> a distinct first-page header as section
      Then section.different_first_page_header_footer is <value>
diff --git a/tests/test_section.py b/tests/test_section.py
index 944ad8a84..4e4f7b9ac 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -92,6 +92,16 @@ def section_(self, request):
 
 class DescribeSection(object):
 
+    def it_knows_when_it_displays_a_distinct_first_page_header(
+        self, diff_first_header_get_fixture
+    ):
+        sectPr, expected_value = diff_first_header_get_fixture
+        section = Section(sectPr, None)
+
+        different_first_page_header_footer = section.different_first_page_header_footer
+
+        assert different_first_page_header_footer is expected_value
+
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):
@@ -198,6 +208,20 @@ def it_can_change_its_page_margins(self, margins_set_fixture):
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", False),
+            ("w:sectPr/w:titlePg", True),
+            ("w:sectPr/w:titlePg{w:val=0}", False),
+            ("w:sectPr/w:titlePg{w:val=1}", True),
+            ("w:sectPr/w:titlePg{w:val=true}", True),
+        ]
+    )
+    def diff_first_header_get_fixture(self, request):
+        sectPr_cxml, expected_value = request.param
+        sectPr = element(sectPr_cxml)
+        return sectPr, expected_value
+
     @pytest.fixture(params=[
         ('w:sectPr/w:pgMar{w:left=120}',   'left_margin',      76200),
         ('w:sectPr/w:pgMar{w:right=240}',  'right_margin',    152400),

From 0d2083f0900a20b1d91dae3547f299aed2afde42 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 00:06:38 -0800
Subject: [PATCH 223/367] hdr: add Section.different_first_page_hea.. setter

---
 docx/oxml/section.py         |  7 +++++++
 docx/section.py              |  4 ++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 24 ++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index 1a43835db..fc953e74d 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -319,6 +319,13 @@ def titlePg_val(self):
             return False
         return titlePg.val
 
+    @titlePg_val.setter
+    def titlePg_val(self, value):
+        if value in [None, False]:
+            self._remove_titlePg()
+        else:
+            self.get_or_add_titlePg().val = value
+
     @property
     def top_margin(self):
         """
diff --git a/docx/section.py b/docx/section.py
index a1017b269..2c0adcd1c 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -70,6 +70,10 @@ def different_first_page_header_footer(self):
         """
         return self._sectPr.titlePg_val
 
+    @different_first_page_header_footer.setter
+    def different_first_page_header_footer(self, value):
+        self._sectPr.titlePg_val = value
+
     @lazyproperty
     def footer(self):
         """|_Footer| object representing default page footer for this section.
diff --git a/features/sct-section.feature b/features/sct-section.feature
index 576bd4949..be3b9fe35 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -14,7 +14,6 @@ Feature: Access and change section properties
       | without         | False |
 
 
-  @wip
   Scenario Outline: Section.different_first_page_header_footer setter
     Given a Section object <with-or-without> a distinct first-page header as section
      When I assign <value> to section.different_first_page_header_footer
diff --git a/tests/test_section.py b/tests/test_section.py
index 4e4f7b9ac..7c753bbd4 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -102,6 +102,16 @@ def it_knows_when_it_displays_a_distinct_first_page_header(
 
         assert different_first_page_header_footer is expected_value
 
+    def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
+        self, diff_first_header_set_fixture
+    ):
+        sectPr, value, expected_xml = diff_first_header_set_fixture
+        section = Section(sectPr, None)
+
+        section.different_first_page_header_footer = value
+
+        assert sectPr.xml == expected_xml
+
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):
@@ -222,6 +232,20 @@ def diff_first_header_get_fixture(self, request):
         sectPr = element(sectPr_cxml)
         return sectPr, expected_value
 
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", True, "w:sectPr/w:titlePg"),
+            ("w:sectPr/w:titlePg", False, "w:sectPr"),
+            ("w:sectPr/w:titlePg{w:val=1}", True, "w:sectPr/w:titlePg"),
+            ("w:sectPr/w:titlePg{w:val=off}", False, "w:sectPr"),
+        ]
+    )
+    def diff_first_header_set_fixture(self, request):
+        sectPr_cxml, value, expected_cxml = request.param
+        sectPr = element(sectPr_cxml)
+        expected_xml = xml(expected_cxml)
+        return sectPr, value, expected_xml
+
     @pytest.fixture(params=[
         ('w:sectPr/w:pgMar{w:left=120}',   'left_margin',      76200),
         ('w:sectPr/w:pgMar{w:right=240}',  'right_margin',    152400),

From db7a828ce2f0e533f152039a3c9272d9d79f6044 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 22:38:29 -0800
Subject: [PATCH 224/367] acpt: add scenarios for first/even header/footer

---
 features/sct-section.feature | 24 ++++++++++++++++++++++++
 features/steps/section.py    | 28 ++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/features/sct-section.feature b/features/sct-section.feature
index be3b9fe35..5c8777e6b 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -27,6 +27,30 @@ Feature: Access and change section properties
       | without         | False |
 
 
+  @wip
+  Scenario: Section.even_page_footer
+    Given a Section object as section
+     Then section.even_page_footer is a _Footer object
+
+
+  @wip
+  Scenario: Section.even_page_header
+    Given a Section object as section
+     Then section.even_page_header is a _Header object
+
+
+  @wip
+  Scenario: Section.first_page_footer
+    Given a Section object as section
+     Then section.first_page_footer is a _Footer object
+
+
+  @wip
+  Scenario: Section.first_page_header
+    Given a Section object as section
+     Then section.first_page_header is a _Header object
+
+
   Scenario: Section.footer
     Given a Section object as section
      Then section.footer is a _Footer object
diff --git a/features/steps/section.py b/features/steps/section.py
index 5ccbe173d..d8d566fc7 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -162,6 +162,34 @@ def then_section_different_first_page_header_footer_is(context, bool_val):
     )
 
 
+@then("section.even_page_footer is a _Footer object")
+def then_section_even_page_footer_is_a_Footer_object(context):
+    actual = type(context.section.even_page_footer).__name__
+    expected = "_Footer"
+    assert actual == expected, "section.even_page_footer is a %s object" % actual
+
+
+@then("section.even_page_header is a _Header object")
+def then_section_even_page_header_is_a_Header_object(context):
+    actual = type(context.section.even_page_header).__name__
+    expected = "_Header"
+    assert actual == expected, "section.even_page_header is a %s object" % actual
+
+
+@then("section.first_page_footer is a _Footer object")
+def then_section_first_page_footer_is_a_Footer_object(context):
+    actual = type(context.section.first_page_footer).__name__
+    expected = "_Footer"
+    assert actual == expected, "section.first_page_footer is a %s object" % actual
+
+
+@then("section.first_page_header is a _Header object")
+def then_section_first_page_header_is_a_Header_object(context):
+    actual = type(context.section.first_page_header).__name__
+    expected = "_Header"
+    assert actual == expected, "section.first_page_header is a %s object" % actual
+
+
 @then("section.footer is a _Footer object")
 def then_section_footer_is_a_Footer_object(context):
     actual = type(context.section.footer).__name__

From d27f4c6528e24162186479f1261f4c3b8d07ecc4 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 22:47:26 -0800
Subject: [PATCH 225/367] rfctr: _Header and _Footer take header/footer type

In preparation for adding even-page and first-page header and footer
properties, pass the WD_HEADER_FOOTER_INDEX member identifying the
header or footer type (primary, first, even) to _Header and _Footer on
construction. This will allow each of these classes to serve for all
three header/footer types.
---
 docx/section.py       | 27 +++++++++---------
 tests/test_section.py | 66 ++++++++++++++++++++++++-------------------
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/docx/section.py b/docx/section.py
index 2c0adcd1c..ff3f15f9a 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -81,7 +81,7 @@ def footer(self):
         The default footer is used for odd-numbered pages when separate odd/even footers
         are enabled. It is used for both odd and even-numbered pages otherwise.
         """
-        return _Footer(self._sectPr, self._document_part)
+        return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.PRIMARY)
 
     @property
     def footer_distance(self):
@@ -117,7 +117,7 @@ def header(self):
         The default header is used for odd-numbered pages when separate odd/even headers
         are enabled. It is used for both odd and even-numbered pages otherwise.
         """
-        return _Header(self._sectPr, self._document_part)
+        return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.PRIMARY)
 
     @property
     def header_distance(self):
@@ -227,9 +227,10 @@ def top_margin(self, value):
 class _BaseHeaderFooter(BlockItemContainer):
     """Base class for header and footer classes"""
 
-    def __init__(self, sectPr, document_part):
+    def __init__(self, sectPr, document_part, header_footer_index):
         self._sectPr = sectPr
         self._document_part = document_part
+        self._hdrftr_index = header_footer_index
 
     @property
     def is_linked_to_previous(self):
@@ -325,24 +326,24 @@ class _Footer(_BaseHeaderFooter):
     def _add_definition(self):
         """Return newly-added footer part."""
         footer_part, rId = self._document_part.add_footer_part()
-        self._sectPr.add_footerReference(WD_HEADER_FOOTER.PRIMARY, rId)
+        self._sectPr.add_footerReference(self._hdrftr_index, rId)
         return footer_part
 
     @property
     def _definition(self):
         """|FooterPart| object containing content of this footer."""
-        footerReference = self._sectPr.get_footerReference(WD_HEADER_FOOTER.PRIMARY)
+        footerReference = self._sectPr.get_footerReference(self._hdrftr_index)
         return self._document_part.footer_part(footerReference.rId)
 
     def _drop_definition(self):
         """Remove footer definition (footer part) associated with this section."""
-        rId = self._sectPr.remove_footerReference(WD_HEADER_FOOTER.PRIMARY)
+        rId = self._sectPr.remove_footerReference(self._hdrftr_index)
         self._document_part.drop_rel(rId)
 
     @property
     def _has_definition(self):
         """True if a footer is defined for this section."""
-        footerReference = self._sectPr.get_footerReference(WD_HEADER_FOOTER.PRIMARY)
+        footerReference = self._sectPr.get_footerReference(self._hdrftr_index)
         return False if footerReference is None else True
 
     @property
@@ -351,7 +352,7 @@ def _prior_headerfooter(self):
         preceding_sectPr = self._sectPr.preceding_sectPr
         return (
             None if preceding_sectPr is None
-            else _Footer(preceding_sectPr, self._document_part)
+            else _Footer(preceding_sectPr, self._document_part, self._hdrftr_index)
         )
 
 
@@ -361,24 +362,24 @@ class _Header(_BaseHeaderFooter):
     def _add_definition(self):
         """Return newly-added header part."""
         header_part, rId = self._document_part.add_header_part()
-        self._sectPr.add_headerReference(WD_HEADER_FOOTER.PRIMARY, rId)
+        self._sectPr.add_headerReference(self._hdrftr_index, rId)
         return header_part
 
     @property
     def _definition(self):
         """|HeaderPart| object containing content of this header."""
-        headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        headerReference = self._sectPr.get_headerReference(self._hdrftr_index)
         return self._document_part.header_part(headerReference.rId)
 
     def _drop_definition(self):
         """Remove header definition associated with this section."""
-        rId = self._sectPr.remove_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        rId = self._sectPr.remove_headerReference(self._hdrftr_index)
         self._document_part.drop_header_part(rId)
 
     @property
     def _has_definition(self):
         """True if a header is explicitly defined for this section."""
-        headerReference = self._sectPr.get_headerReference(WD_HEADER_FOOTER.PRIMARY)
+        headerReference = self._sectPr.get_headerReference(self._hdrftr_index)
         return False if headerReference is None else True
 
     @property
@@ -387,5 +388,5 @@ def _prior_headerfooter(self):
         preceding_sectPr = self._sectPr.preceding_sectPr
         return (
             None if preceding_sectPr is None
-            else _Header(preceding_sectPr, self._document_part)
+            else _Header(preceding_sectPr, self._document_part, self._hdrftr_index)
         )
diff --git a/tests/test_section.py b/tests/test_section.py
index 7c753bbd4..6870aac23 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -6,7 +6,7 @@
 
 import pytest
 
-from docx.enum.section import WD_ORIENT, WD_SECTION
+from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.section import _BaseHeaderFooter, _Footer, _Header, Section, Sections
@@ -121,7 +121,9 @@ def it_provides_access_to_its_default_footer(
 
         footer = section.footer
 
-        _Footer_.assert_called_once_with(sectPr, document_part_)
+        _Footer_.assert_called_once_with(
+            sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY
+        )
         assert footer is footer_
 
     def it_provides_access_to_its_default_header(
@@ -133,7 +135,9 @@ def it_provides_access_to_its_default_header(
 
         header = section.header
 
-        _Header_.assert_called_once_with(sectPr, document_part_)
+        _Header_.assert_called_once_with(
+            sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY
+        )
         assert header is header_
 
     def it_knows_its_start_type(self, start_type_get_fixture):
@@ -413,7 +417,7 @@ def it_knows_when_its_linked_to_the_previous_header_or_footer(
     ):
         has_definition, expected_value = is_linked_get_fixture
         _has_definition_prop_.return_value = has_definition
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         is_linked = header.is_linked_to_previous
 
@@ -428,7 +432,7 @@ def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
     ):
         has_definition, new_value, drop_calls, add_calls = is_linked_set_fixture
         _has_definition_prop_.return_value = has_definition
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         header.is_linked_to_previous = new_value
 
@@ -440,7 +444,7 @@ def it_provides_access_to_the_header_or_footer_part_for_BlockItemContainer(
     ):
         # ---this override fulfills part of the BlockItemContainer subclass interface---
         _get_or_add_definition_.return_value = header_part_
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         header_part = header.part
 
@@ -453,7 +457,7 @@ def it_provides_access_to_the_hdr_or_ftr_element_to_help(
         hdr = element("w:hdr")
         _get_or_add_definition_.return_value = header_part_
         header_part_.element = hdr
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         hdr_elm = header._element
 
@@ -465,7 +469,7 @@ def it_gets_the_definition_when_it_has_one(
     ):
         _has_definition_prop_.return_value = True
         _definition_prop_.return_value = header_part_
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         header_part = header._get_or_add_definition()
 
@@ -481,7 +485,7 @@ def but_it_gets_the_prior_definition_when_it_is_linked(
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = prior_headerfooter_
         prior_headerfooter_._get_or_add_definition.return_value = header_part_
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         header_part = header._get_or_add_definition()
 
@@ -498,7 +502,7 @@ def and_it_adds_a_definition_when_it_is_linked_and_the_first_section(
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = None
         _add_definition_.return_value = header_part_
-        header = _BaseHeaderFooter(None, None)
+        header = _BaseHeaderFooter(None, None, None)
 
         header_part = header._get_or_add_definition()
 
@@ -564,7 +568,7 @@ class Describe_Footer(object):
     def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_footer_part.return_value = footer_part_, "rId3"
-        footer = _Footer(sectPr, document_part_)
+        footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
         footer_part = footer._add_definition()
 
@@ -577,9 +581,9 @@ def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
     def it_provides_access_to_its_footer_part_to_help(
         self, document_part_, footer_part_
     ):
-        sectPr = element("w:sectPr/w:footerReference{w:type=default,r:id=rId3}")
+        sectPr = element("w:sectPr/w:footerReference{w:type=even,r:id=rId3}")
         document_part_.footer_part.return_value = footer_part_
-        footer = _Footer(sectPr, document_part_)
+        footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
 
         footer_part = footer._definition
 
@@ -587,8 +591,8 @@ def it_provides_access_to_its_footer_part_to_help(
         assert footer_part is footer_part_
 
     def it_can_drop_the_related_footer_part_to_help(self, document_part_):
-        sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId42}")
-        footer = _Footer(sectPr, document_part_)
+        sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=first,r:id=rId42}")
+        footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
 
         footer._drop_definition()
 
@@ -597,7 +601,7 @@ def it_can_drop_the_related_footer_part_to_help(self, document_part_):
 
     def it_knows_when_it_has_a_definition_to_help(self, has_definition_fixture):
         sectPr, expected_value = has_definition_fixture
-        footer = _Footer(sectPr, None)
+        footer = _Footer(sectPr, None, WD_HEADER_FOOTER.PRIMARY)
 
         has_definition = footer._has_definition
 
@@ -608,19 +612,21 @@ def it_provides_access_to_the_prior_Footer_to_help(
     ):
         doc_elm = element("w:document/(w:sectPr,w:sectPr)")
         prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
-        footer = _Footer(sectPr, document_part_)
+        footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
         # ---mock must occur after construction of "real" footer---
         _Footer_ = class_mock(request, "docx.section._Footer", return_value=footer_)
 
         prior_footer = footer._prior_headerfooter
 
-        _Footer_.assert_called_once_with(prior_sectPr, document_part_)
+        _Footer_.assert_called_once_with(
+            prior_sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE
+        )
         assert prior_footer is footer_
 
     def but_it_returns_None_when_its_the_first_footer(self):
         doc_elm = element("w:document/w:sectPr")
         sectPr = doc_elm[0]
-        footer = _Footer(sectPr, None)
+        footer = _Footer(sectPr, None, None)
 
         prior_footer = footer._prior_headerfooter
 
@@ -658,13 +664,13 @@ class Describe_Header(object):
     def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_header_part.return_value = header_part_, "rId3"
-        header = _Header(sectPr, document_part_)
+        header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
 
         header_part = header._add_definition()
 
         document_part_.add_header_part.assert_called_once_with()
         assert sectPr.xml == xml(
-            "w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId3}"
+            "w:sectPr{r:a=b}/w:headerReference{w:type=first,r:id=rId3}"
         )
         assert header_part is header_part_
 
@@ -673,7 +679,7 @@ def it_provides_access_to_its_header_part_to_help(
     ):
         sectPr = element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}")
         document_part_.header_part.return_value = header_part_
-        header = _Header(sectPr, document_part_)
+        header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
         header_part = header._definition
 
@@ -681,8 +687,8 @@ def it_provides_access_to_its_header_part_to_help(
         assert header_part is header_part_
 
     def it_can_drop_the_related_header_part_to_help(self, document_part_):
-        sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=default,r:id=rId42}")
-        header = _Header(sectPr, document_part_)
+        sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=even,r:id=rId42}")
+        header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
 
         header._drop_definition()
 
@@ -691,7 +697,7 @@ def it_can_drop_the_related_header_part_to_help(self, document_part_):
 
     def it_knows_when_it_has_a_header_part_to_help(self, has_definition_fixture):
         sectPr, expected_value = has_definition_fixture
-        header = _Header(sectPr, None)
+        header = _Header(sectPr, None, WD_HEADER_FOOTER.FIRST_PAGE)
 
         has_definition = header._has_definition
 
@@ -702,19 +708,21 @@ def it_provides_access_to_the_prior_Header_to_help(
     ):
         doc_elm = element("w:document/(w:sectPr,w:sectPr)")
         prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
-        header = _Header(sectPr, document_part_)
+        header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
         # ---mock must occur after construction of "real" header---
         _Header_ = class_mock(request, "docx.section._Header", return_value=header_)
 
         prior_header = header._prior_headerfooter
 
-        _Header_.assert_called_once_with(prior_sectPr, document_part_)
+        _Header_.assert_called_once_with(
+            prior_sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY
+        )
         assert prior_header is header_
 
     def but_it_returns_None_when_its_the_first_header(self):
         doc_elm = element("w:document/w:sectPr")
         sectPr = doc_elm[0]
-        header = _Header(sectPr, None)
+        header = _Header(sectPr, None, None)
 
         prior_header = header._prior_headerfooter
 
@@ -724,7 +732,7 @@ def but_it_returns_None_when_its_the_first_header(self):
 
     @pytest.fixture(
         params=[
-            ("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=default}", True)
+            ("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=first}", True)
         ]
     )
     def has_definition_fixture(self, request):

From 2038b64ab75d1940e1a799df98bb427b82000eab Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 22:53:51 -0800
Subject: [PATCH 226/367] hdr: add Section.even_page_footer

---
 docx/section.py              |  9 +++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index ff3f15f9a..287ce2343 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -74,6 +74,15 @@ def different_first_page_header_footer(self):
     def different_first_page_header_footer(self, value):
         self._sectPr.titlePg_val = value
 
+    @property
+    def even_page_footer(self):
+        """|_Footer| object defining footer content for even pages.
+
+        The content of this footer definition is ignored unless the document setting
+        :attr:`~Settings.odd_and_even_pages_header_footer` is set True.
+        """
+        return _Footer(self._sectPr, self._document_part,  WD_HEADER_FOOTER.EVEN_PAGE)
+
     @lazyproperty
     def footer(self):
         """|_Footer| object representing default page footer for this section.
diff --git a/features/sct-section.feature b/features/sct-section.feature
index 5c8777e6b..6236d1250 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -27,7 +27,6 @@ Feature: Access and change section properties
       | without         | False |
 
 
-  @wip
   Scenario: Section.even_page_footer
     Given a Section object as section
      Then section.even_page_footer is a _Footer object
diff --git a/tests/test_section.py b/tests/test_section.py
index 6870aac23..13a573ce6 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -112,6 +112,20 @@ def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
 
         assert sectPr.xml == expected_xml
 
+    def it_provides_access_to_its_even_page_footer(
+        self, document_part_, _Footer_, footer_
+    ):
+        sectPr = element('w:sectPr')
+        _Footer_.return_value = footer_
+        section = Section(sectPr, document_part_)
+
+        footer = section.even_page_footer
+
+        _Footer_.assert_called_once_with(
+            sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE
+        )
+        assert footer is footer_
+
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):

From 3ac49e52378da3b72417a9fc5db80f1b7cdf37f6 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 22:57:44 -0800
Subject: [PATCH 227/367] hdr: add Section.even_page_header

---
 docx/section.py              |  9 +++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index 287ce2343..8f28cd96c 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -83,6 +83,15 @@ def even_page_footer(self):
         """
         return _Footer(self._sectPr, self._document_part,  WD_HEADER_FOOTER.EVEN_PAGE)
 
+    @property
+    def even_page_header(self):
+        """|_Header| object defining header content for even pages.
+
+        The content of this header definition is ignored unless the document setting
+        :attr:`~Settings.odd_and_even_pages_header_footer` is set True.
+        """
+        return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.EVEN_PAGE)
+
     @lazyproperty
     def footer(self):
         """|_Footer| object representing default page footer for this section.
diff --git a/features/sct-section.feature b/features/sct-section.feature
index 6236d1250..6aea85cdc 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -32,7 +32,6 @@ Feature: Access and change section properties
      Then section.even_page_footer is a _Footer object
 
 
-  @wip
   Scenario: Section.even_page_header
     Given a Section object as section
      Then section.even_page_header is a _Header object
diff --git a/tests/test_section.py b/tests/test_section.py
index 13a573ce6..7e7cd0250 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -126,6 +126,20 @@ def it_provides_access_to_its_even_page_footer(
         )
         assert footer is footer_
 
+    def it_provides_access_to_its_even_page_header(
+        self, document_part_, _Header_, header_
+    ):
+        sectPr = element("w:sectPr")
+        _Header_.return_value = header_
+        section = Section(sectPr, document_part_)
+
+        header = section.even_page_header
+
+        _Header_.assert_called_once_with(
+            sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE
+        )
+        assert header is header_
+
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):

From 68a28ab253be121742b1a439d609010f7e1b7fc9 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 23:03:00 -0800
Subject: [PATCH 228/367] hdr: add Section.first_page_footer

---
 docx/section.py              |  9 +++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index 8f28cd96c..627118da3 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -92,6 +92,15 @@ def even_page_header(self):
         """
         return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.EVEN_PAGE)
 
+    @property
+    def first_page_footer(self):
+        """|_Footer| object defining footer content for the first page of this section.
+
+        The content of this footer definition is ignored unless the property
+        :attr:`.different_first_page_header_footer` is set True.
+        """
+        return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.FIRST_PAGE)
+
     @lazyproperty
     def footer(self):
         """|_Footer| object representing default page footer for this section.
diff --git a/features/sct-section.feature b/features/sct-section.feature
index 6aea85cdc..d6bbe1c16 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -37,7 +37,6 @@ Feature: Access and change section properties
      Then section.even_page_header is a _Header object
 
 
-  @wip
   Scenario: Section.first_page_footer
     Given a Section object as section
      Then section.first_page_footer is a _Footer object
diff --git a/tests/test_section.py b/tests/test_section.py
index 7e7cd0250..071e39148 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -140,6 +140,20 @@ def it_provides_access_to_its_even_page_header(
         )
         assert header is header_
 
+    def it_provides_access_to_its_first_page_footer(
+        self, document_part_, _Footer_, footer_
+    ):
+        sectPr = element("w:sectPr")
+        _Footer_.return_value = footer_
+        section = Section(sectPr, document_part_)
+
+        footer = section.first_page_footer
+
+        _Footer_.assert_called_once_with(
+            sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE
+        )
+        assert footer is footer_
+
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):

From 569b88029a4deb8e6195f896af61d1743913420a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 23:08:18 -0800
Subject: [PATCH 229/367] hdr: add Section.first_page_header

---
 docx/section.py              |  9 +++++++++
 features/sct-section.feature |  1 -
 tests/test_section.py        | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docx/section.py b/docx/section.py
index 627118da3..f1fbb489d 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -101,6 +101,15 @@ def first_page_footer(self):
         """
         return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.FIRST_PAGE)
 
+    @property
+    def first_page_header(self):
+        """|_Header| object defining header content for the first page of this section.
+
+        The content of this header definition is ignored unless the property
+        :attr:`.different_first_page_header_header` is set True.
+        """
+        return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.FIRST_PAGE)
+
     @lazyproperty
     def footer(self):
         """|_Footer| object representing default page footer for this section.
diff --git a/features/sct-section.feature b/features/sct-section.feature
index d6bbe1c16..d00287403 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -42,7 +42,6 @@ Feature: Access and change section properties
      Then section.first_page_footer is a _Footer object
 
 
-  @wip
   Scenario: Section.first_page_header
     Given a Section object as section
      Then section.first_page_header is a _Header object
diff --git a/tests/test_section.py b/tests/test_section.py
index 071e39148..7ac29a0f5 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -154,6 +154,20 @@ def it_provides_access_to_its_first_page_footer(
         )
         assert footer is footer_
 
+    def it_provides_access_to_its_first_page_header(
+        self, document_part_, _Header_, header_
+    ):
+        sectPr = element("w:sectPr")
+        _Header_.return_value = header_
+        section = Section(sectPr, document_part_)
+
+        header = section.first_page_header
+
+        _Header_.assert_called_once_with(
+            sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE
+        )
+        assert header is header_
+
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):

From a2df1d10c003e2ecd3b51b9d0033e7888bf2a124 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 5 Jan 2019 23:41:25 -0800
Subject: [PATCH 230/367] docs: add API docs for header/footer

---
 docs/api/section.rst | 18 +++++++++++++++++-
 docs/conf.py         |  4 ++++
 docx/section.py      | 28 +++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/docs/api/section.rst b/docs/api/section.rst
index 9aeb6ca1a..e2d547c75 100644
--- a/docs/api/section.rst
+++ b/docs/api/section.rst
@@ -22,4 +22,20 @@ Provides access to section properties such as margins and page orientation.
 
 
 .. autoclass:: Section
-   :members:
+   :members: 
+
+
+|_Header| and |_Footer| objects
+-------------------------------
+
+
+.. autoclass:: _Header()
+   :inherited-members: 
+   :members: 
+   :exclude-members: part
+
+
+.. autoclass:: _Footer()
+   :inherited-members: 
+   :members: 
+   :exclude-members: part
diff --git a/docs/conf.py b/docs/conf.py
index f997ac188..1a988453a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -109,8 +109,12 @@
 
 .. |_Footer| replace:: :class:`._Footer`
 
+.. |FooterPart| replace:: :class:`.FooterPart`
+
 .. |_Header| replace:: :class:`._Header`
 
+.. |HeaderPart| replace:: :class:`.HeaderPart`
+
 .. |ImageParts| replace:: :class:`.ImageParts`
 
 .. |Inches| replace:: :class:`.Inches`
diff --git a/docx/section.py b/docx/section.py
index f1fbb489d..77798ca5d 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -79,7 +79,7 @@ def even_page_footer(self):
         """|_Footer| object defining footer content for even pages.
 
         The content of this footer definition is ignored unless the document setting
-        :attr:`~Settings.odd_and_even_pages_header_footer` is set True.
+        :attr:`~.Settings.odd_and_even_pages_header_footer` is set True.
         """
         return _Footer(self._sectPr, self._document_part,  WD_HEADER_FOOTER.EVEN_PAGE)
 
@@ -88,7 +88,7 @@ def even_page_header(self):
         """|_Header| object defining header content for even pages.
 
         The content of this header definition is ignored unless the document setting
-        :attr:`~Settings.odd_and_even_pages_header_footer` is set True.
+        :attr:`~.Settings.odd_and_even_pages_header_footer` is set True.
         """
         return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.EVEN_PAGE)
 
@@ -106,7 +106,7 @@ def first_page_header(self):
         """|_Header| object defining header content for the first page of this section.
 
         The content of this header definition is ignored unless the property
-        :attr:`.different_first_page_header_header` is set True.
+        :attr:`.different_first_page_header_footer` is set True.
         """
         return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.FIRST_PAGE)
 
@@ -270,9 +270,9 @@ def __init__(self, sectPr, document_part, header_footer_index):
 
     @property
     def is_linked_to_previous(self):
-        """True if this header/footer uses the definition from the preceding section.
+        """``True`` if this header/footer uses the definition from the prior section.
 
-        False if this header/footer has an explicit definition.
+        ``False`` if this header/footer has an explicit definition.
 
         Assigning ``True`` to this property removes the header/footer definition for
         this section, causing it to "inherit" the corresponding definition of the prior
@@ -357,7 +357,14 @@ def _prior_headerfooter(self):
 
 
 class _Footer(_BaseHeaderFooter):
-    """Page footer."""
+    """Page footer, used for all three types (default, even-page, and first-page).
+
+    Note that, like a document or table cell, a footer must contain a minimum of one
+    paragraph and a new or otherwise "empty" footer contains a single empty paragraph.
+    This first paragraph can be accessed as `footer.paragraphs[0]` for purposes of
+    adding content to it. Using :meth:`add_paragraph()` by itself to add content will
+    leave an empty paragraph above the newly added one.
+    """
 
     def _add_definition(self):
         """Return newly-added footer part."""
@@ -393,7 +400,14 @@ def _prior_headerfooter(self):
 
 
 class _Header(_BaseHeaderFooter):
-    """Page header."""
+    """Page header, used for all three types (default, even-page, and first-page).
+
+    Note that, like a document or table cell, a header must contain a minimum of one
+    paragraph and a new or otherwise "empty" header contains a single empty paragraph.
+    This first paragraph can be accessed as `header.paragraphs[0]` for purposes of
+    adding content to it. Using :meth:`add_paragraph()` by itself to add content will
+    leave an empty paragraph above the newly added one.
+    """
 
     def _add_definition(self):
         """Return newly-added header part."""

From 5a310348c1b52b0dd5e04c23c2a1f61bee6c0d64 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 6 Jan 2019 14:05:11 -0800
Subject: [PATCH 231/367] doc: Document.add_section() strips hdr/ftr refs

The implementation of `Document.add_section()` "clones" the previously
last `w:sectPr` element to produce the `w:sectPr` for the new section.
This has the effect of duplicating the header and footer references
along with the rIds used to link them to their header or footer part.

There have been no reports that this causes a problem, but in any case
the correct behavior is to add a new section without any header or
footer definitions, such that the new section "inherits" all
header/footer definitions (and header/footer parts are not "reused").

Add code to remove all `w:headerReference` and `w:footerReference`
elements from a "cloned" `w:sectPr` element when adding a section.
---
 docx/oxml/document.py                         |  26 ++++++++++++------
 features/doc-add-section.feature              |  11 ++++++++
 features/steps/document.py                    |  10 +++++++
 features/steps/section.py                     |   9 ++++++
 .../steps/test_files/doc-add-section.docx     | Bin 21259 -> 17956 bytes
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/docx/oxml/document.py b/docx/oxml/document.py
index e1cb4ac55..4211b8ed1 100644
--- a/docx/oxml/document.py
+++ b/docx/oxml/document.py
@@ -33,17 +33,25 @@ class CT_Body(BaseOxmlElement):
     sectPr = ZeroOrOne('w:sectPr', successors=())
 
     def add_section_break(self):
+        """Return `w:sectPr` element for new section added at end of document.
+
+        The last `w:sectPr` becomes the second-to-last, with the new `w:sectPr` being an
+        exact clone of the previous one, except that all header and footer references
+        are removed (and are therefore now "inherited" from the prior section).
+
+        A copy of the previously-last `w:sectPr` will now appear in a new `w:p` at the
+        end of the document. The returned `w:sectPr` is the sentinel `w:sectPr` for the
+        document (and as implemented, *is* the prior sentinel `w:sectPr` with headers
+        and footers removed).
         """
-        Return the current ``<w:sectPr>`` element after adding a clone of it
-        in a new ``<w:p>`` element appended to the block content elements.
-        Note that the "current" ``<w:sectPr>`` will always be the sentinel
-        sectPr in this case since we're always working at the end of the
-        block content.
-        """
+        # ---get the sectPr at file-end, which controls last section (sections[-1])---
         sentinel_sectPr = self.get_or_add_sectPr()
-        cloned_sectPr = sentinel_sectPr.clone()
-        p = self.add_p()
-        p.set_sectPr(cloned_sectPr)
+        # ---add exact copy to new `w:p` element; that is now second-to last section---
+        self.add_p().set_sectPr(sentinel_sectPr.clone())
+        # ---remove any header or footer references from "new" last section---
+        for hdrftr_ref in sentinel_sectPr.xpath("w:headerReference|w:footerReference"):
+            sentinel_sectPr.remove(hdrftr_ref)
+        # ---the sentinel `w:sectPr` now controls the new last section---
         return sentinel_sectPr
 
     def clear_content(self):
diff --git a/features/doc-add-section.feature b/features/doc-add-section.feature
index 9b1c6e30c..4f9a8e860 100644
--- a/features/doc-add-section.feature
+++ b/features/doc-add-section.feature
@@ -11,3 +11,14 @@ Feature: Add a document section
       Then the document has two sections
        And the first section is portrait
        And the second section is landscape
+
+
+  Scenario: Document.add_section() adds a section that inherits headers and footers
+    Given a single-section Document object with headers and footers as document
+     When I execute section = document.add_section()
+     Then section.header.is_linked_to_previous is True
+      And section.even_page_header.is_linked_to_previous is True
+      And section.first_page_header.is_linked_to_previous is True
+      And section.footer.is_linked_to_previous is True
+      And section.even_page_footer.is_linked_to_previous is True
+      And section.first_page_footer.is_linked_to_previous is True
diff --git a/features/steps/document.py b/features/steps/document.py
index 2827d8582..a8e4d1adf 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -59,6 +59,11 @@ def given_a_single_section_document_having_portrait_layout(context):
     context.original_dimensions = (section.page_width, section.page_height)
 
 
+@given("a single-section Document object with headers and footers as document")
+def given_a_single_section_Document_object_with_headers_and_footers(context):
+    context.document = Document(test_docx("doc-add-section"))
+
+
 # when ====================================================
 
 @when('I add a 2 x 2 table specifying only row and column count')
@@ -160,6 +165,11 @@ def when_I_change_the_new_section_layout_to_landscape(context):
     section.page_height = new_height
 
 
+@when("I execute section = document.add_section()")
+def when_I_execute_section_eq_document_add_section(context):
+    context.section = context.document.add_section()
+
+
 # then ====================================================
 
 @then('document.inline_shapes is an InlineShapes object')
diff --git a/features/steps/section.py b/features/steps/section.py
index d8d566fc7..91209eac1 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -204,6 +204,15 @@ def then_section_header_is_a_Header_object(context):
     assert actual == expected, "section.header is a %s object" % actual
 
 
+@then("section.{propname}.is_linked_to_previous is True")
+def then_section_hdrftr_prop_is_linked_to_previous_is_True(context, propname):
+    actual = getattr(context.section, propname).is_linked_to_previous
+    expected = True
+    assert actual == expected, (
+        "section.%s.is_linked_to_previous is %s" % (propname, actual)
+    )
+
+
 @then('the reported {margin_side} margin is {inches} inches')
 def then_the_reported_margin_is_inches(context, margin_side, inches):
     prop_name = {
diff --git a/features/steps/test_files/doc-add-section.docx b/features/steps/test_files/doc-add-section.docx
index 4b17ce6ab8ccb0f531463b86c5c023edee51d859..cd5ab100f6d3c3eb46d73528376cdfdf09aa06e9 100644
GIT binary patch
literal 17956
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
O05!mMVh#SEd;cGZGoqRR

literal 21259
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


From ada86c3880f1b070ad6525201610866af4945865 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 6 Jan 2019 14:57:45 -0800
Subject: [PATCH 232/367] rfctr: extract default .docx template to directory

Maintaining the default document template as a directory allows its
individual parts (XML files) to be curated like code, with line-changes
tracked by Git.

Extract the default template to a directory and load that directory as
the default when no template document is specified to the `Document()`
constructor.

Also add Header and Footer styles.
---
 docx/api.py                                   |     2 +-
 docx/styles/__init__.py                       |     4 +-
 .../default-docx-template/[Content_Types].xml |    17 +
 .../default-docx-template/_rels/.rels         |     7 +
 .../customXml/_rels/item1.xml.rels            |     4 +
 .../default-docx-template/customXml/item1.xml |     2 +
 .../customXml/itemProps1.xml                  |     6 +
 .../default-docx-template/docProps/app.xml    |    36 +
 .../default-docx-template/docProps/core.xml   |    13 +
 .../docProps/thumbnail.jpeg                   |   Bin 0 -> 8324 bytes
 .../word/_rels/document.xml.rels              |    11 +
 .../default-docx-template/word/document.xml   |    11 +
 .../default-docx-template/word/fontTable.xml  |    61 +
 .../default-docx-template/word/numbering.xml  |   201 +
 .../default-docx-template/word/settings.xml   |    53 +
 .../default-docx-template/word/styles.xml     | 11844 ++++++++++++++++
 .../word/stylesWithEffects.xml                | 11800 +++++++++++++++
 .../word/theme/theme1.xml                     |   318 +
 .../word/webSettings.xml                      |     5 +
 docx/templates/default-src.docx               |   Bin 77650 -> 0 bytes
 docx/templates/default.docx                   |   Bin 38003 -> 0 bytes
 21 files changed, 24393 insertions(+), 2 deletions(-)
 create mode 100644 docx/templates/default-docx-template/[Content_Types].xml
 create mode 100644 docx/templates/default-docx-template/_rels/.rels
 create mode 100644 docx/templates/default-docx-template/customXml/_rels/item1.xml.rels
 create mode 100644 docx/templates/default-docx-template/customXml/item1.xml
 create mode 100644 docx/templates/default-docx-template/customXml/itemProps1.xml
 create mode 100644 docx/templates/default-docx-template/docProps/app.xml
 create mode 100644 docx/templates/default-docx-template/docProps/core.xml
 create mode 100644 docx/templates/default-docx-template/docProps/thumbnail.jpeg
 create mode 100644 docx/templates/default-docx-template/word/_rels/document.xml.rels
 create mode 100644 docx/templates/default-docx-template/word/document.xml
 create mode 100644 docx/templates/default-docx-template/word/fontTable.xml
 create mode 100644 docx/templates/default-docx-template/word/numbering.xml
 create mode 100644 docx/templates/default-docx-template/word/settings.xml
 create mode 100644 docx/templates/default-docx-template/word/styles.xml
 create mode 100644 docx/templates/default-docx-template/word/stylesWithEffects.xml
 create mode 100644 docx/templates/default-docx-template/word/theme/theme1.xml
 create mode 100644 docx/templates/default-docx-template/word/webSettings.xml
 delete mode 100644 docx/templates/default-src.docx
 delete mode 100644 docx/templates/default.docx

diff --git a/docx/api.py b/docx/api.py
index 63e18c406..9a2215d7a 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -34,4 +34,4 @@ def _default_docx_path():
     Return the path to the built-in default .docx package.
     """
     _thisdir = os.path.split(__file__)[0]
-    return os.path.join(_thisdir, 'templates', 'default.docx')
+    return os.path.join(_thisdir, 'templates', 'default-docx-template')
diff --git a/docx/styles/__init__.py b/docx/styles/__init__.py
index 3eff43e55..63ebaa2b6 100644
--- a/docx/styles/__init__.py
+++ b/docx/styles/__init__.py
@@ -16,7 +16,9 @@ class BabelFish(object):
     """
 
     style_aliases = (
-        ('Caption',   'caption'),
+        ('Caption', 'caption'),
+        ('Footer', 'footer'),
+        ('Header', 'header'),
         ('Heading 1', 'heading 1'),
         ('Heading 2', 'heading 2'),
         ('Heading 3', 'heading 3'),
diff --git a/docx/templates/default-docx-template/[Content_Types].xml b/docx/templates/default-docx-template/[Content_Types].xml
new file mode 100644
index 000000000..a2e37e896
--- /dev/null
+++ b/docx/templates/default-docx-template/[Content_Types].xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="xml" ContentType="application/xml"/>
+  <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
+  <Default Extension="jpeg" ContentType="image/jpeg"/>
+  <Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
+  <Override PartName="/customXml/itemProps1.xml" ContentType="application/vnd.openxmlformats-officedocument.customXmlProperties+xml"/>
+  <Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>
+  <Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/>
+  <Override PartName="/word/stylesWithEffects.xml" ContentType="application/vnd.ms-word.stylesWithEffects+xml"/>
+  <Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>
+  <Override PartName="/word/webSettings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"/>
+  <Override PartName="/word/fontTable.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"/>
+  <Override PartName="/word/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/>
+  <Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>
+  <Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>
+</Types>
diff --git a/docx/templates/default-docx-template/_rels/.rels b/docx/templates/default-docx-template/_rels/.rels
new file mode 100644
index 000000000..40657c778
--- /dev/null
+++ b/docx/templates/default-docx-template/_rels/.rels
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
+  <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"/>
+</Relationships>
diff --git a/docx/templates/default-docx-template/customXml/_rels/item1.xml.rels b/docx/templates/default-docx-template/customXml/_rels/item1.xml.rels
new file mode 100644
index 000000000..8a65d2128
--- /dev/null
+++ b/docx/templates/default-docx-template/customXml/_rels/item1.xml.rels
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps" Target="itemProps1.xml"/>
+</Relationships>
diff --git a/docx/templates/default-docx-template/customXml/item1.xml b/docx/templates/default-docx-template/customXml/item1.xml
new file mode 100644
index 000000000..94c8babdb
--- /dev/null
+++ b/docx/templates/default-docx-template/customXml/item1.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="/APA.XSL" StyleName="APA"/>
diff --git a/docx/templates/default-docx-template/customXml/itemProps1.xml b/docx/templates/default-docx-template/customXml/itemProps1.xml
new file mode 100644
index 000000000..6664fc08b
--- /dev/null
+++ b/docx/templates/default-docx-template/customXml/itemProps1.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<ds:datastoreItem xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml" ds:itemID="{EF278816-EC6F-A645-907D-7F25AECB1D4A}">
+  <ds:schemaRefs>
+    <ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/>
+  </ds:schemaRefs>
+</ds:datastoreItem>
diff --git a/docx/templates/default-docx-template/docProps/app.xml b/docx/templates/default-docx-template/docProps/app.xml
new file mode 100644
index 000000000..bf89187e2
--- /dev/null
+++ b/docx/templates/default-docx-template/docProps/app.xml
@@ -0,0 +1,36 @@
+<?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">
+  <Template>Normal.dotm</Template>
+  <TotalTime>0</TotalTime>
+  <Pages>1</Pages>
+  <Words>0</Words>
+  <Characters>0</Characters>
+  <Application>Microsoft Macintosh Word</Application>
+  <DocSecurity>0</DocSecurity>
+  <Lines>0</Lines>
+  <Paragraphs>0</Paragraphs>
+  <ScaleCrop>false</ScaleCrop>
+  <HeadingPairs>
+    <vt:vector size="2" baseType="variant">
+      <vt:variant>
+        <vt:lpstr>Title</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>1</vt:i4>
+      </vt:variant>
+    </vt:vector>
+  </HeadingPairs>
+  <TitlesOfParts>
+    <vt:vector size="1" baseType="lpstr">
+      <vt:lpstr/>
+    </vt:vector>
+  </TitlesOfParts>
+  <Manager/>
+  <Company/>
+  <LinksUpToDate>false</LinksUpToDate>
+  <CharactersWithSpaces>0</CharactersWithSpaces>
+  <SharedDoc>false</SharedDoc>
+  <HyperlinkBase/>
+  <HyperlinksChanged>false</HyperlinksChanged>
+  <AppVersion>14.0000</AppVersion>
+</Properties>
diff --git a/docx/templates/default-docx-template/docProps/core.xml b/docx/templates/default-docx-template/docProps/core.xml
new file mode 100644
index 000000000..55109c766
--- /dev/null
+++ b/docx/templates/default-docx-template/docProps/core.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <dc:title/>
+  <dc:subject/>
+  <dc:creator>python-docx</dc:creator>
+  <cp:keywords/>
+  <dc:description>generated by python-docx</dc:description>
+  <cp:lastModifiedBy/>
+  <cp:revision>1</cp:revision>
+  <dcterms:created xsi:type="dcterms:W3CDTF">2013-12-23T23:15:00Z</dcterms:created>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2013-12-23T23:15:00Z</dcterms:modified>
+  <cp:category/>
+</cp:coreProperties>
diff --git a/docx/templates/default-docx-template/docProps/thumbnail.jpeg b/docx/templates/default-docx-template/docProps/thumbnail.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..d0c4f1f553fedc9e469c7c5253fbed0b10e7476e
GIT binary patch
literal 8324
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

literal 0
HcmV?d00001

diff --git a/docx/templates/default-docx-template/word/_rels/document.xml.rels b/docx/templates/default-docx-template/word/_rels/document.xml.rels
new file mode 100644
index 000000000..de8ebbc5f
--- /dev/null
+++ b/docx/templates/default-docx-template/word/_rels/document.xml.rels
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
+  <Relationship Id="rId4" Type="http://schemas.microsoft.com/office/2007/relationships/stylesWithEffects" Target="stylesWithEffects.xml"/>
+  <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings" Target="settings.xml"/>
+  <Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings" Target="webSettings.xml"/>
+  <Relationship Id="rId7" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable" Target="fontTable.xml"/>
+  <Relationship Id="rId8" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/>
+  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml" Target="../customXml/item1.xml"/>
+  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering" Target="numbering.xml"/>
+</Relationships>
diff --git a/docx/templates/default-docx-template/word/document.xml b/docx/templates/default-docx-template/word/document.xml
new file mode 100644
index 000000000..3edb08e8c
--- /dev/null
+++ b/docx/templates/default-docx-template/word/document.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mv="urn:schemas-microsoft-com:mac:vml" 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:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 wp14">
+  <w:body>
+    <w:sectPr w:rsidR="00FC693F" w:rsidRPr="0006063C" w:rsidSect="00034616">
+      <w:pgSz w:w="12240" w:h="15840"/>
+      <w:pgMar w:top="1440" w:right="1800" w:bottom="1440" w:left="1800" w:header="720" w:footer="720" w:gutter="0"/>
+      <w:cols w:space="720"/>
+      <w:docGrid w:linePitch="360"/>
+    </w:sectPr>
+  </w:body>
+</w:document>
diff --git a/docx/templates/default-docx-template/word/fontTable.xml b/docx/templates/default-docx-template/word/fontTable.xml
new file mode 100644
index 000000000..a2e06581b
--- /dev/null
+++ b/docx/templates/default-docx-template/word/fontTable.xml
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:fonts xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" mc:Ignorable="w14">
+  <w:font w:name="Symbol">
+    <w:panose1 w:val="00000000000000000000"/>
+    <w:charset w:val="02"/>
+    <w:family w:val="auto"/>
+    <w:pitch w:val="variable"/>
+    <w:sig w:usb0="00000000" w:usb1="10000000" w:usb2="00000000" 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="E0002AFF" w:usb1="C0007841" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" 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="E00002FF" w:usb1="400004FF" w:usb2="00000000" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="ＭＳ 明朝">
+    <w:panose1 w:val="00000000000000000000"/>
+    <w:charset w:val="80"/>
+    <w:family w:val="roman"/>
+    <w:notTrueType/>
+    <w:pitch w:val="fixed"/>
+    <w:sig w:usb0="00000001" w:usb1="08070000" w:usb2="00000010" w:usb3="00000000" w:csb0="00020000" 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="E10002FF" w:usb1="4000ACFF" w:usb2="00000009" w:usb3="00000000" w:csb0="0000019F" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="ＭＳ ゴシック">
+    <w:panose1 w:val="00000000000000000000"/>
+    <w:charset w:val="80"/>
+    <w:family w:val="modern"/>
+    <w:notTrueType/>
+    <w:pitch w:val="fixed"/>
+    <w:sig w:usb0="00000001" w:usb1="08070000" w:usb2="00000010" w:usb3="00000000" w:csb0="00020000" w:csb1="00000000"/>
+  </w:font>
+  <w:font w:name="Courier">
+    <w:panose1 w:val="02000500000000000000"/>
+    <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="E0002AFF" w:usb1="C0007843" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
+  </w:font>
+</w:fonts>
diff --git a/docx/templates/default-docx-template/word/numbering.xml b/docx/templates/default-docx-template/word/numbering.xml
new file mode 100644
index 000000000..cba57e24b
--- /dev/null
+++ b/docx/templates/default-docx-template/word/numbering.xml
@@ -0,0 +1,201 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:numbering xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mv="urn:schemas-microsoft-com:mac:vml" 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:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 wp14">
+  <w:abstractNum w:abstractNumId="0">
+    <w:nsid w:val="FFFFFF7C"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="C310EC42"/>
+    <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="1800"/>
+        </w:tabs>
+        <w:ind w:left="1800" w:hanging="360"/>
+      </w:pPr>
+    </w:lvl>
+  </w:abstractNum>
+  <w:abstractNum w:abstractNumId="1">
+    <w:nsid w:val="FFFFFF7D"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="E4089024"/>
+    <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="1440"/>
+        </w:tabs>
+        <w:ind w:left="1440" w:hanging="360"/>
+      </w:pPr>
+    </w:lvl>
+  </w:abstractNum>
+  <w:abstractNum w:abstractNumId="2">
+    <w:nsid w:val="FFFFFF7E"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="FB12693A"/>
+    <w:lvl w:ilvl="0">
+      <w:start w:val="1"/>
+      <w:numFmt w:val="decimal"/>
+      <w:pStyle w:val="ListNumber3"/>
+      <w:lvlText w:val="%1."/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:tabs>
+          <w:tab w:val="num" w:pos="1080"/>
+        </w:tabs>
+        <w:ind w:left="1080" w:hanging="360"/>
+      </w:pPr>
+    </w:lvl>
+  </w:abstractNum>
+  <w:abstractNum w:abstractNumId="3">
+    <w:nsid w:val="FFFFFF7F"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="38441652"/>
+    <w:lvl w:ilvl="0">
+      <w:start w:val="1"/>
+      <w:numFmt w:val="decimal"/>
+      <w:pStyle w:val="ListNumber2"/>
+      <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="360"/>
+      </w:pPr>
+    </w:lvl>
+  </w:abstractNum>
+  <w:abstractNum w:abstractNumId="4">
+    <w:nsid w:val="FFFFFF81"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="171AC3A4"/>
+    <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="1440"/>
+        </w:tabs>
+        <w:ind w:left="1440" 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="5">
+    <w:nsid w:val="FFFFFF82"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="F3EAFDEC"/>
+    <w:lvl w:ilvl="0">
+      <w:start w:val="1"/>
+      <w:numFmt w:val="bullet"/>
+      <w:pStyle w:val="ListBullet3"/>
+      <w:lvlText w:val=""/>
+      <w:lvlJc w:val="left"/>
+      <w:pPr>
+        <w:tabs>
+          <w:tab w:val="num" w:pos="1080"/>
+        </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:abstractNum>
+  <w:abstractNum w:abstractNumId="6">
+    <w:nsid w:val="FFFFFF83"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="3D1EFFD4"/>
+    <w:lvl w:ilvl="0">
+      <w:start w:val="1"/>
+      <w:numFmt w:val="bullet"/>
+      <w:pStyle w:val="ListBullet2"/>
+      <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="720" 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="FFFFFF88"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="D0A62B40"/>
+    <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="8">
+    <w:nsid w:val="FFFFFF89"/>
+    <w:multiLevelType w:val="singleLevel"/>
+    <w:tmpl w:val="29761A62"/>
+    <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:num w:numId="1">
+    <w:abstractNumId w:val="8"/>
+  </w:num>
+  <w:num w:numId="2">
+    <w:abstractNumId w:val="6"/>
+  </w:num>
+  <w:num w:numId="3">
+    <w:abstractNumId w:val="5"/>
+  </w:num>
+  <w:num w:numId="4">
+    <w:abstractNumId w:val="4"/>
+  </w:num>
+  <w:num w:numId="5">
+    <w:abstractNumId w:val="7"/>
+  </w:num>
+  <w:num w:numId="6">
+    <w:abstractNumId w:val="3"/>
+  </w:num>
+  <w:num w:numId="7">
+    <w:abstractNumId w:val="2"/>
+  </w:num>
+  <w:num w:numId="8">
+    <w:abstractNumId w:val="1"/>
+  </w:num>
+  <w:num w:numId="9">
+    <w:abstractNumId w:val="0"/>
+  </w:num>
+</w:numbering>
diff --git a/docx/templates/default-docx-template/word/settings.xml b/docx/templates/default-docx-template/word/settings.xml
new file mode 100644
index 000000000..1e84bf185
--- /dev/null
+++ b/docx/templates/default-docx-template/word/settings.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:settings xmlns:mc="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:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" mc:Ignorable="w14">
+  <w:zoom w:val="bestFit"/>
+  <w:proofState w:spelling="clean" w:grammar="clean"/>
+  <w:defaultTabStop w:val="720"/>
+  <w:characterSpacingControl w:val="doNotCompress"/>
+  <w:savePreviewPicture/>
+  <w:compat>
+    <w:useFELayout/>
+    <w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="14"/>
+    <w:compatSetting w:name="overrideTableStyleFontSizeAndJustification" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="enableOpenTypeFeatures" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+    <w:compatSetting w:name="doNotFlipMirrorIndents" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/>
+  </w:compat>
+  <w:rsids>
+    <w:rsidRoot w:val="00B47730"/>
+    <w:rsid w:val="00034616"/>
+    <w:rsid w:val="0006063C"/>
+    <w:rsid w:val="0015074B"/>
+    <w:rsid w:val="0029639D"/>
+    <w:rsid w:val="00326F90"/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:rsid w:val="00B47730"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:rsid w:val="00FC693F"/>
+  </w:rsids>
+  <m:mathPr>
+    <m:mathFont m:val="Cambria Math"/>
+    <m:brkBin m:val="before"/>
+    <m:brkBinSub m:val="--"/>
+    <m:smallFrac m:val="0"/>
+    <m:dispDef/>
+    <m:lMargin m:val="0"/>
+    <m:rMargin m:val="0"/>
+    <m:defJc m:val="centerGroup"/>
+    <m:wrapIndent m:val="1440"/>
+    <m:intLim m:val="subSup"/>
+    <m:naryLim m:val="undOvr"/>
+  </m:mathPr>
+  <w:themeFontLang w:val="en-US" w:eastAsia="ja-JP"/>
+  <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
+  <w:doNotAutoCompressPictures/>
+  <w:shapeDefaults>
+    <o:shapedefaults v:ext="edit" spidmax="1027"/>
+    <o:shapelayout v:ext="edit">
+      <o:idmap v:ext="edit" data="1"/>
+    </o:shapelayout>
+  </w:shapeDefaults>
+  <w:decimalSymbol w:val="."/>
+  <w:listSeparator w:val=","/>
+  <w14:docId w14:val="24062061"/>
+  <w14:defaultImageDpi w14:val="300"/>
+</w:settings>
diff --git a/docx/templates/default-docx-template/word/styles.xml b/docx/templates/default-docx-template/word/styles.xml
new file mode 100644
index 000000000..46d1e98f7
--- /dev/null
+++ b/docx/templates/default-docx-template/word/styles.xml
@@ -0,0 +1,11844 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:styles xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" mc:Ignorable="w14">
+  <w:docDefaults>
+    <w:rPrDefault>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="minorHAnsi" w:eastAsiaTheme="minorEastAsia" w:hAnsiTheme="minorHAnsi" w:cstheme="minorBidi"/>
+        <w:sz w:val="22"/>
+        <w:szCs w:val="22"/>
+        <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:line="276" w:lineRule="auto"/>
+      </w:pPr>
+    </w:pPrDefault>
+  </w:docDefaults>
+  <w:latentStyles w:defLockedState="0" w:defUIPriority="99" w:defSemiHidden="1" w:defUnhideWhenUsed="1" w:defQFormat="0" w:count="276">
+    <w:lsdException w:name="Normal" w:semiHidden="0" w:uiPriority="0" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="heading 1" w:semiHidden="0" w:uiPriority="9" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="heading 2" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 3" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 4" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 5" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 6" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 7" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 8" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 9" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="toc 1" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 2" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 3" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 4" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 5" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 6" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 7" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 8" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 9" w:uiPriority="39"/>
+    <w:lsdException w:name="caption" w:uiPriority="35" w:qFormat="1"/>
+    <w:lsdException w:name="Title" w:semiHidden="0" w:uiPriority="10" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Default Paragraph Font" w:uiPriority="1"/>
+    <w:lsdException w:name="Subtitle" w:semiHidden="0" w:uiPriority="11" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Strong" w:semiHidden="0" w:uiPriority="22" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Emphasis" w:semiHidden="0" w:uiPriority="20" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Table Grid" w:semiHidden="0" w:uiPriority="59" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Placeholder Text" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="No Spacing" w:semiHidden="0" w:uiPriority="1" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Light Shading" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 1" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 1" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 1" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 1" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Revision" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="List Paragraph" w:semiHidden="0" w:uiPriority="34" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Quote" w:semiHidden="0" w:uiPriority="29" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Intense Quote" w:semiHidden="0" w:uiPriority="30" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Medium List 2 Accent 1" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 1" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 1" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 1" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 1" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 1" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 1" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 2" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 2" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 2" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 2" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 2" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 2" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 2" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 2" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 2" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 2" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 2" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 3" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 3" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 3" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 3" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 3" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 3" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 3" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 3" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 3" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 3" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 3" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 3" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 3" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 4" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 4" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 4" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 4" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 4" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 4" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 4" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 4" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 4" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 4" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 4" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 4" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 4" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 4" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 5" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 5" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 5" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 5" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 5" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 5" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 5" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 5" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 5" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 5" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 5" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 5" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 5" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 5" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 6" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 6" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 6" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 6" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 6" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 6" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 6" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 6" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 6" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 6" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 6" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 6" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 6" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 6" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Subtle Emphasis" w:semiHidden="0" w:uiPriority="19" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Intense Emphasis" w:semiHidden="0" w:uiPriority="21" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Subtle Reference" w:semiHidden="0" w:uiPriority="31" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Intense Reference" w:semiHidden="0" w:uiPriority="32" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Book Title" w:semiHidden="0" w:uiPriority="33" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Bibliography" w:uiPriority="37"/>
+    <w:lsdException w:name="TOC Heading" w:uiPriority="39" w:qFormat="1"/>
+  </w:latentStyles>
+  <w:style w:type="paragraph" w:default="1" w:styleId="Normal">
+    <w:name w:val="Normal"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Header">
+    <w:name w:val="header"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="HeaderChar"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00E618BF"/>
+    <w:pPr>
+      <w:tabs>
+        <w:tab w:val="center" w:pos="4680"/>
+        <w:tab w:val="right" w:pos="9360"/>
+      </w:tabs>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="HeaderChar">
+    <w:name w:val="Header Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Header"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="00E618BF"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Footer">
+    <w:name w:val="footer"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="FooterChar"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00E618BF"/>
+    <w:pPr>
+      <w:tabs>
+        <w:tab w:val="center" w:pos="4680"/>
+        <w:tab w:val="right" w:pos="9360"/>
+      </w:tabs>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="FooterChar">
+    <w:name w:val="Footer Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Footer"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="00E618BF"/>
+  </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="00FC693F"/>
+    <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="365F91" w:themeColor="accent1" w:themeShade="BF"/>
+      <w:sz w:val="28"/>
+      <w:szCs w:val="28"/>
+    </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="00FC693F"/>
+    <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="paragraph" w:styleId="Heading3">
+    <w:name w:val="heading 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading3Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="2"/>
+    </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:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading4">
+    <w:name w:val="heading 4"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading4Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="3"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading5">
+    <w:name w:val="heading 5"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading5Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="4"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading6">
+    <w:name w:val="heading 6"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading6Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="5"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading7">
+    <w:name w:val="heading 7"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading7Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="6"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading8">
+    <w:name w:val="heading 8"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading8Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="7"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading9">
+    <w:name w:val="heading 9"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading9Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="8"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:default="1" w:styleId="DefaultParagraphFont">
+    <w:name w:val="Default Paragraph Font"/>
+    <w:uiPriority w:val="1"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+  </w:style>
+  <w:style w:type="table" w:default="1" w:styleId="TableNormal">
+    <w:name w:val="Normal Table"/>
+    <w:uiPriority w:val="99"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <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:uiPriority w:val="99"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="NoSpacing">
+    <w:name w:val="No Spacing"/>
+    <w:uiPriority w:val="1"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+  </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="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:b/>
+      <w:bCs/>
+      <w:color w:val="365F91" w:themeColor="accent1" w:themeShade="BF"/>
+      <w:sz w:val="28"/>
+      <w:szCs w:val="28"/>
+    </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="00FC693F"/>
+    <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:customStyle="1" w:styleId="Heading3Char">
+    <w:name w:val="Heading 3 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading3"/>
+    <w:uiPriority w:val="9"/>
+    <w:rsid w:val="00FC693F"/>
+    <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:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Title">
+    <w:name w:val="Title"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="TitleChar"/>
+    <w:uiPriority w:val="10"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:pBdr>
+        <w:bottom w:val="single" w:sz="8" w:space="4" w:color="4F81BD" w:themeColor="accent1"/>
+      </w:pBdr>
+      <w:spacing w:after="300" w:line="240" w:lineRule="auto"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="17365D" w:themeColor="text2" w:themeShade="BF"/>
+      <w:spacing w:val="5"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="52"/>
+      <w:szCs w:val="52"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="TitleChar">
+    <w:name w:val="Title Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Title"/>
+    <w:uiPriority w:val="10"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="17365D" w:themeColor="text2" w:themeShade="BF"/>
+      <w:spacing w:val="5"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="52"/>
+      <w:szCs w:val="52"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Subtitle">
+    <w:name w:val="Subtitle"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="SubtitleChar"/>
+    <w:uiPriority w:val="11"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:numPr>
+        <w:ilvl w:val="1"/>
+      </w:numPr>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:spacing w:val="15"/>
+      <w:sz w:val="24"/>
+      <w:szCs w:val="24"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="SubtitleChar">
+    <w:name w:val="Subtitle Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Subtitle"/>
+    <w:uiPriority w:val="11"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:spacing w:val="15"/>
+      <w:sz w:val="24"/>
+      <w:szCs w:val="24"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListParagraph">
+    <w:name w:val="List Paragraph"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="34"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:ind w:left="720"/>
+      <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:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <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:uiPriority w:val="99"/>
+    <w:rsid w:val="00AA1D8D"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="BodyText2">
+    <w:name w:val="Body Text 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="BodyText2Char"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:pPr>
+      <w:spacing w:after="120" w:line="480" w:lineRule="auto"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="BodyText2Char">
+    <w:name w:val="Body Text 2 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="BodyText2"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="00AA1D8D"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="BodyText3">
+    <w:name w:val="Body Text 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="BodyText3Char"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+    </w:pPr>
+    <w:rPr>
+      <w:sz w:val="16"/>
+      <w:szCs w:val="16"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="BodyText3Char">
+    <w:name w:val="Body Text 3 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="BodyText3"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:rPr>
+      <w:sz w:val="16"/>
+      <w:szCs w:val="16"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="List">
+    <w:name w:val="List"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:pPr>
+      <w:ind w:left="360" w:hanging="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="List2">
+    <w:name w:val="List 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:ind w:left="720" w:hanging="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="List3">
+    <w:name w:val="List 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:ind w:left="1080" w:hanging="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListBullet">
+    <w:name w:val="List Bullet"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="1"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListBullet2">
+    <w:name w:val="List Bullet 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="2"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListBullet3">
+    <w:name w:val="List Bullet 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="3"/>
+      </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:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="5"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListNumber2">
+    <w:name w:val="List Number 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="6"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListNumber3">
+    <w:name w:val="List Number 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="7"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListContinue">
+    <w:name w:val="List Continue"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+      <w:ind w:left="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListContinue2">
+    <w:name w:val="List Continue 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+      <w:ind w:left="720"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListContinue3">
+    <w:name w:val="List Continue 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+      <w:ind w:left="1080"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="MacroText">
+    <w:name w:val="macro"/>
+    <w:link w:val="MacroTextChar"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:tabs>
+        <w:tab w:val="left" w:pos="576"/>
+        <w:tab w:val="left" w:pos="1152"/>
+        <w:tab w:val="left" w:pos="1728"/>
+        <w:tab w:val="left" w:pos="2304"/>
+        <w:tab w:val="left" w:pos="2880"/>
+        <w:tab w:val="left" w:pos="3456"/>
+        <w:tab w:val="left" w:pos="4032"/>
+      </w:tabs>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:ascii="Courier" w:hAnsi="Courier"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="MacroTextChar">
+    <w:name w:val="Macro Text Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="MacroText"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="0029639D"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Courier" w:hAnsi="Courier"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Quote">
+    <w:name w:val="Quote"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="QuoteChar"/>
+    <w:uiPriority w:val="29"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="QuoteChar">
+    <w:name w:val="Quote Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Quote"/>
+    <w:uiPriority w:val="29"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading4Char">
+    <w:name w:val="Heading 4 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading4"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading5Char">
+    <w:name w:val="Heading 5 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading5"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading6Char">
+    <w:name w:val="Heading 6 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading6"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading7Char">
+    <w:name w:val="Heading 7 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading7"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading8Char">
+    <w:name w:val="Heading 8 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading8"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading9Char">
+    <w:name w:val="Heading 9 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading9"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Caption">
+    <w:name w:val="caption"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:uiPriority w:val="35"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:sz w:val="18"/>
+      <w:szCs w:val="18"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Strong">
+    <w:name w:val="Strong"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="22"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Emphasis">
+    <w:name w:val="Emphasis"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="20"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="IntenseQuote">
+    <w:name w:val="Intense Quote"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="IntenseQuoteChar"/>
+    <w:uiPriority w:val="30"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:pBdr>
+        <w:bottom w:val="single" w:sz="4" w:space="4" w:color="4F81BD" w:themeColor="accent1"/>
+      </w:pBdr>
+      <w:spacing w:before="200" w:after="280"/>
+      <w:ind w:left="936" w:right="936"/>
+    </w:pPr>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="IntenseQuoteChar">
+    <w:name w:val="Intense Quote Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="IntenseQuote"/>
+    <w:uiPriority w:val="30"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="SubtleEmphasis">
+    <w:name w:val="Subtle Emphasis"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="19"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="808080" w:themeColor="text1" w:themeTint="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="IntenseEmphasis">
+    <w:name w:val="Intense Emphasis"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="21"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="SubtleReference">
+    <w:name w:val="Subtle Reference"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="31"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:smallCaps/>
+      <w:color w:val="C0504D" w:themeColor="accent2"/>
+      <w:u w:val="single"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="IntenseReference">
+    <w:name w:val="Intense Reference"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="32"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:smallCaps/>
+      <w:color w:val="C0504D" w:themeColor="accent2"/>
+      <w:spacing w:val="5"/>
+      <w:u w:val="single"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="BookTitle">
+    <w:name w:val="Book Title"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="33"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:smallCaps/>
+      <w:spacing w:val="5"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="TOCHeading">
+    <w:name w:val="TOC Heading"/>
+    <w:basedOn w:val="Heading1"/>
+    <w:next w:val="Normal"/>
+    <w:uiPriority w:val="39"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:outlineLvl w:val="9"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="table" w:styleId="TableGrid">
+    <w:name w:val="Table Grid"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="59"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:insideV w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+      </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:style>
+  <w:style w:type="table" w:styleId="LightShading">
+    <w:name w:val="Light Shading"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent1">
+    <w:name w:val="Light Shading Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="365F91" w:themeColor="accent1" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent2">
+    <w:name w:val="Light Shading Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="943634" w:themeColor="accent2" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent3">
+    <w:name w:val="Light Shading Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="76923C" w:themeColor="accent3" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent4">
+    <w:name w:val="Light Shading Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="5F497A" w:themeColor="accent4" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent5">
+    <w:name w:val="Light Shading Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="31849B" w:themeColor="accent5" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent6">
+    <w:name w:val="Light Shading Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="E36C0A" w:themeColor="accent6" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList">
+    <w:name w:val="Light List"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent1">
+    <w:name w:val="Light List Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent2">
+    <w:name w:val="Light List Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent3">
+    <w:name w:val="Light List Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent4">
+    <w:name w:val="Light List Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent5">
+    <w:name w:val="Light List Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent6">
+    <w:name w:val="Light List Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid">
+    <w:name w:val="Light Grid"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent1">
+    <w:name w:val="Light Grid Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent2">
+    <w:name w:val="Light Grid Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent3">
+    <w:name w:val="Light Grid Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent4">
+    <w:name w:val="Light Grid Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent5">
+    <w:name w:val="Light Grid Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent6">
+    <w:name w:val="Light Grid Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1">
+    <w:name w:val="Medium Shading 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent1">
+    <w:name w:val="Medium Shading 1 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent2">
+    <w:name w:val="Medium Shading 1 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent3">
+    <w:name w:val="Medium Shading 1 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent4">
+    <w:name w:val="Medium Shading 1 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent5">
+    <w:name w:val="Medium Shading 1 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent6">
+    <w:name w:val="Medium Shading 1 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2">
+    <w:name w:val="Medium Shading 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent1">
+    <w:name w:val="Medium Shading 2 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent2">
+    <w:name w:val="Medium Shading 2 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent3">
+    <w:name w:val="Medium Shading 2 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent4">
+    <w:name w:val="Medium Shading 2 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent5">
+    <w:name w:val="Medium Shading 2 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent6">
+    <w:name w:val="Medium Shading 2 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1">
+    <w:name w:val="Medium List 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent1">
+    <w:name w:val="Medium List 1 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent2">
+    <w:name w:val="Medium List 1 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent3">
+    <w:name w:val="Medium List 1 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent4">
+    <w:name w:val="Medium List 1 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent5">
+    <w:name w:val="Medium List 1 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent6">
+    <w:name w:val="Medium List 1 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2">
+    <w:name w:val="Medium List 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent1">
+    <w:name w:val="Medium List 2 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent2">
+    <w:name w:val="Medium List 2 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent3">
+    <w:name w:val="Medium List 2 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent4">
+    <w:name w:val="Medium List 2 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent5">
+    <w:name w:val="Medium List 2 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent6">
+    <w:name w:val="Medium List 2 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1">
+    <w:name w:val="Medium Grid 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+      </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="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" 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="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent1">
+    <w:name w:val="Medium Grid 1 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+      </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="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </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="table" w:styleId="MediumGrid1-Accent2">
+    <w:name w:val="Medium Grid 1 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+      </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="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" 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="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent3">
+    <w:name w:val="Medium Grid 1 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+      </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="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" 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="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent4">
+    <w:name w:val="Medium Grid 1 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+      </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="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" 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="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent5">
+    <w:name w:val="Medium Grid 1 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+      </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="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" 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="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent6">
+    <w:name w:val="Medium Grid 1 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+      </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="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" 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="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2">
+    <w:name w:val="Medium Grid 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="E6E6E6" w:themeFill="text1" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CCCCCC" w:themeFill="text1" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent1">
+    <w:name w:val="Medium Grid 2 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="EDF2F8" w:themeFill="accent1" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DBE5F1" w:themeFill="accent1" w:themeFillTint="33"/>
+      </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:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+        <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="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent2">
+    <w:name w:val="Medium Grid 2 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="F8EDED" w:themeFill="accent2" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F2DBDB" w:themeFill="accent2" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent3">
+    <w:name w:val="Medium Grid 2 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="F5F8EE" w:themeFill="accent3" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EAF1DD" w:themeFill="accent3" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent4">
+    <w:name w:val="Medium Grid 2 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="F2EFF6" w:themeFill="accent4" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E5DFEC" w:themeFill="accent4" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent5">
+    <w:name w:val="Medium Grid 2 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="EDF6F9" w:themeFill="accent5" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DAEEF3" w:themeFill="accent5" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent6">
+    <w:name w:val="Medium Grid 2 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="FEF4EC" w:themeFill="accent6" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE9D9" w:themeFill="accent6" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3">
+    <w:name w:val="Medium Grid 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent1">
+    <w:name w:val="Medium Grid 3 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <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="table" w:styleId="MediumGrid3-Accent2">
+    <w:name w:val="Medium Grid 3 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent3">
+    <w:name w:val="Medium Grid 3 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent4">
+    <w:name w:val="Medium Grid 3 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent5">
+    <w:name w:val="Medium Grid 3 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent6">
+    <w:name w:val="Medium Grid 3 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList">
+    <w:name w:val="Dark List"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent1">
+    <w:name w:val="Dark List Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="243F60" w:themeFill="accent1" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="365F91" w:themeFill="accent1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent2">
+    <w:name w:val="Dark List Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="622423" w:themeFill="accent2" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent3">
+    <w:name w:val="Dark List Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4E6128" w:themeFill="accent3" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent4">
+    <w:name w:val="Dark List Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="3F3151" w:themeFill="accent4" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent5">
+    <w:name w:val="Dark List Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="205867" w:themeFill="accent5" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent6">
+    <w:name w:val="Dark List Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="974706" w:themeFill="accent6" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading">
+    <w:name w:val="Colorful Shading"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="E6E6E6" w:themeFill="text1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" 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="999999" w:themeFill="text1" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent1">
+    <w:name w:val="Colorful Shading Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="EDF2F8" w:themeFill="accent1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="2C4C74" w:themeFill="accent1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="2C4C74" w:themeColor="accent1" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="2C4C74" w:themeFill="accent1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="2C4C74" w:themeFill="accent1" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <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="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:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent2">
+    <w:name w:val="Colorful Shading Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="F8EDED" w:themeFill="accent2" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="772C2A" w:themeFill="accent2" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="772C2A" w:themeColor="accent2" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="772C2A" w:themeFill="accent2" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="772C2A" w:themeFill="accent2" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E5B8B7" w:themeFill="accent2" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent3">
+    <w:name w:val="Colorful Shading Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="F5F8EE" w:themeFill="accent3" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5E7530" w:themeFill="accent3" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="5E7530" w:themeColor="accent3" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5E7530" w:themeFill="accent3" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5E7530" w:themeFill="accent3" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D6E3BC" w:themeFill="accent3" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent4">
+    <w:name w:val="Colorful Shading Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="F2EFF6" w:themeFill="accent4" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4C3B62" w:themeFill="accent4" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="4C3B62" w:themeColor="accent4" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4C3B62" w:themeFill="accent4" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4C3B62" w:themeFill="accent4" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CCC0D9" w:themeFill="accent4" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent5">
+    <w:name w:val="Colorful Shading Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="EDF6F9" w:themeFill="accent5" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="276A7C" w:themeFill="accent5" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="276A7C" w:themeColor="accent5" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="276A7C" w:themeFill="accent5" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="276A7C" w:themeFill="accent5" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="B6DDE8" w:themeFill="accent5" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent6">
+    <w:name w:val="Colorful Shading Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="FEF4EC" w:themeFill="accent6" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="B65608" w:themeFill="accent6" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="B65608" w:themeColor="accent6" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="B65608" w:themeFill="accent6" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="B65608" w:themeFill="accent6" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBD4B4" w:themeFill="accent6" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList">
+    <w:name w:val="Colorful List"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="E6E6E6" w:themeFill="text1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9E3A38" w:themeFill="accent2" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="9E3A38" w:themeColor="accent2" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CCCCCC" w:themeFill="text1" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent1">
+    <w:name w:val="Colorful List Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="EDF2F8" w:themeFill="accent1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9E3A38" w:themeFill="accent2" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="9E3A38" w:themeColor="accent2" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <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:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent2">
+    <w:name w:val="Colorful List Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F8EDED" w:themeFill="accent2" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9E3A38" w:themeFill="accent2" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="9E3A38" w:themeColor="accent2" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="F2DBDB" w:themeFill="accent2" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent3">
+    <w:name w:val="Colorful List Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F5F8EE" w:themeFill="accent3" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="664E82" w:themeFill="accent4" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="664E82" w:themeColor="accent4" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EAF1DD" w:themeFill="accent3" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent4">
+    <w:name w:val="Colorful List Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F2EFF6" w:themeFill="accent4" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="7E9C40" w:themeFill="accent3" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="7E9C40" w:themeColor="accent3" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E5DFEC" w:themeFill="accent4" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent5">
+    <w:name w:val="Colorful List Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="EDF6F9" w:themeFill="accent5" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F2730A" w:themeFill="accent6" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="F2730A" w:themeColor="accent6" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DAEEF3" w:themeFill="accent5" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent6">
+    <w:name w:val="Colorful List Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="FEF4EC" w:themeFill="accent6" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="348DA5" w:themeFill="accent5" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="348DA5" w:themeColor="accent5" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE9D9" w:themeFill="accent6" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid">
+    <w:name w:val="Colorful Grid"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="CCCCCC" w:themeFill="text1" 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="999999" w:themeFill="text1" 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="999999" w:themeFill="text1" 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="000000" w:themeFill="text1" 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="000000" w:themeFill="text1" 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="808080" w:themeFill="text1" 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="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </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="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="table" w:styleId="ColorfulGrid-Accent2">
+    <w:name w:val="Colorful Grid Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="F2DBDB" w:themeFill="accent2" 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="E5B8B7" w:themeFill="accent2" 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="E5B8B7" w:themeFill="accent2" 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="943634" w:themeFill="accent2" 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="943634" w:themeFill="accent2" 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="DFA7A6" w:themeFill="accent2" 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="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent3">
+    <w:name w:val="Colorful Grid Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="EAF1DD" w:themeFill="accent3" 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="D6E3BC" w:themeFill="accent3" 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="D6E3BC" w:themeFill="accent3" 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="76923C" w:themeFill="accent3" 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="76923C" w:themeFill="accent3" 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="CDDDAC" w:themeFill="accent3" 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="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent4">
+    <w:name w:val="Colorful Grid Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="E5DFEC" w:themeFill="accent4" 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="CCC0D9" w:themeFill="accent4" 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="CCC0D9" w:themeFill="accent4" 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="5F497A" w:themeFill="accent4" 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="5F497A" w:themeFill="accent4" 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="BFB1D0" w:themeFill="accent4" 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="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent5">
+    <w:name w:val="Colorful Grid Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="DAEEF3" w:themeFill="accent5" 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="B6DDE8" w:themeFill="accent5" 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="B6DDE8" w:themeFill="accent5" 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="31849B" w:themeFill="accent5" 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="31849B" w:themeFill="accent5" 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="A5D5E2" w:themeFill="accent5" 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="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent6">
+    <w:name w:val="Colorful Grid Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="FDE9D9" w:themeFill="accent6" 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="FBD4B4" w:themeFill="accent6" 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="FBD4B4" w:themeFill="accent6" 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="E36C0A" w:themeFill="accent6" 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="E36C0A" w:themeFill="accent6" 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="FBCAA2" w:themeFill="accent6" 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="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+</w:styles>
diff --git a/docx/templates/default-docx-template/word/stylesWithEffects.xml b/docx/templates/default-docx-template/word/stylesWithEffects.xml
new file mode 100644
index 000000000..91c1734e7
--- /dev/null
+++ b/docx/templates/default-docx-template/word/stylesWithEffects.xml
@@ -0,0 +1,11800 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:styles xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mv="urn:schemas-microsoft-com:mac:vml" 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:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 wp14">
+  <w:docDefaults>
+    <w:rPrDefault>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="minorHAnsi" w:eastAsiaTheme="minorEastAsia" w:hAnsiTheme="minorHAnsi" w:cstheme="minorBidi"/>
+        <w:sz w:val="22"/>
+        <w:szCs w:val="22"/>
+        <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:line="276" w:lineRule="auto"/>
+      </w:pPr>
+    </w:pPrDefault>
+  </w:docDefaults>
+  <w:latentStyles w:defLockedState="0" w:defUIPriority="99" w:defSemiHidden="1" w:defUnhideWhenUsed="1" w:defQFormat="0" w:count="276">
+    <w:lsdException w:name="Normal" w:semiHidden="0" w:uiPriority="0" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="heading 1" w:semiHidden="0" w:uiPriority="9" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="heading 2" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 3" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 4" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 5" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 6" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 7" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 8" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="heading 9" w:uiPriority="9" w:qFormat="1"/>
+    <w:lsdException w:name="toc 1" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 2" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 3" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 4" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 5" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 6" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 7" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 8" w:uiPriority="39"/>
+    <w:lsdException w:name="toc 9" w:uiPriority="39"/>
+    <w:lsdException w:name="caption" w:uiPriority="35" w:qFormat="1"/>
+    <w:lsdException w:name="Title" w:semiHidden="0" w:uiPriority="10" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Default Paragraph Font" w:uiPriority="1"/>
+    <w:lsdException w:name="Subtitle" w:semiHidden="0" w:uiPriority="11" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Strong" w:semiHidden="0" w:uiPriority="22" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Emphasis" w:semiHidden="0" w:uiPriority="20" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Table Grid" w:semiHidden="0" w:uiPriority="59" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Placeholder Text" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="No Spacing" w:semiHidden="0" w:uiPriority="1" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Light Shading" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 1" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 1" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 1" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 1" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Revision" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="List Paragraph" w:semiHidden="0" w:uiPriority="34" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Quote" w:semiHidden="0" w:uiPriority="29" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Intense Quote" w:semiHidden="0" w:uiPriority="30" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Medium List 2 Accent 1" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 1" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 1" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 1" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 1" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 1" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 1" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 2" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 2" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 2" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 2" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 2" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 2" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 2" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 2" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 2" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 2" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 2" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 3" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 3" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 3" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 3" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 3" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 3" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 3" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 3" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 3" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 3" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 3" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 3" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 3" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 4" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 4" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 4" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 4" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 4" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 4" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 4" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 4" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 4" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 4" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 4" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 4" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 4" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 4" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 5" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 5" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 5" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 5" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 5" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 5" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 5" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 5" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 5" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 5" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 5" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 5" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 5" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 5" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Shading Accent 6" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light List Accent 6" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Light Grid Accent 6" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 1 Accent 6" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Shading 2 Accent 6" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 1 Accent 6" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium List 2 Accent 6" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 1 Accent 6" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 2 Accent 6" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Medium Grid 3 Accent 6" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Dark List Accent 6" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Shading Accent 6" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful List Accent 6" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Colorful Grid Accent 6" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
+    <w:lsdException w:name="Subtle Emphasis" w:semiHidden="0" w:uiPriority="19" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Intense Emphasis" w:semiHidden="0" w:uiPriority="21" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Subtle Reference" w:semiHidden="0" w:uiPriority="31" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Intense Reference" w:semiHidden="0" w:uiPriority="32" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Book Title" w:semiHidden="0" w:uiPriority="33" w:unhideWhenUsed="0" w:qFormat="1"/>
+    <w:lsdException w:name="Bibliography" w:uiPriority="37"/>
+    <w:lsdException w:name="TOC Heading" w:uiPriority="39" w:qFormat="1"/>
+  </w:latentStyles>
+  <w:style w:type="paragraph" w:default="1" w:styleId="Normal">
+    <w:name w:val="Normal"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+  </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="00FC693F"/>
+    <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="365F91" w:themeColor="accent1" w:themeShade="BF"/>
+      <w:sz w:val="28"/>
+      <w:szCs w:val="28"/>
+    </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="00FC693F"/>
+    <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="paragraph" w:styleId="Heading3">
+    <w:name w:val="heading 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading3Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="2"/>
+    </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:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading4">
+    <w:name w:val="heading 4"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading4Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="3"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading5">
+    <w:name w:val="heading 5"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading5Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="4"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading6">
+    <w:name w:val="heading 6"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading6Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="5"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading7">
+    <w:name w:val="heading 7"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading7Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="6"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading8">
+    <w:name w:val="heading 8"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading8Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="7"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Heading9">
+    <w:name w:val="heading 9"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="Heading9Char"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:keepNext/>
+      <w:keepLines/>
+      <w:spacing w:before="200" w:after="0"/>
+      <w:outlineLvl w:val="8"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:default="1" w:styleId="DefaultParagraphFont">
+    <w:name w:val="Default Paragraph Font"/>
+    <w:uiPriority w:val="1"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+  </w:style>
+  <w:style w:type="table" w:default="1" w:styleId="TableNormal">
+    <w:name w:val="Normal Table"/>
+    <w:uiPriority w:val="99"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <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:uiPriority w:val="99"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="NoSpacing">
+    <w:name w:val="No Spacing"/>
+    <w:uiPriority w:val="1"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+  </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="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:b/>
+      <w:bCs/>
+      <w:color w:val="365F91" w:themeColor="accent1" w:themeShade="BF"/>
+      <w:sz w:val="28"/>
+      <w:szCs w:val="28"/>
+    </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="00FC693F"/>
+    <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:customStyle="1" w:styleId="Heading3Char">
+    <w:name w:val="Heading 3 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading3"/>
+    <w:uiPriority w:val="9"/>
+    <w:rsid w:val="00FC693F"/>
+    <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:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Title">
+    <w:name w:val="Title"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="TitleChar"/>
+    <w:uiPriority w:val="10"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:pBdr>
+        <w:bottom w:val="single" w:sz="8" w:space="4" w:color="4F81BD" w:themeColor="accent1"/>
+      </w:pBdr>
+      <w:spacing w:after="300" w:line="240" w:lineRule="auto"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="17365D" w:themeColor="text2" w:themeShade="BF"/>
+      <w:spacing w:val="5"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="52"/>
+      <w:szCs w:val="52"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="TitleChar">
+    <w:name w:val="Title Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Title"/>
+    <w:uiPriority w:val="10"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="17365D" w:themeColor="text2" w:themeShade="BF"/>
+      <w:spacing w:val="5"/>
+      <w:kern w:val="28"/>
+      <w:sz w:val="52"/>
+      <w:szCs w:val="52"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Subtitle">
+    <w:name w:val="Subtitle"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="SubtitleChar"/>
+    <w:uiPriority w:val="11"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:numPr>
+        <w:ilvl w:val="1"/>
+      </w:numPr>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:spacing w:val="15"/>
+      <w:sz w:val="24"/>
+      <w:szCs w:val="24"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="SubtitleChar">
+    <w:name w:val="Subtitle Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Subtitle"/>
+    <w:uiPriority w:val="11"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:spacing w:val="15"/>
+      <w:sz w:val="24"/>
+      <w:szCs w:val="24"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListParagraph">
+    <w:name w:val="List Paragraph"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="34"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:ind w:left="720"/>
+      <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:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <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:uiPriority w:val="99"/>
+    <w:rsid w:val="00AA1D8D"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="BodyText2">
+    <w:name w:val="Body Text 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="BodyText2Char"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:pPr>
+      <w:spacing w:after="120" w:line="480" w:lineRule="auto"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="BodyText2Char">
+    <w:name w:val="Body Text 2 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="BodyText2"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="00AA1D8D"/>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="BodyText3">
+    <w:name w:val="Body Text 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:link w:val="BodyText3Char"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+    </w:pPr>
+    <w:rPr>
+      <w:sz w:val="16"/>
+      <w:szCs w:val="16"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="BodyText3Char">
+    <w:name w:val="Body Text 3 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="BodyText3"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:rPr>
+      <w:sz w:val="16"/>
+      <w:szCs w:val="16"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="List">
+    <w:name w:val="List"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00AA1D8D"/>
+    <w:pPr>
+      <w:ind w:left="360" w:hanging="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="List2">
+    <w:name w:val="List 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:ind w:left="720" w:hanging="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="List3">
+    <w:name w:val="List 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:ind w:left="1080" w:hanging="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListBullet">
+    <w:name w:val="List Bullet"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="1"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListBullet2">
+    <w:name w:val="List Bullet 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="2"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListBullet3">
+    <w:name w:val="List Bullet 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="3"/>
+      </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:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="00326F90"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="5"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListNumber2">
+    <w:name w:val="List Number 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="6"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListNumber3">
+    <w:name w:val="List Number 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:numPr>
+        <w:numId w:val="7"/>
+      </w:numPr>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListContinue">
+    <w:name w:val="List Continue"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+      <w:ind w:left="360"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListContinue2">
+    <w:name w:val="List Continue 2"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+      <w:ind w:left="720"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="ListContinue3">
+    <w:name w:val="List Continue 3"/>
+    <w:basedOn w:val="Normal"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:spacing w:after="120"/>
+      <w:ind w:left="1080"/>
+      <w:contextualSpacing/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="MacroText">
+    <w:name w:val="macro"/>
+    <w:link w:val="MacroTextChar"/>
+    <w:uiPriority w:val="99"/>
+    <w:unhideWhenUsed/>
+    <w:rsid w:val="0029639D"/>
+    <w:pPr>
+      <w:tabs>
+        <w:tab w:val="left" w:pos="576"/>
+        <w:tab w:val="left" w:pos="1152"/>
+        <w:tab w:val="left" w:pos="1728"/>
+        <w:tab w:val="left" w:pos="2304"/>
+        <w:tab w:val="left" w:pos="2880"/>
+        <w:tab w:val="left" w:pos="3456"/>
+        <w:tab w:val="left" w:pos="4032"/>
+      </w:tabs>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:ascii="Courier" w:hAnsi="Courier"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="MacroTextChar">
+    <w:name w:val="Macro Text Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="MacroText"/>
+    <w:uiPriority w:val="99"/>
+    <w:rsid w:val="0029639D"/>
+    <w:rPr>
+      <w:rFonts w:ascii="Courier" w:hAnsi="Courier"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Quote">
+    <w:name w:val="Quote"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="QuoteChar"/>
+    <w:uiPriority w:val="29"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="QuoteChar">
+    <w:name w:val="Quote Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Quote"/>
+    <w:uiPriority w:val="29"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading4Char">
+    <w:name w:val="Heading 4 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading4"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading5Char">
+    <w:name w:val="Heading 5 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading5"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading6Char">
+    <w:name w:val="Heading 6 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading6"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="243F60" w:themeColor="accent1" w:themeShade="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading7Char">
+    <w:name w:val="Heading 7 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading7"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading8Char">
+    <w:name w:val="Heading 8 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading8"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="Heading9Char">
+    <w:name w:val="Heading 9 Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="Heading9"/>
+    <w:uiPriority w:val="9"/>
+    <w:semiHidden/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="404040" w:themeColor="text1" w:themeTint="BF"/>
+      <w:sz w:val="20"/>
+      <w:szCs w:val="20"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="Caption">
+    <w:name w:val="caption"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:uiPriority w:val="35"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+      <w:sz w:val="18"/>
+      <w:szCs w:val="18"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Strong">
+    <w:name w:val="Strong"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="22"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="Emphasis">
+    <w:name w:val="Emphasis"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="20"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="IntenseQuote">
+    <w:name w:val="Intense Quote"/>
+    <w:basedOn w:val="Normal"/>
+    <w:next w:val="Normal"/>
+    <w:link w:val="IntenseQuoteChar"/>
+    <w:uiPriority w:val="30"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:pBdr>
+        <w:bottom w:val="single" w:sz="4" w:space="4" w:color="4F81BD" w:themeColor="accent1"/>
+      </w:pBdr>
+      <w:spacing w:before="200" w:after="280"/>
+      <w:ind w:left="936" w:right="936"/>
+    </w:pPr>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:customStyle="1" w:styleId="IntenseQuoteChar">
+    <w:name w:val="Intense Quote Char"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:link w:val="IntenseQuote"/>
+    <w:uiPriority w:val="30"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="SubtleEmphasis">
+    <w:name w:val="Subtle Emphasis"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="19"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="808080" w:themeColor="text1" w:themeTint="7F"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="IntenseEmphasis">
+    <w:name w:val="Intense Emphasis"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="21"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:i/>
+      <w:iCs/>
+      <w:color w:val="4F81BD" w:themeColor="accent1"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="SubtleReference">
+    <w:name w:val="Subtle Reference"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="31"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:smallCaps/>
+      <w:color w:val="C0504D" w:themeColor="accent2"/>
+      <w:u w:val="single"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="IntenseReference">
+    <w:name w:val="Intense Reference"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="32"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:smallCaps/>
+      <w:color w:val="C0504D" w:themeColor="accent2"/>
+      <w:spacing w:val="5"/>
+      <w:u w:val="single"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="character" w:styleId="BookTitle">
+    <w:name w:val="Book Title"/>
+    <w:basedOn w:val="DefaultParagraphFont"/>
+    <w:uiPriority w:val="33"/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:rPr>
+      <w:b/>
+      <w:bCs/>
+      <w:smallCaps/>
+      <w:spacing w:val="5"/>
+    </w:rPr>
+  </w:style>
+  <w:style w:type="paragraph" w:styleId="TOCHeading">
+    <w:name w:val="TOC Heading"/>
+    <w:basedOn w:val="Heading1"/>
+    <w:next w:val="Normal"/>
+    <w:uiPriority w:val="39"/>
+    <w:semiHidden/>
+    <w:unhideWhenUsed/>
+    <w:qFormat/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:outlineLvl w:val="9"/>
+    </w:pPr>
+  </w:style>
+  <w:style w:type="table" w:styleId="TableGrid">
+    <w:name w:val="Table Grid"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="59"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+        <w:insideV w:val="single" w:sz="4" w:space="0" w:color="auto"/>
+      </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:style>
+  <w:style w:type="table" w:styleId="LightShading">
+    <w:name w:val="Light Shading"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent1">
+    <w:name w:val="Light Shading Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="365F91" w:themeColor="accent1" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent2">
+    <w:name w:val="Light Shading Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="943634" w:themeColor="accent2" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent3">
+    <w:name w:val="Light Shading Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="76923C" w:themeColor="accent3" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent4">
+    <w:name w:val="Light Shading Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="5F497A" w:themeColor="accent4" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent5">
+    <w:name w:val="Light Shading Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="31849B" w:themeColor="accent5" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightShading-Accent6">
+    <w:name w:val="Light Shading Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="60"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="E36C0A" w:themeColor="accent6" w:themeShade="BF"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList">
+    <w:name w:val="Light List"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent1">
+    <w:name w:val="Light List Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00FC693F"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent2">
+    <w:name w:val="Light List Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent3">
+    <w:name w:val="Light List Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent4">
+    <w:name w:val="Light List Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent5">
+    <w:name w:val="Light List Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightList-Accent6">
+    <w:name w:val="Light List Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="61"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid">
+    <w:name w:val="Light Grid"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent1">
+    <w:name w:val="Light Grid Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent2">
+    <w:name w:val="Light Grid Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent3">
+    <w:name w:val="Light Grid Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent4">
+    <w:name w:val="Light Grid Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent5">
+    <w:name w:val="Light Grid Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="LightGrid-Accent6">
+    <w:name w:val="Light Grid Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="62"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1">
+    <w:name w:val="Medium Shading 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent1">
+    <w:name w:val="Medium Shading 1 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent2">
+    <w:name w:val="Medium Shading 1 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent3">
+    <w:name w:val="Medium Shading 1 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent4">
+    <w:name w:val="Medium Shading 1 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent5">
+    <w:name w:val="Medium Shading 1 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading1-Accent6">
+    <w:name w:val="Medium Shading 1 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="63"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band2Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2">
+    <w:name w:val="Medium Shading 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent1">
+    <w:name w:val="Medium Shading 2 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent2">
+    <w:name w:val="Medium Shading 2 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent3">
+    <w:name w:val="Medium Shading 2 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent4">
+    <w:name w:val="Medium Shading 2 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent5">
+    <w:name w:val="Medium Shading 2 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumShading2-Accent6">
+    <w:name w:val="Medium Shading 2 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="64"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+        <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:pPr>
+        <w:spacing w:before="0" w:after="0" w:line="240" w:lineRule="auto"/>
+      </w:pPr>
+      <w:rPr>
+        <w:color w:val="auto"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="double" w:sz="6" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D8D8D8" w:themeFill="background1" w:themeFillShade="D8"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="auto"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1">
+    <w:name w:val="Medium List 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent1">
+    <w:name w:val="Medium List 1 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent2">
+    <w:name w:val="Medium List 1 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent3">
+    <w:name w:val="Medium List 1 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent4">
+    <w:name w:val="Medium List 1 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent5">
+    <w:name w:val="Medium List 1 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList1-Accent6">
+    <w:name w:val="Medium List 1 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="65"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="1F497D" w:themeColor="text2"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2">
+    <w:name w:val="Medium List 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent1">
+    <w:name w:val="Medium List 2 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent2">
+    <w:name w:val="Medium List 2 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent3">
+    <w:name w:val="Medium List 2 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent4">
+    <w:name w:val="Medium List 2 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent5">
+    <w:name w:val="Medium List 2 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumList2-Accent6">
+    <w:name w:val="Medium List 2 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="66"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:sz w:val="24"/>
+        <w:szCs w:val="24"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="swCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1">
+    <w:name w:val="Medium Grid 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+      </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="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="404040" w:themeColor="text1" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" 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="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent1">
+    <w:name w:val="Medium Grid 1 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+      </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="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="7BA0CD" w:themeColor="accent1" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </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="table" w:styleId="MediumGrid1-Accent2">
+    <w:name w:val="Medium Grid 1 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+      </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="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="CF7B79" w:themeColor="accent2" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" 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="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent3">
+    <w:name w:val="Medium Grid 1 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+      </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="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="B3CC82" w:themeColor="accent3" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" 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="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent4">
+    <w:name w:val="Medium Grid 1 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+      </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="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="9F8AB9" w:themeColor="accent4" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" 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="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent5">
+    <w:name w:val="Medium Grid 1 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+      </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="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="78C0D4" w:themeColor="accent5" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" 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="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid1-Accent6">
+    <w:name w:val="Medium Grid 1 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="67"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+      </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="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="F9B074" w:themeColor="accent6" w:themeTint="BF"/>
+        </w:tcBorders>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" 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="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2">
+    <w:name w:val="Medium Grid 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="000000" w:themeColor="text1"/>
+      </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="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="E6E6E6" w:themeFill="text1" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CCCCCC" w:themeFill="text1" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent1">
+    <w:name w:val="Medium Grid 2 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+      </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="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="EDF2F8" w:themeFill="accent1" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DBE5F1" w:themeFill="accent1" w:themeFillTint="33"/>
+      </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:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        </w:tcBorders>
+        <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="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent2">
+    <w:name w:val="Medium Grid 2 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+      </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="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="F8EDED" w:themeFill="accent2" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F2DBDB" w:themeFill="accent2" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent3">
+    <w:name w:val="Medium Grid 2 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+      </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="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="F5F8EE" w:themeFill="accent3" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EAF1DD" w:themeFill="accent3" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent4">
+    <w:name w:val="Medium Grid 2 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+      </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="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="F2EFF6" w:themeFill="accent4" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E5DFEC" w:themeFill="accent4" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent5">
+    <w:name w:val="Medium Grid 2 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+      </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="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="EDF6F9" w:themeFill="accent5" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DAEEF3" w:themeFill="accent5" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid2-Accent6">
+    <w:name w:val="Medium Grid 2 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="68"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:rFonts w:asciiTheme="majorHAnsi" w:eastAsiaTheme="majorEastAsia" w:hAnsiTheme="majorHAnsi" w:cstheme="majorBidi"/>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideH w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideV w:val="single" w:sz="8" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+      </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="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <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="FEF4EC" w:themeFill="accent6" w:themeFillTint="19"/>
+      </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:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b w:val="0"/>
+        <w:bCs w:val="0"/>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE9D9" w:themeFill="accent6" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:insideH w:val="single" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:insideV w:val="single" w:sz="6" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3">
+    <w:name w:val="Medium Grid 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent1">
+    <w:name w:val="Medium Grid 3 Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <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="table" w:styleId="MediumGrid3-Accent2">
+    <w:name w:val="Medium Grid 3 Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent3">
+    <w:name w:val="Medium Grid 3 Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent4">
+    <w:name w:val="Medium Grid 3 Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent5">
+    <w:name w:val="Medium Grid 3 Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="MediumGrid3-Accent6">
+    <w:name w:val="Medium Grid 3 Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="69"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <w:tblInd w:w="0" w:type="dxa"/>
+      <w:tblBorders>
+        <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideH w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV w:val="single" w:sz="6" 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="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:i w:val="0"/>
+        <w:iCs w:val="0"/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="24" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideV w:val="single" w:sz="8" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList">
+    <w:name w:val="Dark List"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent1">
+    <w:name w:val="Dark List Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="4F81BD" w:themeFill="accent1"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="243F60" w:themeFill="accent1" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <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="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="365F91" w:themeFill="accent1" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent2">
+    <w:name w:val="Dark List Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="C0504D" w:themeFill="accent2"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="622423" w:themeFill="accent2" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="943634" w:themeFill="accent2" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent3">
+    <w:name w:val="Dark List Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="9BBB59" w:themeFill="accent3"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4E6128" w:themeFill="accent3" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="76923C" w:themeFill="accent3" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent4">
+    <w:name w:val="Dark List Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="8064A2" w:themeFill="accent4"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="3F3151" w:themeFill="accent4" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5F497A" w:themeFill="accent4" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent5">
+    <w:name w:val="Dark List Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="4BACC6" w:themeFill="accent5"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="205867" w:themeFill="accent5" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="31849B" w:themeFill="accent5" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="DarkList-Accent6">
+    <w:name w:val="Dark List Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="70"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="FFFFFF" w:themeColor="background1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F79646" w:themeFill="accent6"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="974706" w:themeFill="accent6" w:themeFillShade="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="single" w:sz="18" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E36C0A" w:themeFill="accent6" w:themeFillShade="BF"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading">
+    <w:name w:val="Colorful Shading"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="E6E6E6" w:themeFill="text1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="000000" w:themeColor="text1" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="000000" w:themeFill="text1" 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="999999" w:themeFill="text1" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent1">
+    <w:name w:val="Colorful Shading Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="4F81BD" w:themeColor="accent1"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="EDF2F8" w:themeFill="accent1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="2C4C74" w:themeFill="accent1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="2C4C74" w:themeColor="accent1" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="2C4C74" w:themeFill="accent1" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="2C4C74" w:themeFill="accent1" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <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="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:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent2">
+    <w:name w:val="Colorful Shading Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="F8EDED" w:themeFill="accent2" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="C0504D" w:themeColor="accent2"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="772C2A" w:themeFill="accent2" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="772C2A" w:themeColor="accent2" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="772C2A" w:themeFill="accent2" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="772C2A" w:themeFill="accent2" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E5B8B7" w:themeFill="accent2" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent3">
+    <w:name w:val="Colorful Shading Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="F5F8EE" w:themeFill="accent3" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5E7530" w:themeFill="accent3" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="5E7530" w:themeColor="accent3" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5E7530" w:themeFill="accent3" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="5E7530" w:themeFill="accent3" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="D6E3BC" w:themeFill="accent3" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent4">
+    <w:name w:val="Colorful Shading Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="8064A2" w:themeColor="accent4"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="F2EFF6" w:themeFill="accent4" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="9BBB59" w:themeColor="accent3"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4C3B62" w:themeFill="accent4" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="4C3B62" w:themeColor="accent4" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4C3B62" w:themeFill="accent4" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="4C3B62" w:themeFill="accent4" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CCC0D9" w:themeFill="accent4" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent5">
+    <w:name w:val="Colorful Shading Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="EDF6F9" w:themeFill="accent5" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="276A7C" w:themeFill="accent5" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="276A7C" w:themeColor="accent5" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="276A7C" w:themeFill="accent5" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="276A7C" w:themeFill="accent5" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="B6DDE8" w:themeFill="accent5" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulShading-Accent6">
+    <w:name w:val="Colorful Shading Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="71"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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:top w:val="single" w:sz="24" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+        <w:left w:val="single" w:sz="4" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:bottom w:val="single" w:sz="4" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:right w:val="single" w:sz="4" w:space="0" w:color="F79646" w:themeColor="accent6"/>
+        <w:insideH w:val="single" w:sz="4" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        <w:insideV 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="FEF4EC" w:themeFill="accent6" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="single" w:sz="24" w:space="0" w:color="4BACC6" w:themeColor="accent5"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="6" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="B65608" w:themeFill="accent6" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="single" w:sz="4" w:space="0" w:color="B65608" w:themeColor="accent6" w:themeShade="99"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="B65608" w:themeFill="accent6" w:themeFillShade="99"/>
+      </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:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="B65608" w:themeFill="accent6" w:themeFillShade="99"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBD4B4" w:themeFill="accent6" w:themeFillTint="66"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="neCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="nwCell">
+      <w:rPr>
+        <w:color w:val="000000" w:themeColor="text1"/>
+      </w:rPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList">
+    <w:name w:val="Colorful List"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="E6E6E6" w:themeFill="text1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9E3A38" w:themeFill="accent2" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="9E3A38" w:themeColor="accent2" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="C0C0C0" w:themeFill="text1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="CCCCCC" w:themeFill="text1" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent1">
+    <w:name w:val="Colorful List Accent 1"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="EDF2F8" w:themeFill="accent1" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9E3A38" w:themeFill="accent2" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="9E3A38" w:themeColor="accent2" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D3DFEE" w:themeFill="accent1" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <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:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent2">
+    <w:name w:val="Colorful List Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F8EDED" w:themeFill="accent2" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="9E3A38" w:themeFill="accent2" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="9E3A38" w:themeColor="accent2" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="EFD3D2" w:themeFill="accent2" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="F2DBDB" w:themeFill="accent2" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent3">
+    <w:name w:val="Colorful List Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F5F8EE" w:themeFill="accent3" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="664E82" w:themeFill="accent4" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="664E82" w:themeColor="accent4" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="E6EED5" w:themeFill="accent3" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="EAF1DD" w:themeFill="accent3" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent4">
+    <w:name w:val="Colorful List Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="F2EFF6" w:themeFill="accent4" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="7E9C40" w:themeFill="accent3" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="7E9C40" w:themeColor="accent3" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="DFD8E8" w:themeFill="accent4" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="E5DFEC" w:themeFill="accent4" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent5">
+    <w:name w:val="Colorful List Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="EDF6F9" w:themeFill="accent5" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="F2730A" w:themeFill="accent6" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="F2730A" w:themeColor="accent6" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="D2EAF1" w:themeFill="accent5" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="DAEEF3" w:themeFill="accent5" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulList-Accent6">
+    <w:name w:val="Colorful List Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="72"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </w:rPr>
+    <w:tblPr>
+      <w:tblStyleRowBandSize w:val="1"/>
+      <w:tblStyleColBandSize w:val="1"/>
+      <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:tcPr>
+      <w:shd w:val="clear" w:color="auto" w:fill="FEF4EC" w:themeFill="accent6" w:themeFillTint="19"/>
+    </w:tcPr>
+    <w:tblStylePr w:type="firstRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="FFFFFF" w:themeColor="background1"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:bottom w:val="single" w:sz="12" w:space="0" w:color="FFFFFF" w:themeColor="background1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="348DA5" w:themeFill="accent5" w:themeFillShade="CC"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastRow">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+        <w:color w:val="348DA5" w:themeColor="accent5" w:themeShade="CC"/>
+      </w:rPr>
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="single" w:sz="12" w:space="0" w:color="000000" w:themeColor="text1"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FFFFFF" w:themeFill="background1"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="firstCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="lastCol">
+      <w:rPr>
+        <w:b/>
+        <w:bCs/>
+      </w:rPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Vert">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:tcBorders>
+          <w:top w:val="nil"/>
+          <w:left w:val="nil"/>
+          <w:bottom w:val="nil"/>
+          <w:right w:val="nil"/>
+          <w:insideH w:val="nil"/>
+          <w:insideV w:val="nil"/>
+        </w:tcBorders>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE4D0" w:themeFill="accent6" w:themeFillTint="3F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+    <w:tblStylePr w:type="band1Horz">
+      <w:tblPr/>
+      <w:tcPr>
+        <w:shd w:val="clear" w:color="auto" w:fill="FDE9D9" w:themeFill="accent6" w:themeFillTint="33"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid">
+    <w:name w:val="Colorful Grid"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="CCCCCC" w:themeFill="text1" 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="999999" w:themeFill="text1" 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="999999" w:themeFill="text1" 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="000000" w:themeFill="text1" 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="000000" w:themeFill="text1" 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="808080" w:themeFill="text1" 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="808080" w:themeFill="text1" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </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="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="table" w:styleId="ColorfulGrid-Accent2">
+    <w:name w:val="Colorful Grid Accent 2"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="F2DBDB" w:themeFill="accent2" 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="E5B8B7" w:themeFill="accent2" 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="E5B8B7" w:themeFill="accent2" 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="943634" w:themeFill="accent2" 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="943634" w:themeFill="accent2" 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="DFA7A6" w:themeFill="accent2" 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="DFA7A6" w:themeFill="accent2" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent3">
+    <w:name w:val="Colorful Grid Accent 3"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="EAF1DD" w:themeFill="accent3" 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="D6E3BC" w:themeFill="accent3" 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="D6E3BC" w:themeFill="accent3" 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="76923C" w:themeFill="accent3" 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="76923C" w:themeFill="accent3" 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="CDDDAC" w:themeFill="accent3" 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="CDDDAC" w:themeFill="accent3" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent4">
+    <w:name w:val="Colorful Grid Accent 4"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="E5DFEC" w:themeFill="accent4" 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="CCC0D9" w:themeFill="accent4" 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="CCC0D9" w:themeFill="accent4" 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="5F497A" w:themeFill="accent4" 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="5F497A" w:themeFill="accent4" 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="BFB1D0" w:themeFill="accent4" 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="BFB1D0" w:themeFill="accent4" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent5">
+    <w:name w:val="Colorful Grid Accent 5"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="DAEEF3" w:themeFill="accent5" 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="B6DDE8" w:themeFill="accent5" 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="B6DDE8" w:themeFill="accent5" 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="31849B" w:themeFill="accent5" 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="31849B" w:themeFill="accent5" 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="A5D5E2" w:themeFill="accent5" 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="A5D5E2" w:themeFill="accent5" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+  <w:style w:type="table" w:styleId="ColorfulGrid-Accent6">
+    <w:name w:val="Colorful Grid Accent 6"/>
+    <w:basedOn w:val="TableNormal"/>
+    <w:uiPriority w:val="73"/>
+    <w:rsid w:val="00CB0664"/>
+    <w:pPr>
+      <w:spacing w:after="0" w:line="240" w:lineRule="auto"/>
+    </w:pPr>
+    <w:rPr>
+      <w:color w:val="000000" w:themeColor="text1"/>
+    </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="FDE9D9" w:themeFill="accent6" 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="FBD4B4" w:themeFill="accent6" 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="FBD4B4" w:themeFill="accent6" 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="E36C0A" w:themeFill="accent6" 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="E36C0A" w:themeFill="accent6" 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="FBCAA2" w:themeFill="accent6" 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="FBCAA2" w:themeFill="accent6" w:themeFillTint="7F"/>
+      </w:tcPr>
+    </w:tblStylePr>
+  </w:style>
+</w:styles>
diff --git a/docx/templates/default-docx-template/word/theme/theme1.xml b/docx/templates/default-docx-template/word/theme/theme1.xml
new file mode 100644
index 000000000..2b30074a9
--- /dev/null
+++ b/docx/templates/default-docx-template/word/theme/theme1.xml
@@ -0,0 +1,318 @@
+<?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:font script="Geor" typeface="Sylfaen"/>
+      </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:font script="Geor" typeface="Sylfaen"/>
+      </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>
diff --git a/docx/templates/default-docx-template/word/webSettings.xml b/docx/templates/default-docx-template/word/webSettings.xml
new file mode 100644
index 000000000..189a20a22
--- /dev/null
+++ b/docx/templates/default-docx-template/word/webSettings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<w:webSettings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" mc:Ignorable="w14">
+  <w:allowPNG/>
+  <w:doNotSaveAsSingleFile/>
+</w:webSettings>
diff --git a/docx/templates/default-src.docx b/docx/templates/default-src.docx
deleted file mode 100644
index 31c8e20b4a21a0c45d9b22b1c3f68808fca37279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77650
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

diff --git a/docx/templates/default.docx b/docx/templates/default.docx
deleted file mode 100644
index dd00cd2fc1bbea08f8a92e1ca0b1afd1e276d866..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38003
zcmb5VWmH_v)-8-%aCe8G!Gl|H2<{NvwQ+Y3?hxGF-66QUySuydb)F;ddEW2bamW3$
zdyKtn&suY?RaLX9yXB<7A<#iUKwv-swy4r%S$GnepdcXkP#_>^z`L440BZ*$YX==A
zR~sXHtuHQCmh}m;vMU0}eHTyYv^pL|rwF`C${4{yzGNciCHF1rQE~JyvfOCI8y&TX
z^~eFbF*enPV{H#!weyiC2T0?g+~THwfZ<v<4Y*6Ly8g<P>xJ!-XAL;=JxwG3;DS}K
z#Dkk5%jyUpzdpiLeQESgiJxu=GI|80E)@<WoFcC&D$F#Vr7FbyvV}T%h#6gqB1^f+
zvH{6j0)<}_d-uRq-4gu>;I2FuQf5-V^_fPf^cwvty=F553xlq6?(pna<Gr3MJ9W3Q
zBK6|JzGm+}Ru8dt?eD0Hd)thYE`YSnMb)Am;JxO{Q)v(c;GZ1#D4vrbXqm9WKc8YM
zPWlXHjxM<saTvYE!QN*dA}H8+rzHe+t>qzKotozSW_=MP1%HGR^(OV&NsM+0njsp}
z<qZNivjCMvs=gtRy<C}mt~n8y!Nv|&o}Xu^%LVfdA>r3Q6gyx-f2ewW(j%4~9jJ1^
zZ<mw$RQMUEY`_MYL1~dUsx!HL46k@~wGwoF>WHA{Lnl{VtFQXO8^-7%w=keBThsKR
zcf#;vAw~8bRPJy2L_9Bbd;{k36buC96Yx{V&dAc9;me<EdF+@ZI1{qZg=c8Al+2oC
zX~>|lJ4!Zt%rl4qb1UB3YxMVePxsuA7P)fWsGEl?CYCYt1JV0%>Xpp|HKlspLr2E>
z2gy}{^?s6{5g0%ho-kq20JGF-esv2*$@p5=z!-A7b{ky2EtdHNlwg-e_%?q!aMwpN
z*$qdKUogr}eF2Nv)8x{re-UD2Ui7N&t4W&GJ<3OL5+W=-vN!?ixB<<~Pr7}u;8`+i
zYrhWqqt|tL4CW+$uJn&JYKQbW7lPaQ>_Q>)CbC<ou?rRC9hBle>ihx%9X<vU95cRY
zv4F(Fc6<cQht1!S&<!{0rG#Yn0GWuiS5t0x$iJ&}v^`+o1yqL)Sows&PXkAL2Y{8D
zl_kSJ^fGfWvSRvE`+o@+F;Q*a!-x#Exh89CI;AvnE+_djjRK-3Ve^|RNv0Kw)MtmJ
z={8T{LMSeWHtzG6C+C-orr%hYi1B6TD>C4evWntib3{8=N6O$~QgJI(*>miM?L;YS
zIP9PAf)}E3Xkr&jl*v1Bdc67$oASepwT)?}BnU?IYi_U_vs}+xuoS)U%uPWE)i|V8
z5@u#;u>m+AJu^JeQP9^5ArkN6Oz*?ru2`%u0?nzyE9j_HAb&sB9<P|wDAJ|`M+(_P
z|DAh=57$B=kTVpJ`=1g2KivP#x;(rZuA31Z<iSg1D0ZlTD+GN;0r@jZHe7|o^D<Oy
zTWp^G$9hQTri-)9z`m9AI~WlwmrSFGguM-%`<bW=(ZkKYzzuTXNuVHfS_QJHqKTNg
zW0MOci7Yr4&Cn3~&JQNcSqPN?FcX_%gv0U>*tbC&>^eWRl0LsMOVvbo%6e8@F@}9J
ziq0i(6#{HIl;<xMP#k(^<@6bA6oHjZaH)oN0dq_Li&uT?cj+x4AAKM%?EfDxIXi%j
z{a-0fkFK`%XG9lq?&!YW9%9OZFhvg$2cfo@lhh(`@u9FJTM>>Zd3TrQVlx<Uu5dV?
z<HqOT3$WHLo22<XMM(~$RLY$ll-AbC#!5EGRl&t)2Fcm%PccBs;o!7kJ5W9Y^#zgq
znsD#e*wx``o5^ScnYcB(8`NHpHr`M=|5%s9Mi?f|+85M#16yp$GOac#uR&O{3rua-
zV!KymcH0yq`EMuo)050g=Z8|sDy&x9TI!jy^7ZtcwkX7PGS6oof$J5!Kg-wqLOu}N
zLQlwVbsu@wncP`x3WuQ|ZxTr#|JQ_YyRw3H0+hrO0t5sZD2pM$;4dv0^lWVYRCv15
zi1i91a@z|ngqB078ML50cC6pL;FQoBZdGhr<Lof0WDG<z)3%rAQwRoU5X0S1?pp4b
zy5W}vL1XAT8B=A9k*AzNIomb3`pVFO{gtr;QhSIJ$YKnYJ`^omor&S{IVgHqhhM64
z6~peNwfdu1gwQtjva}Np%ZLK&b?ybNGBzHQuSNnQr%u(6y_X4c^^5Dt@{F>frQmOs
zrlqb$6TEC<J9o$Gi3tdZqF{P&ED$5ErDjx1A);8)#CS})?U$pb5ayrU9qwujk5IBq
ztTeHBX2=9i2<dFDXW$=u;dZeM@-_v$ChtUTO4HA&RzR>q>rQHk6>ExBL#`vvqC3?D
z2eLTXz~6+Z!iT2G63q1gzi&}8)qGcNqnqw)i@Bo_rS1_Sp1Hp*zG4c~EDJ$v5Jbl{
z{6h1t9tPZ;vU9-4m0yFafrei1zU-%0p~VZB;V-qIkb90#@rhKARFz6@e<>s3t?2(u
zo=EVbPlQKnKz*)ya3Hjxp(Udkfsx6Ei{eDF73kFrx(E0S8E?UhEhpxru}$<~iu;EA
z<;sfbVDrh5_tUX66o*$+Ei7Tu8LZ{oQ1}R;Z<FOlQUc$Y>IOM?a2l4fyQOSQQtyfc
zf4;0(ds`~QD+A#rZ0geu-pAbCDbe5OfyRwmc3WU!Tme@Kl>aOY1Av{;UzHIn4d`Zs
z54v~_4V99mc$+LJHV><lP77i+`=09b=_fUg6)Hv0w0CFSBqF5@H<#DjqF1`5R~hXE
zNIx8fJ%37I2Xrj;7sFpK7o{SXo9>v!yLAevcAbzX6JZkl4#V-js=2J#=(@bnv0sh2
zGObY@B}0rfi;B}Z109AUnAt?IQesVqo$4S^gSU8#L8%MHC7|JN#nUok(jvs$*_Dwt
z!v!GO#OugYM0Qofbj{ssvnGB}S@@O*rB0J@mPDz9cNdr$OHWI!y`nt*=xDnuh5F{C
z!jz1OHZj5>C9ex<7;@_Mh5$d1jFVOLJzH~?2FIo^5~tba!f^b6pe}-WHPR8Ej^$e}
zx4OI^gb+$oqjh^{medxGihP)q^Lhlx`(o_YQkS5EPF4uB9Zm+<{dju6T|^qz(NHtV
zO$-ljCFTq%VlH{eHnEI~ZLFxX8Mc?B|BpExrjr}0k03-JJ(PWo_+f|CyVM`v)B4xo
zf6q_O;JisYBnU_VF$f6Of9A)*)X_@cTF=b#i@A-F$(f3U4Vp4KU#mMiwbd9h6+Jq1
zcPn#O9{o33u&-vz1@T|==qqi5B;useQYiJDXA))7feZd!FptMaHM){RnyuWFAD4oN
zfEYCLCv@z7Qu8Y|9&{b>tJSqUSh;{0o$=GPrMHf>n>G6hPWJ=roPivjp2=%ecUVSv
za3dGN+q#Ys>-q{Cj#9}}jIRzLhmFnMTObx-rtrf#wX^yfEtbs^8=vUH{a6QsSd%p2
zusHECeEiL~T5OMC7}1eriB>-<$;N<lBnTy>>mXS(UQ8p%C8)DnJg9@or1m6TaLmbt
za0ZFK-{4sMLTOv_HCF<IGAo-5tzAmk?=ySX=th!El_bMT*==*g;Xx`4KfgogR8t0g
z{lOC?7>T3xUeB;xCgh)$>`)gD#o2D4`iSLgpA$I^+Ir4vl*uwfJiOH!<X#MS`9*Ne
z!=hy&b%R~|Vl|W})>n>8)%|$Tng<wGEcEZ^b+wEVxRTB+Vd!o8Szp#-G2EecVluB`
z@8Q^p5P7~;N8EpU!q&;7!_1^jN-43r;wa~{$j1#vQ*9Y07_5z{L=zgPVKb>vgo)>x
zdt6<wIt|(Dx`PH!z%c)=k4&B~+V|zfe0a9mFfp7#K3yu&{f**2xq}{G?w)jCv>_D5
z#Ok~KB*n7i9LKI7a#=**u9(}8zPd)1=n4P6@J|phf&_eP$N?j|V4vgtAerDv-P$&T
zK{Oz4;Y_bsoCUy_p%ysNBZkpJ-He?0(<4gZE96x<@MZ$UF`42#+76=On3K?>zcI!<
z?eZ~4q36~|kK!bsh-+k4I64uJ(}d_Mm1x2z-YvzX^}3yH!*#xN#T`_n5VU+TA<2-n
zgBIvU>`j=7JK0#ce;*VMC!BWt*t+$!l5?zmzczXF>VVE{e;o?&<Nux6TZ$FR*ys~0
zPqywwfkaL1zl+;)mH0bwf^Rl3)<L!W5TRm1#>Mn=Kz%|IO}3{-w>h8r`_ihxy5+k0
z`&G&pq-6?gv_}6IpOvArZ9ZtU#?+I2zTJD^+I~UNUW#`S<?CEIi&vTG26a*o0_xw#
zxXk!l&Jx=q*|12wm&Fjr4#6mh`Vfcray@oIs-h2R<PzuNc+;Y|MdS84TfJC7feSxi
zZsGJ}(ULi67xjg$wZZ3nuj!k~48}=lS6*rf?d;z1Fm=>HVX9xpH;?6tWyf<oC1Ud8
z*psx1Q?3@(qf^Sh&%VT;=$Uy<%d;=dr*tmjq+N|~EEQ3_N+9BR4>Op?cHtnthe|R3
z^dk?E_A`N+yvTAB)^VWOV5hth=%!?VNPhX0p$?7Ku!rKaK;cvN3sw^`<0qLm#9_)_
zWQcS%OQv22NOaqi>v5&Srwr-BoT)Gu?IU)uAM3~w?`t>_+UtH-vS6o(!Y=|1^^ff!
zpRlGCi4=Som%3(_TqX=ekuFgwp^<Ec)qU!{h?(4tEYE5d0T@e&Un_Jo4mY>cl=G(0
zbn`z5tt}>r8}a;qo<kYHg;Cpuqo|Sf;QTry#13n|E+Kx`Gg6DZ<nkPjo@GTp#fGEn
zv8CH`$<Q?$1wVw=-wlo!p`S+3*`1EkNr-7Q?%9urO*~s8OA8*C9<4-M3C=S%j=)dg
zHM@>aYb_XWbDux;>vk{eYlxj@c6W7@KHH{vbXz0*t$A@%8NVy8Xg_j1A57@AJ5_%|
z=<cyoP?+JhzjTn{oozodpQP<&v{G8x{xrYBz3$p*aZnM(w|+CU?)k$1b~@6dbBE9A
zR`%esaReCmcv*XRGx6r|-rBD0)Ovo4;{V8TWa>hQ=QGt>gb1PtAam2e>iMeZ8*{m1
z=hzd9d8Abu6g8n47pu2a<?8+r4f`~1Pj=iZRQwCg<X)OfR!WhkwZ41#L(vF4km8sN
z@d)3VgUlr0$!1Ry(V+^dzz+)7G|TtDUOret?z{Q_*NpGV!pRO?k@tXB4Ien;I|J+t
z|G6Onx;95E;I{nVdy?{5L0O=Sg}!{@6X^+zLocun!#T~NY^4#c%y0WfW+m}baD7&8
zZB4i02OW8_ar@x~+HH52k9!R|FOfUL_;WkjXTKo6MY1R9^~xLtHTZi{858bw6*yK!
z&CoS0ZqR#VsnJOY!_*f9^WOVNg#in>QIP`3GueRZ&}<?r5zYP$bw~%?0T%NY0>Q5&
zyG4m*Bdk>?*IdM|3*Fww5y-JU?OS+|xD%Gyh^<g*0K*2b@BU}_PZ>Vi=&L`FsfNmJ
zMRj{4mgzs#x%gXemG$3<A#8Y-Hn?%KRwJJoL8dwn`Am}Fsf-P1__AI2d~dr!M?AiV
zG2+^*u-ZhQ=7J9Be}{f<<?Xp>LWlzuWv288;N#xyW1UmWJBSwx%L!#2B@?&HL#ll!
z;|shTPE_ZK@fTWNBm7<P^EH`K2%!Dp0v>++u|R(b{-09k$N!F8W<(CU;1P+Jl0k+x
zl_cvXRI6SVqEK3fW{iwe!*i!wiJmUJASXdqf}Prn$C(&C*f20jWau>7BWSJ$Q^FNS
zLv{JVG#EfLy}2+k=7QofFP|_4hc4@n*7$qGysj(`eo@eFkB6Kpbv7m6>nKg8d$J~0
z%KWneBRHlVyB@L7p#5(bHUFV*>Yw5kX5itPVJqduTnZ<dwy1=;62orxl7nEL*<ZrF
zF?{#o{5i2D2wDod;BIUu4GhhXd$pCi({WWie&Z{C=qlM6hcj@cq(DHDi>coY*)TMs
zxxL?F?4!hJ4V^UamA6e^!a@4i<WDYicqRt@t_fb{z1*y-kKCWodM?do^Q!0)+cnXO
zDdXCE_=)1WDT>>hzl{Rh=zcF56jk~D!y;&mKI7yp)z`mcy4SwW`Oa2vi};af{wXp@
ztajq(Qi9SB61n=dHWj0TPB!Uj(?XlLH`_H2zMT7@OvDmbB1<EicKT-Ch*usTNvh+k
zRm0Uwez_T@#P{u`7M)c+`Btvf0r^wsD$K&LHKOm`ji}Ov_S5L`rrzpV1naw=g<}<n
zmqubYUuHsbgstm{%Uhuj1hjiFCZMNcXTozEDre@$Kv%oy5i1-4&PH<T@EX!M7Yf1h
z_^SX>!!em}SLHVF`4ihx)6AzUb6=THxtG-5CUqj-!Tw${FPvHS2EdYefdc_S{a48t
z1JBHq^z<$NvdwFWzpa-U@%w?tEL2Hpl9qAx=qNP(L3JaDc<vx*_*IxIF=qnJ(=X%P
zmQjpnRT8bYR?%)}w4>ypelR!=LgL^goF5ZU`X9G%1R9ObbTyR1G&D^YUAQ)M-QY}l
z9=qH`&+Q{Y2GkKx$YOqI8^2KYRvQ>JW{jztR1%xhODR8jxR*JuI%r{p!}gR=>UT$A
z!wpq^O|si%rsJo)G9p$BXCs&lIsO#}(o|!Q=Nb|QBZM2RN-B=M#nrx%K+YWLSIQJI
zH*Dn=vZ6GoM<*f>&#Y-IzdyjZXMuNkhRuX4o-JHtVa)Orsz7Vc4RI7A($MF(pNfKo
zibT4-(m!aeqoy)Gp7NE`xZvHZABt2mUn!gkD^ws?)@FAlYuBLlWa&4yl*p~yR~l0i
zW7d>%@-$O<WP=j_E6G${iKJ4x!_dg^lp@f@vftx0lZ{(WkY}UC09C))!fGwwK+Yq7
zP3!&wc*RWSoU%qk^L8}&o42;;Cv9IY7f_xXA>&=;OR&PtyX8|DN4Iu_%8KG2>^x09
zCk3IZZm=ww2Cj}wc*!Cvwi?$%9Q3Z)H#T5JgF~7sZH{|gKaA3>Gy0B>wpM0(kWQ{{
z3I`Z;KIE~!-p|CExv<k<wJ@MfXZ9H)^+d17=s6m6BM3}_EEq+=en24eHZrwx<WQO^
z3!dahgiH^ne>Sb6GflUam_#%k?1Wp^f467)sBh}j8STvEv;GeM^L65y5>?`7*)SfX
zD|hso*>xg+gZ8G9uFdZ6#2dau#euS_Z2%+~!&vpjp6AbT$Je9|%9BDj=?c*j&nvvY
zm*gNpgGVel@aPuzKT6UXxJNLuGqX1Nvtq2NuSITuMeoQg6o{dzFuvv{$ud%bk2Wt+
zRyHd@()9zictcx4q-*pn=2Owh9`J==o{>&Y7cgs<NV6YLnt11nq<_49!plu(OALkK
zJ8f~6Y4mp`-49?0Ufa;wUMX6U$Gzgr@!QdJ4pV-(=@}~=^D(guqS$o=@hkmJDIGK~
zdE%hELZhx1G)qAC6J3(-R*N*59`jSIt~=T8>OKC#(1ijuY8m=wIEoIL(b-lq2SP-4
zUeg`^XFsMbihfN|(ms5@Pb4_gjPX)M(K@xan2d^fL*a5cjZn07dh<fGaUN9zP4uqG
zDWJ&MWjOS)B3kE>hwlnXgNowkl9Z%F*!x_CCQ{#ht2WI=rh8i6sBj@vA;r%Eq9|J>
z);0}tWXYGi_CQ?V-kvH#rU-7_gcmpkQNZO@(!OOskNXW(KYitIU>yi+eO+9BrxQse
zoE#jO%y?Wt{lxX#z3Lv9Kvvo_eDnq`{}NJvXwz&cP?!ZST(^(AKW4s1x)7WIZY(~L
zYO2$?Oc957EI2XFWY6_S3@3RR3W0|0`%wgaD|~IZ`88xEljl-FlQ=6K)i@E+o_XRl
zsljRMxC6e6m|n|Qd9WmKUmg&8mE)XAdK#xwX3SdVuLH1pAu7xu=aAmCie7dX+QHru
zp~QWkw0;(J4(ZpWf|ku}30@UZK{I2n7J}W{lMQeR2o}7x;F`m-OIfV9F!)TtUF9$7
z(DCztG44^|uz;*LM>~nMD%Lq#)Th^Fow3^FbnHNWXj=JirZ1=XNtvF^nR8nSt~^fN
zb$9S{wKg2pu207<V&#nDZ++j>2?S3&Oh;sdOtSIOIq_+NgnpDqZrXZ#;(mC*-_-I4
zcUymf*S%)Q_LeL3-fhV0T(K83@Se4H&NPbG*ZO>_<Nf-S2{?Bx_Yjfp_p>mHSAz95
zIJ`+5gBU{*Bi7pk-CFig#e}IV?GS1($b8Xw0hTuLy92sx!H)gPfz^Y{Xq@>&RM@Z6
z@RxzRRJt;@UmN{|Y_^5AJe=-P&lyAJjYU$wPCYbd?=;I)Evkzk!=%&X4|xgiL&J#t
zE4I*;ss~{)S)P(OAVuo0A2g#kP9DBt;a>tAlPydc4-`LWaN#G?`!-(96|OX@zq};s
zM?dnDxgfykk@;=-*ldI#vl2r@z&s$pw2KB*f&K;vAF>g<M8L>{`>ljb0t9TdNlpPy
z-f+CDum8)3Ogne*uK-7IJ8)6?w-2#5a&Q2SU;94;xL#$&Zkq$yb3(PrWy=V*!FIG4
zgIPp(Nt)&~Z~hljv=!*`p-L>gUWb=PgHftvb+(gvX4P|AN6{SCc}EA!@mck>@Z}O?
z(|s`Eelr!!#(2<%j%qH0kSt#BCt=8e+AWlmt%aA;R-v3~rmks1wM{O)C(9}pQOcd_
zapz<bPkQow5bFT_!7h2L0r=uZg-E;K<jmw`@yR<Jw{I?!$tbmg#V*sy*i5ms*?s+L
z3Bs0N$p^-wX5^9{%as#J8F2Ost~peazrp*R5X3C28+^>+`f!^VegKjdS&m(TyE->p
zptD0&c49Bf{FF!sG<v|9j={*=?D0JrXP-NuHpVb$6|)E*=Txzp3z8rdgeJ%p#R*>I
zt9V>j?Xu-WuPi~P;Lj_0kV21xkw>}7-68H-%Em&Ie>eT!l+=&IHDqM0>y2L~CD=tL
zV{{d7fMY6R_-tzqxt<l9q8gtsDsJL|`%F)^K@w=^uS_G4_!Y|!kD@3SbDKdAQ?42g
zb(zMjZh!&q0+z2WdNm%dald4{A^2F$yzTi7hd{)vzr1Qc&+(HlStK_3b{_qFPS?Fg
zK50_tTo)t)_1kEwPlIY+SLHp1f_<I~B$n(D63;=OVle_}t#a_|H|$JN-)6@TgwTUK
zsw+6MRLM7Qx3YD6k)J=%@&nv<Az7~~-P`aUG6~yyzSBG4h4H@82iR(Kd>~5~qIF_b
z<U3UH|J)|#LmKenQBMo>$MeSJO$+Q<aj|RV`6S!z;^@v-_r#;-#aa0_)Q5@Wg)e5Z
zHAmW!Ue=P<VAf{vlc0v7M7}Jl!I)QtmH~MLU2uJQeA`xPWOfC7D>7aWTmBI|E%BE@
zxG1j@i|`TLzQ52Lp&BxMlFJP2A#SnNLFt6@0SUIeZ22302}&t{Je5(Dot*f5!m*1W
z`kfWBbq1_`)|c8_;mjV0^DPR7j<W<QJO1iRLMWQf6v&Ap^HfRjo2iG{c^=W_Q8vNa
z-~6Vxx6{({B?>DnE)jWUFZ3%=wV)I$>9A!5zKWpUASFT#2zYd5RaN~Z;KNp^K5HHh
zHIqYbZ9n6rxzu+J<v+LD)}+c{a;sY!aVHDFH4Ni@2YoQx!xJp#*xa5#{2)HQk04;U
znTBa(PPxlk8LJjTWjHC{-S;obAFG&N=lgvD6|3F#ep5#dDRgnU>&0QUQ74~0XUr*I
z1dGu}GpuL<$y~%wIq*5?$ATwJ&2k>6ueEp--ATiaqr0sn>!=27>nzOP<_12#aP+TN
z6kLK18mjPDj@zBAi6R0%=DI#939j?rO7r&6vZoDK?>n@=ujOH2=ze*uz*(RS3Iyq2
z_R`+L)zav%dEm@bGj8W=?A^<IXsFxOOgKes4tcOUyKoFXclXYfjQcBZY3b}5uBybF
zM9J0OLS+%H1St6zSXAPump&0eaTE>^nGAB4&bQ1B9Ua2=+SPNF)VtQoAa4SXyQ&}j
zRvD@%vKJlC3lm2=lsdep_hEN8+eWq89WTdGd*`JePZuB0_l*Fj7k=%;*5ICpg;s!e
z<~py}`bDS5&D}z4;l#*7-+5&!!^quMPgLsJiN5!v{maqGLf`#DBZIf=a+{a>sVb2Q
zL+Kllj=R6$qszH5?exh0&cNIZ^Eyv^`<I26orli#FFJ_4*7L0sr3|f7fX<({_bbLP
zuSTt|8s|>I?p~gpcMmOU<&|sj{;iSPs<JC%);G2v3q50L-c!}3JqyA9J0I;GJbZ0@
zo;PoWcgC%cmo**_E{BI#ogXJ#TZ}Ffsf8|2wpaHx8%C;;3l02M6ALm)U$7Xw)8A#-
zPu|YA8UdKCg>%OTJ(ZjeuPt1QkJb(A<%CF?bXcu#mW>*_{NKkHY9{zi5PofVET7pY
z<<8w4U!C~ftz`zQe5kjzx!<<6M(uN-2Q!4-6^;at-08gE@qKXHC-LEb?{NQN`El*#
zbh5QlY2Rb>p35i)4X&eR@Q}~y)XET6ICm9H$9J9tT}DvARr_4SMf@^_7o5cZ{*)-a
zux-^z{T|Bjq$AJzON(0i_^RUpI;4ZYJYL9uZ-D5lZ0DEEjSD2AHg_Hk{vWRk5ByfD
zsb_j@ZSH9@6IdGzI;tDx8JS5Z&QU#5J$DClH`gDY+7%!5ntU4-9{@Mu+vb77u@yJ(
zmh2Od_S1~Gjm$)y8WB6w8g0XwSA+ZVq*L0~v}yw)K<SDsmloA8KJC{Jtk#|pfvfMH
z+FxpT_w>{(tRzjx44l4fM9I#|3d~M~6lF#iWirY0qvd!Nq`aN7%YM$=f4M9q)oJxl
zTU<Ctro6A`7WnCThRClEycGt#HAw=z#TepwW_^Crd0)rz?)lIcgKzGoeWsIG|FROT
z&&`|3g2YeX5GK3Qmo$Nd!_dT{yfF6Ch~!>P#7q7-b@8w=_N-V=KS5TN(B}2jwpi|T
zH&0cta}d7C`)bwdR#DHsod#gT^m0?@q2~u^XC$ozXC`%CByc_1-dw)-`W}By(^c|P
z^L%decKLW}`n;e4&xuB2xEnlYtpo72SNw(<K*_!<(AeL-ku*`-xG*9PYm+xwShX{^
z0_$*U7)NTyLS{t<=8SrbJw&OqE7QL$3UO|jW7S*9p3@-J2Mw)bNgp|<^5St*v*hLB
zj<T-YZ*K8!E_P}>oA@>tGP%yIqInZ2{it_;>tG`;l2z7<CzU+CmPqk^>U07X%IvE-
ztUm;ILjYTS`Ag==N0}2=H$DGFEB;0K+fP0dfxP6=j}EK*JMyL6=r0{Q7fB~;*Mg&Y
zvcI)IeJ<|ZMZ+&forf7$fwh1LE(>5An^9RsovNnQi{5-qs1mh7mQo|*iGg$>n)^wo
z8+t5^$tdDZ`UyLaHzxHe8|YX$6oGF?fq+^BhzYQGB?hqNkY%l-UZD`{Mqk1pSBbhn
zzyJZjAlmFo$OO93=YS7F?_rP`#oZxbu*rcB%1{VF!Ttr|<HOcX*44I8Y5nu@Posam
z{il(jy_k;=^<OAwf8hT@`OgObiSpm05FH}`1uH0u1OZj71A+-I14AO-0)j>SE!Ka8
z6cXv<Ce{0=SvRm5?mwHsq;i8ne3$=&V+y40{};}GHuw+DKtB(9ml*P=SpX0RNKK$C
zW!XBG*Z-}?1KCU0Rs1Rb=cB<iIg(GN^<Cyj)X16L8~LTnr@*<9cFE*?7ckysOD|7k
zcZ#k9VzKe{<DL<7dk?DPC~okb<<E;BOx};yuAT)ox9<=;!G;WNdpZDaZSGDCH`9)f
zossMXhNpqL4A~31v`l*budnY<&#23H2S%L-Tdx(HPqixm{*Ta=z_arz;fZo+e+NRD
zx7&O0DA8l@rMt#7G2Ov;wnpbg>wA7WMEkoawg>1+;Gk$G>L{D<)aGkT&hXZ@w3oI<
zvo+&T#*5q;Xl5rx@_uXi;q`QN`O@)4>qW0#`}`UUz#!wL=Cx{x)Pwas@{p%f%yn%i
zvYZ|8a!N5w^nPRaMzN47=kl}W(&?nJ%~=!cqr#<;?Irrf+F~oU(OI*0qz`y;rF&&!
zSbbM?BK&dQha`4%8?tHOJy5&7wzKUbzWT)k+Mt1Q#xG{|q&99Ex;e?@^V1YpR5Vm_
zyE&sf)bCRX-{z(db&%_uliz;CL{2cff?PPFOh~)<;=vx`!FAF1r6gx~0d*Un#oayq
zSrK^r&0V0Nws6FM--t?bgR5^?4OYN;FM=M(v!#haZSfp)r-8q0{qV`hdOVUy!_*zv
ziN`F`W0Mo|7eIJHoQ-)Cz*yJRguH6P?KSWxCVU|1)e9EDhp+KALcT!iaq+*LD5aBC
z5)R*#VDtM7g~D^h?Kf~wrlw<x9nUuiivX@cC0m-!!v?cwwvo+KO*AaZZjf8#&E;cp
z<&Yd4+BM2KFng!`Vh}{V@3v`}TLN|=N7y#!TsNV>sJuGHB%<h9cC@uv;kH)%rR^;^
z3Csb>+q-jIWgT#!yKy9w;jM#S@H}bR;o<u9l9N1U*ZHLIHa9a~^V-DEhKES0jKFVs
z|1wr85Vf)s$IGT=Y_I&jc3?qz`J=PlOU-(sTHJc|GC4JnC8@BNes-qFF8;Ntd3SaD
zZFb}!=R^bm-Z|pumUd>3IJ@~g;E6c9%12k-%+r2`*u>QzGQy$;<H`(u&??n?m+gR?
zD5JTrqU_p+7#KC5^1J?k)s8EG`X^2$Aqyd=aT}pQ!COcc`L|cMfX7{!E8l4I0Mizu
z!hz!CIJf6PAAYCPrg<E^{mh#g?yOGX36TQleB*%&6SL!qiTJl)t`bOvWW4TF2OQ~z
zwpdz~I#_4bkG}lKMldFFWh}s7sa)CZv(2~KLSiEg1n*o~Z`N>MA4m3|bYWmz)rPgT
z>tCJkwt4mKSSOQBEC#uPb9n1boyG4tYShN3Eq&&OBfaPI7{ePA9=%fpZ@tRDct-d&
zZouV|n=gr4iq&tgQ<y!<*5Evl>pAKJxw;hsF3YglJ@YC2%ocJ{$uH5m(16Y#H<_z;
z$q|bG^o)Kc(i%tfmkqTM3C70JImsrpA@|%d)o0@ro%`#NEC+$PYvzRN(61BT_-NBC
z!PGCe@s-*h0oN9X)9#*(!n@TY+iK&+JuawWCx${%clg|6?@CP*$1!;;Srv+(d8%GP
zXMGV5VDDB4MtE|^TLgU%CR2SU<|4Q{`KO{MHSmL5eiuNiMc5b<>ZL*V1K8<r202a;
zAqhVLEd2H5f>+GAcBLGI>`}FBXO9bl2&34T)3FKh@KyPww&Kv}CBGrf^RQgWA}x4o
zm+>1JQAT;QcPZ7#Z{f2Ykdh)G{kjM|av)|kG^ng6**Q%gAc<T0no3x+r8~WxECOI)
z7zyorva!}(I9xly52oGF>72mgO2HW~sdqQmTSKkDk+0lCDc4v&K&iJ1TnI1PSPpr2
z@i5HS7nndu!yT6&=~1uWm8DP7xn5_zE%eAyWXaJRA=9YeogiC&j9tK+vb7-N;&*7*
z=(Not9w2G|T5Ta-`a_IT3lPGt6;x`zrn9Wpc%2VbPvZEMzeri?gR7{4-m6%USK%E>
z^zI_8@GOYIt<#vuo;>74RT@T=&7fJwV-e$iswZ$HsTOqf{A$G5nd5$-*`TCm&n6j(
zU6q~SKxjTen%5gS<ZJqFVOvcxQMfRGmgBNuyV?$q`&W^5qSUEXD;KQ(fa%Jaq&!he
z3&cL*O(pVfXpy1c^I`x8h^?krsM{*Rrd0;~y|!J+%>e%OjM(-|^`#K{K%@mbvFzs=
zC0o*foj(5^?^7(J@4g>jabMN5dOTbeEc)BIdwvYcb>kn6*f)bd**6Q`LB+kq-;su}
zL>YNdz3Pb=qewV}A5SrniVYMI9h$NZ`0lm^-`x<#PPi{dxi(T>1d>zs-z8(m8R)}*
zXH63QhKd~LCh&a_l<5eXm~Ld4_-D8oFLS}}VDddU&N(HgF8At9AJYvR9=+@V($6&O
z{+^Cp+#kt9%eHayd)l|gy4Ax&lj|ZuuSuc7DGV4J>yV28_O`~WiOk}2RCp6UqWnoT
zc@FSOPTU1JkkP9qFG&tkE`TK55kU%GZ?m>QAft0JmG1Yfk&gh4^l`w^+)USIY2j(S
z;CcYj%dh7FID&yw^1{wKXO<C)IPU0KgM>(M49uU5T-5j676k>Dc1t5QZe;YTuGuTH
z!SsW-aldz89gGO(W)fhBO)ClaT5G-r3?z=f<jH`)sIV8pEj6k*7@W^UJe}JtcHkHB
zdkY-+PZ4jzn_eXxH%_~X!(FCKbubtUbFB6^(>y6Db$kIBXVkRFV7Q9g8D+wl^aB9K
zE<$Cg!+S(GQtj0H9Q&UXY@uUgMy2M70H4G5JzGZ1ynX~`NVgdCv_+UXQP64(;7p(H
z7|3(KhwRUgt3<4blZs1cdY>=GxN-HF)_Q7NOHF(un4z9;;`C2TRs8N@PdZp=80MB9
z((;3C?Z-6h@m-AuQGwGFfjocb;jO(4k$Ori!2K7|jn@&;$yvsT?RCb@Xaes12FN$q
z&hbeoIiAG;BAezPZBkuv+*2-iqf;m!2m6ht)m~nm&o^96J=d7_mM)B%E0ev6Y+H0x
zz5`wmUrEZ>U+P0YnLe7ipY83Kx2_QB-X`PutddgG$Aw|5jAqa`7)zEGv{_5WUuK|t
zX=xh|xYPRF6wj``A0d{BZn-(%R;V&KXX1f7z%r~7$#F?MNqcRva)Ooe)D?#DV^lkf
zYGQ!sV0IB*E)c#);%#mP5yI+{1V8sjcyTcLY%z?Sy~jZGISN?7!W7c)+$2EqwbNm(
z0Dlwu`eb`&hwf72t!h{}5GLZ3sKqTY=%vABi*f0c7I5)(g`Wv_|FhtL^V7&_neM_1
zBT`|3@?KNx)+p7!#YG!88MdhkpEm{Al8xEsbo94*?Be(r$jB+lCbll!73=_u84DGH
z7uyta3Kgw=a~o^?3@EUNpwx|kt#ze5&Z8iA7KGPHBo|rt+l6)%4>-{$bWG1-sB?r>
zJo7=^+(f(1E+%u>2PkYyJbxR2+gNGbZC4qfjBcVdOm%CWg9`!T9D#j?xTn2XoMRE;
z!5CkL*L$1~;gztJeTFJjRB^rOu$A5Kt*71BT?kR#U{>KAi$j!tYaPVj$^iLXy3^G$
znfxkbsPwH{xrsee2He*jO}vTyX*4(80U&C|NHDQj_?y0HhX28s8OHzD03Md-gJ_j^
z6T1yyki;TfWB3hhpon4>Pq)enzPtU1tuk`PCH8xA8yD4&K=++PR^%pjGS~;o%(1$-
z^9cSlh?x*i+*SP9_hxoM*3=21|7&#hNu$%-Cj<{a5Y8idW&}3Z15nSUJH9D>UQ6vo
zIslis-FFhdooJUBm|@&Zi`^rwp((7={jdRSu15>aW7q%5guGM}`(K%GpRv$R@0UPM
zLUT%J#$Ck=E)*PUf6}X8QGH?^n7DgO_DEr~K<#KfGYUB{*f&XR<XE_Qixnk3>Sz&t
zm=<z-t>hUY!j$dwTDD$C92h4{6@noY>|Sw&wR&PrULG)+NDn#~TM1sVL%O?1t$oQl
zN}oK`hGFkPWzVff-|6ZgIYr~<0STb>k#lMnW>zsdqnc6f!5U$=;Q3Ye+FeVoTz}jx
zL}~eGDE(|m(S}j$+)ZoIO{+M8YDEg|(4$^Z%&z5PBI9PF2A){q+tAJml53=U=w^`s
z+jO&zD{^nu(fBnAN-tR!1r!j$$KLRIT}yt`a6B!f4{))NcC!FN#>I4NT6AkF%DP#R
z<~#OC)c%3Aka4s4CnVdyAfI~wKr-99SUed=6h0^FcqNjfs%p6nDk1{PB>?3Cjr!Kg
zKvWltW6m~d!$WHhXpXyrPk=EA0D?u=G}~lDBb06(JiHd5oSD~cT{Cwu0ueyJQFb-D
zcRex@+jdwYg=Ds{RnB%)o^Yx19pe+A92OwWOVRu@U<aX)wQ${GtDN(wTn|C51#0<z
z9wa=`H~XYq+1P!;-2%OMeXD#gl`SJgYfI3Od%CUk3$I~JaO3=;yM;&_2Fu1jI8Ibq
zlX|=L;4J^2I1Zis;kfVi7srEyBp^q_av(?XP^5oxB-Qx`N7x<dJbwVk7SDg<NC7wl
ztjyUbBssnQ*x(%bOzCSM<nT&gxWn(HT{5m$@S+3nfRr@Nmt>b}J^!LL|8Q<r|IC@%
z<{VWS<_&1r7()~o<kBHL-2OkD2bJ(pL~wuC8b;!+;}&GKs70lsnDvS^|6CW;LH|Rk
zxvPb(sHUkpO`MI8-5N)%)14cpoiAXUX$`#BUkTfcZ}44<e(zJrUZuKbJX(`Q(lG0w
zB0fk1v@ZDKu2@q|EQ7)twS}1a8tk-J2TlpMy29GeJ<n8T;%3JzK4rZf|Iv$<$_p7^
zl!{q^Y#>T*jUG3o4e?`RQ-Hhx0xkA5f1dXwDAq%)Odtpdd{0-j;&%gnnYdl^Qnkjf
z-u2wSL5L?|#?0b-I6$wzf`fxJzYwz%kQUKVry!xo#iNUa5O2U!h|p704`0tn<3z9W
z$f4I)U6BZHwoq=$D05qfbY;{yi9+@}m3$!;p4>(iozpJU4S+!=1tGApWjIm_0qJ6d
zhv&Rwl`!Bp#&V$6K9dOnfnoh-kGsbx<I^^V3@UKWHz*wpLvyltAOwN#c#1+g$Sy?S
zE_J+E`|6+wMb3^S2o8fnEW8;6?2+2&PmdbIe|nVkB>U4N<|mY<+JI_5O|{=JC>$Om
zS>WgA6zOm%AlN~^B*hs)5~xuX4cEuTI!(*z$e_rk0sE}OdTAi8sU%=NtDe!Rh$s*_
zBz|pPQOLe*Bw$zi7c{g#3Y-(}=w~{+j}woysfCFF0(LjZtUkz~-yp0_!MbVtZzGjk
zO>BiA>?prmYl=dOUbQ2T_(js`RU`XyOJUPC1!9CF`}Q=#b8Vh$PZuMD`siU}+Z~&w
z^~V|7)hDRR`ghNr2f+9Ukg*oZBkn*9uE3*!?4J9tI)vzw<C0>N2<sYz5QiAwa26Wh
z743ee%0rDi)S`|_7XF|y>m_edEfpcQ68I|hD;e~U)HXtB$l6Q=&SlHIVLD*~!vRB9
zBSl?Q9gQTylQ9%@YGGZ!D8eyTyWvDby0$c-2yC4HofwI`St(;PCX$yirFV1ZZx8}m
zC@C{k!M0$#<@2N<gXz%CN63OyxTG*Bq*YA9(UFCEU4p7=*J!({P2VqQPBaU=1Lx>x
z+7&_s)_r#ONlZaVzye@aCm{k<!;c6`ohG(}V0OPJuQr6kg>Sp#eS;uS@75;)b53Mb
zvH3)cO#&7Sz;WnWYtK_80R!n_WZa#dVU_W7vH7D>&wtk_jZ66QVejVn?C$NL?`CTN
zY3a&WF*VpeH@Fm{0tJ6im07^XXaCJt@V+v<^zHiL$J5=6HfBCWupkL;k@a_K)*@>e
z3Yj8n>9aL(3U?UrMJ%YI%eE-2NHi}{u|G@5*}s<%k0#UR_RlZqNkToEQah<qGb>>^
z9%|;_1k#}gJ|t(KZeQv-Ym`YqHAP&@2FEMK<NQ2mV>#O8MdlP-Qd5y?yhp9Rc#mnI
zj0WZABruWBsx7Opy2$|l3B)gG@_s!?)aFLp{%p&NH_Dkni|}}-v9A>AM(+<N)}F{q
zaiKj&`s)7p5b^kMER}O5T@Ywh@D$OHdySbFr{~Zb=n(>+;l+}{H*XA>r{sB`=Y3y{
znjzn^ba^Vhd^*Duad}&Uakta<ey8Add7F26yK%se;Or}E8wQs=np|KmwA;17QR29)
zKc#kkE5Y2l>p21Ro~Y`eMgW-UEm_6@tn-tNPr9ryi`t!q6SJFlpIqM5Qrp#2FP}9Z
zp5tyetKHHN7`!pGJ3Vt@D*5sBbjD96+)po`%deivy!kS1j-?(GpyQ{rD~)9K1{au%
zY&I>H6tAC^>AO#Y7dAo`Dm%z=Hw-lvjZ-#E%d!D~tPuMFmF$LxX8}~DPS?r6^6A)e
zz`{ny0uiMI&-P!up8v@U8pvy%B6tB1vA{3=xi*AM3i|)0ul&&dK85AWXCRmAukN*9
zx9%Fx?*`0xBq;xb(ub0$`0z=m3W47OAZ~#_V-(u9i!V#`U;P~A^AY&dRNfvfD!Nzd
zOp&&Exx7WVy!|az&nh$uYGskIm7TDaL>9H|7HHbuFWQ|qY?W3VUsoAQPOBCssMkhr
zo~hv;yH6(AbE!AEBcKe%K`~Sa<s^eU5;^mq@wuRshaC?W6=}iBOi{G?+ulXnyzVHb
z9w}$Kzs|gh8X$Pm&JoaHw)rh=1S~|=FQwK4`*W<^cw<gf!N(h4kZ_nh!5Y~Xi)mxH
z=<69uvbzp$11}a=HJ4TR?X@Y`?N5G39C+m}#;2}H1==kIQnFMo4_=NEf<^4{u{ZBQ
z?W5$=is77wCf<xE^XWV^B9+{tz^7D{y%Q0n1d*vd(?sN=b7qG?w#FOd#qm9E^wSUH
z4KwM6s`rlhk<s5-pxCB$>Ra}2nywWzzf50vK&d7Ld^5NxmA9sI%WPnq={Df)aCVso
zjowzb_ONxMBw@cX+G7<Uj}j+0H@`W8D5OW*jE=Jkv$*$Cgc#p}fd2|Ig+f=ONP*?k
z5LG9}%u(;a5oQT7Mjm@^?ipd~B2?ZEFx~(1og_t&)!zQ)1SF4(WGgw{EX4ReL<)KA
z7!-;bVG5qAN|F_=wDMGbUNy)x5dbv>pMxV@>veu<2VW%?Xi1XN{7LZ-=IZJ@7f7*;
zIES$bZq6^>ZB*e}Hy_{cLag9$WvFAl!*TBMdqX5Cd#Qq~{-#h<WtrS<_~57V1g0Uz
z=iTT)OcwUWPDFtcG}Oo?VBp44O%PLMgu28t$YVZWrNXr_X{Ju)3!nb#o&}1PBt<Wn
zy~omBNt7VxS1V&65OQ?vtP(u>I3U2lsemM9iR_CYYbiALAW)F3E}AL2c(k#Ky^23%
z{Z0FQD1}*0FN0=7u2|t0JA~EzIE7i%)4s8i`BVRqNXFWmz(?sbIesk*!qh0CEo_cD
zZ<hcN6%_I;)R@1_iH(A#7L(kF`6epAJ~tABL=(ijxa1D!HLzwLa<a9o{%Z0IBNSMe
zM5*(k9gkK;n<HRm%&l`|zV|P`gg5;^ekoPzJ}wb@pMRws^9d>LrvCJ1LS1N|J=5uB
zb<gy!&Ad;R6^dosKQWuptXZvxH968?p4SB-^LI+_=`5XjC_~>)Hpv4%F)@^H4ibIL
z9M6mD^@>bmeCPd*dAs++Vc|V@PQSId{{&ouAODrcFxMq<Q+`kb%Bljv_zm_d#<tRW
z6~qhl5af^*glSfD3cQ$08bPXroEAtnN(<hft=_0lQfa`#CjF7(`ti34kzpzMK8*Or
z*~zcNnk6~Piz+-|!?cV1R18!AG6C?tIYX}Qozunde%D|y5pwI~yo|z5U#qv3ovA8+
zYfcxo%^59*#wX=K;ZXsKv#sJAmB4eW${!)(Rja(^wB^=CeV~R*ha3V1ma2b2>_H-@
zWVh+X_L5QZ-)iNz?ORJ^UaMfqQ!8kP!qH^40eQ%;D?pueH=rWRY5#r~bQN^P1I4AP
zq?|z^G#M~PjmHu&-TxiLnnAwzz`(%1N4dx5BJ~{K$OY*ZbFHw;54}gvRu^%dcrA<B
zkbnZZhjB_2j}_mDlI44C&P=dn>tsnO=n5KOOjY@3=SEi1m}(b)ozhC-Ijou9RVVIB
zU6bT@ort?E>MFIA3%4REF5n9J0=);h_eaaNl<)u4QX8n{aO$7US{&XF>tX3(i_64W
z>dGz)3v@tfU?S7%{UhjNz36?dM~R>bb14QD({w}q9_s0P8+@m#7o*9;fycmel^}Cv
zobb%2+f7#_IZb=G)Cuqj8)aO>FlIE$U~H2a@y594jaWx*Zj0Nh<AF35o?+2~RR=eI
zI{Wi@GO>@hqSjcn7-5n=a+}&2#S;8}tZSLAgAs6X3Hq5yy<Qd*xA<QyB%=b!Bty&8
z6Lxe%uqBcuF?Q%+5yan`!6JUx34NwATA;vfruG*HkLic0dS*It8e!!sHmja(jzi22
zx@sz8S@PhfpQ~d;K(>G&o{d!_yS{`s8aD}HL$(mVmL9Pukg8EHjkO>j2~r~qk*iQ6
zOG;dT)mU<@7PTHGo);)%0xR<xZCTTgkWp}?b3D%zD$_Hpa-c-=EbL3cECAJy0141Q
zwSXwWaEYIT`||=xaXj&aBVBP%mSlzeKCl5WR{e+{-&{YN8ZGqwiB%1}`k%3ev2pDQ
zRQ-vyIw%{JLs2k)MPK@62BcaP<Qx4@HZVsgo?$L-WDDZ?=-J1Z1Fl3RWCe-^DmjR1
zQRM6&)uI*Xp=fnAC;Abq@q%T(Y6cK$Z^@3WeYol0RMd`FC4$v@Tt51LE$gIXT4*Fg
zg|LAkn@g0T6d@nTtAzXsBPfq6y_<H!X|_WV2wM*Q2lh3MO+lnBEh|9_%VM_xULT<s
zm#ph}plpSH{xDv*SK&a0s~0y&a`XG#uyq*Qm@IfNE+|Yr`8>?**E=eU)NjBzgcMYj
zGfvbL>Xj3I<WkY~;tB@X0hwRN$xIGcgt6HvLRCZQN1*858O)zyS~!G48x-4rCeTMP
zm`yKkTs5mM2sHCiBLm5X>PzXgQk|Gn&Z@yA@5}5jw_r(EWc3rgk19X@@g-y4Ivx|G
z0DV-Rz2Md+w1qQaF{h<|T4p`ET_>e#L9G6uxak4AqEu~pE@7?!DL*FlVzDGP@k_S(
zY<v+DxsDbMbY*zd#%LXzwbIl8iuR8<!FyR7+lZAL%;ioJ1WYO=wA)@NY70L<%>C4u
z$?iW!uQ@+w@Mm@+Cx&^Ek(@8S`I2HzFa#zAY)*-Yobb(EngFW(BMI40Tnl*CDajNL
zJTWu6j;<fXp-=#cOd1tca#{tE&``sy&?jS7$F^x(*8N?++Y)xc{1$Ak{dgMBBWxw=
zxf}!8pERgy@p+*on1UE%s&OF7qg%n@H0EVYaw4?F`f20+wQ?@L%>oz*>#=;wWfj2+
zd7<ccasn7PW8y{nyAua!GW!&rZfHu`p+HMol#?h3SyE*5H_(F`sK0@3^F;0}{rC^i
z@qTR}=+dGf5Y!ZIJU>po_bSQ%SX!>wCoGaPKh^>0Ys}$*?kOh}$iMgxf03JCtb!Oo
z{<)z*{z_AlCD{2>(Kp`^EdD3faY#)dY_slPuo=o}e_Yu*gxFka)^u$sP=XBQS*D`v
zvYbfXdJ~L0`eDA(B2yHlDGx#hxjuZa!wh959fPb;6@|VfDng3W&pc|MMj=Z~FB5Nz
z^&Kf&NR{&jg`rE50ito8R=5cLY0`{k>ktXo*@wxB!<PjHaugy_k-QWo;=1y&G$k4k
z%B-0p5K2tJM9d{c)%^k(<$0lIteInrZK3sDKeGNLEu99gZT#C6=188SaR`3jyxk99
zCJtwMS<}836}`&sc3L^*tMLSvV#|kEa-|}7#&N{mW%=dVS?t_V@SI?8zg)Jo<2Y#E
z`_)b4;W%qq0C@9CQ;e`WxJk;FAT0q4Vq1If7}9M_Z9zFcY(Vq#2oWgHnZJqGt8DzI
z$7i)~6}9GSDyWyhulvjLHdCNrK$ad~Ib#*ng_2Mvz8}aN7x>G8X9s1<v8Th6S>ID>
z6^jDDXxkk|eJeFoOgz-4_pGS{UGf;xhaz5fAbm+ssF6-{qkb_$fMG|r9(7ehw$AgJ
zH`u`IM(E1brsk3qP5V5mm0-O(#4ky+4ijhV_#~QkaROc&sD2s|Kz1F1VAQWB&Jk_%
z==vQxSFmeIsSVXYPTY}ps#U>Q^XI!V>XM{GWn!bsvX5no1`~L+4OdLUyeRDFbaGqN
zPf=Lp_~IN3zyZz_8~~mt(0#=1(#8==X3Mwf6R;zrZKD7ymK<Ix#j)*?DWGZTh3QVV
z1!HLUK*iE5)a@J4Ba4e8G8Gc{ZGwRbDzGgFwVgH}CE-wq!lFp{!Cc~7KEmKW1O^KT
zY$4jxc6q#w=uyDUEUHBt@s>b$vrPM5BqupOF(j(Y#P2vG*YG70I7%WLfo|JEZRp|v
zvhV$K6!^9svX|OAH?@m+uwq%=p<?QKkf?~{_!Uw7I01rRFqHHZVI{)_wYy`Ev_yax
z9YNqlTcSILotSzH2G=KG<|oY;6-f^5*n(4C<p0`n_%^Ga`|$UF5GJ7iAHq6B$@HW8
z0CIfaVG}~5J(j;j9#Y6z@*u2XPmuq~M77%;13W;$iUb}YG}{0V5Jm#YfCmUzk;$Oq
z9O*?B#<>A;y=KWWfdij_F{ho(YMv(xb%QDpZ{6baT+vA==%gWW5N|apZo~p#qQX&4
zvgv)|6a134Z&J;U8Yv*6@c$8Z7f?~HZNvDH?(P;uIz+mWt|6sUx?$)BNkO_hrIGFi
zkp^jyZfOBQnr{!DbDs0O|M&a;i?#Mz&g{AF>$>i7uU)@A(KS@`kO{iuOWm|2bl^&?
z`a*~+TO#}Gvl{Q)Jio*@CD_YlGZKkhlsdqs1L{QvNKLR_xko0RV@;f1YZDF$0ej44
zpV@8X`8pJRjKd9j7EkKeLrl2%KjXTksr6vJ+}y{G;#sAIG6TBofh0wVfG)A0Zh5@v
zikp7CM=J3vLxUVgs8l<&0FI_zY%(N#=egw@+p@RpRILl)BmoZ-iNs5c<Qn=&lNK`5
zgl^X|vz9nI+DC;ua3*H*C)VLB!5_%fvk{X>d+);QMXe5&!fC#EEXpN~A*+|uFebgJ
zb9Nczs?K2W2Q|H#&+$$b((pu9LDHHbY~#xtO%pH9LtHd|SoL5R#aJ7pyrunNqf^`q
zGn176y_{&+vY~qB6P6*5Ff|`8B8P4kR=Z$%SQrcydKeGo#<z+vvBQ3PT0H)D=!WKD
zyqeM#vM#L=*7(W@;$$rcDn_GJ$KQJ1?<+2K-z`k4rcj-&AxdI-L49IFUti#nHFj(y
znLt=0o<QKAP4>O(jt>*ojo_hv@V|oDz(|n9^sAzLh$*P1s5K}s#!HmCdv=F<8k#gX
z<IP44YxB5>v#b1;7;Bbk14Fa+xLoTC1*V_Fv!XCz$_GP!Ni08Llx!0I%t-UYvrMK&
zl2c%y(?0`=zL=P#dGP-z2U+*0|CN}=CI+x)+gFN`9ND7D2YZU}^Ys^sa!L)z(fwh0
z6)ch=mY>MoGwaz3&Im|uENi%@2wx~{`sp?>a&ULVEF4M4=Yu0O?YK8Ex;Qs5T+3PS
zuf!;^{00yZFd?6Wtlfg^7xr`wgT$q4z8J_)SnMv>6wFB!^sMMggK{jtl!FRVMU~mI
zRxKp6HE0lI*lyR4R1Z+HMx;H;#AurVRf~~VFb<Jdfn*1A!Vhe5VZtB(GX$~U&p0h@
z`44Uj#S!)rln+q8Ay<KTTMUp>a<|))u{_bGlVMe6Sbkk;F6N_DK&JyycqAbCExroB
zf}sn(zQM?MPpA^J`0tKAPY4qZg5>lxHDr;(1&-Jb(0vji(N{26L>n0DF=fsIXfO?r
zWZ~z<43UV|_@@ZvT5gcJ2@`JeSB1<?6<L0mu)j)5r~^l~qyD;4^KzIl)LfYGe07J(
zCdTQz+XIZU<t#Gi0U;kA-*Pf@LJTlPBaS&;91Z99x0HHGeJqsZ1nLWGR|b}eN5E}A
zDDjq>G<F{fYK1EK<U>M0I65+(f?U6r2CxlLF^PJJ;$fm{qqO=mb}QQ-+uZdhW3-cg
znhu^-W=a@aIAI`TJ;NpZu7YBPw$5=0R?QK4&kI)+p!aObLcgkugE&R<ZRgdU(n{4=
z;SPZqHz(#bx?W}1FUshXgKY0K%0tRfHHbdfFgRoghPHPpid{M-J0uaE&s&-=0Jj1q
zWWvH8gU6S)xvHQ-o8@qjk{2>ROgpCuiWV&dPN5bpa29z85u!miOdW0);ecLenDLDI
z@O%&(M-j-brS7skPM#8gT)X?y4OP_K3UVUR^q*S#^dV^Ka7^5aZ?q$4%DZA4y@&`@
z%LqE>2+x~HXg<EXbMCPW0fIMU&^pEhiAC$J&zom{aY*Ao<cRJq*&Xlu--89@OlADG
zSm)@qbnUUkr!PhU!oJSf>B#uvyN@AtXx;%mD+2`W1)bBO6>g^T5Uz2!%~{&Ppg5$p
za>P2MEvHH=6s4;ExEr&4Ne6}`<<xt^fua@wDHQmJ0qC7QTUwCuSQJo;0jL&osZN>{
z75MZ4M`HjS&!}FSG|%X<d_m#VNXeMTE(ea<P7tIFts<=gXCz2#9MW#V*oyt#?p=#m
zYaG9aEkSn<LWce9DTY8>^op9%n1Gf|iuYK$np2r(?raKOogP{2SH;%&?8xPZ$}##x
z^Je=l@<lg)$sRZF(-WoA@iE2c*_KmDo;1ru$W7pmsCI~0KKCRbe7BQVblm<PXWva<
zOD4L2^x)oA!fvarKS2cUZAg7}=z?(JYG$WvDIQP8o8sKnk4r|+KGC>Cqxiv1N^{n{
zt(gfjF?MInqj|9)8aZT(%Eg_zKh7lQPOn&Ds%nm~Iw!o&N<dVr#b&8+M26h<s*bE{
zbT+Ur^^N7m_sdgZQGL7+aqbtaUeaxJY4<p7&yhd*wvW(N{=C5hJBG7VT`68yoMz|I
zhpTDeGe%G+z<te$OCY|Kr=g#@W%vckjUV_`nUgT!j8Rcwt}O%X@$hF7PGeWUMXQIk
z`ru{tfg5AT*j3Wt2TcQS)jL`fOIf+yyKQhpxC}{3pjjS#v#UO@^)t%CxA7M2*|b!@
zx1#LWfgSk_#8vDB9R36xkOyxT_>HnD`jAYC(Rcz*>dISS@qh;`j&n19$??k2%4Gc9
zCt9I+uLR1;5aEsOP0t(}bUz#wymaav(Uw*MeWq9}%}6M$t6SA&X)MmD3*e=rwTiLc
zcDIC~EKH0y!BwDgg{H#q1&i{203`TVU%><yIVI4c5{QQr-eU+!qC}LA_EX3#J?$rU
z7`RDH+y*zi?E<yy%5SX(`+5?*ki8RNK|Ulio)E9hCo{hu_)d?Mj&^eB!_UGk^!i}%
zB;K}3!bd6JYmbBQ_nQC7$a&1*-x(FHiJ(Bes>t|av>`>6h_I{-+5tB4U+iThd2=Ta
zd1&xFh@VNAN?5=G$yma&+f}tmQs#>kTfnm4GXjfcG3p<wl4~@UL-<1x<0@~cV`dS9
zxM|#^Njctswt($kihiSisxRhDO5D9&7zsq7XU;rN9%i<JwKYU14j|sr=GFfW6=oS}
zD3pz{0p`LG0$M^HHfcdv`-yaxd3_I=KkM__^vo7LE$%jFZbkyJc2P!xtTnE*nCARS
zBD*JUnI66;MWUz1(2wU6owAY`AO4!64G#H*UC(NK+yorUZE<&1aOn3pynEr`jmX}G
z6td^W_yK`n@cq2{b^*tyPficu=FyMj%!cSgABeZU5B`{d7WruY3vrXjXjk6&6%#>1
zJmh%9CLrSPS?YTWnWf0Lf6Ws6hJPEFDu1|`juvPPuvix3-Ae|?y|j#}YL-2f!Tldo
z^8#6F-CyBHY9dr_hOThKTV8qv%e{<FT{~r7OBg35&@|=T(CH++h&&^$B`yLMKLJC8
zQFBg4!Gt%LF(Ylc&U^4=68Nmws<ARwE=u7SO`P|Jn)Hi0Y$RQEDcMZz-j}6IGr8s;
z5ZD#&Qpbf3Q}<eToNn8OCk1ioe(PbkpP>={=4@7F)|UDX*Ddm;1Q#z=dKuX>KU@t@
zNNW4_df;L9n&XCQVmZh4?A5981j$*Sy>w_WGCuoAnu_`>SY~EUSmq<+x4f9DfBsY@
zMdi^jr{<$oK||6SC6=T#`Ob8{a-(rmE!xT+U|D54<gL1C%&ofUU@sAn=+mD95gae4
z2q^xSh~h#tR24cd!GPs{pEBu(Rh8PUy3eFiSs5zR8&JH!SiDEZwy-g(si^{oD1+iu
z<_VEob<P-YV9(@cv@P5%wPCt}5+pD&a2*0$NJ*EnXpo8QtIe}ekEa9#egX-^!jk`$
zfK0O}$kYs+A-@|SK7m6rXt_s@y!GqzFU$e@fs!QU7*!mjdyXsz_B|jY+JQYf5U&hu
zO5-#WZ-rcaI&BfIhpQ+^4owtvoAMhNd2E#MHjv2aWvac<qBKbEw^F7b)PFMCH+_@;
zGhhRnH_}`t?q=gD%CK1q5Tyk5?<m^nTWV%6?+vlX=TAAz-WdO#5laQnKN$_uZoXJc
z;4>zpV~LsSWme#Y+XGU9;=NyVz0ehtjaK;8T#Uh@Z6iG(p@lN)Y`6OwKGwC_cbReL
zhlM{;**CJ&<m9MFq!liSm*Q6V^w}fh*U#&iEh~RYC+>uEtC$Z_U{%2lgGaRmR0`ui
zgWwm0yWhTv&7S5^=5Q6`<4|TRQJqa-FTrs)E_v>5Y~Y>`hDMu9HRebi$8p8Cb&!fc
zn9#cX5t{GJP&3&@p+m$tg$m}1n$#4yjYA=wTw}(n8fZC`^T3yh^+95)nZ{(QVP#U`
zoeDl+VkeS_w_x(#G>lC`&8uYs6JO<yn=Osl==qq%+I~#5#3w4MJ^grpNoQTr)J281
zg8eL_TrNJrJQmk7u8T?zt()q$hbmE3rD=?6lkJrHGO(hY1R<i%1T)h#cGF@1n#vds
ze_=>7)hza$C(3-ox(^QD@@EpFriq?VzCc95fH^F_mK7rY0ttRe8h?)qK5zCoLWWeQ
z7B@P+<sc>BFqIT=2T!dkDqDQ*WvWEOEA>JxlLSezv4hv;^&8L;9PV<kOf@X0N?8&r
zFUX-Im^fi04pAc1Kxb=w5g&Vac1+@pmw7Y`XaavQMf?hlHyrYH4N67H8E2}AtY&}E
z-GZFuz{dD@EHOwd6U6_-8v6>wlF#P}n~&D7wj*Vlj1zTEl6dLMlPu%*-5h`6E2O%o
z(;5j8_3FBYvGDfv{Zy5YUOa=382=5L3_adY@p3{zIaR_#0Y3T9BNqOECJjqx3kfqb
zQ)B19Y?EGczGThO?KNKgexG7i64dj-VV^N<=&$<2o2RLlS3-bo(o6dsw=c`kcx2!w
zlI@Q@5G_3rbmW^tFG3X4{MxA>J?!ei@4?-p<JPBnxq|E9_bTcm*VT?)v+umX=h^I4
zzw;A=O?%qar6a&LZEkn~w&`(aeET^4$u>P4xV7GAj}I^Fo!wp>w^mkSoSbA|-p-w@
zv@Z$@FdN{vcD9$3H>5A`Og-3Rq$j(jD`u->47(X{FZR2Q8S?Plb<Q2_7&R}_eBFrv
z?j&8lFKJFjGq7fj2t9vvfe(~9`)%c8xp^7IRXOYeKASSTt(m9wvlFK6ocHzcy63Vy
zcd0h;(G{$`^eeQzPB!!P^LuR2^K-M>Tpac(=)7iW4mk1k^AIv<D`~lO&o6r9eSA0U
z6yKj6lpflcyzS}N)b6&p?F8;kzc{wM@I2yPn2n29+?8aY;5n}{FbK{1o)fy*H@D^Y
z8SQN8Ve?dqb-bUy($0}*jWD+E!!WD6-E;eMZ(6ONK8XiuHoLy+2aBEd-1e1ov+7nA
z_e~FAOGYht@$Y<*%9j(aR@~?7mZxd*Imw|XzISaaHUt#e@%*x$cPtWH_kNFa%X&2e
zf_CIR+eLkg=f270yrhc{HG*XP<a`tYk1luoE9JjiTPs(YT`|gLDhKarDmu%t#e_#@
zTW5U0X3g_Q=B+bSUhI5ia^u3E2-y9us}{}C5z6{!?prf1mJJ5qcCu!zuJVtKmRx`S
zwRQgP{@NSd{BXHSQS&>M_t&de*AKqc_m{ng-+O+aurE8@P|qoU2+&YpZO6Z{``zNM
zNoHqqYS}42+hB5~S~gyW%P}@D{CHZ~=sbdNf2;7oqF?J4%biM2kGj9!{Ckk<a=nRw
zhJZ=<zRu&S#`~^H5!BWxtf`3paNBRtP&Ue?wY0jbSX2~9k;Ga?p&lJQd~tibe%*61
zweNWSn3Z(kcaju6xA{myvGZ8c7Yb2U-Z^pzf+ytp!sJPndwChUHTng;cTP8DyT52#
zKURy8*q0qJlVRY>Q=mUQ)-JC%=MTvXG8625_TetC=c1|GVIv{1@29cqr?xT|pN>+T
z9!n|CL{jEg?Q^|M52aSAwQW+(%3c<UIx*))+`L^t%enG(4W#JEUhWD8Uiz^HyhI4R
z^!oBb*h`c2q2qd88kMv2^X2&P_X}I;>Wr+*)K&xh#lGF6jf*{&Z8+}2{j}?!myY9Z
zQ)2JaAF5XER4#RlhaC}ZBv>mIBbKc+>?7at_$p|vEUz|}^=o_O$K6+a?O`2{2;H9A
zxpr)Bzje9p*DsCD=60iqA}#jqLh{@$n%OP7*Xs$T@L;;3f$28gDuNiR+^yUuCI__7
z2GGmID36*#pI7w91pB&Uy_0*QRPFm!tK-p;$9q2}L^=q3sC@T=%sY#gh>>L7J?=vd
zR^v+85(6GfgTd9#hNfM^IQMw^QBkA$@mo_S?p;>bD{@J@?*<<oDwvI%d9!tbPRuYc
zK8Ov$n9j^-b|viB0OrZe2cJ#4Rtbghg=RHe`5^Q1qxM6`_e`Y5tELn7w#G~R<v4V#
zckGY14GVMeCZTUyt{mG9KD!O`3&pd*d5s<wKnE&TeL~ixp4WjZ$Fiw`p2c<3@s$%_
z{Om9K{$8VtxLcCRFw#M4XU#{ApFNbmlq|Iu_b6(_D8^OF?rSJ^mE@W{k|y;MG*3B}
z-LugvE$G>>1_({kfeIDvVfODOUdQh;igZ9(`#Dt70EMoq2E0N49e9KC2zVm~c%w?P
z3C`i45Tvt+jZpV#B%L%Hkd^-aG-M_BQQK#vg~gC4b&&8+QU1NczoY!`SrBqI!a1bm
zeTU|epRjvI3UAp6g&r6L1mpa#T>nbxJM=y?mOZc<60n-}U#oT5+o7znNz_B)EJO34
zPD0}Rdxd}1TqRitH?2dp0<4A&tOh9!-5OjbbAx_)ein5by#0Jz=jC0cOne)ZulKYc
zvoLex@C8i&0W+@p_&9@M(gxZu!`f?b|8E(8o%f`#yvm}-%SP8f6${&=ezaaSeB8Y|
z4&C0)9P0Uv^N~bG*nQY{#g)hP=9sV9`*GKLa^L!rv!Z{K8>Pr?7=z&9%KaMg2<)|Y
zzm(a5Cy?2?a=XX!8KI%oBs}XgIqF8Uu*>EF8u`cR)rD<+kRY4M>gWYYL)m?Fgh}~B
zGfVsW#aXn^-r(-c&G7Zs!mm5a>QP-VS=f27YV$Eq#+Wx&>fMEDv-dr3bEjLdv2exg
zu-@g`MektruwuIHq|eHh|JamULNe#E!^Mtmwy*g0)X8`<fAi9tW9p%$xr)_fpT(9d
z#lFUhy}?O)9jDGV-^DcYF~7yMDC6U3kK<E{$@{fCrq9CRMF_AI-}w*mPEH6y6*fG1
zmI<eLiFQAl2xVvDf=q<6GEKY=rp1sAT}!(UEnsV@VR!Cs%%KJpvk{!$d(S_Q@j5jj
z3^Ju;4X86fx6H<$wBsz$i;Qu-g|#fQk0}f&(m+#Gq!ti-?yfImX-;|Y9c|(5F~;jP
zfzpt3Y3d9qpU_%!p$w-gX8~@Z@F~(mchV{7nM(N5N~~hv)c`(risB_}>oQ7mjX?Ku
ztS_4#f%7MrVeO(fm53WYlaU&Tk1ew2;&5LOv(%{F^RT+(JE+}lgx=2thls9=OIi?q
zd*h*vwp}7gr+ACL{oz_^wuR7I;$95;bDtPHI$l7kYE;Q^(Pb#A>d3WHTx2P7o0#KI
zb>Rsig>JP|j!;~Mi|WGGUYD73kn6^gu+VN!`rZ8|U#5qFVt2=8yud^C0GbPU!Tb8|
zE?Pn;ecSh3`+jP3sOGLtSf7hjzLe#zY2k#Mm6X{I!~SxbBQ@&nX@_FJ`&zTF*LBlU
z*1OnGj=f@bNpaNzFYR*4B~vT5c1L-4)fXzV#?QwH>f!EQqU;;hDe@|{4^uSqD!o3a
z>e@K_*&yfO5{5+}#YS*u;yQ-08+M>)#LaZrF!HGs>_rB)ui(tI9<wuXK~%+j4H7gX
z1&{CuewDw)5)}<<x<GUs#M*#<K7*+2JRDW2`U>H~T{ckI)dB*n%vR4;7jp~(`vs<2
zm1=uWrby3=+=d=x+Y4GZld?JzoCwE^JI}}F+&sLPeAm$3iF%N552mX<bOf^9BTwyg
z(ZBXO)(EaR>)wcimS^4fn%by*!Lf}5Oe=>O$=N)gP<93;8VvQH=?hi=P#@Y5s7RHa
zEsrOI!}22Q*orix+5xNgT6x>G`id5wr(oOHDapLM7;!&2m`_ZN7}YzqFnDeF%#DX3
zplCC(XX>=B!jbn0SbZ{<2Y{7!?K}inZ8OhAeSQK~CeODG_UxXod73cJ>{HSfrWxFv
z4(C*f0>CP@1DPw@j~sjQbt}D~*NDdWs@MXrvt7FoVbA$@(+*biS|c8$YnPhbUeD-E
zGoK+ra~H))W~JoZ&ExqqbhQA`Aj$q5Exw0T=7m4$NiH``b_9vbjc?xbT+UStmrMnW
zD&lo{;T~Ci!cL*O0mjX8+AVkHwhFj#QL@jidsVu5B>V9{&f3+vIexj9$L?MIoHy)D
zs!afc^TcI-bf=lVJU-oSDeAj%(jK_@=>{WDbCeiYv7;tlu+HK{CY*)d)M9g3H)~2`
zy_-8Mo-|t6YQvLKH*4O#cz#~<4!n}d!dCX%&LwJVAUb(98HH@r*?eY6P~T_?_w$}|
z(KdNS+V>)IPTP>VU&V{s(GTA4rl0b}6bUqEGV_yKYpsSTDlL46_*GXklW;QA$S-t`
zCrau4_9wm;wP{C3=^RXWO#ZUESI36qb>7>?u5GCsaxs~_2yvfkZY|xpzb4)^>rg7<
zDi|~4ueaJa;G3x%WSuTS7+Mvnd@w$(T26>qVcpxqM%p-2C3~-|U~o)8;nwWJ!Rzqg
z_&s3nb%&knV1w|OjcTF>dgy|K)5WJvn}L=ym3}h!wq#I^81S^@gGhIZVL5kIU!CU5
zOldXlQJTvJJu<jzvAQGA7nK-#y3jtA*BXdm4>fjCpC$;g%9M)pTtZt@AV<B_2A7}r
zAD(T}KU}2T(u9lk)}zGa$5}E6V=kR;bgv6vhO)PG`5i@`DFejHQOWwIoqsuFSgGf5
z@7$}I{MxHo{{lLmclZYLOWGW}(9Q!JRc#n0pX9|4!q|M{X$)tMv`rC*rTZJl--G?j
zC;d$%@xR|-;%s`#e;j=E3jSr99QAX=Fd0G0ms|cRzhE#!OieMxzt)ixse(=9Zv#-h
z;z_H>j;}XjuG1ouLZ@V?iqcPOPKx0PJZoHaP1UL~+KDvF!R!edu}0TYePVsl;gze<
zhmGkqm8XikCK^Z~ud^dnia*fNkX6o;Bm>0ip(%sr5G#?Drui3oAKZo-YtEY#ehu7j
zFTa`E=c*Su>D>I9p1Rtj=QoXcO&@(PzbqCUCFUBpX)silx*j)(CcR%R+aCaq4<gCL
zJ;;0|7Ju7x=%LjfgJ0J6t)i$G-{fY{5bW7n6SZG51S?Ue@%v0ci=@X^Zre+xEWoEC
zT{Zad;H|UI@#Mud%Yscd&c4A)?s>PxTB5VXL;QYYk1vE+t#mM(iO(;82Z)uDnlDSG
zdB)@uv0?{^mDE>Tdy}CSP0qw&;oV(N)e+wj`~rp}X-RfgWxuvernJUAmZAmUZBOpK
zxYM8Ci}qscEc9fO3yUx$j)uHA(qC4Wu1Z3STHV|^g@$ZR(Zi=7ZGv^&3HD<^)n7-6
zOqMddH`1v^g<k5YSqIH+ms;**6e?FF&hQa^-^LI>x+|O<qxUf}I_x+x^&MF(@hfih
zV(8bp%rY;WuDXF<L%DKE!}q`Y`t|<(@b#Jkbk<0edP5f}>8YP>2Rv}389HN-JVu6}
zoYEWoVc|Q93zJrS98%xucZ`0jf@uI7I-;X>+OSr5Yumcr!b<*5MIVrl>*3&yFuFcm
z@OCO>vkpHm6hX3=S#RCo;1|$A&%g-Yxy0Z$oI##TuW)Pk?BK0L`v%vRup(ka%iOuu
z7$=9`#o&5$y2k2pnE6c|u4@<WC&FEQXlE~UioiF)XG~v|R+}cGkzfcP8kUYvWR!Ff
z>XQ5&blJ05n0~H%G|%HVd!OwV&76y_$vo=CkWrxTENFQi(mii=H0n?6S~SA+ows@H
zq5MGsi?_PHxFFO0`M1$=RI+;F=5fet>eR~i^J7%=94*gBJVcY;PXTgb$Xd1qDu?Jy
z`H2qJ{@o3)5a$Z#%K4modBTy)TLxy<mNW%WVUHCoeQ`p(RAYAvNRCIRoqXmPy%zI3
zkI{B@*d|-qPIR~+NJvRcounSO6=wLq4bw)DmVuU5lE!XyPkXg9A>vZ{q<kRi??S3|
zL++*YYGIcpUN3G3ufrAjKuSV|;TwtN_H`Qyh}i-USmh_Zb2B8W5AuRRZHN?Y;=bRR
z@x=|Mep%`2B(=Vx$p_>XNxQaU@;cgevYn`J#aY1k1b!|D^thBh*!9~Cq}5s6%AIla
zm)NqMekwJ|!Tzb#--UB+d>?ydIE>D$Slw`sBR};5DC#5ZQo0S-6sU#!*kMBf=F-l=
zMd@~T#l71`==cABb|8+3^K7>zFlQ4tJ_Z25Hc^_m7m$?!07f;JjUk)IJ*SZ8cdQ_g
zb)!GXqQykTSc~G+fbknJYP=@(%5v5GRUfr`+MmHMex+PW*FWFq`Pf#KQdI`b#0oGI
zD#xRWWy>8yMZ6grzm01wXFtkZ*)=A2XGb>+)V6guXW18VV9WfT;cQ7H-{|%0Q+{Z2
zzdG}1^^j}G^x_I#TYBG=d=CA+#*!_uaXgD3Ejqn1dT#Hytb)dKPIQ?uceWnWF66nL
zq%r;103U^UT32@{L>;K-N1mr9<)F%Zc?~oJCNHhc!Gb>8tmh@ArnKbjM!mGwleCO$
z%-QWY`dT>psoqHzWV|^fW9$m;KYI9UC;59x*__eqjy^pjWQGx&(J7Pf$^;(#QDdL%
zWqoc49Pi>{{ha;bWE`O=EXHm>3=({C8PYgg(5T*}BSb{sR{ye%^SWS;Peq$MgCpH@
zBDm4)Q)39P;SW-aMI9J6ZTOJVM)g!hfrAR=7dWAfN$usQYO5Pl<1ykJHL4gMLr*RW
z?`P6@1@e=N5(;gMLS07Ng(}hqT$C2zqR<KX5dL;i`xS2srN%w2ahoUBD@<9f1)Q3%
ze!YId+HyE8_TA-)e!;bEtM)yysCY%0&(!Pgz4W6c1OWX~_q0xd2^j-4*%SRL1~l2i
zN-e;mO5NP87lw%yzp$KA)eu>(m==-O4D{+)|7xulSUF3z2U1+G7&O<MixqBPM?IR3
zU}@uIZ08(#CblcGxI*kd!Oo`EUO%*Tp=BRQ<s{fve`p%Hn@EuD8)8zCocWKj@^AG1
z%UGQuZMytrtnvUyCTox8)b)+`Z%0ONe{`}qV+<H8p3374Q=IrNUNOFhq^VO1Vpg@?
zZ&P>n#A%^&mRWMmk-%ejSZuw1S83m;p|9NDCinSqEmD{vVNQNcM$*eTQja(s{Nc<b
z_?VzSaJSuSm(5FBPOj1S+;YiiU&Z%F?gDV%as-|feePwvnocg~FWZg0A-J6i$;7^>
zJ@L}h`O|^<n<E|39~aMYqxZ-ukAr%o&qZ%e-qGubFnNv4=Vf&1wW<}0X1#k>MFvIE
z^>Vf6Q=)g)K4{M+VJ4IE$edNog;uPTzq-v{4<0rdeY$9f**oUi_V>jRJ(~){MY^hy
zc$v*S=ou;E12f17SE&~@<QK*sg>%=}dO)#2L5aO)`+__54Q-RIWqxR`VwC&{#0G^p
z{RE!W0r1oXC1NK$-~xarxo|T8Jkdx1;7LCuE-xej*YtX?1r?EnoGv^~=L(amN)M;1
zs8r7~tSh6&Rr?=fg$o#~k-v;pl_T?$vHFIJ`s#usT#Va<z<H43$yohoNWfVAHRQp(
z`QOG$KZNfxWV+h?uOTzwF{wnty3iH6vQ&mXJ%@I(qPNB)T%^B<#1xHCO<@%`9LN2N
zYG(vbEpB*99f&^Pn&iwN4rOQoAClv_FQv=_R9jkPcWm*5i0~nZs2Y09HUtq0d@K5y
zUwrK}1hM8u@D1$OAjGSP_TdqS*jdw^M(JDZTAc!q63l?6XWe~)Q&4YU5wYfTksQVe
zml@TM(%uqNVZP3FT9{;DJFB!s#Bw%4J`YAbOzlbOW`^{D$=BrDGp{*7w;@8Ij&@<H
zD)#bZh{s1%lzZ-PN4e69L%~|*@<xIQ8AVpi!k{P{DYja~V5wIyyAhv5<A}lPv!##A
zS*b@O`@R=vcoi`F3Ht+59c#R#e2z!6Hf#^Pcx}Qdkw_T8n)o@M9TVky^_A+?4q0O%
zrhaR-vBV?1p5qEa<YN!!wZ_tX9sDX#Cj~%gns);^FqfbIAhfiA=fzok6HH^YCY@<R
zz_$V5Z~siqj5aJ(^9AJ`8P!h@F<7BDurEUpH%_O2%YNG?xPv_<Vwr3ixx=?Kc;_0y
z!HP$P$xYeh?m+xM^N|&UefQFtMMoP>@}V9A(d3OfFarct312q_69EvdFB+B4@I?Cw
zqU911zT3AXmDJ~Hf=rn2|2|<LGODZoGsla|GvK^$%F-RMSHPq1<ks@zm@0q~7NI5)
z6_YgQ+Sf4VfpNpC^Nw28_r56!&avAlCJcUvBpw-UC_VlI&X7+0?WM>Nc@NZ1@G}O1
zliq+{|LkroiU&sY+y1`Z<nhH(ou1J1q(!e<MKB*nTOCJ76GwZS^iXK99AfeL+E0T3
zK8h2ARB94DY__)v{T~nSK2FmQG*W$-B1u$ZZcc8#ro8Xh-KpvSh}SJY&!D|0_9pUE
z=3vFnmu&sZP3N8Q%De6|?#VI=gxc=50`MpJPW{1*5%o$FrFUf-HMHBy!`eZ97>^xT
zkNUo{932C7RU;go-w4H4+T7VuKS#%)#dc5Gf1T=IIviaJ>R)Z?r)V)Em7qb<zohf_
zJ@>@Y_xs)(l`@xoFO8w!`AYv$fE-~n?wuNF8=j_qk1;iV;VcnV*5*p~vH*A*TEx$r
z^$YHei($nNUkOt2lTvpGh>d?N0ykl~+f=S9n_K<7;cfFB8C@AsaKEqcx>wF{F9!|2
zPZmV3Ty4`2n#;bdV%)hf7j$*M|LT4pz@M!syD!(2NRlvJSZM+>8`fZ_t6pbZh(EhA
z{To@a3eyl9m}qMP&l<7#2p}s;L`jWZI=NL{7XVph_a6Ky41%mqfd9b^T0d)~)-TfM
zfJ~>zFTb=sl*^%4t`b)I5i6RBeqcI!Yp0}=-Vw)}%4{&0^ChIxL~-aKxgN2SLf?;C
zzw<7^!aLT|DAm$8_f<#-9s}{NoF$;jdj1)uWsc(O`iry#CijK>pEsiifKlsbfAdEF
z@zXwLn{RyE!>Nf7qTnSwXX#Q-0hbSrlM2N}31Px@fns0QlG}aU-%2ex8#|Jfotf$N
zC@aU;Z;fwad%Rub-S2^}rKGo~0;+5A_f18mhiy-Tk)N_@MEgVBWV@-pu*5S10L2Yk
zAYXw3yPHe`&ltJsN)!wRGt_+0@dDYm`P2>v@t!5s{a@<YN8d)#@BZ(4?EQ%3s2k7@
z4qj;gxHvaG&6i$DzSvmbLgBsctwEz#)Ua|>8FT$hSv8+}i3w@R0m=#ms#NQbvf8Ee
zzTJc<tAxPTZH)|SX*q%n{3Sdb0-0IqXBv?#zGP5pWbZtM$KqD}if;Kc3LY6|4-QkO
zQFIGC0cFMZ&^$Xl{YP2p1IntNM?F!#&L;~Bmo7&{fefeAVNXfDDM&Y|{cmNZyWaPg
zva0=~tQMN@{wS+oQ2;7(`nR$oq)Bt^_)A$`vO_!+W!i;PFoChZVCfg6i4pyjHvl^_
z+dZ3mChhX3XM%qcb94kNnKEq#2GxW(k4VWd!Q!ii!9s3%CF%r|*FR3HCjxL<cs0Qm
zW~@(6tJdlIkJI`=1~{#qe>*KUS&mIc#bc!;+E5Fi2#BZ(GrRv&#J-3a2c!rftN(Wq
zkzd4X<=XZC6!0nsX#$n8jofT8pM4*5^f36zM!B;5Wuw}u0UJg7ZyP1~!K@?2!j;|)
zaAT11pO{wgT!G}rqK^Jcnmg!`=V>1{0PIEdrx@`6wHONxj$6z6GWyh1eNmN{uWz-r
z`S&%+Yj}SWlxk;pWiwi5!nBWS>kxhCz413@r>{rX`z)W#$g;fXUb}KK$y@EES>dbD
z`s@CFctbe-2&2}-QO4dfmF;oCu6`ivBdCA!TyZaW#6alqGPSpR-*F~9yBN*v3kkEB
zkqWpvq?(&7wA|c*cqI_eYoSzG4cFjoQB3TZS40FAT82WKvdrVAa;=e!g5K+JZpQQR
zVI^|ZO}t((20DA20nTr$KEY*8)B%McP0|6yg-6lHK{ZU(vwOpa;swDA2rk-TU?)BH
zZLoPE>hdf|@`v4z5J%isF!~MH`jOEEAdfPX<{f%g2|Nv@m7d^2<&`&h6-zZ6fN&bS
z{6{!ZO|2iB4@*7?r=T-Q#~#dug)e7PN4agp6f&7->d8jKs`}x?HaTs<C<^&)!Ni2k
zrhPOyZ5c;_XYbFrpgENEB?^0&$CDyo(6Rb|L*2f}rz3rJoomgwJ@Z?7KcTTDOg8IG
zMNR41HnXk;@iwzb)fh7)`Lpe9n}3KD13THDDj-Bk-zKbAM(yt5>`uv5<*zzab9R9`
z9-RKJ<6&^AhMnsFk%UX0R)$~S#f?&uioVZND{xXEt+-VAJH%x%&<dRYM=QP>Z3Xvj
z!S9CF#GhGtzwj6uK3yR0o3rXLLTwcEg>tQkxo1kZ`j$3g#Vh-<&epaWwzYF?`2^Qs
zWZ|B3wHm}Fz4JECf-j3$!2X$)70Bq`V~yyuY@m&@N!J%lV_V`qSCvN+_Hk>eNOJXi
zLZ=X^g@Kp@&`GGJKHt{Bgx}&p!<P69W$9OlpBDD$-=ZJkc+fiDZa~GU4C6WzK8&QI
zo9@UXzQ#0@u5k^oB^3j|ABwXoAPpAj{qRjCK$59B7cZga06TI%MzkP6Iv-B+p3tS%
zlsIv^E@l5yAcR@9lym;YtWYtnc_7TH_x$W%%qqf(Osqz0_z$y!M6H%&Vy?t{qDw$j
zfDHW=wU0QlVE-v<bx3UYWSYP)2wfrs=n^S}F0B`<uPLcB`ajVnmG?YzuL{runVKb2
z5yCh#5Sj6;zhDpPh%&aa%!Z*6eIX9x)b^i=R_4|zSEfgJU!u?V1Jjz2A%GK4t%Z4(
zL-?OumCgHe%WGi(l!PV|N#Xd}SQ_rR7B~`G0w@Mcn_)IA@lEx6byvM|EE0AI9IJyW
zqsX^w(9BmEKvr#c{`P#9t)sKL@KOU}!a|<CLqmX=Fdl|4ya{+4e@qyN_H?k3sQ$!c
zkW=<Rw0vFM!efj$mr7s#NkqL9dlFIjfQXtN#kW?IWqVhejQ-@T3>E%3D-6I{p+lUN
z!!(!6znoRZ0U_Y5lKwa=P*74h=eup%iYLAGCFDtOF#~$5IGuU67#HKK8Y`J|80Sa*
z#=;fwf08A}wSMT(6I9m-kgcSof8emwOW(`LTSuGpvw6Gg{gcNnkOzUS#4xJuRY|hy
z*683D{Ot-n^|O$}``Ms&p;AGN>v}0Cy}q7OmI^K(re90m{pyJc&PZDME#i^SuMguE
z+$Fs4%t9(0^W%ije{ZFsPWolUTQ6lbetUqSuM+v3mLtU_t%ZYI$L2+Z#7qj=*{f5-
z<$a~bPAi56?19CI(Riu+is{Ou6iui{3@`4?!jXOlFKqHc*(fUDC9w>S`6ea$HEjx-
zxbh}-iE7_|xQR!pv~nz}+AA+21+q$a(vNar3ci_$95p>uJSUaJ4mH%F1S{ogS_wQP
zCS(-}t%#iPn=%=H2D6`Hl6ZJKgvEKWYOg+;Z>Ek5cH88HL$+TG>T_a)suJOzbUEP*
z!vM5e8{3VK8<DfSprRAQOB@+glAsC1R#P6#!hQRqicT8Ol=(fw{<tYxX-YQ+(Ob0?
z04_<Y^m!15)bjp@tqouRwgfJvnwgP;ig@%j)qxCVtoigj1du(o&cnB??^WP*)kb6z
z3shgxsj5o%{dd#?r2mdei5@~jF<tdC1x@X*7U)(1Er><IhqPd{H9Y>B^4EOCTCpcq
zf~SUZU&eH6I0L-t%3HN++TWk^S|ldi@Mxa$-GqZgUTzIPa{>&PbSV!>aDLc*2!i$d
z1ra<>p*X&`<zwQ>Md7%qKSc0qlP9+9)8PXh2dRE&04W3Kf=6Ub-GP+j^Q8Vq%2d$*
zoib0#xS5T9Uz#D8l0;<m3q?F$A@kg;aMMY?*Wyv{jCon4C^FLUY3uH6hpRLmW@(BU
z{5DnE)apD$v4>^^2+a||N7Bqz;E&2%a1&b;=Jses`&*)sg52}L8wHEXIwE%Xb}y9G
zyHfKajPSn^OD`=M6#Q%oCcwny{%ZaCVT0bk$miz>#^WjYnFg8MfQvfXuq^a3&S7>U
zuI>cXGfEN)VL25B#vkl=se7bDBhHvsl+y{c(~-2jIUHUIrE1iZEoxxXfJ@UFdK3=U
zWFf72e~S(iAs9?szS#RQ>4ldcGgI!X;e$vJxo-p*5V_xo98{m6t;4UyR^pP0=f`o6
z*e2Q?K1nNwct?-xknEE(Kw2pS(yI47{BLPBbe@7P2~%mJ?1=nPlxn6z<Ul3W7Vdkp
zj0xknHr*9%BbYo(t7}vMQ;Dl<<IrTdV+Sh_EE~i)P_FBStT^<OVxz}EBNd&jIrdPZ
zUS0dcVMhsibj#3?+Oe~+uKzsufwrx_ei}1&a5;Bm3msrQAdkrb;6Q_h{?`(;am)ZC
z!?zYSVr59BA;>_bFVuiaK}teTyo-578p#}2QFcZ9-NlpdO3vl}$9M6%PclV6=NIqZ
zg29*Oxtu<rOmt`(Y-$VY9siBgabWF>3lJ{{HBCo4#&QvWc&YAhD#CXp%fKb-sI@^G
zV<tO@YbVD#h<{IxaS%^Sj&t~ehA7LE0Z+N^oEIJuiyej2_llqJ%RVcFOR<RAHyH!z
zO9uo^IsFvRXN#K8Vvonrq+Fj@m5Na7S%0~ChK(+~s)1mJk`EBC(EPJhF|BJ<2$woD
zp@*EvU5FSe?jn2vUPr8BNkoy#@k!O?fgT;+?!n@sOhXABe?m_hua$c~^vp*WE!{tv
zC(|Ejf14*y^ehK_;5Q`45tw2e4omE1(osT_KMu?B+<9kH5`fPC3`<oarWK3(G%P@^
zN=_1)7<>a>Nhhe_S?HC5OGR$kgH_<tlFK3(Y((l%8M2>%m#0-;5RO!}2KFbD|8Jl9
z-FqyEYs7Hng$x6Nj1`wHRggl{{~8x6Wi<NTE)8iEDGzRmePQa<5gpg^6z|y&-cf;<
z-X`_vq9`h!p*d(oqhjBJmQ)x`#ht6SxuNg#89AFYOm#i_Wb)yZ^Ov`2Q;QUsEbAlE
zHe*vK+CR&967Z>Ox=?94pw_;gg)OOYdYy#1YpbZm$Cy$bGNOq*F*!@W_{F&tif_Hg
z@cr2*FM~aLX*iR&wm<j7xXN&H<EU(+ul;rhVFmqZ1AkEz)!OEuW2litS+$!1F66se
z@*Ds4Ur|3|sJ}V*O8vU2q51=@{KLc=snBytzS5M;V>v<bi;Z-PSiLP?%*?J0<D=aF
zrk9NDgzp%N|5D9w1O4WAQdSRcEP@<c_&h**ToK2=ijtnSE{6#L+(sznRp<03MwH0i
zy2=+Kh)crs%i(x`75MBlln#A4=KeWZS+T$d#+rGUaGm_;oxq7M<J(nqVF(;zGY8;M
zM!osi6C6VO1Ba&mz@dkw`BNJK<Kz>Qzg^FtfdoDzjh!Nx=)M7vQ7Av4pa7zjPdB2W
z$HO{(J^36ELD|nA3}Kto;6>TqnFrHILp=$rlv>x(C(%{)m+0bq5?$XY-k|h4d}Y!7
z0&WEa)n_a}He=tCehPtrD={vfC!7RPO5Z+Ri4lgzTlDA_3x0hAcqxccVva8ZE`!L1
z`+3|6lmfqzl>xXXr`astr}4P{h%Wg*qU-x}(l6a?qz*vOo`}+)Qm6y2dJ+G0Oyn-N
z>=c1Et?xR)eK(lz@h$A1juDD}ZZqV{t`%k>JAHysP5^`&(em1Pf>85+AQaml2=$}#
zkquc2i$Cb=f7jw2a1{u!Du|o{Dw((v15SF$<nWCD{6ogN5y5!TkVCjmA7ApfpRkM|
zv%zaU4k_mpfy4n|TpJjL#sE-LLcYgD->HpLbpHpYnT@al0h{K1uPy5rYXi~u7Fv5P
zw|RQqV|bTA8P64ywk$NFoQd#T{oOOtO#^%Vg0&h99;(OD3e6ImXyV5B4C+%+Igefz
z#{KfNDQ=F1>$0F^52AhvPijq88~$pX{Pt&^yY3%q1!xp930sR=4CH73P%E}eurffc
zgaB&w_E~SSK~)!<6``b7=hZJ22(=RGjB#^$qE-!GlrJ|1*$n@oR!k1%%b{fBkv^AR
z5Nfpvp;i}Cr~iXm!2r}MD?rUTjSN(@5CEZ8Tu;<W0H9VTp?_1W`42w*r=*Q05`Z6K
zE%MlJ?l?FNd<JrI%iICPR#CGY3{ugbFnXY(Yn5R#2+`8X*s;Wf&8K%-X<k@|2qgeF
zQMkTiJqtx|?WrFA{$ZWNZQhdnR<%F#{C^K72rA+|n1CoPo8YMtRV9MI<k!N7<$1EG
z`4exC@=QXIQ)uRn@}WZiYhN~iHGQ61g2xBQl_ljm$KvalaFCNs?m0<OYR&*JghrwH
zO^qnSq5l&ov)f`LT2397XY?MNw!Ho&9scgWkd#P|WrH~-Ugl2Reg-$_wWuiw!mH9<
z(mZ67yZ-PoR{m4x!$<^EM(B(kU*6H!gK>mIO?aGti!EY6Y+a%j6i<0;A_%vW$<v_F
zFPaM(IJ<SoE*p;(u5yhTv;5qh(sxvi8BjAwg#(?&O$XO$6@losM&HRVd7qnBI61#^
znpADn??##-sVpy$Qi-~7ZKmP|Ya1iyyl3dup1=P^F?BLV&OeJx3VJ^MjaBlp%D)F!
z;Qc3Wc)(iay{*{}GO=|Z&hMku60QGZtxBUI)(XACNX#65RbzF19Dyi5^|ht^Kh|nG
zvM=q8<=ywobzzYH_N_R^3l=X#Z@RRHO>atwwUVc2{SAmH$1@hT#|m%TJ9S)%*!`h*
z5{^MNU4&|JJ;8#iGRPMl;0o0rFQ|^>=xC@$#TfTe)v>>VMnJUi^+ERPV$1>B@3OTw
zM%u4aGA9T;KUktOt)goYPWA}-2`%Nln}pxVNgWXVoT)gb4HafL^CD$r7i;|WLVo%P
zu#uKriiX|(g1TK$(59REm$h2&$)cyFsu-rDg$zjx3<)7L*ot{<3}xo-tw?Wp1HjPR
z;;8m!478iouifTP&|X_V7v*iv-~#*%s-;moFU8+}W()8$mw=yfW~7~<OMyLv6=w=D
z4FqF<g<t{?x`Wu9j1)i<O%pPyg6L$?-tf}vT4aD#=w8QAqv_juBrAiE6Cc49t--UV
z2{^HrG{9m9pkMO5M1ApLWI_XTeF0#q@(c%7*-IrII$AwtkmQ8>7XE7EXSy)B?Je+k
zwe147f?%Hq?<R@u0<;kTYX$1^!y!OgvHju~HTPPHfJHQz9Rt|LKT1;#Aw^0msi;)T
zQ|A<yBSz*p<T?@ugpn|P#tNguWG4;)F2Vqd^KXcrg;+ewq_x3kcdZHE5Q8|Ok0l1l
zu@NG37>NV8-C#P)-78=6p+~OWebeT6-xGs>d40Z)&-tE<4Ixql9b93<Y6~UaD9HvO
z2cuW%QoOx2qSS~RhJ-Z$wxV7?LVmsSnXaTvt1v?;VJ--)()5jIyFf{sT8j8?>5L_D
zg4*DSeeR|h*j<#w0CpGIJrOxDwhIh~WN^Rwj;zd`*XQJ9ATrV}MZ^hC;}6MbB;c4I
zj(<HwB&tOuO^6@1R85TkD<`hko^}3!i37)2)8<Q|Kuu&#^kVdeWxkH=tFlo7ndLj+
zR>QH(Qj7Aw662+(|Evw9G_4u@Cna%lQcMkyxHA#aws?UL60q=~qrF!FZO~m(acK;8
zegM8Dn!M}!35U52N}!g!4A_SOiYg?*T5QVy&H_I%9_Y-r_&=QiV<Y4eR5|6=5GJ7w
z$&ikizit5cc)p;cwWX&Ou5i62Zr*bE&>|kEkb(RmNS!KR*h;2E)p%Y!v6asm^;D!V
zmfvY1UGTNfoVQ(;o0fYB>2`-qo`yHnQHR-{()ny`gDBgYBZG&;OO?j=E5$F~29GOW
zgRX!}B+Z#kYBY>4zMQ^S(Z2(99}rZGax;Qar{w6%2;V2+v;4QV(gU;=Cnn?)W?VvS
zgUS?JnB-~9V{95tkxPAE%~nF567GQI`kR<3A^hWKyl_u{Gp2x6g5iza2+FE4cxGrz
z#}zX*j}*wZ=2u`gXsO2=#l-umxbGQQy9uJS>aj#X5|Zp%1bH7s#^`VcE!T;_Tfbg9
zkw8dN9Dt<Awx*-=9KN*Y&WnKZwFFQXpwZ8t67X27-AbTB68I~Dm)r2XctnGa9GPCw
z5{mLKih|7tVyDt4#VCs?i)1B5K`ucTn+_^*GNJXknxY^nBi%T0|7&Ro98+u60^F84
z!B(Ba^8rhW^Q`w7;mt(GZfwR;FV2U}pOPv)$MDa1pTPi7vKdiOrkcgpijoaw(K=K3
zyW~F&SwMy4lL$n3YDi%c43Lk^Tzb%JSAodXZ}Z|{ZD5{w+hrKh!N}lJ6QD~{XM=2K
zva*@gT(~3ymS@saaqpc+q^$fi9(-Co%b$M=m78uZMqx?ojERY;d6{;+G)9X`1^jqK
zTk^=n1k~%KT>d)>Rx)5)YZERXHqE3WkeYp=XQ4f*f1Jhe@vW9(CY_&17e4ARr?rFP
z9;k(nsNj*u97)1gWm#N#5vJsu_*emG?^A+IW)}$x!F%q@U~XC3Z&jJR@bT9I@60FQ
z-8h<XDompxcM1ytk3OzW?3f&-d^$r?%ev6@oKpybq=q{ZOk;5ulDnvY7!sGk60+tk
zRhbf!`G(jZn<)TA6a%VDk^l+Lxh;H5Ppv3}h$J8mRj)f&R&^)2=_nqFX2Dk}D#KV8
z%eWe*I4T8fO_TLERRbMW(t8QG4YdQ`qL=*d-!UF^cT=J5iCb%J&1dtmC>jJvG)!u=
zXl)6g_7XknRtHD`r$M0cwUWo_hN<Y!hyo;lZ*#;UT13JqnGt_P#`tbvoJOY>2H>rv
zX|(}w1)K)|kGGltBAH+!^u~>wYdZD8<CmPqLhRN?E>lE-v;bhYn*LZazQMpFCib7b
zRWH&>|4FETKf_)1vXy#77Yd@uekET1rjlBxdzb8P_^;}S-b1Pr!~9QmHmE>#Jc#Z7
z_xpJN1T)#Xaf)>=`V+_wp9tZ6;iE$H-$}7Eot^o`XWl(R{WrKu5T$DR3jCgJD+3f1
z-rwNL*}~M;l=W%(3i5k$N7@SZi(G^qzcnyhwx(|uUBX)=4(E?%3(>F}#iHxPb!_OA
zDfeD<pdC4O`5P@)^&%fO^j1}fpd3!#r`eG;p#Lx+q+bZ9QwHz!DSW3v=%>0C@a{BF
z`8jhCO8)FN%u)XSQhQs)1C4UE5dE_MsNO5^p>LLW4f+QC#kAB>J^hCDT%}$UawQ^x
z2cmS-cx6|^HZqnjePR=H=<`l-n62SvEK_pav)D*E^gx8TS?W(#%}Y!kn78;pb3?z+
zE>9pXBBJ7cayf#Aa(W<-rRZ3*Vj`_aTCDHQjF)Ci!_eUIO1xIR8Yya%Bb*N{upPW7
z^JEhV?SX~`Kd1e!&U;rY`$|fNIu=))DNp{}MXzusizue7=FHx_JK_1;n~RI#bW6+9
zG!D3*`jvA>Zzo%6*S|G<l3={Xz3?rYl#z*n?&E-qa~_TaFH6TK7A7gyuIxDzAG}P{
z4k^r1oMPZUAbE?UASgCPSEXQ{zi69gK}?ipCZzCq=2>f3VENKQ_x*jlH#T1Vp2!p>
zHe247*(*7@nmUz<%KT~R3|B|0sA5)plRN|pmD%Kjx@9EXd4zYwIaqZxpHYy=*}Y$g
zHX(O^iJQ(CJ>N~x^j}0p$g}k!714SZHQV8Hy}6h?-d!fesxNr6J+s+gNq(;j+lh4V
zi2bm0%lhDZLw|K}?Pj0lT@N)7-?i#@bJ%Fmsq2p^^W~s2`~Gxe;lN(#@jR4Pq6rN?
zRAvdvD=d)z2h^dGB7;F44RH-kE)2oO3+G-6rypW)EblLZ%DRu`p9e_zqfe4KWDma6
z32S=gQA}TdQ1d~$KPjYX+mrZRgvw-Y`8-r(0-?;J!rdu!^ZW~>`2dGbrE)ulAkTP_
z9b%THf&(grL|dwS<fzzaSS2TCj9jWan2(%~Hb&{nASq~pt{fQ0>gNdVbR$2~=i{TY
z@P}B$WNUxS`h3eRaOhR2s}wV7d85*VM3qKh*Y&|)zgqnpwakDm-O?Kg*P@YG(*9u7
z!dFzdzevA$JilT|w_;e1t9KMNv5hS$5=-gw3XTDO$N7ax{IQGP54b*0qg93XLK|M}
zs+9AEd746{yH%b^QNa%zVJ*?Inl*2hdyVHvKU$gfAUokHw};3NBIbQ@Eq!k0nZEBf
zFRb2qZqh2ZXp?vkYKWa%6}s=@TMnr+GO8)MU3??bQszSM^fPo~nrr>bsw8{BxYu_N
zMg9{@^Wq}ra@n#I6VJKuW54s(<q4N@9p^<7qc^U72|0_p_WrtQU-yO=@+T|=wjx;b
z0vJ23z9)Rt{6PAe5FJ{wk5;p(l?Amx9*?oUH^sW<OFm_e?n*YZ4}(GRua+P8xJgOq
z1f0KqOYu?Q>P&x_of+B*&dodbQQb&NXlrJeo}Q)sBzbgZS)%-bP*FNsb~D9u>*~m0
z4=b{uM?UjrD^)Q`nqHxn*pjvu8+)smO#$v&AY&Z-Q3ISoj@9x_v|lT^%J-9NLw+$^
zN%FVfb$JzSbl-d4+ZQi~&vN5CZv+N5)UOnCF&Xye*hX%VN%>wtH&bX-V8vChHrRAe
zPFNkn_5Y5wyLEBOD}t%8(N40y%=nBm3I8!dVPH9oM>ny7<rJ;3lxu&8rmX(0<&5^U
zcH-~15kCeo*DW~SG_Xl}ykn?$;V@=sb*92xbjgHadx6sc^T}mjnU61J7)HzGq01zo
zWSspi>(3qNB;OPJVyE>t($EBB$RNhf6>;Z<k73)2Ufnro6AnX?Wi@(7WZzkeYBCm&
zf7x=Ekqt<3(i$V`=z|DhOL^*;hl1oxTTygvey6rgrKlySL)E0v!$7^c|0yhXTk@4R
znRa8`MsDk^{NdUwLrpHDb@rf!zLAwjyE)kz_Z&o&d7F6o;F0fdwCLDU%)>6Rh>G8>
zsM*!{^V@?KTFTa)pt(59=VsTN9y{ByXIHmNlvHzl<3iUwC*CqRV(JJp+baH_JvuW#
zU`dtF_E2e7*LVBno-u30EU<f0$z?oSL3{B&tM&XZ`p#Gj#D_MlQ4^2ed`XU<Z)tB-
z<k~Cuvbw*&SIP=F_F~cIpVO2Cvn{{h&sj6KMM=A3Yn$Q~o}aaQJc5&#)d|M=?LBhZ
z!*s&W)EQQcyz*Y0<`+5qJRUtyvYFuAIqyhwZkU%1|4QSl?i~G9kwrb}e3?h?J1RHK
zb#_)-vMBM}<&|%qrabr9bmM|ycCO_$$@Yg1lE&fFllvk|W<Fi1mBx2pML$8EZKiTx
ziiQf0++5cr{kCoKJN>6`xyUqsTKKces>vT(YP9&Kf5?1u^uwR|C*zhrUYM}K`v1e3
zI-EuQ7Jt{r{$NL~_+CUk4Q60uVAux4BCv|DJT)m8=^oYI3kS0f8}Kk(sNQ$z$)w=N
zDLsZxlZ+%}cTaKL#$O<#YPc1+FYxTI@5Yg461%^sDZW%(d9PmTtlk69g}IxI^o`iU
z9xZrtB}M*y``zSY8XVRfy<)T8a7}r8dr90X)?a*19lb}Cl2#gR@_a53bJX&rWX}Q_
z*&7iu7o`Q0Ua9A`*w4M|x2RBQMO>!nx<BhQ<SzAo+^%8K=XJ>V)MiHMYnAUD-34{e
zp1Rn-?am_I7wpdinF9A5f02KlBej0!r+@M(Q@(guwAsjQ&fOAJxJT#Oi5F8OBlr4=
z?R{ZtlG$>}EK#Q}Afxy6?T@YbKO5Y6=I%HkTw2J>%f3`mEc@T{+qs`u1H2iTM3_OL
z!@-bWDCDcWK-zOYFucA28w|ogQ5a|diUBW_b_U*So|;z@A5vM6S{w^%IG`KA_ilCR
zU!c-Az$?+YVY-2I1LFmt5%EQ-ImP;VAQD~U%SXqH4*(VF0F}w1X#55=D!H_{BtJJI
zH%A|0L}p29F1X=>)vS39R@avU&0qtXh3bn>z)N)zX2DHCcg)t^KE4lu1|$IukU(+F
zDHe1C0*dkriotF{H|5Li+v2Z*CgcG12%wnqkd=WUB|jOgRX?$y09#0IzrWeM5UBej
z(EEZYx__}F=}yis0^c%^Zuz1U*V6X_t!YtUU=T;qK8q7cdr1cHUhurc%pAR}g4A>j
zLn@6e&4F%s3iN>tiXlC~%Sg-fi&CKR0rX61E-+<)Jc2b!-re;(!vge)6)<6;`sOb%
zXuu{Rn}P0--<AuClY!cQ1204tLUD)zFoMC_(|~C+Brz!mYiOWfi4HTOf$=b~O$^qL
zazQ$}{pc4mBlNdQLiHnG&y21e{T5e*_I_EIcKDsH=$g?_Oh9N(2tv_}c76i7Ip`e$
tggF=6q2{1>3($=~FH#Xkoa%!bfmXl<c(Vdy92Dn*42i&0^rs)h0|54mgB1V(


From e29662a853990dfe3cbf39e266520e8e146d9ab3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 6 Jan 2019 17:02:11 -0800
Subject: [PATCH 233/367] release: prepare v0.8.8 release

---
 HISTORY.rst      | 6 ++++++
 docx/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 1f6514d7e..fb61ed8e9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+0.8.8 (2019-01-07)
+++++++++++++++++++
+
+- Add support for headers and footers
+
+
 0.8.7 (2018-08-18)
 ++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index 153856fef..e9d34e1a1 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.7'
+__version__ = '0.8.8'
 
 
 # register custom Part classes with opc package reader

From 6756f6cd145511d3eb6d1d188beea391b1ddfd53 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 8 Jan 2019 15:49:53 -0800
Subject: [PATCH 234/367] release: prepare v0.8.9 release

---
 HISTORY.rst      | 6 ++++++
 MANIFEST.in      | 2 +-
 docx/__init__.py | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index fb61ed8e9..b00569153 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+0.8.9 (2019-01-08)
+++++++++++++++++++
+
+- Fix gap in MANIFEST.in that excluded default document template directory
+
+
 0.8.8 (2019-01-07)
 ++++++++++++++++++
 
diff --git a/MANIFEST.in b/MANIFEST.in
index e8803804e..90c2f9fdc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include HISTORY.rst LICENSE README.rst tox.ini
-graft docx/templates *
+graft docx/templates
 graft features
 graft tests
 graft docs
diff --git a/docx/__init__.py b/docx/__init__.py
index e9d34e1a1..33e15e31a 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.8'
+__version__ = '0.8.9'
 
 
 # register custom Part classes with opc package reader

From 90fc91c7570c24fd983e63daef1036ac01d03193 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 8 Jan 2019 23:12:12 -0800
Subject: [PATCH 235/367] release: prepare v0.8.10 release

---
 HISTORY.rst                 |   7 +++++++
 docx/__init__.py            |   2 +-
 docx/api.py                 |   2 +-
 docx/templates/default.docx | Bin 0 -> 38116 bytes
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 docx/templates/default.docx

diff --git a/HISTORY.rst b/HISTORY.rst
index b00569153..5612cbf05 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ---------------
 
+0.8.10 (2019-01-08)
++++++++++++++++++++
+
+- Revert use of expanded package directory for default.docx to work around setup.py
+  problem with filenames containing square brackets.
+
+
 0.8.9 (2019-01-08)
 ++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index 33e15e31a..4dae2946b 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.9'
+__version__ = '0.8.10'
 
 
 # register custom Part classes with opc package reader
diff --git a/docx/api.py b/docx/api.py
index 9a2215d7a..63e18c406 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -34,4 +34,4 @@ def _default_docx_path():
     Return the path to the built-in default .docx package.
     """
     _thisdir = os.path.split(__file__)[0]
-    return os.path.join(_thisdir, 'templates', 'default-docx-template')
+    return os.path.join(_thisdir, 'templates', 'default.docx')
diff --git a/docx/templates/default.docx b/docx/templates/default.docx
new file mode 100644
index 0000000000000000000000000000000000000000..c22ff36205f90636c3057b94f99157be64203896
GIT binary patch
literal 38116
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

literal 0
HcmV?d00001


From da75fcf01f7f322e846e2ac3e1936aedd766acc8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 10 Jun 2019 15:16:10 -0700
Subject: [PATCH 236/367] fix: tweak setup.py handling of template directory

Also some pending documentation updates and some Black changes.
---
 docs/user/hdrftr.rst | 25 +++++++++----------------
 docx/compat.py       | 14 +++++---------
 docx/oxml/ns.py      | 31 ++++++++++++++++---------------
 docx/section.py      | 11 ++++++-----
 setup.py             |  2 +-
 5 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/docs/user/hdrftr.rst b/docs/user/hdrftr.rst
index b80420b8a..040da7ad3 100644
--- a/docs/user/hdrftr.rst
+++ b/docs/user/hdrftr.rst
@@ -77,24 +77,13 @@ Adding "zoned" header content
 -----------------------------
 
 A header with multiple "zones" is often accomplished using carefully placed tab stops.
-The required tab-stops for a center and right-aligned "zone" are part of the latent
-``Header`` style in Word, but that style is not present in the default ``python-docx``
-template and will need to be added::
 
-    >>> from docx.enum.style import WD_STYLE_TYPE
-    >>> from docx.enum.text import WD_TAB_ALIGNMENT
-    >>> styles = document.styles
-    >>> style = styles.add_style("Header", WD_STYLE_TYPE.PARAGRAPH)
-    >>> style.base_style = styles["Normal"]
-    >>> tab_stops = style.paragraph_format.tab_stops
-    >>> tab_stops.add_tab_stop(Inches(3.25), WD_TAB_ALIGNMENT.CENTER)
-    >>> tab_stops.add_tab_stop(Inches(6.5), WD_TAB_ALIGNMENT.RIGHT)
+The required tab-stops for a center and right-aligned "zone" are part of the ``Header``
+and ``Footer`` styles in Word. If you're using a custom template rather than the
+`python-docx` default, it probably makes sense to define that style in your template.
 
-If you're using a custom template rather than the `python-docx` default, it probably
-makes sense to define that style in your template.
-
-Once the ``Header`` style is present, tabs are used to separate left, center, and
-right-aligned header content::
+Inserted tab characters (``"\t"``) are used to separate left, center, and right-aligned
+header content::
 
     >>> paragraph = header.paragraphs[0]
     >>> paragraph.text = "Left Text\tCenter Text\tRight Text"
@@ -103,6 +92,10 @@ right-aligned header content::
 .. image:: /_static/img/hdrftr-02.png
    :scale: 75%
 
+The ``Header`` style is automatically applied to a new header, so the third line just
+above (applying the ``Header`` style) is unnecessary in this case, but included here to
+illustrate the general case.
+
 
 Removing a header
 -----------------
diff --git a/docx/compat.py b/docx/compat.py
index dc9e20e39..98ab9051c 100644
--- a/docx/compat.py
+++ b/docx/compat.py
@@ -4,9 +4,7 @@
 Provides Python 2/3 compatibility objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import sys
 
@@ -16,12 +14,11 @@
 
 if sys.version_info >= (3, 0):
 
+    from collections.abc import Sequence
     from io import BytesIO
 
     def is_string(obj):
-        """
-        Return True if *obj* is a string, False otherwise.
-        """
+        """Return True if *obj* is a string, False otherwise."""
         return isinstance(obj, str)
 
     Unicode = str
@@ -32,12 +29,11 @@ def is_string(obj):
 
 else:
 
+    from collections import Sequence  # noqa
     from StringIO import StringIO as BytesIO  # noqa
 
     def is_string(obj):
-        """
-        Return True if *obj* is a string, False otherwise.
-        """
+        """Return True if *obj* is a string, False otherwise."""
         return isinstance(obj, basestring)
 
     Unicode = unicode
diff --git a/docx/oxml/ns.py b/docx/oxml/ns.py
index c240366da..6b0861284 100644
--- a/docx/oxml/ns.py
+++ b/docx/oxml/ns.py
@@ -8,21 +8,22 @@
 
 
 nsmap = {
-    "a": ("http://schemas.openxmlformats.org/drawingml/2006/main"),
-    "c": ("http://schemas.openxmlformats.org/drawingml/2006/chart"),
-    "cp": ("http://schemas.openxmlformats.org/package/2006/metadata/core-properties"),
-    "dc": ("http://purl.org/dc/elements/1.1/"),
-    "dcmitype": ("http://purl.org/dc/dcmitype/"),
-    "dcterms": ("http://purl.org/dc/terms/"),
-    "dgm": ("http://schemas.openxmlformats.org/drawingml/2006/diagram"),
-    "m": ("http://schemas.openxmlformats.org/officeDocument/2006/math"),
-    "pic": ("http://schemas.openxmlformats.org/drawingml/2006/picture"),
-    "r": ("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
-    "sl": ("http://schemas.openxmlformats.org/schemaLibrary/2006/main"),
-    "w": ("http://schemas.openxmlformats.org/wordprocessingml/2006/main"),
-    "wp": ("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"),
-    "xml": ("http://www.w3.org/XML/1998/namespace"),
-    "xsi": ("http://www.w3.org/2001/XMLSchema-instance"),
+    "a": "http://schemas.openxmlformats.org/drawingml/2006/main",
+    "c": "http://schemas.openxmlformats.org/drawingml/2006/chart",
+    "cp": "http://schemas.openxmlformats.org/package/2006/metadata/core-properties",
+    "dc": "http://purl.org/dc/elements/1.1/",
+    "dcmitype": "http://purl.org/dc/dcmitype/",
+    "dcterms": "http://purl.org/dc/terms/",
+    "dgm": "http://schemas.openxmlformats.org/drawingml/2006/diagram",
+    "m": "http://schemas.openxmlformats.org/officeDocument/2006/math",
+    "pic": "http://schemas.openxmlformats.org/drawingml/2006/picture",
+    "r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+    "sl": "http://schemas.openxmlformats.org/schemaLibrary/2006/main",
+    "w": "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
+    'w14': "http://schemas.microsoft.com/office/word/2010/wordml",
+    "wp": "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
+    "xml": "http://www.w3.org/XML/1998/namespace",
+    "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 
 pfxmap = dict((value, key) for key, value in nsmap.items())
diff --git a/docx/section.py b/docx/section.py
index 77798ca5d..32ceec7da 100644
--- a/docx/section.py
+++ b/docx/section.py
@@ -4,9 +4,8 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from collections import Sequence
-
 from docx.blkcntnr import BlockItemContainer
+from docx.compat import Sequence
 from docx.enum.section import WD_HEADER_FOOTER
 from docx.shared import lazyproperty
 
@@ -81,7 +80,7 @@ def even_page_footer(self):
         The content of this footer definition is ignored unless the document setting
         :attr:`~.Settings.odd_and_even_pages_header_footer` is set True.
         """
-        return _Footer(self._sectPr, self._document_part,  WD_HEADER_FOOTER.EVEN_PAGE)
+        return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.EVEN_PAGE)
 
     @property
     def even_page_header(self):
@@ -394,7 +393,8 @@ def _prior_headerfooter(self):
         """|_Footer| proxy on prior sectPr element or None if this is first section."""
         preceding_sectPr = self._sectPr.preceding_sectPr
         return (
-            None if preceding_sectPr is None
+            None
+            if preceding_sectPr is None
             else _Footer(preceding_sectPr, self._document_part, self._hdrftr_index)
         )
 
@@ -437,6 +437,7 @@ def _prior_headerfooter(self):
         """|_Header| proxy on prior sectPr element or None if this is first section."""
         preceding_sectPr = self._sectPr.preceding_sectPr
         return (
-            None if preceding_sectPr is None
+            None
+            if preceding_sectPr is None
             else _Header(preceding_sectPr, self._document_part, self._hdrftr_index)
         )
diff --git a/setup.py b/setup.py
index 098d28e69..f0b3ef54d 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ def text_of(relpath):
 URL = 'https://github.com/python-openxml/python-docx'
 LICENSE = text_of('LICENSE')
 PACKAGES = find_packages(exclude=['tests', 'tests.*'])
-PACKAGE_DATA = {'docx': ['templates/*']}
+PACKAGE_DATA = {'docx': ['templates/*.xml', 'templates/*.docx']}
 
 INSTALL_REQUIRES = ['lxml>=2.3.2']
 TEST_SUITE = 'tests'

From e1beb7306cd01c8355f80c671e76a7922f1bdf6c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 26 Dec 2020 12:56:59 -0800
Subject: [PATCH 237/367] fix: miscellaneous small Python 3 build-time fixes

---
 .travis.yml        | 2 +-
 docs/api/style.rst | 2 +-
 docx/compat.py     | 4 ++--
 docx/opc/compat.py | 7 +++----
 tox.ini            | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 105c42594..6ce09e8e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
+  - "3.8"
   - "3.6"
-  - "3.5"
   - "2.7"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
diff --git a/docs/api/style.rst b/docs/api/style.rst
index e1647caac..9e05ab351 100644
--- a/docs/api/style.rst
+++ b/docs/api/style.rst
@@ -6,7 +6,7 @@ Style-related objects
 
 A style is used to collect a set of formatting properties under a single name
 and apply those properties to a content object all at once. This promotes
-formatting consistency thoroughout a document and across related documents
+formatting consistency throughout a document and across related documents
 and allows formatting changes to be made globally by changing the definition
 in the appropriate style.
 
diff --git a/docx/compat.py b/docx/compat.py
index 98ab9051c..1e3012d95 100644
--- a/docx/compat.py
+++ b/docx/compat.py
@@ -34,6 +34,6 @@ def is_string(obj):
 
     def is_string(obj):
         """Return True if *obj* is a string, False otherwise."""
-        return isinstance(obj, basestring)
+        return isinstance(obj, basestring)  # noqa
 
-    Unicode = unicode
+    Unicode = unicode  # noqa
diff --git a/docx/opc/compat.py b/docx/opc/compat.py
index d944fe43b..d5f63ac19 100644
--- a/docx/opc/compat.py
+++ b/docx/opc/compat.py
@@ -4,9 +4,7 @@
 Provides Python 2/3 compatibility objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import sys
 
@@ -29,6 +27,7 @@ def is_string(obj):
         """
         return isinstance(obj, str)
 
+
 # ===========================================================================
 # Python 2 versions
 # ===========================================================================
@@ -47,4 +46,4 @@ def is_string(obj):
         """
         Return True if *obj* is a string, False otherwise.
         """
-        return isinstance(obj, basestring)
+        return isinstance(obj, basestring)  # noqa
diff --git a/tox.ini b/tox.ini
index 4f75c628e..6ced79b71 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ python_classes = Test Describe
 python_functions = it_ they_ and_it_ but_it_
 
 [tox]
-envlist = py26, py27, py34, py35, py36
+envlist = py26, py27, py34, py35, py36, py38
 
 [testenv]
 deps =

From e1ffdcc4ba1ed348aac51e54a260f015ff9a38f7 Mon Sep 17 00:00:00 2001
From: Brian Seitz <brnstz@gmail.com>
Date: Thu, 24 Oct 2019 18:57:31 -0400
Subject: [PATCH 238/367] Add 'zip_safe' == False to setup.py

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

diff --git a/setup.py b/setup.py
index f0b3ef54d..0eaeb50c8 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ def text_of(relpath):
 
 LONG_DESCRIPTION = text_of('README.rst') + '\n\n' + text_of('HISTORY.rst')
 
+ZIP_SAFE = False
 
 params = {
     'name':             NAME,
@@ -77,6 +78,7 @@ def text_of(relpath):
     'tests_require':    TESTS_REQUIRE,
     'test_suite':       TEST_SUITE,
     'classifiers':      CLASSIFIERS,
+    'zip_safe':         ZIP_SAFE,
 }
 
 setup(**params)

From 24b9af76be07e633ca648250ff0c26bfcd1bad0e Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 15 May 2021 13:54:30 -0700
Subject: [PATCH 239/367] fix: documentation fixes

---
 docs/api/enum/WdLineSpacing.rst               | 2 +-
 docs/dev/analysis/features/shapes/picture.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/enum/WdLineSpacing.rst b/docs/api/enum/WdLineSpacing.rst
index b03e7dd17..f28142e2d 100644
--- a/docs/api/enum/WdLineSpacing.rst
+++ b/docs/api/enum/WdLineSpacing.rst
@@ -10,7 +10,7 @@ Example::
     from docx.enum.text import WD_LINE_SPACING
 
     paragraph = document.add_paragraph()
-    paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
+    paragraph.paragraph_format.line_spacing_rule = WD_LINE_SPACING.EXACTLY
 
 ----
 
diff --git a/docs/dev/analysis/features/shapes/picture.rst b/docs/dev/analysis/features/shapes/picture.rst
index a98c6e906..ca327512a 100644
--- a/docs/dev/analysis/features/shapes/picture.rst
+++ b/docs/dev/analysis/features/shapes/picture.rst
@@ -12,7 +12,7 @@ Candidate protocol
 ::
 
     >>> run = paragraph.add_run()
-    >>> inline_shape = run.add_inline_picture(file_like_image, MIME_type=None)
+    >>> inline_shape = run.add_picture(file_like_image, MIME_type=None)
     >>> inline_shape.width = width
     >>> inline_shape.height = height
 

From eafffeac96acd5e880440a90fc5006d87bd023cb Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 15 May 2021 14:37:48 -0700
Subject: [PATCH 240/367] black: blacken setup.py

This produces a lot of line changes for single to double quotes, but no
logic changes were made.
---
 setup.py | 90 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/setup.py b/setup.py
index 0eaeb50c8..5958749f6 100644
--- a/setup.py
+++ b/setup.py
@@ -21,64 +21,62 @@ def text_of(relpath):
 # Read the version from docx.__version__ without importing the package
 # (and thus attempting to import packages it depends on that may not be
 # installed yet)
-version = re.search(
-    "__version__ = '([^']+)'", text_of('docx/__init__.py')
-).group(1)
+version = re.search("__version__ = '([^']+)'", text_of("docx/__init__.py")).group(1)
 
 
-NAME = 'python-docx'
+NAME = "python-docx"
 VERSION = version
-DESCRIPTION = 'Create and update Microsoft Word .docx files.'
-KEYWORDS = 'docx office openxml word'
-AUTHOR = 'Steve Canny'
-AUTHOR_EMAIL = 'python-docx@googlegroups.com'
-URL = 'https://github.com/python-openxml/python-docx'
-LICENSE = text_of('LICENSE')
-PACKAGES = find_packages(exclude=['tests', 'tests.*'])
-PACKAGE_DATA = {'docx': ['templates/*.xml', 'templates/*.docx']}
+DESCRIPTION = "Create and update Microsoft Word .docx files."
+KEYWORDS = "docx office openxml word"
+AUTHOR = "Steve Canny"
+AUTHOR_EMAIL = "python-docx@googlegroups.com"
+URL = "https://github.com/python-openxml/python-docx"
+LICENSE = text_of("LICENSE")
+PACKAGES = find_packages(exclude=["tests", "tests.*"])
+PACKAGE_DATA = {"docx": ["templates/*.xml", "templates/*.docx"]}
 
-INSTALL_REQUIRES = ['lxml>=2.3.2']
-TEST_SUITE = 'tests'
-TESTS_REQUIRE = ['behave', 'mock', 'pyparsing', 'pytest']
+INSTALL_REQUIRES = ["lxml>=2.3.2"]
+TEST_SUITE = "tests"
+TESTS_REQUIRE = ["behave", "mock", "pyparsing", "pytest"]
 
 CLASSIFIERS = [
-    'Development Status :: 3 - Alpha',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: MIT License',
-    'Operating System :: OS Independent',
-    'Programming Language :: Python',
-    'Programming Language :: Python :: 2',
-    'Programming Language :: Python :: 2.6',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
-    'Topic :: Office/Business :: Office Suites',
-    'Topic :: Software Development :: Libraries'
+    "Development Status :: 3 - Alpha",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
+    "Topic :: Office/Business :: Office Suites",
+    "Topic :: Software Development :: Libraries",
 ]
 
-LONG_DESCRIPTION = text_of('README.rst') + '\n\n' + text_of('HISTORY.rst')
+LONG_DESCRIPTION = text_of("README.rst") + "\n\n" + text_of("HISTORY.rst")
 
 ZIP_SAFE = False
 
 params = {
-    'name':             NAME,
-    'version':          VERSION,
-    'description':      DESCRIPTION,
-    'keywords':         KEYWORDS,
-    'long_description': LONG_DESCRIPTION,
-    'author':           AUTHOR,
-    'author_email':     AUTHOR_EMAIL,
-    'url':              URL,
-    'license':          LICENSE,
-    'packages':         PACKAGES,
-    'package_data':     PACKAGE_DATA,
-    'install_requires': INSTALL_REQUIRES,
-    'tests_require':    TESTS_REQUIRE,
-    'test_suite':       TEST_SUITE,
-    'classifiers':      CLASSIFIERS,
-    'zip_safe':         ZIP_SAFE,
+    "name": NAME,
+    "version": VERSION,
+    "description": DESCRIPTION,
+    "keywords": KEYWORDS,
+    "long_description": LONG_DESCRIPTION,
+    "author": AUTHOR,
+    "author_email": AUTHOR_EMAIL,
+    "url": URL,
+    "license": LICENSE,
+    "packages": PACKAGES,
+    "package_data": PACKAGE_DATA,
+    "install_requires": INSTALL_REQUIRES,
+    "tests_require": TESTS_REQUIRE,
+    "test_suite": TEST_SUITE,
+    "classifiers": CLASSIFIERS,
+    "zip_safe": ZIP_SAFE,
 }
 
 setup(**params)

From 36cac78de080d412e9e50d56c2784e33655cad59 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 15 May 2021 14:36:34 -0700
Subject: [PATCH 241/367] release: prepare v0.8.11 release

---
 HISTORY.rst      | 6 ++++++
 docx/__init__.py | 2 +-
 setup.py         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 5612cbf05..2b33a4d5d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+0.8.11 (2021-05-15)
++++++++++++++++++++
+
+- Small build changes and Python 3.8 version changes like collections.abc location.
+
+
 0.8.10 (2019-01-08)
 +++++++++++++++++++
 
diff --git a/docx/__init__.py b/docx/__init__.py
index 4dae2946b..59756c021 100644
--- a/docx/__init__.py
+++ b/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = '0.8.10'
+__version__ = "0.8.11"
 
 
 # register custom Part classes with opc package reader
diff --git a/setup.py b/setup.py
index 5958749f6..7c34edcca 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def text_of(relpath):
 # Read the version from docx.__version__ without importing the package
 # (and thus attempting to import packages it depends on that may not be
 # installed yet)
-version = re.search("__version__ = '([^']+)'", text_of("docx/__init__.py")).group(1)
+version = re.search(r'__version__ = "([^"]+)"', text_of("docx/__init__.py")).group(1)
 
 
 NAME = "python-docx"

From 629f942ee2cdeb42bbe48460010cba354b2ab28e Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 24 Sep 2023 12:18:38 -0700
Subject: [PATCH 242/367] rfctr: Blacken code base

---
 docs/conf.py                          |  61 ++-
 docx/api.py                           |   2 +-
 docx/blkcntnr.py                      |   4 +-
 docx/compat.py                        |   2 -
 docx/dml/color.py                     |   4 +-
 docx/document.py                      |   9 +-
 docx/enum/__init__.py                 |   1 -
 docx/enum/base.py                     |  74 ++--
 docx/enum/dml.py                      |  87 ++--
 docx/enum/section.py                  |  40 +-
 docx/enum/shape.py                    |   1 +
 docx/enum/style.py                    | 560 ++++++-----------------
 docx/enum/table.py                    |  91 ++--
 docx/enum/text.py                     | 343 ++++++---------
 docx/image/__init__.py                |  20 +-
 docx/image/bmp.py                     |   3 +-
 docx/image/constants.py               | 227 +++++-----
 docx/image/gif.py                     |   5 +-
 docx/image/helpers.py                 |  21 +-
 docx/image/image.py                   |  14 +-
 docx/image/jpeg.py                    |  75 ++--
 docx/image/png.py                     |  22 +-
 docx/image/tiff.py                    |  38 +-
 docx/opc/constants.py                 | 610 +++++++++++---------------
 docx/opc/coreprops.py                 |   5 +-
 docx/opc/oxml.py                      |  84 ++--
 docx/opc/package.py                   |  13 +-
 docx/opc/packuri.py                   |  17 +-
 docx/opc/part.py                      |  15 +-
 docx/opc/parts/coreprops.py           |  15 +-
 docx/opc/phys_pkg.py                  |  15 +-
 docx/opc/pkgreader.py                 |  23 +-
 docx/opc/pkgwriter.py                 |   6 +-
 docx/opc/rel.py                       |  25 +-
 docx/opc/shared.py                    |   7 +-
 docx/opc/spec.py                      |  36 +-
 docx/oxml/__init__.py                 | 211 ++++-----
 docx/oxml/coreprops.py                | 137 +++---
 docx/oxml/document.py                 |  12 +-
 docx/oxml/ns.py                       |  17 +-
 docx/oxml/numbering.py                |  40 +-
 docx/oxml/section.py                  |  57 ++-
 docx/oxml/settings.py                 | 131 ++++--
 docx/oxml/shape.py                    | 134 +++---
 docx/oxml/shared.py                   |  11 +-
 docx/oxml/simpletypes.py              | 122 ++----
 docx/oxml/styles.py                   | 125 +++---
 docx/oxml/table.py                    | 244 +++++++----
 docx/oxml/text/font.py                | 139 +++---
 docx/oxml/text/paragraph.py           |   9 +-
 docx/oxml/text/parfmt.py              | 113 +++--
 docx/oxml/text/run.py                 |  45 +-
 docx/oxml/xmlchemy.py                 | 175 ++++----
 docx/package.py                       |   8 +-
 docx/parts/hdrftr.py                  |   8 +-
 docx/parts/image.py                   |   7 +-
 docx/parts/numbering.py               |   6 +-
 docx/parts/settings.py                |  12 +-
 docx/parts/story.py                   |   2 +-
 docx/parts/styles.py                  |  12 +-
 docx/shape.py                         |  14 +-
 docx/shared.py                        |  19 +-
 docx/styles/__init__.py               |  32 +-
 docx/styles/latent.py                 |  36 +-
 docx/styles/style.py                  |  12 +-
 docx/styles/styles.py                 |  11 +-
 docx/table.py                         |  13 +-
 docx/text/font.py                     |  84 ++--
 docx/text/paragraph.py                |  11 +-
 docx/text/parfmt.py                   |  10 +-
 docx/text/run.py                      |  18 +-
 docx/text/tabstops.py                 |  17 +-
 features/environment.py               |   4 +-
 features/steps/api.py                 |  21 +-
 features/steps/block.py               |  17 +-
 features/steps/cell.py                |  17 +-
 features/steps/coreprops.py           |  99 +++--
 features/steps/document.py            | 106 ++---
 features/steps/font.py                | 167 ++++---
 features/steps/hdrftr.py              |  11 +-
 features/steps/helpers.py             |  21 +-
 features/steps/image.py               |  42 +-
 features/steps/numbering.py           |  11 +-
 features/steps/paragraph.py           | 107 ++---
 features/steps/parfmt.py              | 161 ++++---
 features/steps/section.py             | 133 +++---
 features/steps/settings.py            |  19 +-
 features/steps/shape.py               |  95 ++--
 features/steps/shared.py              |   6 +-
 features/steps/styles.py              | 305 ++++++-------
 features/steps/table.py               | 311 +++++++------
 features/steps/tabstops.py            |  57 +--
 features/steps/text.py                | 160 +++----
 tests/dml/test_color.py               | 142 +++---
 tests/image/test_bmp.py               |   7 +-
 tests/image/test_gif.py               |   5 +-
 tests/image/test_helpers.py           |  20 +-
 tests/image/test_image.py             | 126 +++---
 tests/image/test_jpeg.py              | 245 +++++------
 tests/image/test_png.py               |  96 ++--
 tests/image/test_tiff.py              | 151 ++++---
 tests/opc/parts/test_coreprops.py     |  11 +-
 tests/opc/test_coreprops.py           | 168 +++----
 tests/opc/test_oxml.py                |  61 +--
 tests/opc/test_package.py             | 219 ++++-----
 tests/opc/test_packuri.py             |  49 ++-
 tests/opc/test_part.py                | 117 +++--
 tests/opc/test_phys_pkg.py            |  64 ++-
 tests/opc/test_pkgreader.py           | 305 +++++++------
 tests/opc/test_pkgwriter.py           | 100 ++---
 tests/opc/test_rel.py                 | 154 +++----
 tests/opc/unitdata/rels.py            | 122 +++---
 tests/opc/unitdata/types.py           |  18 +-
 tests/oxml/parts/test_document.py     |  27 +-
 tests/oxml/parts/unitdata/document.py |   8 +-
 tests/oxml/test__init__.py            |  62 ++-
 tests/oxml/test_ns.py                 |  20 +-
 tests/oxml/test_styles.py             |  33 +-
 tests/oxml/test_table.py              | 287 +++++++-----
 tests/oxml/test_xmlchemy.py           | 426 +++++++++---------
 tests/oxml/text/test_run.py           |  22 +-
 tests/oxml/unitdata/dml.py            | 102 ++---
 tests/oxml/unitdata/numbering.py      |  10 +-
 tests/oxml/unitdata/section.py        |  29 +-
 tests/oxml/unitdata/shared.py         |  10 +-
 tests/oxml/unitdata/styles.py         |  10 +-
 tests/oxml/unitdata/table.py          |  44 +-
 tests/oxml/unitdata/text.py           |  96 ++--
 tests/parts/test_document.py          |  38 +-
 tests/parts/test_hdrftr.py            |   2 -
 tests/parts/test_image.py             |  33 +-
 tests/parts/test_numbering.py         |  31 +-
 tests/parts/test_settings.py          |  11 +-
 tests/parts/test_story.py             |   1 -
 tests/parts/test_styles.py            |   7 +-
 tests/styles/test_latent.py           | 297 +++++++------
 tests/styles/test_style.py            | 391 +++++++++--------
 tests/styles/test_styles.py           | 219 +++++----
 tests/test_api.py                     |  17 +-
 tests/test_blkcntnr.py                |  58 +--
 tests/test_document.py                |  94 ++--
 tests/test_enum.py                    |  55 +--
 tests/test_package.py                 |  19 +-
 tests/test_section.py                 | 230 +++++-----
 tests/test_settings.py                |   3 +-
 tests/test_shape.py                   | 109 +++--
 tests/test_shared.py                  |  63 ++-
 tests/test_table.py                   | 528 ++++++++++++----------
 tests/text/test_font.py               | 475 +++++++++++---------
 tests/text/test_paragraph.py          | 179 ++++----
 tests/text/test_parfmt.py             | 473 +++++++++++---------
 tests/text/test_run.py                | 285 ++++++------
 tests/text/test_tabstops.py           | 261 ++++++-----
 tests/unitdata.py                     |  42 +-
 tests/unitutil/cxml.py                |  67 +--
 tests/unitutil/file.py                |  20 +-
 tests/unitutil/mock.py                |   6 +-
 157 files changed, 7141 insertions(+), 6738 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 1a988453a..ceea98093 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(".."))
 
 from docx import __version__  # noqa
 
@@ -31,28 +31,28 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode'
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'python-docx'
-copyright = u'2013, Steve Canny'
+project = "python-docx"
+copyright = "2013, Steve Canny"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -193,7 +193,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['.build']
+exclude_patterns = [".build"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -211,7 +211,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -221,7 +221,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'armstrong'
+html_theme = "armstrong"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -229,7 +229,7 @@
 # html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ['_themes']
+html_theme_path = ["_themes"]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -250,7 +250,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -263,8 +263,7 @@
 # Custom sidebar templates, maps document names to template names.
 # html_sidebars = {}
 html_sidebars = {
-    '**': ['localtoc.html', 'relations.html', 'sidebarlinks.html',
-           'searchbox.html']
+    "**": ["localtoc.html", "relations.html", "sidebarlinks.html", "searchbox.html"]
 }
 
 # Additional templates that should be rendered to pages, maps page names to
@@ -298,7 +297,7 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'python-docxdoc'
+htmlhelp_basename = "python-docxdoc"
 
 
 # -- Options for LaTeX output -----------------------------------------------
@@ -306,10 +305,8 @@
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     # 'preamble': '',
 }
@@ -321,8 +318,7 @@
 #  author,
 #  documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'python-docx.tex', u'python-docx Documentation',
-     u'Steve Canny', 'manual'),
+    ("index", "python-docx.tex", "python-docx Documentation", "Steve Canny", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -350,10 +346,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'python-docx', u'python-docx Documentation',
-     [u'Steve Canny'], 1)
-]
+man_pages = [("index", "python-docx", "python-docx Documentation", ["Steve Canny"], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -365,9 +358,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'python-docx', u'python-docx Documentation',
-     u'Steve Canny', 'python-docx', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        "index",
+        "python-docx",
+        "python-docx Documentation",
+        "Steve Canny",
+        "python-docx",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -381,4 +380,4 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/3/': None}
+intersphinx_mapping = {"http://docs.python.org/3/": None}
diff --git a/docx/api.py b/docx/api.py
index 63e18c406..4cf6acd1b 100644
--- a/docx/api.py
+++ b/docx/api.py
@@ -34,4 +34,4 @@ def _default_docx_path():
     Return the path to the built-in default .docx package.
     """
     _thisdir = os.path.split(__file__)[0]
-    return os.path.join(_thisdir, 'templates', 'default.docx')
+    return os.path.join(_thisdir, "templates", "default.docx")
diff --git a/docx/blkcntnr.py b/docx/blkcntnr.py
index a80903e52..b4d4d8b04 100644
--- a/docx/blkcntnr.py
+++ b/docx/blkcntnr.py
@@ -25,7 +25,7 @@ def __init__(self, element, parent):
         super(BlockItemContainer, self).__init__(parent)
         self._element = element
 
-    def add_paragraph(self, text='', style=None):
+    def add_paragraph(self, text="", style=None):
         """
         Return a paragraph newly added to the end of the content in this
         container, having *text* in a single run if present, and having
@@ -46,6 +46,7 @@ def add_table(self, rows, cols, width):
         distributed between the table columns.
         """
         from .table import Table
+
         tbl = CT_Tbl.new_tbl(rows, cols, width)
         self._element._insert_tbl(tbl)
         return Table(tbl, self)
@@ -65,6 +66,7 @@ def tables(self):
         Read-only.
         """
         from .table import Table
+
         return [Table(tbl, self) for tbl in self._element.tbl_lst]
 
     def _add_paragraph(self):
diff --git a/docx/compat.py b/docx/compat.py
index 1e3012d95..dfa8ea054 100644
--- a/docx/compat.py
+++ b/docx/compat.py
@@ -13,7 +13,6 @@
 # ===========================================================================
 
 if sys.version_info >= (3, 0):
-
     from collections.abc import Sequence
     from io import BytesIO
 
@@ -28,7 +27,6 @@ def is_string(obj):
 # ===========================================================================
 
 else:
-
     from collections import Sequence  # noqa
     from StringIO import StringIO as BytesIO  # noqa
 
diff --git a/docx/dml/color.py b/docx/dml/color.py
index 2f2f25cb2..cfdf097a4 100644
--- a/docx/dml/color.py
+++ b/docx/dml/color.py
@@ -4,9 +4,7 @@
 DrawingML objects related to color, ColorFormat being the most prominent.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..enum.dml import MSO_COLOR_TYPE
 from ..oxml.simpletypes import ST_HexColorAuto
diff --git a/docx/document.py b/docx/document.py
index 6493c458b..6acdb839a 100644
--- a/docx/document.py
+++ b/docx/document.py
@@ -18,7 +18,7 @@ class Document(ElementProxy):
     a document.
     """
 
-    __slots__ = ('_part', '__body')
+    __slots__ = ("_part", "__body")
 
     def __init__(self, element, part):
         super(Document, self).__init__(element)
@@ -44,7 +44,7 @@ def add_page_break(self):
         paragraph.add_run().add_break(WD_BREAK.PAGE)
         return paragraph
 
-    def add_paragraph(self, text='', style=None):
+    def add_paragraph(self, text="", style=None):
         """
         Return a paragraph newly added to the end of the document, populated
         with *text* and having paragraph style *style*. *text* can contain
@@ -172,9 +172,7 @@ def _block_width(self):
         space between the margins of the last section of this document.
         """
         section = self.sections[-1]
-        return Emu(
-            section.page_width - section.left_margin - section.right_margin
-        )
+        return Emu(section.page_width - section.left_margin - section.right_margin)
 
     @property
     def _body(self):
@@ -191,6 +189,7 @@ class _Body(BlockItemContainer):
     Proxy for ``<w:body>`` element in this document, having primarily a
     container role.
     """
+
     def __init__(self, body_elm, parent):
         super(_Body, self).__init__(body_elm, parent)
         self._body = body_elm
diff --git a/docx/enum/__init__.py b/docx/enum/__init__.py
index dd49faafd..e1bbd47f2 100644
--- a/docx/enum/__init__.py
+++ b/docx/enum/__init__.py
@@ -8,7 +8,6 @@
 
 
 class Enumeration(object):
-
     @classmethod
     def from_xml(cls, xml_val):
         return cls._xml_to_idx[xml_val]
diff --git a/docx/enum/base.py b/docx/enum/base.py
index 36764b1a6..0bcdbd6dd 100644
--- a/docx/enum/base.py
+++ b/docx/enum/base.py
@@ -17,6 +17,7 @@ def alias(*aliases):
     Decorating a class with @alias('FOO', 'BAR', ..) allows the class to
     be referenced by each of the names provided as arguments.
     """
+
     def decorator(cls):
         # alias must be set in globals from caller's frame
         caller = sys._getframe(1)
@@ -24,6 +25,7 @@ def decorator(cls):
         for alias in aliases:
             globals_dict[alias] = cls
         return cls
+
     return decorator
 
 
@@ -45,10 +47,12 @@ def page_str(self):
         The RestructuredText documentation page for the enumeration. This is
         the only API member for the class.
         """
-        tmpl = '.. _%s:\n\n%s\n\n%s\n\n----\n\n%s'
+        tmpl = ".. _%s:\n\n%s\n\n%s\n\n----\n\n%s"
         components = (
-            self._ms_name, self._page_title, self._intro_text,
-            self._member_defs
+            self._ms_name,
+            self._page_title,
+            self._intro_text,
+            self._member_defs,
         )
         return tmpl % components
 
@@ -56,12 +60,12 @@ def page_str(self):
     def _intro_text(self):
         """Docstring of the enumeration, formatted for documentation page."""
         try:
-            cls_docstring = self._clsdict['__doc__']
+            cls_docstring = self._clsdict["__doc__"]
         except KeyError:
-            cls_docstring = ''
+            cls_docstring = ""
 
         if cls_docstring is None:
-            return ''
+            return ""
 
         return textwrap.dedent(cls_docstring).strip()
 
@@ -72,10 +76,12 @@ def _member_def(self, member):
         """
         member_docstring = textwrap.dedent(member.docstring).strip()
         member_docstring = textwrap.fill(
-            member_docstring, width=78, initial_indent=' '*4,
-            subsequent_indent=' '*4
+            member_docstring,
+            width=78,
+            initial_indent=" " * 4,
+            subsequent_indent=" " * 4,
         )
-        return '%s\n%s\n' % (member.name, member_docstring)
+        return "%s\n%s\n" % (member.name, member_docstring)
 
     @property
     def _member_defs(self):
@@ -83,19 +89,18 @@ def _member_defs(self):
         A single string containing the aggregated member definitions section
         of the documentation page
         """
-        members = self._clsdict['__members__']
+        members = self._clsdict["__members__"]
         member_defs = [
-            self._member_def(member) for member in members
-            if member.name is not None
+            self._member_def(member) for member in members if member.name is not None
         ]
-        return '\n'.join(member_defs)
+        return "\n".join(member_defs)
 
     @property
     def _ms_name(self):
         """
         The Microsoft API name for this enumeration
         """
-        return self._clsdict['__ms_name__']
+        return self._clsdict["__ms_name__"]
 
     @property
     def _page_title(self):
@@ -103,8 +108,8 @@ def _page_title(self):
         The title for the documentation page, formatted as code (surrounded
         in double-backtics) and underlined with '=' characters
         """
-        title_underscore = '=' * (len(self._clsname)+4)
-        return '``%s``\n%s' % (self._clsname, title_underscore)
+        title_underscore = "=" * (len(self._clsname) + 4)
+        return "``%s``\n%s" % (self._clsname, title_underscore)
 
 
 class MetaEnumeration(type):
@@ -113,6 +118,7 @@ class MetaEnumeration(type):
     named member and compiles state needed by the enumeration class to
     respond to other attribute gets
     """
+
     def __new__(meta, clsname, bases, clsdict):
         meta._add_enum_members(clsdict)
         meta._collect_valid_settings(clsdict)
@@ -126,7 +132,7 @@ def _add_enum_members(meta, clsdict):
         thing to properly add itself to the enumeration class. This
         delegation allows member sub-classes to add specialized behaviors.
         """
-        enum_members = clsdict['__members__']
+        enum_members = clsdict["__members__"]
         for member in enum_members:
             member.add_to_enum(clsdict)
 
@@ -136,20 +142,18 @@ def _collect_valid_settings(meta, clsdict):
         Return a sequence containing the enumeration values that are valid
         assignment values. Return-only values are excluded.
         """
-        enum_members = clsdict['__members__']
+        enum_members = clsdict["__members__"]
         valid_settings = []
         for member in enum_members:
             valid_settings.extend(member.valid_settings)
-        clsdict['_valid_settings'] = valid_settings
+        clsdict["_valid_settings"] = valid_settings
 
     @classmethod
     def _generate_docs_page(meta, clsname, clsdict):
         """
         Return the RST documentation page for the enumeration.
         """
-        clsdict['__docs_rst__'] = (
-            _DocsPageFormatter(clsname, clsdict).page_str
-        )
+        clsdict["__docs_rst__"] = _DocsPageFormatter(clsname, clsdict).page_str
 
 
 class EnumerationBase(object):
@@ -158,8 +162,9 @@ class EnumerationBase(object):
     only basic behavior. It's __dict__ is used below in the Python 2+3
     compatible metaclass definition.
     """
+
     __members__ = ()
-    __ms_name__ = ''
+    __ms_name__ = ""
 
     @classmethod
     def validate(cls, value):
@@ -172,9 +177,7 @@ def validate(cls, value):
             )
 
 
-Enumeration = MetaEnumeration(
-    'Enumeration', (object,), dict(EnumerationBase.__dict__)
-)
+Enumeration = MetaEnumeration("Enumeration", (object,), dict(EnumerationBase.__dict__))
 
 
 class XmlEnumeration(Enumeration):
@@ -182,8 +185,9 @@ class XmlEnumeration(Enumeration):
     Provides ``to_xml()`` and ``from_xml()`` methods in addition to base
     enumeration features
     """
+
     __members__ = ()
-    __ms_name__ = ''
+    __ms_name__ = ""
 
     @classmethod
     def from_xml(cls, xml_val):
@@ -214,6 +218,7 @@ class EnumMember(object):
     Used in the enumeration class definition to define a member value and its
     mappings
     """
+
     def __init__(self, name, value, docstring):
         self._name = name
         if isinstance(value, int):
@@ -278,6 +283,7 @@ class EnumValue(int):
     for its symbolic name and description, respectively. Subclasses int, so
     behaves as a regular int unless the strings are asked for.
     """
+
     def __new__(cls, member_name, int_value, docstring):
         return super(EnumValue, cls).__new__(cls, int_value)
 
@@ -305,6 +311,7 @@ class ReturnValueOnlyEnumMember(EnumMember):
     Used to define a member of an enumeration that is only valid as a query
     result and is not valid as a setting, e.g. MSO_VERTICAL_ANCHOR.MIXED (-2)
     """
+
     @property
     def valid_settings(self):
         """
@@ -317,6 +324,7 @@ class XmlMappedEnumMember(EnumMember):
     """
     Used to define a member whose value maps to an XML attribute value.
     """
+
     def __init__(self, name, value, xml_value, docstring):
         super(XmlMappedEnumMember, self).__init__(name, value, docstring)
         self._xml_value = xml_value
@@ -349,15 +357,15 @@ def _get_or_add_member_to_xml(clsdict):
         """
         Add the enum -> xml value mapping to the enumeration class state
         """
-        if '_member_to_xml' not in clsdict:
-            clsdict['_member_to_xml'] = dict()
-        return clsdict['_member_to_xml']
+        if "_member_to_xml" not in clsdict:
+            clsdict["_member_to_xml"] = dict()
+        return clsdict["_member_to_xml"]
 
     @staticmethod
     def _get_or_add_xml_to_member(clsdict):
         """
         Add the xml -> enum value mapping to the enumeration class state
         """
-        if '_xml_to_member' not in clsdict:
-            clsdict['_xml_to_member'] = dict()
-        return clsdict['_xml_to_member']
+        if "_xml_to_member" not in clsdict:
+            clsdict["_xml_to_member"] = dict()
+        return clsdict["_xml_to_member"]
diff --git a/docx/enum/dml.py b/docx/enum/dml.py
index 1ad0eaa87..133d824d6 100644
--- a/docx/enum/dml.py
+++ b/docx/enum/dml.py
@@ -6,9 +6,7 @@
 
 from __future__ import absolute_import
 
-from .base import (
-    alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
-)
+from .base import alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
 
 
 class MSO_COLOR_TYPE(Enumeration):
@@ -22,28 +20,22 @@ class MSO_COLOR_TYPE(Enumeration):
         assert font.color.type == MSO_COLOR_TYPE.SCHEME
     """
 
-    __ms_name__ = 'MsoColorType'
+    __ms_name__ = "MsoColorType"
 
     __url__ = (
-        'http://msdn.microsoft.com/en-us/library/office/ff864912(v=office.15'
-        ').aspx'
+        "http://msdn.microsoft.com/en-us/library/office/ff864912(v=office.15" ").aspx"
     )
 
     __members__ = (
+        EnumMember("RGB", 1, "Color is specified by an |RGBColor| value."),
+        EnumMember("THEME", 2, "Color is one of the preset theme colors."),
         EnumMember(
-            'RGB', 1, 'Color is specified by an |RGBColor| value.'
-        ),
-        EnumMember(
-            'THEME', 2, 'Color is one of the preset theme colors.'
-        ),
-        EnumMember(
-            'AUTO', 101, 'Color is determined automatically by the '
-            'application.'
+            "AUTO", 101, "Color is determined automatically by the " "application."
         ),
     )
 
 
-@alias('MSO_THEME_COLOR')
+@alias("MSO_THEME_COLOR")
 class MSO_THEME_COLOR_INDEX(XmlEnumeration):
     """
     Indicates the Office theme color, one of those shown in the color gallery
@@ -58,67 +50,64 @@ class MSO_THEME_COLOR_INDEX(XmlEnumeration):
         font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
     """
 
-    __ms_name__ = 'MsoThemeColorIndex'
+    __ms_name__ = "MsoThemeColorIndex"
 
     __url__ = (
-        'http://msdn.microsoft.com/en-us/library/office/ff860782(v=office.15'
-        ').aspx'
+        "http://msdn.microsoft.com/en-us/library/office/ff860782(v=office.15" ").aspx"
     )
 
     __members__ = (
-        EnumMember(
-            'NOT_THEME_COLOR', 0, 'Indicates the color is not a theme color.'
-        ),
-        XmlMappedEnumMember(
-            'ACCENT_1', 5, 'accent1', 'Specifies the Accent 1 theme color.'
-        ),
-        XmlMappedEnumMember(
-            'ACCENT_2', 6, 'accent2', 'Specifies the Accent 2 theme color.'
-        ),
-        XmlMappedEnumMember(
-            'ACCENT_3', 7, 'accent3', 'Specifies the Accent 3 theme color.'
-        ),
-        XmlMappedEnumMember(
-            'ACCENT_4', 8, 'accent4', 'Specifies the Accent 4 theme color.'
-        ),
+        EnumMember("NOT_THEME_COLOR", 0, "Indicates the color is not a theme color."),
         XmlMappedEnumMember(
-            'ACCENT_5', 9, 'accent5', 'Specifies the Accent 5 theme color.'
+            "ACCENT_1", 5, "accent1", "Specifies the Accent 1 theme color."
         ),
         XmlMappedEnumMember(
-            'ACCENT_6', 10, 'accent6', 'Specifies the Accent 6 theme color.'
+            "ACCENT_2", 6, "accent2", "Specifies the Accent 2 theme color."
         ),
         XmlMappedEnumMember(
-            'BACKGROUND_1', 14, 'background1', 'Specifies the Background 1 '
-            'theme color.'
+            "ACCENT_3", 7, "accent3", "Specifies the Accent 3 theme color."
         ),
         XmlMappedEnumMember(
-            'BACKGROUND_2', 16, 'background2', 'Specifies the Background 2 '
-            'theme color.'
+            "ACCENT_4", 8, "accent4", "Specifies the Accent 4 theme color."
         ),
         XmlMappedEnumMember(
-            'DARK_1', 1, 'dark1', 'Specifies the Dark 1 theme color.'
+            "ACCENT_5", 9, "accent5", "Specifies the Accent 5 theme color."
         ),
         XmlMappedEnumMember(
-            'DARK_2', 3, 'dark2', 'Specifies the Dark 2 theme color.'
+            "ACCENT_6", 10, "accent6", "Specifies the Accent 6 theme color."
         ),
         XmlMappedEnumMember(
-            'FOLLOWED_HYPERLINK', 12, 'followedHyperlink', 'Specifies the '
-            'theme color for a clicked hyperlink.'
+            "BACKGROUND_1",
+            14,
+            "background1",
+            "Specifies the Background 1 " "theme color.",
         ),
         XmlMappedEnumMember(
-            'HYPERLINK', 11, 'hyperlink', 'Specifies the theme color for a '
-            'hyperlink.'
+            "BACKGROUND_2",
+            16,
+            "background2",
+            "Specifies the Background 2 " "theme color.",
         ),
+        XmlMappedEnumMember("DARK_1", 1, "dark1", "Specifies the Dark 1 theme color."),
+        XmlMappedEnumMember("DARK_2", 3, "dark2", "Specifies the Dark 2 theme color."),
         XmlMappedEnumMember(
-            'LIGHT_1', 2, 'light1', 'Specifies the Light 1 theme color.'
+            "FOLLOWED_HYPERLINK",
+            12,
+            "followedHyperlink",
+            "Specifies the " "theme color for a clicked hyperlink.",
         ),
         XmlMappedEnumMember(
-            'LIGHT_2', 4, 'light2', 'Specifies the Light 2 theme color.'
+            "HYPERLINK",
+            11,
+            "hyperlink",
+            "Specifies the theme color for a " "hyperlink.",
         ),
         XmlMappedEnumMember(
-            'TEXT_1', 13, 'text1', 'Specifies the Text 1 theme color.'
+            "LIGHT_1", 2, "light1", "Specifies the Light 1 theme color."
         ),
         XmlMappedEnumMember(
-            'TEXT_2', 15, 'text2', 'Specifies the Text 2 theme color.'
+            "LIGHT_2", 4, "light2", "Specifies the Light 2 theme color."
         ),
+        XmlMappedEnumMember("TEXT_1", 13, "text1", "Specifies the Text 1 theme color."),
+        XmlMappedEnumMember("TEXT_2", 15, "text2", "Specifies the Text 2 theme color."),
     )
diff --git a/docx/enum/section.py b/docx/enum/section.py
index 381e81877..814e4cfba 100644
--- a/docx/enum/section.py
+++ b/docx/enum/section.py
@@ -9,7 +9,7 @@
 from .base import alias, XmlEnumeration, XmlMappedEnumMember
 
 
-@alias('WD_HEADER_FOOTER')
+@alias("WD_HEADER_FOOTER")
 class WD_HEADER_FOOTER_INDEX(XmlEnumeration):
     """
     alias: **WD_HEADER_FOOTER**
@@ -36,7 +36,7 @@ class WD_HEADER_FOOTER_INDEX(XmlEnumeration):
     )
 
 
-@alias('WD_ORIENT')
+@alias("WD_ORIENT")
 class WD_ORIENTATION(XmlEnumeration):
     """
     alias: **WD_ORIENT**
@@ -51,21 +51,17 @@ class WD_ORIENTATION(XmlEnumeration):
         section.orientation = WD_ORIENT.LANDSCAPE
     """
 
-    __ms_name__ = 'WdOrientation'
+    __ms_name__ = "WdOrientation"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff837902.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff837902.aspx"
 
     __members__ = (
-        XmlMappedEnumMember(
-            'PORTRAIT', 0, 'portrait', 'Portrait orientation.'
-        ),
-        XmlMappedEnumMember(
-            'LANDSCAPE', 1, 'landscape', 'Landscape orientation.'
-        ),
+        XmlMappedEnumMember("PORTRAIT", 0, "portrait", "Portrait orientation."),
+        XmlMappedEnumMember("LANDSCAPE", 1, "landscape", "Landscape orientation."),
     )
 
 
-@alias('WD_SECTION')
+@alias("WD_SECTION")
 class WD_SECTION_START(XmlEnumeration):
     """
     alias: **WD_SECTION**
@@ -80,24 +76,16 @@ class WD_SECTION_START(XmlEnumeration):
         section.start_type = WD_SECTION.NEW_PAGE
     """
 
-    __ms_name__ = 'WdSectionStart'
+    __ms_name__ = "WdSectionStart"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff840975.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff840975.aspx"
 
     __members__ = (
+        XmlMappedEnumMember("CONTINUOUS", 0, "continuous", "Continuous section break."),
+        XmlMappedEnumMember("NEW_COLUMN", 1, "nextColumn", "New column section break."),
+        XmlMappedEnumMember("NEW_PAGE", 2, "nextPage", "New page section break."),
+        XmlMappedEnumMember("EVEN_PAGE", 3, "evenPage", "Even pages section break."),
         XmlMappedEnumMember(
-            'CONTINUOUS', 0, 'continuous', 'Continuous section break.'
-        ),
-        XmlMappedEnumMember(
-            'NEW_COLUMN', 1, 'nextColumn', 'New column section break.'
-        ),
-        XmlMappedEnumMember(
-            'NEW_PAGE', 2, 'nextPage', 'New page section break.'
-        ),
-        XmlMappedEnumMember(
-            'EVEN_PAGE', 3, 'evenPage', 'Even pages section break.'
-        ),
-        XmlMappedEnumMember(
-            'ODD_PAGE', 4, 'oddPage', 'Section begins on next odd page.'
+            "ODD_PAGE", 4, "oddPage", "Section begins on next odd page."
         ),
     )
diff --git a/docx/enum/shape.py b/docx/enum/shape.py
index 937f30a9f..b785ab9c1 100644
--- a/docx/enum/shape.py
+++ b/docx/enum/shape.py
@@ -12,6 +12,7 @@ class WD_INLINE_SHAPE_TYPE(object):
     Corresponds to WdInlineShapeType enumeration
     http://msdn.microsoft.com/en-us/library/office/ff192587.aspx
     """
+
     CHART = 12
     LINKED_PICTURE = 4
     PICTURE = 3
diff --git a/docx/enum/style.py b/docx/enum/style.py
index 515c594ce..1915429c0 100644
--- a/docx/enum/style.py
+++ b/docx/enum/style.py
@@ -9,7 +9,7 @@
 from .base import alias, EnumMember, XmlEnumeration, XmlMappedEnumMember
 
 
-@alias('WD_STYLE')
+@alias("WD_STYLE")
 class WD_BUILTIN_STYLE(XmlEnumeration):
     """
     alias: **WD_STYLE**
@@ -26,409 +26,147 @@ class WD_BUILTIN_STYLE(XmlEnumeration):
         style = styles[WD_STYLE.BODY_TEXT]
     """
 
-    __ms_name__ = 'WdBuiltinStyle'
+    __ms_name__ = "WdBuiltinStyle"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff835210.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff835210.aspx"
 
     __members__ = (
-        EnumMember(
-            'BLOCK_QUOTATION', -85, 'Block Text.'
-        ),
-        EnumMember(
-            'BODY_TEXT', -67, 'Body Text.'
-        ),
-        EnumMember(
-            'BODY_TEXT_2', -81, 'Body Text 2.'
-        ),
-        EnumMember(
-            'BODY_TEXT_3', -82, 'Body Text 3.'
-        ),
-        EnumMember(
-            'BODY_TEXT_FIRST_INDENT', -78, 'Body Text First Indent.'
-        ),
-        EnumMember(
-            'BODY_TEXT_FIRST_INDENT_2', -79, 'Body Text First Indent 2.'
-        ),
-        EnumMember(
-            'BODY_TEXT_INDENT', -68, 'Body Text Indent.'
-        ),
-        EnumMember(
-            'BODY_TEXT_INDENT_2', -83, 'Body Text Indent 2.'
-        ),
-        EnumMember(
-            'BODY_TEXT_INDENT_3', -84, 'Body Text Indent 3.'
-        ),
-        EnumMember(
-            'BOOK_TITLE', -265, 'Book Title.'
-        ),
-        EnumMember(
-            'CAPTION', -35, 'Caption.'
-        ),
-        EnumMember(
-            'CLOSING', -64, 'Closing.'
-        ),
-        EnumMember(
-            'COMMENT_REFERENCE', -40, 'Comment Reference.'
-        ),
-        EnumMember(
-            'COMMENT_TEXT', -31, 'Comment Text.'
-        ),
-        EnumMember(
-            'DATE', -77, 'Date.'
-        ),
-        EnumMember(
-            'DEFAULT_PARAGRAPH_FONT', -66, 'Default Paragraph Font.'
-        ),
-        EnumMember(
-            'EMPHASIS', -89, 'Emphasis.'
-        ),
-        EnumMember(
-            'ENDNOTE_REFERENCE', -43, 'Endnote Reference.'
-        ),
-        EnumMember(
-            'ENDNOTE_TEXT', -44, 'Endnote Text.'
-        ),
-        EnumMember(
-            'ENVELOPE_ADDRESS', -37, 'Envelope Address.'
-        ),
-        EnumMember(
-            'ENVELOPE_RETURN', -38, 'Envelope Return.'
-        ),
-        EnumMember(
-            'FOOTER', -33, 'Footer.'
-        ),
-        EnumMember(
-            'FOOTNOTE_REFERENCE', -39, 'Footnote Reference.'
-        ),
-        EnumMember(
-            'FOOTNOTE_TEXT', -30, 'Footnote Text.'
-        ),
-        EnumMember(
-            'HEADER', -32, 'Header.'
-        ),
-        EnumMember(
-            'HEADING_1', -2, 'Heading 1.'
-        ),
-        EnumMember(
-            'HEADING_2', -3, 'Heading 2.'
-        ),
-        EnumMember(
-            'HEADING_3', -4, 'Heading 3.'
-        ),
-        EnumMember(
-            'HEADING_4', -5, 'Heading 4.'
-        ),
-        EnumMember(
-            'HEADING_5', -6, 'Heading 5.'
-        ),
-        EnumMember(
-            'HEADING_6', -7, 'Heading 6.'
-        ),
-        EnumMember(
-            'HEADING_7', -8, 'Heading 7.'
-        ),
-        EnumMember(
-            'HEADING_8', -9, 'Heading 8.'
-        ),
-        EnumMember(
-            'HEADING_9', -10, 'Heading 9.'
-        ),
-        EnumMember(
-            'HTML_ACRONYM', -96, 'HTML Acronym.'
-        ),
-        EnumMember(
-            'HTML_ADDRESS', -97, 'HTML Address.'
-        ),
-        EnumMember(
-            'HTML_CITE', -98, 'HTML Cite.'
-        ),
-        EnumMember(
-            'HTML_CODE', -99, 'HTML Code.'
-        ),
-        EnumMember(
-            'HTML_DFN', -100, 'HTML Definition.'
-        ),
-        EnumMember(
-            'HTML_KBD', -101, 'HTML Keyboard.'
-        ),
-        EnumMember(
-            'HTML_NORMAL', -95, 'Normal (Web).'
-        ),
-        EnumMember(
-            'HTML_PRE', -102, 'HTML Preformatted.'
-        ),
-        EnumMember(
-            'HTML_SAMP', -103, 'HTML Sample.'
-        ),
-        EnumMember(
-            'HTML_TT', -104, 'HTML Typewriter.'
-        ),
-        EnumMember(
-            'HTML_VAR', -105, 'HTML Variable.'
-        ),
-        EnumMember(
-            'HYPERLINK', -86, 'Hyperlink.'
-        ),
-        EnumMember(
-            'HYPERLINK_FOLLOWED', -87, 'Followed Hyperlink.'
-        ),
-        EnumMember(
-            'INDEX_1', -11, 'Index 1.'
-        ),
-        EnumMember(
-            'INDEX_2', -12, 'Index 2.'
-        ),
-        EnumMember(
-            'INDEX_3', -13, 'Index 3.'
-        ),
-        EnumMember(
-            'INDEX_4', -14, 'Index 4.'
-        ),
-        EnumMember(
-            'INDEX_5', -15, 'Index 5.'
-        ),
-        EnumMember(
-            'INDEX_6', -16, 'Index 6.'
-        ),
-        EnumMember(
-            'INDEX_7', -17, 'Index 7.'
-        ),
-        EnumMember(
-            'INDEX_8', -18, 'Index 8.'
-        ),
-        EnumMember(
-            'INDEX_9', -19, 'Index 9.'
-        ),
-        EnumMember(
-            'INDEX_HEADING', -34, 'Index Heading'
-        ),
-        EnumMember(
-            'INTENSE_EMPHASIS', -262, 'Intense Emphasis.'
-        ),
-        EnumMember(
-            'INTENSE_QUOTE', -182, 'Intense Quote.'
-        ),
-        EnumMember(
-            'INTENSE_REFERENCE', -264, 'Intense Reference.'
-        ),
-        EnumMember(
-            'LINE_NUMBER', -41, 'Line Number.'
-        ),
-        EnumMember(
-            'LIST', -48, 'List.'
-        ),
-        EnumMember(
-            'LIST_2', -51, 'List 2.'
-        ),
-        EnumMember(
-            'LIST_3', -52, 'List 3.'
-        ),
-        EnumMember(
-            'LIST_4', -53, 'List 4.'
-        ),
-        EnumMember(
-            'LIST_5', -54, 'List 5.'
-        ),
-        EnumMember(
-            'LIST_BULLET', -49, 'List Bullet.'
-        ),
-        EnumMember(
-            'LIST_BULLET_2', -55, 'List Bullet 2.'
-        ),
-        EnumMember(
-            'LIST_BULLET_3', -56, 'List Bullet 3.'
-        ),
-        EnumMember(
-            'LIST_BULLET_4', -57, 'List Bullet 4.'
-        ),
-        EnumMember(
-            'LIST_BULLET_5', -58, 'List Bullet 5.'
-        ),
-        EnumMember(
-            'LIST_CONTINUE', -69, 'List Continue.'
-        ),
-        EnumMember(
-            'LIST_CONTINUE_2', -70, 'List Continue 2.'
-        ),
-        EnumMember(
-            'LIST_CONTINUE_3', -71, 'List Continue 3.'
-        ),
-        EnumMember(
-            'LIST_CONTINUE_4', -72, 'List Continue 4.'
-        ),
-        EnumMember(
-            'LIST_CONTINUE_5', -73, 'List Continue 5.'
-        ),
-        EnumMember(
-            'LIST_NUMBER', -50, 'List Number.'
-        ),
-        EnumMember(
-            'LIST_NUMBER_2', -59, 'List Number 2.'
-        ),
-        EnumMember(
-            'LIST_NUMBER_3', -60, 'List Number 3.'
-        ),
-        EnumMember(
-            'LIST_NUMBER_4', -61, 'List Number 4.'
-        ),
-        EnumMember(
-            'LIST_NUMBER_5', -62, 'List Number 5.'
-        ),
-        EnumMember(
-            'LIST_PARAGRAPH', -180, 'List Paragraph.'
-        ),
-        EnumMember(
-            'MACRO_TEXT', -46, 'Macro Text.'
-        ),
-        EnumMember(
-            'MESSAGE_HEADER', -74, 'Message Header.'
-        ),
-        EnumMember(
-            'NAV_PANE', -90, 'Document Map.'
-        ),
-        EnumMember(
-            'NORMAL', -1, 'Normal.'
-        ),
-        EnumMember(
-            'NORMAL_INDENT', -29, 'Normal Indent.'
-        ),
-        EnumMember(
-            'NORMAL_OBJECT', -158, 'Normal (applied to an object).'
-        ),
-        EnumMember(
-            'NORMAL_TABLE', -106, 'Normal (applied within a table).'
-        ),
-        EnumMember(
-            'NOTE_HEADING', -80, 'Note Heading.'
-        ),
-        EnumMember(
-            'PAGE_NUMBER', -42, 'Page Number.'
-        ),
-        EnumMember(
-            'PLAIN_TEXT', -91, 'Plain Text.'
-        ),
-        EnumMember(
-            'QUOTE', -181, 'Quote.'
-        ),
-        EnumMember(
-            'SALUTATION', -76, 'Salutation.'
-        ),
-        EnumMember(
-            'SIGNATURE', -65, 'Signature.'
-        ),
-        EnumMember(
-            'STRONG', -88, 'Strong.'
-        ),
-        EnumMember(
-            'SUBTITLE', -75, 'Subtitle.'
-        ),
-        EnumMember(
-            'SUBTLE_EMPHASIS', -261, 'Subtle Emphasis.'
-        ),
-        EnumMember(
-            'SUBTLE_REFERENCE', -263, 'Subtle Reference.'
-        ),
-        EnumMember(
-            'TABLE_COLORFUL_GRID', -172, 'Colorful Grid.'
-        ),
-        EnumMember(
-            'TABLE_COLORFUL_LIST', -171, 'Colorful List.'
-        ),
-        EnumMember(
-            'TABLE_COLORFUL_SHADING', -170, 'Colorful Shading.'
-        ),
-        EnumMember(
-            'TABLE_DARK_LIST', -169, 'Dark List.'
-        ),
-        EnumMember(
-            'TABLE_LIGHT_GRID', -161, 'Light Grid.'
-        ),
-        EnumMember(
-            'TABLE_LIGHT_GRID_ACCENT_1', -175, 'Light Grid Accent 1.'
-        ),
-        EnumMember(
-            'TABLE_LIGHT_LIST', -160, 'Light List.'
-        ),
-        EnumMember(
-            'TABLE_LIGHT_LIST_ACCENT_1', -174, 'Light List Accent 1.'
-        ),
-        EnumMember(
-            'TABLE_LIGHT_SHADING', -159, 'Light Shading.'
-        ),
-        EnumMember(
-            'TABLE_LIGHT_SHADING_ACCENT_1', -173, 'Light Shading Accent 1.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_GRID_1', -166, 'Medium Grid 1.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_GRID_2', -167, 'Medium Grid 2.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_GRID_3', -168, 'Medium Grid 3.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_LIST_1', -164, 'Medium List 1.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_LIST_1_ACCENT_1', -178, 'Medium List 1 Accent 1.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_LIST_2', -165, 'Medium List 2.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_SHADING_1', -162, 'Medium Shading 1.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_SHADING_1_ACCENT_1', -176,
-            'Medium Shading 1 Accent 1.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_SHADING_2', -163, 'Medium Shading 2.'
-        ),
-        EnumMember(
-            'TABLE_MEDIUM_SHADING_2_ACCENT_1', -177,
-            'Medium Shading 2 Accent 1.'
-        ),
-        EnumMember(
-            'TABLE_OF_AUTHORITIES', -45, 'Table of Authorities.'
-        ),
-        EnumMember(
-            'TABLE_OF_FIGURES', -36, 'Table of Figures.'
-        ),
-        EnumMember(
-            'TITLE', -63, 'Title.'
-        ),
-        EnumMember(
-            'TOAHEADING', -47, 'TOA Heading.'
-        ),
-        EnumMember(
-            'TOC_1', -20, 'TOC 1.'
-        ),
-        EnumMember(
-            'TOC_2', -21, 'TOC 2.'
-        ),
-        EnumMember(
-            'TOC_3', -22, 'TOC 3.'
-        ),
-        EnumMember(
-            'TOC_4', -23, 'TOC 4.'
-        ),
-        EnumMember(
-            'TOC_5', -24, 'TOC 5.'
-        ),
-        EnumMember(
-            'TOC_6', -25, 'TOC 6.'
-        ),
-        EnumMember(
-            'TOC_7', -26, 'TOC 7.'
-        ),
-        EnumMember(
-            'TOC_8', -27, 'TOC 8.'
-        ),
-        EnumMember(
-            'TOC_9', -28, 'TOC 9.'
-        ),
+        EnumMember("BLOCK_QUOTATION", -85, "Block Text."),
+        EnumMember("BODY_TEXT", -67, "Body Text."),
+        EnumMember("BODY_TEXT_2", -81, "Body Text 2."),
+        EnumMember("BODY_TEXT_3", -82, "Body Text 3."),
+        EnumMember("BODY_TEXT_FIRST_INDENT", -78, "Body Text First Indent."),
+        EnumMember("BODY_TEXT_FIRST_INDENT_2", -79, "Body Text First Indent 2."),
+        EnumMember("BODY_TEXT_INDENT", -68, "Body Text Indent."),
+        EnumMember("BODY_TEXT_INDENT_2", -83, "Body Text Indent 2."),
+        EnumMember("BODY_TEXT_INDENT_3", -84, "Body Text Indent 3."),
+        EnumMember("BOOK_TITLE", -265, "Book Title."),
+        EnumMember("CAPTION", -35, "Caption."),
+        EnumMember("CLOSING", -64, "Closing."),
+        EnumMember("COMMENT_REFERENCE", -40, "Comment Reference."),
+        EnumMember("COMMENT_TEXT", -31, "Comment Text."),
+        EnumMember("DATE", -77, "Date."),
+        EnumMember("DEFAULT_PARAGRAPH_FONT", -66, "Default Paragraph Font."),
+        EnumMember("EMPHASIS", -89, "Emphasis."),
+        EnumMember("ENDNOTE_REFERENCE", -43, "Endnote Reference."),
+        EnumMember("ENDNOTE_TEXT", -44, "Endnote Text."),
+        EnumMember("ENVELOPE_ADDRESS", -37, "Envelope Address."),
+        EnumMember("ENVELOPE_RETURN", -38, "Envelope Return."),
+        EnumMember("FOOTER", -33, "Footer."),
+        EnumMember("FOOTNOTE_REFERENCE", -39, "Footnote Reference."),
+        EnumMember("FOOTNOTE_TEXT", -30, "Footnote Text."),
+        EnumMember("HEADER", -32, "Header."),
+        EnumMember("HEADING_1", -2, "Heading 1."),
+        EnumMember("HEADING_2", -3, "Heading 2."),
+        EnumMember("HEADING_3", -4, "Heading 3."),
+        EnumMember("HEADING_4", -5, "Heading 4."),
+        EnumMember("HEADING_5", -6, "Heading 5."),
+        EnumMember("HEADING_6", -7, "Heading 6."),
+        EnumMember("HEADING_7", -8, "Heading 7."),
+        EnumMember("HEADING_8", -9, "Heading 8."),
+        EnumMember("HEADING_9", -10, "Heading 9."),
+        EnumMember("HTML_ACRONYM", -96, "HTML Acronym."),
+        EnumMember("HTML_ADDRESS", -97, "HTML Address."),
+        EnumMember("HTML_CITE", -98, "HTML Cite."),
+        EnumMember("HTML_CODE", -99, "HTML Code."),
+        EnumMember("HTML_DFN", -100, "HTML Definition."),
+        EnumMember("HTML_KBD", -101, "HTML Keyboard."),
+        EnumMember("HTML_NORMAL", -95, "Normal (Web)."),
+        EnumMember("HTML_PRE", -102, "HTML Preformatted."),
+        EnumMember("HTML_SAMP", -103, "HTML Sample."),
+        EnumMember("HTML_TT", -104, "HTML Typewriter."),
+        EnumMember("HTML_VAR", -105, "HTML Variable."),
+        EnumMember("HYPERLINK", -86, "Hyperlink."),
+        EnumMember("HYPERLINK_FOLLOWED", -87, "Followed Hyperlink."),
+        EnumMember("INDEX_1", -11, "Index 1."),
+        EnumMember("INDEX_2", -12, "Index 2."),
+        EnumMember("INDEX_3", -13, "Index 3."),
+        EnumMember("INDEX_4", -14, "Index 4."),
+        EnumMember("INDEX_5", -15, "Index 5."),
+        EnumMember("INDEX_6", -16, "Index 6."),
+        EnumMember("INDEX_7", -17, "Index 7."),
+        EnumMember("INDEX_8", -18, "Index 8."),
+        EnumMember("INDEX_9", -19, "Index 9."),
+        EnumMember("INDEX_HEADING", -34, "Index Heading"),
+        EnumMember("INTENSE_EMPHASIS", -262, "Intense Emphasis."),
+        EnumMember("INTENSE_QUOTE", -182, "Intense Quote."),
+        EnumMember("INTENSE_REFERENCE", -264, "Intense Reference."),
+        EnumMember("LINE_NUMBER", -41, "Line Number."),
+        EnumMember("LIST", -48, "List."),
+        EnumMember("LIST_2", -51, "List 2."),
+        EnumMember("LIST_3", -52, "List 3."),
+        EnumMember("LIST_4", -53, "List 4."),
+        EnumMember("LIST_5", -54, "List 5."),
+        EnumMember("LIST_BULLET", -49, "List Bullet."),
+        EnumMember("LIST_BULLET_2", -55, "List Bullet 2."),
+        EnumMember("LIST_BULLET_3", -56, "List Bullet 3."),
+        EnumMember("LIST_BULLET_4", -57, "List Bullet 4."),
+        EnumMember("LIST_BULLET_5", -58, "List Bullet 5."),
+        EnumMember("LIST_CONTINUE", -69, "List Continue."),
+        EnumMember("LIST_CONTINUE_2", -70, "List Continue 2."),
+        EnumMember("LIST_CONTINUE_3", -71, "List Continue 3."),
+        EnumMember("LIST_CONTINUE_4", -72, "List Continue 4."),
+        EnumMember("LIST_CONTINUE_5", -73, "List Continue 5."),
+        EnumMember("LIST_NUMBER", -50, "List Number."),
+        EnumMember("LIST_NUMBER_2", -59, "List Number 2."),
+        EnumMember("LIST_NUMBER_3", -60, "List Number 3."),
+        EnumMember("LIST_NUMBER_4", -61, "List Number 4."),
+        EnumMember("LIST_NUMBER_5", -62, "List Number 5."),
+        EnumMember("LIST_PARAGRAPH", -180, "List Paragraph."),
+        EnumMember("MACRO_TEXT", -46, "Macro Text."),
+        EnumMember("MESSAGE_HEADER", -74, "Message Header."),
+        EnumMember("NAV_PANE", -90, "Document Map."),
+        EnumMember("NORMAL", -1, "Normal."),
+        EnumMember("NORMAL_INDENT", -29, "Normal Indent."),
+        EnumMember("NORMAL_OBJECT", -158, "Normal (applied to an object)."),
+        EnumMember("NORMAL_TABLE", -106, "Normal (applied within a table)."),
+        EnumMember("NOTE_HEADING", -80, "Note Heading."),
+        EnumMember("PAGE_NUMBER", -42, "Page Number."),
+        EnumMember("PLAIN_TEXT", -91, "Plain Text."),
+        EnumMember("QUOTE", -181, "Quote."),
+        EnumMember("SALUTATION", -76, "Salutation."),
+        EnumMember("SIGNATURE", -65, "Signature."),
+        EnumMember("STRONG", -88, "Strong."),
+        EnumMember("SUBTITLE", -75, "Subtitle."),
+        EnumMember("SUBTLE_EMPHASIS", -261, "Subtle Emphasis."),
+        EnumMember("SUBTLE_REFERENCE", -263, "Subtle Reference."),
+        EnumMember("TABLE_COLORFUL_GRID", -172, "Colorful Grid."),
+        EnumMember("TABLE_COLORFUL_LIST", -171, "Colorful List."),
+        EnumMember("TABLE_COLORFUL_SHADING", -170, "Colorful Shading."),
+        EnumMember("TABLE_DARK_LIST", -169, "Dark List."),
+        EnumMember("TABLE_LIGHT_GRID", -161, "Light Grid."),
+        EnumMember("TABLE_LIGHT_GRID_ACCENT_1", -175, "Light Grid Accent 1."),
+        EnumMember("TABLE_LIGHT_LIST", -160, "Light List."),
+        EnumMember("TABLE_LIGHT_LIST_ACCENT_1", -174, "Light List Accent 1."),
+        EnumMember("TABLE_LIGHT_SHADING", -159, "Light Shading."),
+        EnumMember("TABLE_LIGHT_SHADING_ACCENT_1", -173, "Light Shading Accent 1."),
+        EnumMember("TABLE_MEDIUM_GRID_1", -166, "Medium Grid 1."),
+        EnumMember("TABLE_MEDIUM_GRID_2", -167, "Medium Grid 2."),
+        EnumMember("TABLE_MEDIUM_GRID_3", -168, "Medium Grid 3."),
+        EnumMember("TABLE_MEDIUM_LIST_1", -164, "Medium List 1."),
+        EnumMember("TABLE_MEDIUM_LIST_1_ACCENT_1", -178, "Medium List 1 Accent 1."),
+        EnumMember("TABLE_MEDIUM_LIST_2", -165, "Medium List 2."),
+        EnumMember("TABLE_MEDIUM_SHADING_1", -162, "Medium Shading 1."),
+        EnumMember(
+            "TABLE_MEDIUM_SHADING_1_ACCENT_1", -176, "Medium Shading 1 Accent 1."
+        ),
+        EnumMember("TABLE_MEDIUM_SHADING_2", -163, "Medium Shading 2."),
+        EnumMember(
+            "TABLE_MEDIUM_SHADING_2_ACCENT_1", -177, "Medium Shading 2 Accent 1."
+        ),
+        EnumMember("TABLE_OF_AUTHORITIES", -45, "Table of Authorities."),
+        EnumMember("TABLE_OF_FIGURES", -36, "Table of Figures."),
+        EnumMember("TITLE", -63, "Title."),
+        EnumMember("TOAHEADING", -47, "TOA Heading."),
+        EnumMember("TOC_1", -20, "TOC 1."),
+        EnumMember("TOC_2", -21, "TOC 2."),
+        EnumMember("TOC_3", -22, "TOC 3."),
+        EnumMember("TOC_4", -23, "TOC 4."),
+        EnumMember("TOC_5", -24, "TOC 5."),
+        EnumMember("TOC_6", -25, "TOC 6."),
+        EnumMember("TOC_7", -26, "TOC 7."),
+        EnumMember("TOC_8", -27, "TOC 8."),
+        EnumMember("TOC_9", -28, "TOC 9."),
     )
 
 
@@ -446,21 +184,13 @@ class WD_STYLE_TYPE(XmlEnumeration):
         assert styles[0].type == WD_STYLE_TYPE.PARAGRAPH
     """
 
-    __ms_name__ = 'WdStyleType'
+    __ms_name__ = "WdStyleType"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff196870.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff196870.aspx"
 
     __members__ = (
-        XmlMappedEnumMember(
-            'CHARACTER', 2, 'character', 'Character style.'
-        ),
-        XmlMappedEnumMember(
-            'LIST', 4, 'numbering', 'List style.'
-        ),
-        XmlMappedEnumMember(
-            'PARAGRAPH', 1, 'paragraph', 'Paragraph style.'
-        ),
-        XmlMappedEnumMember(
-            'TABLE', 3, 'table', 'Table style.'
-        ),
+        XmlMappedEnumMember("CHARACTER", 2, "character", "Character style."),
+        XmlMappedEnumMember("LIST", 4, "numbering", "List style."),
+        XmlMappedEnumMember("PARAGRAPH", 1, "paragraph", "Paragraph style."),
+        XmlMappedEnumMember("TABLE", 3, "table", "Table style."),
     )
diff --git a/docx/enum/table.py b/docx/enum/table.py
index eedab082e..f66fdccd5 100644
--- a/docx/enum/table.py
+++ b/docx/enum/table.py
@@ -4,16 +4,12 @@
 Enumerations related to tables in WordprocessingML files
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .base import (
-    alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
-)
+from .base import alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
 
 
-@alias('WD_ALIGN_VERTICAL')
+@alias("WD_ALIGN_VERTICAL")
 class WD_CELL_VERTICAL_ALIGNMENT(XmlEnumeration):
     """
     alias: **WD_ALIGN_VERTICAL**
@@ -28,33 +24,37 @@ class WD_CELL_VERTICAL_ALIGNMENT(XmlEnumeration):
         table.cell(0, 0).vertical_alignment = WD_ALIGN_VERTICAL.BOTTOM
     """
 
-    __ms_name__ = 'WdCellVerticalAlignment'
+    __ms_name__ = "WdCellVerticalAlignment"
 
-    __url__ = 'https://msdn.microsoft.com/en-us/library/office/ff193345.aspx'
+    __url__ = "https://msdn.microsoft.com/en-us/library/office/ff193345.aspx"
 
     __members__ = (
         XmlMappedEnumMember(
-            'TOP', 0, 'top', 'Text is aligned to the top border of the cell.'
+            "TOP", 0, "top", "Text is aligned to the top border of the cell."
         ),
         XmlMappedEnumMember(
-            'CENTER', 1, 'center', 'Text is aligned to the center of the cel'
-            'l.'
+            "CENTER", 1, "center", "Text is aligned to the center of the cel" "l."
         ),
         XmlMappedEnumMember(
-            'BOTTOM', 3, 'bottom', 'Text is aligned to the bottom border of '
-            'the cell.'
+            "BOTTOM",
+            3,
+            "bottom",
+            "Text is aligned to the bottom border of " "the cell.",
         ),
         XmlMappedEnumMember(
-            'BOTH', 101, 'both', 'This is an option in the OpenXml spec, but'
-            ' not in Word itself. It\'s not clear what Word behavior this se'
-            'tting produces. If you find out please let us know and we\'ll u'
-            'pdate this documentation. Otherwise, probably best to avoid thi'
-            's option.'
+            "BOTH",
+            101,
+            "both",
+            "This is an option in the OpenXml spec, but"
+            " not in Word itself. It's not clear what Word behavior this se"
+            "tting produces. If you find out please let us know and we'll u"
+            "pdate this documentation. Otherwise, probably best to avoid thi"
+            "s option.",
         ),
     )
 
 
-@alias('WD_ROW_HEIGHT')
+@alias("WD_ROW_HEIGHT")
 class WD_ROW_HEIGHT_RULE(XmlEnumeration):
     """
     alias: **WD_ROW_HEIGHT**
@@ -71,20 +71,23 @@ class WD_ROW_HEIGHT_RULE(XmlEnumeration):
 
     __ms_name__ = "WdRowHeightRule"
 
-    __url__ = 'https://msdn.microsoft.com/en-us/library/office/ff193620.aspx'
+    __url__ = "https://msdn.microsoft.com/en-us/library/office/ff193620.aspx"
 
     __members__ = (
         XmlMappedEnumMember(
-            'AUTO', 0, 'auto', 'The row height is adjusted to accommodate th'
-            'e tallest value in the row.'
+            "AUTO",
+            0,
+            "auto",
+            "The row height is adjusted to accommodate th"
+            "e tallest value in the row.",
         ),
         XmlMappedEnumMember(
-            'AT_LEAST', 1, 'atLeast', 'The row height is at least a minimum '
-            'specified value.'
-        ),
-        XmlMappedEnumMember(
-            'EXACTLY', 2, 'exact', 'The row height is an exact value.'
+            "AT_LEAST",
+            1,
+            "atLeast",
+            "The row height is at least a minimum " "specified value.",
         ),
+        XmlMappedEnumMember("EXACTLY", 2, "exact", "The row height is an exact value."),
     )
 
 
@@ -100,20 +103,14 @@ class WD_TABLE_ALIGNMENT(XmlEnumeration):
         table.alignment = WD_TABLE_ALIGNMENT.CENTER
     """
 
-    __ms_name__ = 'WdRowAlignment'
+    __ms_name__ = "WdRowAlignment"
 
-    __url__ = ' http://office.microsoft.com/en-us/word-help/HV080607259.aspx'
+    __url__ = " http://office.microsoft.com/en-us/word-help/HV080607259.aspx"
 
     __members__ = (
-        XmlMappedEnumMember(
-            'LEFT', 0, 'left', 'Left-aligned'
-        ),
-        XmlMappedEnumMember(
-            'CENTER', 1, 'center', 'Center-aligned.'
-        ),
-        XmlMappedEnumMember(
-            'RIGHT', 2, 'right', 'Right-aligned.'
-        ),
+        XmlMappedEnumMember("LEFT", 0, "left", "Left-aligned"),
+        XmlMappedEnumMember("CENTER", 1, "center", "Center-aligned."),
+        XmlMappedEnumMember("RIGHT", 2, "right", "Right-aligned."),
     )
 
 
@@ -130,17 +127,21 @@ class WD_TABLE_DIRECTION(Enumeration):
         table.direction = WD_TABLE_DIRECTION.RTL
     """
 
-    __ms_name__ = 'WdTableDirection'
+    __ms_name__ = "WdTableDirection"
 
-    __url__ = ' http://msdn.microsoft.com/en-us/library/ff835141.aspx'
+    __url__ = " http://msdn.microsoft.com/en-us/library/ff835141.aspx"
 
     __members__ = (
         EnumMember(
-            'LTR', 0, 'The table or row is arranged with the first column '
-            'in the leftmost position.'
+            "LTR",
+            0,
+            "The table or row is arranged with the first column "
+            "in the leftmost position.",
         ),
         EnumMember(
-            'RTL', 1, 'The table or row is arranged with the first column '
-            'in the rightmost position.'
+            "RTL",
+            1,
+            "The table or row is arranged with the first column "
+            "in the rightmost position.",
         ),
     )
diff --git a/docx/enum/text.py b/docx/enum/text.py
index 67f6a66af..1de05326f 100644
--- a/docx/enum/text.py
+++ b/docx/enum/text.py
@@ -9,7 +9,7 @@
 from .base import alias, EnumMember, XmlEnumeration, XmlMappedEnumMember
 
 
-@alias('WD_ALIGN_PARAGRAPH')
+@alias("WD_ALIGN_PARAGRAPH")
 class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
     """
     alias: **WD_ALIGN_PARAGRAPH**
@@ -24,42 +24,45 @@ class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
         paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
     """
 
-    __ms_name__ = 'WdParagraphAlignment'
+    __ms_name__ = "WdParagraphAlignment"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff835817.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff835817.aspx"
 
     __members__ = (
+        XmlMappedEnumMember("LEFT", 0, "left", "Left-aligned"),
+        XmlMappedEnumMember("CENTER", 1, "center", "Center-aligned."),
+        XmlMappedEnumMember("RIGHT", 2, "right", "Right-aligned."),
+        XmlMappedEnumMember("JUSTIFY", 3, "both", "Fully justified."),
         XmlMappedEnumMember(
-            'LEFT', 0, 'left', 'Left-aligned'
+            "DISTRIBUTE",
+            4,
+            "distribute",
+            "Paragraph characters are distrib"
+            "uted to fill the entire width of the paragraph.",
         ),
         XmlMappedEnumMember(
-            'CENTER', 1, 'center', 'Center-aligned.'
+            "JUSTIFY_MED",
+            5,
+            "mediumKashida",
+            "Justified with a medium char" "acter compression ratio.",
         ),
         XmlMappedEnumMember(
-            'RIGHT', 2, 'right', 'Right-aligned.'
+            "JUSTIFY_HI",
+            7,
+            "highKashida",
+            "Justified with a high character" " compression ratio.",
         ),
         XmlMappedEnumMember(
-            'JUSTIFY', 3, 'both', 'Fully justified.'
+            "JUSTIFY_LOW",
+            8,
+            "lowKashida",
+            "Justified with a low character " "compression ratio.",
         ),
         XmlMappedEnumMember(
-            'DISTRIBUTE', 4, 'distribute', 'Paragraph characters are distrib'
-            'uted to fill the entire width of the paragraph.'
-        ),
-        XmlMappedEnumMember(
-            'JUSTIFY_MED', 5, 'mediumKashida', 'Justified with a medium char'
-            'acter compression ratio.'
-        ),
-        XmlMappedEnumMember(
-            'JUSTIFY_HI', 7, 'highKashida', 'Justified with a high character'
-            ' compression ratio.'
-        ),
-        XmlMappedEnumMember(
-            'JUSTIFY_LOW', 8, 'lowKashida', 'Justified with a low character '
-            'compression ratio.'
-        ),
-        XmlMappedEnumMember(
-            'THAI_JUSTIFY', 9, 'thaiDistribute', 'Justified according to Tha'
-            'i formatting layout.'
+            "THAI_JUSTIFY",
+            9,
+            "thaiDistribute",
+            "Justified according to Tha" "i formatting layout.",
         ),
     )
 
@@ -69,6 +72,7 @@ class WD_BREAK_TYPE(object):
     Corresponds to WdBreakType enumeration
     http://msdn.microsoft.com/en-us/library/office/ff195905.aspx
     """
+
     COLUMN = 8
     LINE = 6
     LINE_CLEAR_LEFT = 9
@@ -85,72 +89,40 @@ class WD_BREAK_TYPE(object):
 WD_BREAK = WD_BREAK_TYPE
 
 
-@alias('WD_COLOR')
+@alias("WD_COLOR")
 class WD_COLOR_INDEX(XmlEnumeration):
     """
     Specifies a standard preset color to apply. Used for font highlighting and
     perhaps other applications.
     """
 
-    __ms_name__ = 'WdColorIndex'
+    __ms_name__ = "WdColorIndex"
 
-    __url__ = 'https://msdn.microsoft.com/EN-US/library/office/ff195343.aspx'
+    __url__ = "https://msdn.microsoft.com/EN-US/library/office/ff195343.aspx"
 
     __members__ = (
         XmlMappedEnumMember(
-            None, None, None, 'Color is inherited from the style hierarchy.'
-        ),
-        XmlMappedEnumMember(
-            'AUTO', 0, 'default', 'Automatic color. Default; usually black.'
-        ),
-        XmlMappedEnumMember(
-            'BLACK', 1, 'black', 'Black color.'
-        ),
-        XmlMappedEnumMember(
-            'BLUE', 2, 'blue', 'Blue color'
-        ),
-        XmlMappedEnumMember(
-            'BRIGHT_GREEN', 4, 'green', 'Bright green color.'
-        ),
-        XmlMappedEnumMember(
-            'DARK_BLUE', 9, 'darkBlue', 'Dark blue color.'
-        ),
-        XmlMappedEnumMember(
-            'DARK_RED', 13, 'darkRed', 'Dark red color.'
-        ),
-        XmlMappedEnumMember(
-            'DARK_YELLOW', 14, 'darkYellow', 'Dark yellow color.'
-        ),
-        XmlMappedEnumMember(
-            'GRAY_25', 16, 'lightGray', '25% shade of gray color.'
-        ),
-        XmlMappedEnumMember(
-            'GRAY_50', 15, 'darkGray', '50% shade of gray color.'
-        ),
-        XmlMappedEnumMember(
-            'GREEN', 11, 'darkGreen', 'Green color.'
-        ),
-        XmlMappedEnumMember(
-            'PINK', 5, 'magenta', 'Pink color.'
-        ),
-        XmlMappedEnumMember(
-            'RED', 6, 'red', 'Red color.'
-        ),
-        XmlMappedEnumMember(
-            'TEAL', 10, 'darkCyan', 'Teal color.'
-        ),
-        XmlMappedEnumMember(
-            'TURQUOISE', 3, 'cyan', 'Turquoise color.'
-        ),
-        XmlMappedEnumMember(
-            'VIOLET', 12, 'darkMagenta', 'Violet color.'
-        ),
-        XmlMappedEnumMember(
-            'WHITE', 8, 'white', 'White color.'
-        ),
-        XmlMappedEnumMember(
-            'YELLOW', 7, 'yellow', 'Yellow color.'
-        ),
+            None, None, None, "Color is inherited from the style hierarchy."
+        ),
+        XmlMappedEnumMember(
+            "AUTO", 0, "default", "Automatic color. Default; usually black."
+        ),
+        XmlMappedEnumMember("BLACK", 1, "black", "Black color."),
+        XmlMappedEnumMember("BLUE", 2, "blue", "Blue color"),
+        XmlMappedEnumMember("BRIGHT_GREEN", 4, "green", "Bright green color."),
+        XmlMappedEnumMember("DARK_BLUE", 9, "darkBlue", "Dark blue color."),
+        XmlMappedEnumMember("DARK_RED", 13, "darkRed", "Dark red color."),
+        XmlMappedEnumMember("DARK_YELLOW", 14, "darkYellow", "Dark yellow color."),
+        XmlMappedEnumMember("GRAY_25", 16, "lightGray", "25% shade of gray color."),
+        XmlMappedEnumMember("GRAY_50", 15, "darkGray", "50% shade of gray color."),
+        XmlMappedEnumMember("GREEN", 11, "darkGreen", "Green color."),
+        XmlMappedEnumMember("PINK", 5, "magenta", "Pink color."),
+        XmlMappedEnumMember("RED", 6, "red", "Red color."),
+        XmlMappedEnumMember("TEAL", 10, "darkCyan", "Teal color."),
+        XmlMappedEnumMember("TURQUOISE", 3, "cyan", "Turquoise color."),
+        XmlMappedEnumMember("VIOLET", 12, "darkMagenta", "Violet color."),
+        XmlMappedEnumMember("WHITE", 8, "white", "White color."),
+        XmlMappedEnumMember("YELLOW", 7, "yellow", "Yellow color."),
     )
 
 
@@ -166,33 +138,36 @@ class WD_LINE_SPACING(XmlEnumeration):
         paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
     """
 
-    __ms_name__ = 'WdLineSpacing'
+    __ms_name__ = "WdLineSpacing"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff844910.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff844910.aspx"
 
     __members__ = (
-        EnumMember(
-            'ONE_POINT_FIVE', 1, 'Space-and-a-half line spacing.'
-        ),
+        EnumMember("ONE_POINT_FIVE", 1, "Space-and-a-half line spacing."),
         XmlMappedEnumMember(
-            'AT_LEAST', 3, 'atLeast', 'Line spacing is always at least the s'
-            'pecified amount. The amount is specified separately.'
-        ),
-        EnumMember(
-            'DOUBLE', 2, 'Double spaced.'
+            "AT_LEAST",
+            3,
+            "atLeast",
+            "Line spacing is always at least the s"
+            "pecified amount. The amount is specified separately.",
         ),
+        EnumMember("DOUBLE", 2, "Double spaced."),
         XmlMappedEnumMember(
-            'EXACTLY', 4, 'exact', 'Line spacing is exactly the specified am'
-            'ount. The amount is specified separately.'
+            "EXACTLY",
+            4,
+            "exact",
+            "Line spacing is exactly the specified am"
+            "ount. The amount is specified separately.",
         ),
         XmlMappedEnumMember(
-            'MULTIPLE', 5, 'auto', 'Line spacing is specified as a multiple '
-            'of line heights. Changing the font size will change the line sp'
-            'acing proportionately.'
-        ),
-        EnumMember(
-            'SINGLE', 0, 'Single spaced (default).'
+            "MULTIPLE",
+            5,
+            "auto",
+            "Line spacing is specified as a multiple "
+            "of line heights. Changing the font size will change the line sp"
+            "acing proportionately.",
         ),
+        EnumMember("SINGLE", 0, "Single spaced (default)."),
     )
 
 
@@ -201,41 +176,21 @@ class WD_TAB_ALIGNMENT(XmlEnumeration):
     Specifies the tab stop alignment to apply.
     """
 
-    __ms_name__ = 'WdTabAlignment'
+    __ms_name__ = "WdTabAlignment"
 
-    __url__ = 'https://msdn.microsoft.com/EN-US/library/office/ff195609.aspx'
+    __url__ = "https://msdn.microsoft.com/EN-US/library/office/ff195609.aspx"
 
     __members__ = (
-        XmlMappedEnumMember(
-            'LEFT', 0, 'left', 'Left-aligned.'
-        ),
-        XmlMappedEnumMember(
-            'CENTER', 1, 'center', 'Center-aligned.'
-        ),
-        XmlMappedEnumMember(
-            'RIGHT', 2, 'right', 'Right-aligned.'
-        ),
-        XmlMappedEnumMember(
-            'DECIMAL', 3, 'decimal', 'Decimal-aligned.'
-        ),
-        XmlMappedEnumMember(
-            'BAR', 4, 'bar', 'Bar-aligned.'
-        ),
-        XmlMappedEnumMember(
-            'LIST', 6, 'list', 'List-aligned. (deprecated)'
-        ),
-        XmlMappedEnumMember(
-            'CLEAR', 101, 'clear', 'Clear an inherited tab stop.'
-        ),
-        XmlMappedEnumMember(
-            'END', 102, 'end', 'Right-aligned.  (deprecated)'
-        ),
-        XmlMappedEnumMember(
-            'NUM', 103, 'num', 'Left-aligned.  (deprecated)'
-        ),
-        XmlMappedEnumMember(
-            'START', 104, 'start', 'Left-aligned.  (deprecated)'
-        ),
+        XmlMappedEnumMember("LEFT", 0, "left", "Left-aligned."),
+        XmlMappedEnumMember("CENTER", 1, "center", "Center-aligned."),
+        XmlMappedEnumMember("RIGHT", 2, "right", "Right-aligned."),
+        XmlMappedEnumMember("DECIMAL", 3, "decimal", "Decimal-aligned."),
+        XmlMappedEnumMember("BAR", 4, "bar", "Bar-aligned."),
+        XmlMappedEnumMember("LIST", 6, "list", "List-aligned. (deprecated)"),
+        XmlMappedEnumMember("CLEAR", 101, "clear", "Clear an inherited tab stop."),
+        XmlMappedEnumMember("END", 102, "end", "Right-aligned.  (deprecated)"),
+        XmlMappedEnumMember("NUM", 103, "num", "Left-aligned.  (deprecated)"),
+        XmlMappedEnumMember("START", 104, "start", "Left-aligned.  (deprecated)"),
     )
 
 
@@ -244,29 +199,17 @@ class WD_TAB_LEADER(XmlEnumeration):
     Specifies the character to use as the leader with formatted tabs.
     """
 
-    __ms_name__ = 'WdTabLeader'
+    __ms_name__ = "WdTabLeader"
 
-    __url__ = 'https://msdn.microsoft.com/en-us/library/office/ff845050.aspx'
+    __url__ = "https://msdn.microsoft.com/en-us/library/office/ff845050.aspx"
 
     __members__ = (
-        XmlMappedEnumMember(
-            'SPACES', 0, 'none', 'Spaces. Default.'
-        ),
-        XmlMappedEnumMember(
-            'DOTS', 1, 'dot', 'Dots.'
-        ),
-        XmlMappedEnumMember(
-            'DASHES', 2, 'hyphen', 'Dashes.'
-        ),
-        XmlMappedEnumMember(
-            'LINES', 3, 'underscore', 'Double lines.'
-        ),
-        XmlMappedEnumMember(
-            'HEAVY', 4, 'heavy', 'A heavy line.'
-        ),
-        XmlMappedEnumMember(
-            'MIDDLE_DOT', 5, 'middleDot', 'A vertically-centered dot.'
-        ),
+        XmlMappedEnumMember("SPACES", 0, "none", "Spaces. Default."),
+        XmlMappedEnumMember("DOTS", 1, "dot", "Dots."),
+        XmlMappedEnumMember("DASHES", 2, "hyphen", "Dashes."),
+        XmlMappedEnumMember("LINES", 3, "underscore", "Double lines."),
+        XmlMappedEnumMember("HEAVY", 4, "heavy", "A heavy line."),
+        XmlMappedEnumMember("MIDDLE_DOT", 5, "middleDot", "A vertically-centered dot."),
     )
 
 
@@ -275,78 +218,62 @@ class WD_UNDERLINE(XmlEnumeration):
     Specifies the style of underline applied to a run of characters.
     """
 
-    __ms_name__ = 'WdUnderline'
+    __ms_name__ = "WdUnderline"
 
-    __url__ = 'http://msdn.microsoft.com/en-us/library/office/ff822388.aspx'
+    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff822388.aspx"
 
     __members__ = (
         XmlMappedEnumMember(
-            None, None, None, 'Inherit underline setting from containing par'
-            'agraph.'
-        ),
-        XmlMappedEnumMember(
-            'NONE', 0, 'none', 'No underline. This setting overrides any inh'
-            'erited underline value, so can be used to remove underline from'
-            ' a run that inherits underlining from its containing paragraph.'
-            ' Note this is not the same as assigning |None| to Run.underline'
-            '. |None| is a valid assignment value, but causes the run to inh'
-            'erit its underline value. Assigning ``WD_UNDERLINE.NONE`` cause'
-            's underlining to be unconditionally turned off.'
-        ),
-        XmlMappedEnumMember(
-            'SINGLE', 1, 'single', 'A single line. Note that this setting is'
-            'write-only in the sense that |True| (rather than ``WD_UNDERLINE'
-            '.SINGLE``) is returned for a run having this setting.'
-        ),
-        XmlMappedEnumMember(
-            'WORDS', 2, 'words', 'Underline individual words only.'
-        ),
-        XmlMappedEnumMember(
-            'DOUBLE', 3, 'double', 'A double line.'
-        ),
-        XmlMappedEnumMember(
-            'DOTTED', 4, 'dotted', 'Dots.'
-        ),
-        XmlMappedEnumMember(
-            'THICK', 6, 'thick', 'A single thick line.'
-        ),
-        XmlMappedEnumMember(
-            'DASH', 7, 'dash', 'Dashes.'
-        ),
-        XmlMappedEnumMember(
-            'DOT_DASH', 9, 'dotDash', 'Alternating dots and dashes.'
-        ),
-        XmlMappedEnumMember(
-            'DOT_DOT_DASH', 10, 'dotDotDash', 'An alternating dot-dot-dash p'
-            'attern.'
-        ),
-        XmlMappedEnumMember(
-            'WAVY', 11, 'wave', 'A single wavy line.'
-        ),
-        XmlMappedEnumMember(
-            'DOTTED_HEAVY', 20, 'dottedHeavy', 'Heavy dots.'
-        ),
-        XmlMappedEnumMember(
-            'DASH_HEAVY', 23, 'dashedHeavy', 'Heavy dashes.'
+            None, None, None, "Inherit underline setting from containing par" "agraph."
         ),
         XmlMappedEnumMember(
-            'DOT_DASH_HEAVY', 25, 'dashDotHeavy', 'Alternating heavy dots an'
-            'd heavy dashes.'
+            "NONE",
+            0,
+            "none",
+            "No underline. This setting overrides any inh"
+            "erited underline value, so can be used to remove underline from"
+            " a run that inherits underlining from its containing paragraph."
+            " Note this is not the same as assigning |None| to Run.underline"
+            ". |None| is a valid assignment value, but causes the run to inh"
+            "erit its underline value. Assigning ``WD_UNDERLINE.NONE`` cause"
+            "s underlining to be unconditionally turned off.",
         ),
         XmlMappedEnumMember(
-            'DOT_DOT_DASH_HEAVY', 26, 'dashDotDotHeavy', 'An alternating hea'
-            'vy dot-dot-dash pattern.'
+            "SINGLE",
+            1,
+            "single",
+            "A single line. Note that this setting is"
+            "write-only in the sense that |True| (rather than ``WD_UNDERLINE"
+            ".SINGLE``) is returned for a run having this setting.",
         ),
+        XmlMappedEnumMember("WORDS", 2, "words", "Underline individual words only."),
+        XmlMappedEnumMember("DOUBLE", 3, "double", "A double line."),
+        XmlMappedEnumMember("DOTTED", 4, "dotted", "Dots."),
+        XmlMappedEnumMember("THICK", 6, "thick", "A single thick line."),
+        XmlMappedEnumMember("DASH", 7, "dash", "Dashes."),
+        XmlMappedEnumMember("DOT_DASH", 9, "dotDash", "Alternating dots and dashes."),
         XmlMappedEnumMember(
-            'WAVY_HEAVY', 27, 'wavyHeavy', 'A heavy wavy line.'
+            "DOT_DOT_DASH", 10, "dotDotDash", "An alternating dot-dot-dash p" "attern."
         ),
+        XmlMappedEnumMember("WAVY", 11, "wave", "A single wavy line."),
+        XmlMappedEnumMember("DOTTED_HEAVY", 20, "dottedHeavy", "Heavy dots."),
+        XmlMappedEnumMember("DASH_HEAVY", 23, "dashedHeavy", "Heavy dashes."),
         XmlMappedEnumMember(
-            'DASH_LONG', 39, 'dashLong', 'Long dashes.'
+            "DOT_DASH_HEAVY",
+            25,
+            "dashDotHeavy",
+            "Alternating heavy dots an" "d heavy dashes.",
         ),
         XmlMappedEnumMember(
-            'WAVY_DOUBLE', 43, 'wavyDouble', 'A double wavy line.'
+            "DOT_DOT_DASH_HEAVY",
+            26,
+            "dashDotDotHeavy",
+            "An alternating hea" "vy dot-dot-dash pattern.",
         ),
+        XmlMappedEnumMember("WAVY_HEAVY", 27, "wavyHeavy", "A heavy wavy line."),
+        XmlMappedEnumMember("DASH_LONG", 39, "dashLong", "Long dashes."),
+        XmlMappedEnumMember("WAVY_DOUBLE", 43, "wavyDouble", "A double wavy line."),
         XmlMappedEnumMember(
-            'DASH_LONG_HEAVY', 55, 'dashLongHeavy', 'Long heavy dashes.'
+            "DASH_LONG_HEAVY", 55, "dashLongHeavy", "Long heavy dashes."
         ),
     )
diff --git a/docx/image/__init__.py b/docx/image/__init__.py
index 8ab3ada68..e85234545 100644
--- a/docx/image/__init__.py
+++ b/docx/image/__init__.py
@@ -5,9 +5,7 @@
 size, as a required step in including them in a document.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.image.bmp import Bmp
 from docx.image.gif import Gif
@@ -18,12 +16,12 @@
 
 SIGNATURES = (
     # class, offset, signature_bytes
-    (Png,  0, b'\x89PNG\x0D\x0A\x1A\x0A'),
-    (Jfif, 6, b'JFIF'),
-    (Exif, 6, b'Exif'),
-    (Gif,  0, b'GIF87a'),
-    (Gif,  0, b'GIF89a'),
-    (Tiff, 0, b'MM\x00*'),  # big-endian (Motorola) TIFF
-    (Tiff, 0, b'II*\x00'),  # little-endian (Intel) TIFF
-    (Bmp,  0, b'BM'),
+    (Png, 0, b"\x89PNG\x0D\x0A\x1A\x0A"),
+    (Jfif, 6, b"JFIF"),
+    (Exif, 6, b"Exif"),
+    (Gif, 0, b"GIF87a"),
+    (Gif, 0, b"GIF89a"),
+    (Tiff, 0, b"MM\x00*"),  # big-endian (Motorola) TIFF
+    (Tiff, 0, b"II*\x00"),  # little-endian (Intel) TIFF
+    (Bmp, 0, b"BM"),
 )
diff --git a/docx/image/bmp.py b/docx/image/bmp.py
index d22f25871..aebc6b9cc 100644
--- a/docx/image/bmp.py
+++ b/docx/image/bmp.py
@@ -11,6 +11,7 @@ class Bmp(BaseImageHeader):
     """
     Image header parser for BMP images
     """
+
     @classmethod
     def from_stream(cls, stream):
         """
@@ -43,7 +44,7 @@ def default_ext(self):
         """
         Default filename extension, always 'bmp' for BMP images.
         """
-        return 'bmp'
+        return "bmp"
 
     @staticmethod
     def _dpi(px_per_meter):
diff --git a/docx/image/constants.py b/docx/image/constants.py
index 90b469705..e4fa17fb3 100644
--- a/docx/image/constants.py
+++ b/docx/image/constants.py
@@ -9,83 +9,93 @@ class JPEG_MARKER_CODE(object):
     """
     JPEG marker codes
     """
-    TEM = b'\x01'
-    DHT = b'\xC4'
-    DAC = b'\xCC'
-    JPG = b'\xC8'
-
-    SOF0 = b'\xC0'
-    SOF1 = b'\xC1'
-    SOF2 = b'\xC2'
-    SOF3 = b'\xC3'
-    SOF5 = b'\xC5'
-    SOF6 = b'\xC6'
-    SOF7 = b'\xC7'
-    SOF9 = b'\xC9'
-    SOFA = b'\xCA'
-    SOFB = b'\xCB'
-    SOFD = b'\xCD'
-    SOFE = b'\xCE'
-    SOFF = b'\xCF'
-
-    RST0 = b'\xD0'
-    RST1 = b'\xD1'
-    RST2 = b'\xD2'
-    RST3 = b'\xD3'
-    RST4 = b'\xD4'
-    RST5 = b'\xD5'
-    RST6 = b'\xD6'
-    RST7 = b'\xD7'
-
-    SOI = b'\xD8'
-    EOI = b'\xD9'
-    SOS = b'\xDA'
-    DQT = b'\xDB'  # Define Quantization Table(s)
-    DNL = b'\xDC'
-    DRI = b'\xDD'
-    DHP = b'\xDE'
-    EXP = b'\xDF'
-
-    APP0 = b'\xE0'
-    APP1 = b'\xE1'
-    APP2 = b'\xE2'
-    APP3 = b'\xE3'
-    APP4 = b'\xE4'
-    APP5 = b'\xE5'
-    APP6 = b'\xE6'
-    APP7 = b'\xE7'
-    APP8 = b'\xE8'
-    APP9 = b'\xE9'
-    APPA = b'\xEA'
-    APPB = b'\xEB'
-    APPC = b'\xEC'
-    APPD = b'\xED'
-    APPE = b'\xEE'
-    APPF = b'\xEF'
-
-    STANDALONE_MARKERS = (
-        TEM, SOI, EOI, RST0, RST1, RST2, RST3, RST4, RST5, RST6, RST7
-    )
+
+    TEM = b"\x01"
+    DHT = b"\xC4"
+    DAC = b"\xCC"
+    JPG = b"\xC8"
+
+    SOF0 = b"\xC0"
+    SOF1 = b"\xC1"
+    SOF2 = b"\xC2"
+    SOF3 = b"\xC3"
+    SOF5 = b"\xC5"
+    SOF6 = b"\xC6"
+    SOF7 = b"\xC7"
+    SOF9 = b"\xC9"
+    SOFA = b"\xCA"
+    SOFB = b"\xCB"
+    SOFD = b"\xCD"
+    SOFE = b"\xCE"
+    SOFF = b"\xCF"
+
+    RST0 = b"\xD0"
+    RST1 = b"\xD1"
+    RST2 = b"\xD2"
+    RST3 = b"\xD3"
+    RST4 = b"\xD4"
+    RST5 = b"\xD5"
+    RST6 = b"\xD6"
+    RST7 = b"\xD7"
+
+    SOI = b"\xD8"
+    EOI = b"\xD9"
+    SOS = b"\xDA"
+    DQT = b"\xDB"  # Define Quantization Table(s)
+    DNL = b"\xDC"
+    DRI = b"\xDD"
+    DHP = b"\xDE"
+    EXP = b"\xDF"
+
+    APP0 = b"\xE0"
+    APP1 = b"\xE1"
+    APP2 = b"\xE2"
+    APP3 = b"\xE3"
+    APP4 = b"\xE4"
+    APP5 = b"\xE5"
+    APP6 = b"\xE6"
+    APP7 = b"\xE7"
+    APP8 = b"\xE8"
+    APP9 = b"\xE9"
+    APPA = b"\xEA"
+    APPB = b"\xEB"
+    APPC = b"\xEC"
+    APPD = b"\xED"
+    APPE = b"\xEE"
+    APPF = b"\xEF"
+
+    STANDALONE_MARKERS = (TEM, SOI, EOI, RST0, RST1, RST2, RST3, RST4, RST5, RST6, RST7)
 
     SOF_MARKER_CODES = (
-        SOF0, SOF1, SOF2, SOF3, SOF5, SOF6, SOF7, SOF9, SOFA, SOFB, SOFD,
-        SOFE, SOFF
+        SOF0,
+        SOF1,
+        SOF2,
+        SOF3,
+        SOF5,
+        SOF6,
+        SOF7,
+        SOF9,
+        SOFA,
+        SOFB,
+        SOFD,
+        SOFE,
+        SOFF,
     )
 
     marker_names = {
-        b'\x00': 'UNKNOWN',
-        b'\xC0': 'SOF0',
-        b'\xC2': 'SOF2',
-        b'\xC4': 'DHT',
-        b'\xDA': 'SOS',   # start of scan
-        b'\xD8': 'SOI',   # start of image
-        b'\xD9': 'EOI',   # end of image
-        b'\xDB': 'DQT',
-        b'\xE0': 'APP0',
-        b'\xE1': 'APP1',
-        b'\xE2': 'APP2',
-        b'\xED': 'APP13',
-        b'\xEE': 'APP14',
+        b"\x00": "UNKNOWN",
+        b"\xC0": "SOF0",
+        b"\xC2": "SOF2",
+        b"\xC4": "DHT",
+        b"\xDA": "SOS",  # start of scan
+        b"\xD8": "SOI",  # start of image
+        b"\xD9": "EOI",  # end of image
+        b"\xDB": "DQT",
+        b"\xE0": "APP0",
+        b"\xE1": "APP1",
+        b"\xE2": "APP2",
+        b"\xED": "APP13",
+        b"\xEE": "APP14",
     }
 
     @classmethod
@@ -97,26 +107,29 @@ class MIME_TYPE(object):
     """
     Image content types
     """
-    BMP = 'image/bmp'
-    GIF = 'image/gif'
-    JPEG = 'image/jpeg'
-    PNG = 'image/png'
-    TIFF = 'image/tiff'
+
+    BMP = "image/bmp"
+    GIF = "image/gif"
+    JPEG = "image/jpeg"
+    PNG = "image/png"
+    TIFF = "image/tiff"
 
 
 class PNG_CHUNK_TYPE(object):
     """
     PNG chunk type names
     """
-    IHDR = 'IHDR'
-    pHYs = 'pHYs'
-    IEND = 'IEND'
+
+    IHDR = "IHDR"
+    pHYs = "pHYs"
+    IEND = "IEND"
 
 
 class TIFF_FLD_TYPE(object):
     """
     Tag codes for TIFF Image File Directory (IFD) entries.
     """
+
     BYTE = 1
     ASCII = 2
     SHORT = 3
@@ -124,8 +137,11 @@ class TIFF_FLD_TYPE(object):
     RATIONAL = 5
 
     field_type_names = {
-        1: 'BYTE', 2: 'ASCII char', 3: 'SHORT', 4: 'LONG',
-        5: 'RATIONAL'
+        1: "BYTE",
+        2: "ASCII char",
+        3: "SHORT",
+        4: "LONG",
+        5: "RATIONAL",
     }
 
 
@@ -136,6 +152,7 @@ class TIFF_TAG(object):
     """
     Tag codes for TIFF Image File Directory (IFD) entries.
     """
+
     IMAGE_WIDTH = 0x0100
     IMAGE_LENGTH = 0x0101
     X_RESOLUTION = 0x011A
@@ -143,27 +160,27 @@ class TIFF_TAG(object):
     RESOLUTION_UNIT = 0x0128
 
     tag_names = {
-        0x00FE: 'NewSubfileType',
-        0x0100: 'ImageWidth',
-        0x0101: 'ImageLength',
-        0x0102: 'BitsPerSample',
-        0x0103: 'Compression',
-        0x0106: 'PhotometricInterpretation',
-        0x010E: 'ImageDescription',
-        0x010F: 'Make',
-        0x0110: 'Model',
-        0x0111: 'StripOffsets',
-        0x0112: 'Orientation',
-        0x0115: 'SamplesPerPixel',
-        0x0117: 'StripByteCounts',
-        0x011A: 'XResolution',
-        0x011B: 'YResolution',
-        0x011C: 'PlanarConfiguration',
-        0x0128: 'ResolutionUnit',
-        0x0131: 'Software',
-        0x0132: 'DateTime',
-        0x0213: 'YCbCrPositioning',
-        0x8769: 'ExifTag',
-        0x8825: 'GPS IFD',
-        0xC4A5: 'PrintImageMatching',
+        0x00FE: "NewSubfileType",
+        0x0100: "ImageWidth",
+        0x0101: "ImageLength",
+        0x0102: "BitsPerSample",
+        0x0103: "Compression",
+        0x0106: "PhotometricInterpretation",
+        0x010E: "ImageDescription",
+        0x010F: "Make",
+        0x0110: "Model",
+        0x0111: "StripOffsets",
+        0x0112: "Orientation",
+        0x0115: "SamplesPerPixel",
+        0x0117: "StripByteCounts",
+        0x011A: "XResolution",
+        0x011B: "YResolution",
+        0x011C: "PlanarConfiguration",
+        0x0128: "ResolutionUnit",
+        0x0131: "Software",
+        0x0132: "DateTime",
+        0x0213: "YCbCrPositioning",
+        0x8769: "ExifTag",
+        0x8825: "GPS IFD",
+        0xC4A5: "PrintImageMatching",
     }
diff --git a/docx/image/gif.py b/docx/image/gif.py
index 57f037d80..07f2b1c77 100644
--- a/docx/image/gif.py
+++ b/docx/image/gif.py
@@ -14,6 +14,7 @@ class Gif(BaseImageHeader):
     support resolution (DPI) information. Both horizontal and vertical DPI
     default to 72.
     """
+
     @classmethod
     def from_stream(cls, stream):
         """
@@ -36,12 +37,12 @@ def default_ext(self):
         """
         Default filename extension, always 'gif' for GIF images.
         """
-        return 'gif'
+        return "gif"
 
     @classmethod
     def _dimensions_from_stream(cls, stream):
         stream.seek(6)
         bytes_ = stream.read(4)
-        struct = Struct('<HH')
+        struct = Struct("<HH")
         px_width, px_height = struct.unpack(bytes_)
         return px_width, px_height
diff --git a/docx/image/helpers.py b/docx/image/helpers.py
index f1a67e8d6..83b593bf3 100644
--- a/docx/image/helpers.py
+++ b/docx/image/helpers.py
@@ -7,8 +7,8 @@
 from .exceptions import UnexpectedEndOfFileError
 
 
-BIG_ENDIAN = '>'
-LITTLE_ENDIAN = '<'
+BIG_ENDIAN = ">"
+LITTLE_ENDIAN = "<"
 
 
 class StreamReader(object):
@@ -17,12 +17,11 @@ class StreamReader(object):
     binary file. Byte-order is configurable. *base_offset* is added to any
     base value provided to calculate actual location for reads.
     """
+
     def __init__(self, stream, byte_order, base_offset=0):
         super(StreamReader, self).__init__()
         self._stream = stream
-        self._byte_order = (
-            LITTLE_ENDIAN if byte_order == LITTLE_ENDIAN else BIG_ENDIAN
-        )
+        self._byte_order = LITTLE_ENDIAN if byte_order == LITTLE_ENDIAN else BIG_ENDIAN
         self._base_offset = base_offset
 
     def read(self, count):
@@ -37,7 +36,7 @@ def read_byte(self, base, offset=0):
         self._base_offset + *base* + *offset*. If *base* is None, the byte is
         read from the current position in the stream.
         """
-        fmt = 'B'
+        fmt = "B"
         return self._read_int(fmt, base, offset)
 
     def read_long(self, base, offset=0):
@@ -47,7 +46,7 @@ def read_long(self, base, offset=0):
         read from the current position in the stream. The endian setting of
         this instance is used to interpret the byte layout of the long.
         """
-        fmt = '<L' if self._byte_order is LITTLE_ENDIAN else '>L'
+        fmt = "<L" if self._byte_order is LITTLE_ENDIAN else ">L"
         return self._read_int(fmt, base, offset)
 
     def read_short(self, base, offset=0):
@@ -55,7 +54,7 @@ def read_short(self, base, offset=0):
         Return the int value of the two bytes at the file position determined
         by *base* and *offset*, similarly to ``read_long()`` above.
         """
-        fmt = b'<H' if self._byte_order is LITTLE_ENDIAN else b'>H'
+        fmt = b"<H" if self._byte_order is LITTLE_ENDIAN else b">H"
         return self._read_int(fmt, base, offset)
 
     def read_str(self, char_count, base, offset=0):
@@ -63,12 +62,14 @@ def read_str(self, char_count, base, offset=0):
         Return a string containing the *char_count* bytes at the file
         position determined by self._base_offset + *base* + *offset*.
         """
+
         def str_struct(char_count):
-            format_ = '%ds' % char_count
+            format_ = "%ds" % char_count
             return Struct(format_)
+
         struct = str_struct(char_count)
         chars = self._unpack_item(struct, base, offset)
-        unicode_str = chars.decode('UTF-8')
+        unicode_str = chars.decode("UTF-8")
         return unicode_str
 
     def seek(self, base, offset=0):
diff --git a/docx/image/image.py b/docx/image/image.py
index ba2158e72..8fddaabc4 100644
--- a/docx/image/image.py
+++ b/docx/image/image.py
@@ -20,6 +20,7 @@ class Image(object):
     Graphical image stream such as JPEG, PNG, or GIF with properties and
     methods required by ImagePart.
     """
+
     def __init__(self, blob, filename, image_header):
         super(Image, self).__init__()
         self._blob = blob
@@ -43,7 +44,7 @@ def from_file(cls, image_descriptor):
         """
         if is_string(image_descriptor):
             path = image_descriptor
-            with open(path, 'rb') as f:
+            with open(path, "rb") as f:
                 blob = f.read()
                 stream = BytesIO(blob)
             filename = os.path.basename(path)
@@ -175,7 +176,7 @@ def _from_stream(cls, stream, blob, filename=None):
         """
         image_header = _ImageHeaderFactory(stream)
         if filename is None:
-            filename = 'image.%s' % image_header.default_ext
+            filename = "image.%s" % image_header.default_ext
         return cls(blob, filename, image_header)
 
 
@@ -203,6 +204,7 @@ class BaseImageHeader(object):
     """
     Base class for image header subclasses like |Jpeg| and |Tiff|.
     """
+
     def __init__(self, px_width, px_height, horz_dpi, vert_dpi):
         self._px_width = px_width
         self._px_height = px_height
@@ -215,8 +217,8 @@ def content_type(self):
         Abstract property definition, must be implemented by all subclasses.
         """
         msg = (
-            'content_type property must be implemented by all subclasses of '
-            'BaseImageHeader'
+            "content_type property must be implemented by all subclasses of "
+            "BaseImageHeader"
         )
         raise NotImplementedError(msg)
 
@@ -227,8 +229,8 @@ def default_ext(self):
         property definition, must be implemented by all subclasses.
         """
         msg = (
-            'default_ext property must be implemented by all subclasses of '
-            'BaseImageHeader'
+            "default_ext property must be implemented by all subclasses of "
+            "BaseImageHeader"
         )
         raise NotImplementedError(msg)
 
diff --git a/docx/image/jpeg.py b/docx/image/jpeg.py
index 8a263b6c5..adba5c1ad 100644
--- a/docx/image/jpeg.py
+++ b/docx/image/jpeg.py
@@ -18,6 +18,7 @@ class Jpeg(BaseImageHeader):
     """
     Base class for JFIF and EXIF subclasses.
     """
+
     @property
     def content_type(self):
         """
@@ -31,13 +32,14 @@ def default_ext(self):
         """
         Default filename extension, always 'jpg' for JPG images.
         """
-        return 'jpg'
+        return "jpg"
 
 
 class Exif(Jpeg):
     """
     Image header parser for Exif image format
     """
+
     @classmethod
     def from_stream(cls, stream):
         """
@@ -59,6 +61,7 @@ class Jfif(Jpeg):
     """
     Image header parser for JFIF image format
     """
+
     @classmethod
     def from_stream(cls, stream):
         """
@@ -80,6 +83,7 @@ class _JfifMarkers(object):
     Sequence of markers in a JPEG file, perhaps truncated at first SOS marker
     for performance reasons.
     """
+
     def __init__(self, markers):
         super(_JfifMarkers, self).__init__()
         self._markers = list(markers)
@@ -89,16 +93,21 @@ def __str__(self):  # pragma: no cover
         Returns a tabular listing of the markers in this instance, which can
         be handy for debugging and perhaps other uses.
         """
-        header = ' offset  seglen  mc  name\n=======  ======  ==  ====='
-        tmpl = '%7d  %6d  %02X  %s'
+        header = " offset  seglen  mc  name\n=======  ======  ==  ====="
+        tmpl = "%7d  %6d  %02X  %s"
         rows = []
         for marker in self._markers:
-            rows.append(tmpl % (
-                marker.offset, marker.segment_length,
-                ord(marker.marker_code), marker.name
-            ))
+            rows.append(
+                tmpl
+                % (
+                    marker.offset,
+                    marker.segment_length,
+                    ord(marker.marker_code),
+                    marker.name,
+                )
+            )
         lines = [header] + rows
-        return '\n'.join(lines)
+        return "\n".join(lines)
 
     @classmethod
     def from_stream(cls, stream):
@@ -122,7 +131,7 @@ def app0(self):
         for m in self._markers:
             if m.marker_code == JPEG_MARKER_CODE.APP0:
                 return m
-        raise KeyError('no APP0 marker in image')
+        raise KeyError("no APP0 marker in image")
 
     @property
     def app1(self):
@@ -132,7 +141,7 @@ def app1(self):
         for m in self._markers:
             if m.marker_code == JPEG_MARKER_CODE.APP1:
                 return m
-        raise KeyError('no APP1 marker in image')
+        raise KeyError("no APP1 marker in image")
 
     @property
     def sof(self):
@@ -142,7 +151,7 @@ def sof(self):
         for m in self._markers:
             if m.marker_code in JPEG_MARKER_CODE.SOF_MARKER_CODES:
                 return m
-        raise KeyError('no start of frame (SOFn) marker in image')
+        raise KeyError("no start of frame (SOFn) marker in image")
 
 
 class _MarkerParser(object):
@@ -150,6 +159,7 @@ class _MarkerParser(object):
     Service class that knows how to parse a JFIF stream and iterate over its
     markers.
     """
+
     def __init__(self, stream_reader):
         super(_MarkerParser, self).__init__()
         self._stream = stream_reader
@@ -173,9 +183,7 @@ def iter_markers(self):
         marker_code = None
         while marker_code != JPEG_MARKER_CODE.EOI:
             marker_code, segment_offset = marker_finder.next(start)
-            marker = _MarkerFactory(
-                marker_code, self._stream, segment_offset
-            )
+            marker = _MarkerFactory(marker_code, self._stream, segment_offset)
             yield marker
             start = segment_offset + marker.segment_length
 
@@ -184,6 +192,7 @@ class _MarkerFinder(object):
     """
     Service class that knows how to find the next JFIF marker in a stream.
     """
+
     def __init__(self, stream):
         super(_MarkerFinder, self).__init__()
         self._stream = stream
@@ -208,12 +217,12 @@ def next(self, start):
             # skip over any non-\xFF bytes
             position = self._offset_of_next_ff_byte(start=position)
             # skip over any \xFF padding bytes
-            position, byte_ = self._next_non_ff_byte(start=position+1)
+            position, byte_ = self._next_non_ff_byte(start=position + 1)
             # 'FF 00' sequence is not a marker, start over if found
-            if byte_ == b'\x00':
+            if byte_ == b"\x00":
                 continue
             # this is a marker, gather return values and break out of scan
-            marker_code, segment_offset = byte_, position+1
+            marker_code, segment_offset = byte_, position + 1
             break
         return marker_code, segment_offset
 
@@ -226,7 +235,7 @@ def _next_non_ff_byte(self, start):
         """
         self._stream.seek(start)
         byte_ = self._read_byte()
-        while byte_ == b'\xFF':
+        while byte_ == b"\xFF":
             byte_ = self._read_byte()
         offset_of_non_ff_byte = self._stream.tell() - 1
         return offset_of_non_ff_byte, byte_
@@ -239,7 +248,7 @@ def _offset_of_next_ff_byte(self, start):
         """
         self._stream.seek(start)
         byte_ = self._read_byte()
-        while byte_ != b'\xFF':
+        while byte_ != b"\xFF":
             byte_ = self._read_byte()
         offset_of_ff_byte = self._stream.tell() - 1
         return offset_of_ff_byte
@@ -251,7 +260,7 @@ def _read_byte(self):
         """
         byte_ = self._stream.read(1)
         if not byte_:  # pragma: no cover
-            raise Exception('unexpected end of file')
+            raise Exception("unexpected end of file")
         return byte_
 
 
@@ -276,6 +285,7 @@ class _Marker(object):
     Base class for JFIF marker classes. Represents a marker and its segment
     occuring in a JPEG byte stream.
     """
+
     def __init__(self, marker_code, offset, segment_length):
         super(_Marker, self).__init__()
         self._marker_code = marker_code
@@ -322,9 +332,10 @@ class _App0Marker(_Marker):
     """
     Represents a JFIF APP0 marker segment.
     """
+
     def __init__(
-            self, marker_code, offset, length, density_units, x_density,
-            y_density):
+        self, marker_code, offset, length, density_units, x_density, y_density
+    ):
         super(_App0Marker, self).__init__(marker_code, offset, length)
         self._density_units = density_units
         self._x_density = x_density
@@ -379,8 +390,7 @@ def from_stream(cls, stream, marker_code, offset):
         x_density = stream.read_short(offset, 10)
         y_density = stream.read_short(offset, 12)
         return cls(
-            marker_code, offset, segment_length, density_units, x_density,
-            y_density
+            marker_code, offset, segment_length, density_units, x_density, y_density
         )
 
 
@@ -388,6 +398,7 @@ class _App1Marker(_Marker):
     """
     Represents a JFIF APP1 (Exif) marker segment.
     """
+
     def __init__(self, marker_code, offset, length, horz_dpi, vert_dpi):
         super(_App1Marker, self).__init__(marker_code, offset, length)
         self._horz_dpi = horz_dpi
@@ -411,9 +422,7 @@ def from_stream(cls, stream, marker_code, offset):
         if cls._is_non_Exif_APP1_segment(stream, offset):
             return cls(marker_code, offset, segment_length, 72, 72)
         tiff = cls._tiff_from_exif_segment(stream, offset, segment_length)
-        return cls(
-            marker_code, offset, segment_length, tiff.horz_dpi, tiff.vert_dpi
-        )
+        return cls(marker_code, offset, segment_length, tiff.horz_dpi, tiff.vert_dpi)
 
     @property
     def horz_dpi(self):
@@ -438,9 +447,9 @@ def _is_non_Exif_APP1_segment(cls, stream, offset):
         Exif segment, as determined by the ``'Exif\x00\x00'`` signature at
         offset 2 in the segment.
         """
-        stream.seek(offset+2)
+        stream.seek(offset + 2)
         exif_signature = stream.read(6)
-        return exif_signature != b'Exif\x00\x00'
+        return exif_signature != b"Exif\x00\x00"
 
     @classmethod
     def _tiff_from_exif_segment(cls, stream, offset, segment_length):
@@ -449,8 +458,8 @@ def _tiff_from_exif_segment(cls, stream, offset, segment_length):
         *segment_length* at *offset* in *stream*.
         """
         # wrap full segment in its own stream and feed to Tiff()
-        stream.seek(offset+8)
-        segment_bytes = stream.read(segment_length-8)
+        stream.seek(offset + 8)
+        segment_bytes = stream.read(segment_length - 8)
         substream = BytesIO(segment_bytes)
         return Tiff.from_stream(substream)
 
@@ -459,8 +468,8 @@ class _SofMarker(_Marker):
     """
     Represents a JFIF start of frame (SOFx) marker segment.
     """
-    def __init__(
-            self, marker_code, offset, segment_length, px_width, px_height):
+
+    def __init__(self, marker_code, offset, segment_length, px_width, px_height):
         super(_SofMarker, self).__init__(marker_code, offset, segment_length)
         self._px_width = px_width
         self._px_height = px_height
diff --git a/docx/image/png.py b/docx/image/png.py
index 4e899fa5c..c2e4ae820 100644
--- a/docx/image/png.py
+++ b/docx/image/png.py
@@ -12,6 +12,7 @@ class Png(BaseImageHeader):
     """
     Image header parser for PNG images
     """
+
     @property
     def content_type(self):
         """
@@ -25,7 +26,7 @@ def default_ext(self):
         """
         Default filename extension, always 'png' for PNG images.
         """
-        return 'png'
+        return "png"
 
     @classmethod
     def from_stream(cls, stream):
@@ -48,6 +49,7 @@ class _PngParser(object):
     Parses a PNG image stream to extract the image properties found in its
     chunks.
     """
+
     def __init__(self, chunks):
         super(_PngParser, self).__init__()
         self._chunks = chunks
@@ -114,6 +116,7 @@ class _Chunks(object):
     """
     Collection of the chunks parsed from a PNG image stream
     """
+
     def __init__(self, chunk_iterable):
         super(_Chunks, self).__init__()
         self._chunks = list(chunk_iterable)
@@ -135,7 +138,7 @@ def IHDR(self):
         match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.IHDR  # noqa
         IHDR = self._find_first(match)
         if IHDR is None:
-            raise InvalidImageStreamError('no IHDR chunk in PNG image')
+            raise InvalidImageStreamError("no IHDR chunk in PNG image")
         return IHDR
 
     @property
@@ -161,6 +164,7 @@ class _ChunkParser(object):
     """
     Extracts chunks from a PNG image stream
     """
+
     def __init__(self, stream_rdr):
         super(_ChunkParser, self).__init__()
         self._stream_rdr = stream_rdr
@@ -195,10 +199,10 @@ def _iter_chunk_offsets(self):
             chunk_type = self._stream_rdr.read_str(4, chunk_offset, 4)
             data_offset = chunk_offset + 8
             yield chunk_type, data_offset
-            if chunk_type == 'IEND':
+            if chunk_type == "IEND":
                 break
             # incr offset for chunk len long, chunk type, chunk data, and CRC
-            chunk_offset += (4 + 4 + chunk_data_len + 4)
+            chunk_offset += 4 + 4 + chunk_data_len + 4
 
 
 def _ChunkFactory(chunk_type, stream_rdr, offset):
@@ -219,6 +223,7 @@ class _Chunk(object):
     Base class for specific chunk types. Also serves as the default chunk
     type.
     """
+
     def __init__(self, chunk_type):
         super(_Chunk, self).__init__()
         self._chunk_type = chunk_type
@@ -242,6 +247,7 @@ class _IHDRChunk(_Chunk):
     """
     IHDR chunk, contains the image dimensions
     """
+
     def __init__(self, chunk_type, px_width, px_height):
         super(_IHDRChunk, self).__init__(chunk_type)
         self._px_width = px_width
@@ -270,8 +276,8 @@ class _pHYsChunk(_Chunk):
     """
     pYHs chunk, contains the image dpi information
     """
-    def __init__(self, chunk_type, horz_px_per_unit, vert_px_per_unit,
-                 units_specifier):
+
+    def __init__(self, chunk_type, horz_px_per_unit, vert_px_per_unit, units_specifier):
         super(_pHYsChunk, self).__init__(chunk_type)
         self._horz_px_per_unit = horz_px_per_unit
         self._vert_px_per_unit = vert_px_per_unit
@@ -286,9 +292,7 @@ def from_offset(cls, chunk_type, stream_rdr, offset):
         horz_px_per_unit = stream_rdr.read_long(offset)
         vert_px_per_unit = stream_rdr.read_long(offset, 4)
         units_specifier = stream_rdr.read_byte(offset, 8)
-        return cls(
-            chunk_type, horz_px_per_unit, vert_px_per_unit, units_specifier
-        )
+        return cls(chunk_type, horz_px_per_unit, vert_px_per_unit, units_specifier)
 
     @property
     def horz_px_per_unit(self):
diff --git a/docx/image/tiff.py b/docx/image/tiff.py
index c38242360..5b5e8b748 100644
--- a/docx/image/tiff.py
+++ b/docx/image/tiff.py
@@ -12,6 +12,7 @@ class Tiff(BaseImageHeader):
     Image header parser for TIFF images. Handles both big and little endian
     byte ordering.
     """
+
     @property
     def content_type(self):
         """
@@ -25,7 +26,7 @@ def default_ext(self):
         """
         Default filename extension, always 'tiff' for TIFF images.
         """
-        return 'tiff'
+        return "tiff"
 
     @classmethod
     def from_stream(cls, stream):
@@ -48,6 +49,7 @@ class _TiffParser(object):
     Parses a TIFF image stream to extract the image properties found in its
     main image file directory (IFD)
     """
+
     def __init__(self, ifd_entries):
         super(_TiffParser, self).__init__()
         self._ifd_entries = ifd_entries
@@ -107,7 +109,7 @@ def _detect_endian(cls, stream):
         """
         stream.seek(0)
         endian_str = stream.read(2)
-        return BIG_ENDIAN if endian_str == b'MM' else LITTLE_ENDIAN
+        return BIG_ENDIAN if endian_str == b"MM" else LITTLE_ENDIAN
 
     def _dpi(self, resolution_tag):
         """
@@ -124,7 +126,8 @@ def _dpi(self, resolution_tag):
         # resolution unit defaults to inches (2)
         resolution_unit = (
             ifd_entries[TIFF_TAG.RESOLUTION_UNIT]
-            if TIFF_TAG.RESOLUTION_UNIT in ifd_entries else 2
+            if TIFF_TAG.RESOLUTION_UNIT in ifd_entries
+            else 2
         )
 
         if resolution_unit == 1:  # aspect ratio only
@@ -150,6 +153,7 @@ class _IfdEntries(object):
     Image File Directory for a TIFF image, having mapping (dict) semantics
     allowing "tag" values to be retrieved by tag code.
     """
+
     def __init__(self, entries):
         super(_IfdEntries, self).__init__()
         self._entries = entries
@@ -189,6 +193,7 @@ class _IfdParser(object):
     Service object that knows how to extract directory entries from an Image
     File Directory (IFD)
     """
+
     def __init__(self, stream_rdr, offset):
         super(_IfdParser, self).__init__()
         self._stream_rdr = stream_rdr
@@ -200,7 +205,7 @@ def iter_entries(self):
         directory.
         """
         for idx in range(self._entry_count):
-            dir_entry_offset = self._offset + 2 + (idx*12)
+            dir_entry_offset = self._offset + 2 + (idx * 12)
             ifd_entry = _IfdEntryFactory(self._stream_rdr, dir_entry_offset)
             yield ifd_entry
 
@@ -218,9 +223,9 @@ def _IfdEntryFactory(stream_rdr, offset):
     directory entry at *offset* in *stream_rdr*.
     """
     ifd_entry_classes = {
-        TIFF_FLD.ASCII:    _AsciiIfdEntry,
-        TIFF_FLD.SHORT:    _ShortIfdEntry,
-        TIFF_FLD.LONG:     _LongIfdEntry,
+        TIFF_FLD.ASCII: _AsciiIfdEntry,
+        TIFF_FLD.SHORT: _ShortIfdEntry,
+        TIFF_FLD.LONG: _LongIfdEntry,
         TIFF_FLD.RATIONAL: _RationalIfdEntry,
     }
     field_type = stream_rdr.read_short(offset, 2)
@@ -236,6 +241,7 @@ class _IfdEntry(object):
     Base class for IFD entry classes. Subclasses are differentiated by value
     type, e.g. ASCII, long int, etc.
     """
+
     def __init__(self, tag_code, value):
         super(_IfdEntry, self).__init__()
         self._tag_code = tag_code
@@ -252,9 +258,7 @@ def from_stream(cls, stream_rdr, offset):
         tag_code = stream_rdr.read_short(offset, 0)
         value_count = stream_rdr.read_long(offset, 4)
         value_offset = stream_rdr.read_long(offset, 8)
-        value = cls._parse_value(
-            stream_rdr, offset, value_count, value_offset
-        )
+        value = cls._parse_value(stream_rdr, offset, value_count, value_offset)
         return cls(tag_code, value)
 
     @classmethod
@@ -263,7 +267,7 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         Return the value of this field parsed from *stream_rdr* at *offset*.
         Intended to be overridden by subclasses.
         """
-        return 'UNIMPLEMENTED FIELD TYPE'  # pragma: no cover
+        return "UNIMPLEMENTED FIELD TYPE"  # pragma: no cover
 
     @property
     def tag(self):
@@ -284,6 +288,7 @@ class _AsciiIfdEntry(_IfdEntry):
     """
     IFD entry having the form of a NULL-terminated ASCII string
     """
+
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
@@ -291,13 +296,14 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         The length of the string, including a terminating '\x00' (NUL)
         character, is in *value_count*.
         """
-        return stream_rdr.read_str(value_count-1, value_offset)
+        return stream_rdr.read_str(value_count - 1, value_offset)
 
 
 class _ShortIfdEntry(_IfdEntry):
     """
     IFD entry expressed as a short (2-byte) integer
     """
+
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
@@ -307,13 +313,14 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         if value_count == 1:
             return stream_rdr.read_short(offset, 8)
         else:  # pragma: no cover
-            return 'Multi-value short integer NOT IMPLEMENTED'
+            return "Multi-value short integer NOT IMPLEMENTED"
 
 
 class _LongIfdEntry(_IfdEntry):
     """
     IFD entry expressed as a long (4-byte) integer
     """
+
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
@@ -323,13 +330,14 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         if value_count == 1:
             return stream_rdr.read_long(offset, 8)
         else:  # pragma: no cover
-            return 'Multi-value long integer NOT IMPLEMENTED'
+            return "Multi-value long integer NOT IMPLEMENTED"
 
 
 class _RationalIfdEntry(_IfdEntry):
     """
     IFD entry expressed as a numerator, denominator pair
     """
+
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
@@ -342,4 +350,4 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
             denominator = stream_rdr.read_long(value_offset, 4)
             return numerator / denominator
         else:  # pragma: no cover
-            return 'Multi-value Rational NOT IMPLEMENTED'
+            return "Multi-value Rational NOT IMPLEMENTED"
diff --git a/docx/opc/constants.py b/docx/opc/constants.py
index b90aa394a..425435d92 100644
--- a/docx/opc/constants.py
+++ b/docx/opc/constants.py
@@ -10,649 +10,547 @@ class CONTENT_TYPE(object):
     """
     Content type URIs (like MIME-types) that specify a part's format
     """
-    BMP = (
-        'image/bmp'
-    )
-    DML_CHART = (
-        'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    )
+
+    BMP = "image/bmp"
+    DML_CHART = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"
     DML_CHARTSHAPES = (
-        'application/vnd.openxmlformats-officedocument.drawingml.chartshapes'
-        '+xml'
+        "application/vnd.openxmlformats-officedocument.drawingml.chartshapes" "+xml"
     )
     DML_DIAGRAM_COLORS = (
-        'application/vnd.openxmlformats-officedocument.drawingml.diagramColo'
-        'rs+xml'
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramColo" "rs+xml"
     )
     DML_DIAGRAM_DATA = (
-        'application/vnd.openxmlformats-officedocument.drawingml.diagramData'
-        '+xml'
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramData" "+xml"
     )
     DML_DIAGRAM_LAYOUT = (
-        'application/vnd.openxmlformats-officedocument.drawingml.diagramLayo'
-        'ut+xml'
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramLayo" "ut+xml"
     )
     DML_DIAGRAM_STYLE = (
-        'application/vnd.openxmlformats-officedocument.drawingml.diagramStyl'
-        'e+xml'
-    )
-    GIF = (
-        'image/gif'
-    )
-    JPEG = (
-        'image/jpeg'
-    )
-    MS_PHOTO = (
-        'image/vnd.ms-photo'
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramStyl" "e+xml"
     )
+    GIF = "image/gif"
+    JPEG = "image/jpeg"
+    MS_PHOTO = "image/vnd.ms-photo"
     OFC_CUSTOM_PROPERTIES = (
-        'application/vnd.openxmlformats-officedocument.custom-properties+xml'
+        "application/vnd.openxmlformats-officedocument.custom-properties+xml"
     )
     OFC_CUSTOM_XML_PROPERTIES = (
-        'application/vnd.openxmlformats-officedocument.customXmlProperties+x'
-        'ml'
-    )
-    OFC_DRAWING = (
-        'application/vnd.openxmlformats-officedocument.drawing+xml'
+        "application/vnd.openxmlformats-officedocument.customXmlProperties+x" "ml"
     )
+    OFC_DRAWING = "application/vnd.openxmlformats-officedocument.drawing+xml"
     OFC_EXTENDED_PROPERTIES = (
-        'application/vnd.openxmlformats-officedocument.extended-properties+x'
-        'ml'
-    )
-    OFC_OLE_OBJECT = (
-        'application/vnd.openxmlformats-officedocument.oleObject'
-    )
-    OFC_PACKAGE = (
-        'application/vnd.openxmlformats-officedocument.package'
-    )
-    OFC_THEME = (
-        'application/vnd.openxmlformats-officedocument.theme+xml'
+        "application/vnd.openxmlformats-officedocument.extended-properties+x" "ml"
     )
+    OFC_OLE_OBJECT = "application/vnd.openxmlformats-officedocument.oleObject"
+    OFC_PACKAGE = "application/vnd.openxmlformats-officedocument.package"
+    OFC_THEME = "application/vnd.openxmlformats-officedocument.theme+xml"
     OFC_THEME_OVERRIDE = (
-        'application/vnd.openxmlformats-officedocument.themeOverride+xml'
-    )
-    OFC_VML_DRAWING = (
-        'application/vnd.openxmlformats-officedocument.vmlDrawing'
-    )
-    OPC_CORE_PROPERTIES = (
-        'application/vnd.openxmlformats-package.core-properties+xml'
+        "application/vnd.openxmlformats-officedocument.themeOverride+xml"
     )
+    OFC_VML_DRAWING = "application/vnd.openxmlformats-officedocument.vmlDrawing"
+    OPC_CORE_PROPERTIES = "application/vnd.openxmlformats-package.core-properties+xml"
     OPC_DIGITAL_SIGNATURE_CERTIFICATE = (
-        'application/vnd.openxmlformats-package.digital-signature-certificat'
-        'e'
+        "application/vnd.openxmlformats-package.digital-signature-certificat" "e"
     )
     OPC_DIGITAL_SIGNATURE_ORIGIN = (
-        'application/vnd.openxmlformats-package.digital-signature-origin'
+        "application/vnd.openxmlformats-package.digital-signature-origin"
     )
     OPC_DIGITAL_SIGNATURE_XMLSIGNATURE = (
-        'application/vnd.openxmlformats-package.digital-signature-xmlsignatu'
-        're+xml'
-    )
-    OPC_RELATIONSHIPS = (
-        'application/vnd.openxmlformats-package.relationships+xml'
+        "application/vnd.openxmlformats-package.digital-signature-xmlsignatu" "re+xml"
     )
+    OPC_RELATIONSHIPS = "application/vnd.openxmlformats-package.relationships+xml"
     PML_COMMENTS = (
-        'application/vnd.openxmlformats-officedocument.presentationml.commen'
-        'ts+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.commen" "ts+xml"
     )
     PML_COMMENT_AUTHORS = (
-        'application/vnd.openxmlformats-officedocument.presentationml.commen'
-        'tAuthors+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.commen"
+        "tAuthors+xml"
     )
     PML_HANDOUT_MASTER = (
-        'application/vnd.openxmlformats-officedocument.presentationml.handou'
-        'tMaster+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.handou"
+        "tMaster+xml"
     )
     PML_NOTES_MASTER = (
-        'application/vnd.openxmlformats-officedocument.presentationml.notesM'
-        'aster+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.notesM"
+        "aster+xml"
     )
     PML_NOTES_SLIDE = (
-        'application/vnd.openxmlformats-officedocument.presentationml.notesS'
-        'lide+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.notesS" "lide+xml"
     )
     PML_PRESENTATION_MAIN = (
-        'application/vnd.openxmlformats-officedocument.presentationml.presen'
-        'tation.main+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.presen"
+        "tation.main+xml"
     )
     PML_PRES_PROPS = (
-        'application/vnd.openxmlformats-officedocument.presentationml.presPr'
-        'ops+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.presPr" "ops+xml"
     )
     PML_PRINTER_SETTINGS = (
-        'application/vnd.openxmlformats-officedocument.presentationml.printe'
-        'rSettings'
+        "application/vnd.openxmlformats-officedocument.presentationml.printe"
+        "rSettings"
     )
     PML_SLIDE = (
-        'application/vnd.openxmlformats-officedocument.presentationml.slide+'
-        'xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.slide+" "xml"
     )
     PML_SLIDESHOW_MAIN = (
-        'application/vnd.openxmlformats-officedocument.presentationml.slides'
-        'how.main+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.slides"
+        "how.main+xml"
     )
     PML_SLIDE_LAYOUT = (
-        'application/vnd.openxmlformats-officedocument.presentationml.slideL'
-        'ayout+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.slideL"
+        "ayout+xml"
     )
     PML_SLIDE_MASTER = (
-        'application/vnd.openxmlformats-officedocument.presentationml.slideM'
-        'aster+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.slideM"
+        "aster+xml"
     )
     PML_SLIDE_UPDATE_INFO = (
-        'application/vnd.openxmlformats-officedocument.presentationml.slideU'
-        'pdateInfo+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.slideU"
+        "pdateInfo+xml"
     )
     PML_TABLE_STYLES = (
-        'application/vnd.openxmlformats-officedocument.presentationml.tableS'
-        'tyles+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.tableS"
+        "tyles+xml"
     )
     PML_TAGS = (
-        'application/vnd.openxmlformats-officedocument.presentationml.tags+x'
-        'ml'
+        "application/vnd.openxmlformats-officedocument.presentationml.tags+x" "ml"
     )
     PML_TEMPLATE_MAIN = (
-        'application/vnd.openxmlformats-officedocument.presentationml.templa'
-        'te.main+xml'
+        "application/vnd.openxmlformats-officedocument.presentationml.templa"
+        "te.main+xml"
     )
     PML_VIEW_PROPS = (
-        'application/vnd.openxmlformats-officedocument.presentationml.viewPr'
-        'ops+xml'
-    )
-    PNG = (
-        'image/png'
+        "application/vnd.openxmlformats-officedocument.presentationml.viewPr" "ops+xml"
     )
+    PNG = "image/png"
     SML_CALC_CHAIN = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.calcCha'
-        'in+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.calcCha" "in+xml"
     )
     SML_CHARTSHEET = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.chartsh'
-        'eet+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsh" "eet+xml"
     )
     SML_COMMENTS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.comment'
-        's+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.comment" "s+xml"
     )
     SML_CONNECTIONS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.connect'
-        'ions+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.connect" "ions+xml"
     )
     SML_CUSTOM_PROPERTY = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.customP'
-        'roperty'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.customP" "roperty"
     )
     SML_DIALOGSHEET = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.dialogs'
-        'heet+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.dialogs" "heet+xml"
     )
     SML_EXTERNAL_LINK = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.externa'
-        'lLink+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.externa"
+        "lLink+xml"
     )
     SML_PIVOT_CACHE_DEFINITION = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCa'
-        'cheDefinition+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCa"
+        "cheDefinition+xml"
     )
     SML_PIVOT_CACHE_RECORDS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCa'
-        'cheRecords+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCa"
+        "cheRecords+xml"
     )
     SML_PIVOT_TABLE = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTa'
-        'ble+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTa" "ble+xml"
     )
     SML_PRINTER_SETTINGS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.printer'
-        'Settings'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.printer" "Settings"
     )
     SML_QUERY_TABLE = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.queryTa'
-        'ble+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTa" "ble+xml"
     )
     SML_REVISION_HEADERS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.revisio'
-        'nHeaders+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisio"
+        "nHeaders+xml"
     )
     SML_REVISION_LOG = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.revisio'
-        'nLog+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisio" "nLog+xml"
     )
     SML_SHARED_STRINGS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedS'
-        'trings+xml'
-    )
-    SML_SHEET = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedS"
+        "trings+xml"
     )
+    SML_SHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     SML_SHEET_MAIN = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.m'
-        'ain+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.m" "ain+xml"
     )
     SML_SHEET_METADATA = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMe'
-        'tadata+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMe"
+        "tadata+xml"
     )
     SML_STYLES = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+'
-        'xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+" "xml"
     )
     SML_TABLE = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.table+x'
-        'ml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.table+x" "ml"
     )
     SML_TABLE_SINGLE_CELLS = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.tableSi'
-        'ngleCells+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.tableSi"
+        "ngleCells+xml"
     )
     SML_TEMPLATE_MAIN = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.templat'
-        'e.main+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.templat"
+        "e.main+xml"
     )
     SML_USER_NAMES = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.userNam'
-        'es+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.userNam" "es+xml"
     )
     SML_VOLATILE_DEPENDENCIES = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.volatil'
-        'eDependencies+xml'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.volatil"
+        "eDependencies+xml"
     )
     SML_WORKSHEET = (
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.workshe'
-        'et+xml'
-    )
-    TIFF = (
-        'image/tiff'
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.workshe" "et+xml"
     )
+    TIFF = "image/tiff"
     WML_COMMENTS = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.comm'
-        'ents+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.comm" "ents+xml"
     )
     WML_DOCUMENT = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.docu'
-        'ment'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.docu" "ment"
     )
     WML_DOCUMENT_GLOSSARY = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.docu'
-        'ment.glossary+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.docu"
+        "ment.glossary+xml"
     )
     WML_DOCUMENT_MAIN = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.docu'
-        'ment.main+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.docu"
+        "ment.main+xml"
     )
     WML_ENDNOTES = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.endn'
-        'otes+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.endn" "otes+xml"
     )
     WML_FONT_TABLE = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.font'
-        'Table+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.font"
+        "Table+xml"
     )
     WML_FOOTER = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.foot'
-        'er+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.foot" "er+xml"
     )
     WML_FOOTNOTES = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.foot'
-        'notes+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.foot"
+        "notes+xml"
     )
     WML_HEADER = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.head'
-        'er+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.head" "er+xml"
     )
     WML_NUMBERING = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.numb'
-        'ering+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.numb"
+        "ering+xml"
     )
     WML_PRINTER_SETTINGS = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.prin'
-        'terSettings'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.prin"
+        "terSettings"
     )
     WML_SETTINGS = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.sett'
-        'ings+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.sett" "ings+xml"
     )
     WML_STYLES = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.styl'
-        'es+xml'
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.styl" "es+xml"
     )
     WML_WEB_SETTINGS = (
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.webS'
-        'ettings+xml'
-    )
-    XML = (
-        'application/xml'
-    )
-    X_EMF = (
-        'image/x-emf'
-    )
-    X_FONTDATA = (
-        'application/x-fontdata'
-    )
-    X_FONT_TTF = (
-        'application/x-font-ttf'
-    )
-    X_WMF = (
-        'image/x-wmf'
-    )
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.webS"
+        "ettings+xml"
+    )
+    XML = "application/xml"
+    X_EMF = "image/x-emf"
+    X_FONTDATA = "application/x-fontdata"
+    X_FONT_TTF = "application/x-font-ttf"
+    X_WMF = "image/x-wmf"
 
 
 class NAMESPACE(object):
     """Constant values for OPC XML namespaces"""
+
     DML_WORDPROCESSING_DRAWING = (
-        'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDraw'
-        'ing'
+        "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDraw" "ing"
     )
     OFC_RELATIONSHIPS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-    )
-    OPC_RELATIONSHIPS = (
-        'http://schemas.openxmlformats.org/package/2006/relationships'
-    )
-    OPC_CONTENT_TYPES = (
-        'http://schemas.openxmlformats.org/package/2006/content-types'
-    )
-    WML_MAIN = (
-        'http://schemas.openxmlformats.org/wordprocessingml/2006/main'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
     )
+    OPC_RELATIONSHIPS = "http://schemas.openxmlformats.org/package/2006/relationships"
+    OPC_CONTENT_TYPES = "http://schemas.openxmlformats.org/package/2006/content-types"
+    WML_MAIN = "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
 
 
 class RELATIONSHIP_TARGET_MODE(object):
     """Open XML relationship target modes"""
-    EXTERNAL = 'External'
-    INTERNAL = 'Internal'
+
+    EXTERNAL = "External"
+    INTERNAL = "Internal"
 
 
 class RELATIONSHIP_TYPE(object):
     AUDIO = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/audio'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/audio"
     )
     A_F_CHUNK = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/aFChunk'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/aFChunk"
     )
     CALC_CHAIN = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/calcChain'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/calcChain"
     )
     CERTIFICATE = (
-        'http://schemas.openxmlformats.org/package/2006/relationships/digita'
-        'l-signature/certificate'
+        "http://schemas.openxmlformats.org/package/2006/relationships/digita"
+        "l-signature/certificate"
     )
     CHART = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/chart'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/chart"
     )
     CHARTSHEET = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/chartsheet'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/chartsheet"
     )
     CHART_USER_SHAPES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/chartUserShapes'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/chartUserShapes"
     )
     COMMENTS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/comments'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/comments"
     )
     COMMENT_AUTHORS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/commentAuthors'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/commentAuthors"
     )
     CONNECTIONS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/connections'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/connections"
     )
     CONTROL = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/control'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/control"
     )
     CORE_PROPERTIES = (
-        'http://schemas.openxmlformats.org/package/2006/relationships/metada'
-        'ta/core-properties'
+        "http://schemas.openxmlformats.org/package/2006/relationships/metada"
+        "ta/core-properties"
     )
     CUSTOM_PROPERTIES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/custom-properties'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/custom-properties"
     )
     CUSTOM_PROPERTY = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/customProperty'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/customProperty"
     )
     CUSTOM_XML = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/customXml'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/customXml"
     )
     CUSTOM_XML_PROPS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/customXmlProps'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/customXmlProps"
     )
     DIAGRAM_COLORS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/diagramColors'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/diagramColors"
     )
     DIAGRAM_DATA = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/diagramData'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/diagramData"
     )
     DIAGRAM_LAYOUT = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/diagramLayout'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/diagramLayout"
     )
     DIAGRAM_QUICK_STYLE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/diagramQuickStyle'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/diagramQuickStyle"
     )
     DIALOGSHEET = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/dialogsheet'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/dialogsheet"
     )
     DRAWING = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/drawing'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/drawing"
     )
     ENDNOTES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/endnotes'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/endnotes"
     )
     EXTENDED_PROPERTIES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/extended-properties'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/extended-properties"
     )
     EXTERNAL_LINK = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/externalLink'
-    )
-    FONT = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/font'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/externalLink"
     )
+    FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/font"
     FONT_TABLE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/fontTable'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/fontTable"
     )
     FOOTER = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/footer'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/footer"
     )
     FOOTNOTES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/footnotes'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/footnotes"
     )
     GLOSSARY_DOCUMENT = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/glossaryDocument'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/glossaryDocument"
     )
     HANDOUT_MASTER = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/handoutMaster'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/handoutMaster"
     )
     HEADER = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/header'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/header"
     )
     HYPERLINK = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/hyperlink'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/hyperlink"
     )
     IMAGE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/image'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/image"
     )
     NOTES_MASTER = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/notesMaster'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/notesMaster"
     )
     NOTES_SLIDE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/notesSlide'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/notesSlide"
     )
     NUMBERING = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/numbering'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/numbering"
     )
     OFFICE_DOCUMENT = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/officeDocument'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/officeDocument"
     )
     OLE_OBJECT = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/oleObject'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/oleObject"
     )
     ORIGIN = (
-        'http://schemas.openxmlformats.org/package/2006/relationships/digita'
-        'l-signature/origin'
+        "http://schemas.openxmlformats.org/package/2006/relationships/digita"
+        "l-signature/origin"
     )
     PACKAGE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/package'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/package"
     )
     PIVOT_CACHE_DEFINITION = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/pivotCacheDefinition'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/pivotCacheDefinition"
     )
     PIVOT_CACHE_RECORDS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/spreadsheetml/pivotCacheRecords'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/spreadsheetml/pivotCacheRecords"
     )
     PIVOT_TABLE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/pivotTable'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/pivotTable"
     )
     PRES_PROPS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/presProps'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/presProps"
     )
     PRINTER_SETTINGS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/printerSettings'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/printerSettings"
     )
     QUERY_TABLE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/queryTable'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/queryTable"
     )
     REVISION_HEADERS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/revisionHeaders'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/revisionHeaders"
     )
     REVISION_LOG = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/revisionLog'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/revisionLog"
     )
     SETTINGS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/settings'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/settings"
     )
     SHARED_STRINGS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/sharedStrings'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/sharedStrings"
     )
     SHEET_METADATA = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/sheetMetadata'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/sheetMetadata"
     )
     SIGNATURE = (
-        'http://schemas.openxmlformats.org/package/2006/relationships/digita'
-        'l-signature/signature'
+        "http://schemas.openxmlformats.org/package/2006/relationships/digita"
+        "l-signature/signature"
     )
     SLIDE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/slide'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/slide"
     )
     SLIDE_LAYOUT = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/slideLayout'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/slideLayout"
     )
     SLIDE_MASTER = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/slideMaster'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/slideMaster"
     )
     SLIDE_UPDATE_INFO = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/slideUpdateInfo'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/slideUpdateInfo"
     )
     STYLES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/styles'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/styles"
     )
     TABLE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/table'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/table"
     )
     TABLE_SINGLE_CELLS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/tableSingleCells'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/tableSingleCells"
     )
     TABLE_STYLES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/tableStyles'
-    )
-    TAGS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/tags'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/tableStyles"
     )
+    TAGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/tags"
     THEME = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/theme'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/theme"
     )
     THEME_OVERRIDE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/themeOverride'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/themeOverride"
     )
     THUMBNAIL = (
-        'http://schemas.openxmlformats.org/package/2006/relationships/metada'
-        'ta/thumbnail'
+        "http://schemas.openxmlformats.org/package/2006/relationships/metada"
+        "ta/thumbnail"
     )
     USERNAMES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/usernames'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/usernames"
     )
     VIDEO = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/video'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/video"
     )
     VIEW_PROPS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/viewProps'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/viewProps"
     )
     VML_DRAWING = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/vmlDrawing'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/vmlDrawing"
     )
     VOLATILE_DEPENDENCIES = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/volatileDependencies'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/volatileDependencies"
     )
     WEB_SETTINGS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/webSettings'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/webSettings"
     )
     WORKSHEET_SOURCE = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/worksheetSource'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        "/worksheetSource"
     )
     XML_MAPS = (
-        'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
-        '/xmlMaps'
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/xmlMaps"
     )
diff --git a/docx/opc/coreprops.py b/docx/opc/coreprops.py
index 2d38dabd3..186e851df 100644
--- a/docx/opc/coreprops.py
+++ b/docx/opc/coreprops.py
@@ -5,9 +5,7 @@
 writing presentations to and from a .pptx file.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 
 class CoreProperties(object):
@@ -15,6 +13,7 @@ class CoreProperties(object):
     Corresponds to part named ``/docProps/core.xml``, containing the core
     document properties for this document package.
     """
+
     def __init__(self, element):
         self._element = element
 
diff --git a/docx/opc/oxml.py b/docx/opc/oxml.py
index 494b31dca..432dcf9f7 100644
--- a/docx/opc/oxml.py
+++ b/docx/opc/oxml.py
@@ -20,9 +20,9 @@
 oxml_parser.set_element_class_lookup(element_class_lookup)
 
 nsmap = {
-    'ct': NS.OPC_CONTENT_TYPES,
-    'pr': NS.OPC_RELATIONSHIPS,
-    'r':  NS.OFC_RELATIONSHIPS,
+    "ct": NS.OPC_CONTENT_TYPES,
+    "pr": NS.OPC_RELATIONSHIPS,
+    "r": NS.OFC_RELATIONSHIPS,
 }
 
 
@@ -30,6 +30,7 @@
 # functions
 # ===========================================================================
 
+
 def parse_xml(text):
     """
     ``etree.fromstring()`` replacement that uses oxml parser
@@ -43,9 +44,9 @@ def qn(tag):
     prefixed tag name into a Clark-notation qualified tag name for lxml. For
     example, ``qn('p:cSld')`` returns ``'{http://schemas.../main}cSld'``.
     """
-    prefix, tagroot = tag.split(':')
+    prefix, tagroot = tag.split(":")
     uri = nsmap[prefix]
-    return '{%s}%s' % (uri, tagroot)
+    return "{%s}%s" % (uri, tagroot)
 
 
 def serialize_part_xml(part_elm):
@@ -54,7 +55,7 @@ def serialize_part_xml(part_elm):
     part. That is to say, no insignificant whitespace added for readability,
     and an appropriate XML declaration added with UTF-8 encoding specified.
     """
-    return etree.tostring(part_elm, encoding='UTF-8', standalone=True)
+    return etree.tostring(part_elm, encoding="UTF-8", standalone=True)
 
 
 def serialize_for_reading(element):
@@ -62,18 +63,20 @@ def serialize_for_reading(element):
     Serialize *element* to human-readable XML suitable for tests. No XML
     declaration.
     """
-    return etree.tostring(element, encoding='unicode', pretty_print=True)
+    return etree.tostring(element, encoding="unicode", pretty_print=True)
 
 
 # ===========================================================================
 # Custom element classes
 # ===========================================================================
 
+
 class BaseOxmlElement(etree.ElementBase):
     """
     Base class for all custom element classes, to add standardized behavior
     to all classes in one place.
     """
+
     @property
     def xml(self):
         """
@@ -89,13 +92,14 @@ class CT_Default(BaseOxmlElement):
     ``<Default>`` element, specifying the default content type to be applied
     to a part with the specified extension.
     """
+
     @property
     def content_type(self):
         """
         String held in the ``ContentType`` attribute of this ``<Default>``
         element.
         """
-        return self.get('ContentType')
+        return self.get("ContentType")
 
     @property
     def extension(self):
@@ -103,7 +107,7 @@ def extension(self):
         String held in the ``Extension`` attribute of this ``<Default>``
         element.
         """
-        return self.get('Extension')
+        return self.get("Extension")
 
     @staticmethod
     def new(ext, content_type):
@@ -111,10 +115,10 @@ def new(ext, content_type):
         Return a new ``<Default>`` element with attributes set to parameter
         values.
         """
-        xml = '<Default xmlns="%s"/>' % nsmap['ct']
+        xml = '<Default xmlns="%s"/>' % nsmap["ct"]
         default = parse_xml(xml)
-        default.set('Extension', ext)
-        default.set('ContentType', content_type)
+        default.set("Extension", ext)
+        default.set("ContentType", content_type)
         return default
 
 
@@ -123,13 +127,14 @@ class CT_Override(BaseOxmlElement):
     ``<Override>`` element, specifying the content type to be applied for a
     part with the specified partname.
     """
+
     @property
     def content_type(self):
         """
         String held in the ``ContentType`` attribute of this ``<Override>``
         element.
         """
-        return self.get('ContentType')
+        return self.get("ContentType")
 
     @staticmethod
     def new(partname, content_type):
@@ -137,10 +142,10 @@ def new(partname, content_type):
         Return a new ``<Override>`` element with attributes set to parameter
         values.
         """
-        xml = '<Override xmlns="%s"/>' % nsmap['ct']
+        xml = '<Override xmlns="%s"/>' % nsmap["ct"]
         override = parse_xml(xml)
-        override.set('PartName', partname)
-        override.set('ContentType', content_type)
+        override.set("PartName", partname)
+        override.set("ContentType", content_type)
         return override
 
     @property
@@ -149,7 +154,7 @@ def partname(self):
         String held in the ``PartName`` attribute of this ``<Override>``
         element.
         """
-        return self.get('PartName')
+        return self.get("PartName")
 
 
 class CT_Relationship(BaseOxmlElement):
@@ -157,18 +162,19 @@ class CT_Relationship(BaseOxmlElement):
     ``<Relationship>`` element, representing a single relationship from a
     source to a target part.
     """
+
     @staticmethod
     def new(rId, reltype, target, target_mode=RTM.INTERNAL):
         """
         Return a new ``<Relationship>`` element.
         """
-        xml = '<Relationship xmlns="%s"/>' % nsmap['pr']
+        xml = '<Relationship xmlns="%s"/>' % nsmap["pr"]
         relationship = parse_xml(xml)
-        relationship.set('Id', rId)
-        relationship.set('Type', reltype)
-        relationship.set('Target', target)
+        relationship.set("Id", rId)
+        relationship.set("Type", reltype)
+        relationship.set("Target", target)
         if target_mode == RTM.EXTERNAL:
-            relationship.set('TargetMode', RTM.EXTERNAL)
+            relationship.set("TargetMode", RTM.EXTERNAL)
         return relationship
 
     @property
@@ -177,7 +183,7 @@ def rId(self):
         String held in the ``Id`` attribute of this ``<Relationship>``
         element.
         """
-        return self.get('Id')
+        return self.get("Id")
 
     @property
     def reltype(self):
@@ -185,7 +191,7 @@ def reltype(self):
         String held in the ``Type`` attribute of this ``<Relationship>``
         element.
         """
-        return self.get('Type')
+        return self.get("Type")
 
     @property
     def target_ref(self):
@@ -193,7 +199,7 @@ def target_ref(self):
         String held in the ``Target`` attribute of this ``<Relationship>``
         element.
         """
-        return self.get('Target')
+        return self.get("Target")
 
     @property
     def target_mode(self):
@@ -202,13 +208,14 @@ def target_mode(self):
         ``<Relationship>`` element, either ``Internal`` or ``External``.
         Defaults to ``Internal``.
         """
-        return self.get('TargetMode', RTM.INTERNAL)
+        return self.get("TargetMode", RTM.INTERNAL)
 
 
 class CT_Relationships(BaseOxmlElement):
     """
     ``<Relationships>`` element, the root element in a .rels file.
     """
+
     def add_rel(self, rId, reltype, target, is_external=False):
         """
         Add a child ``<Relationship>`` element with attributes set according
@@ -223,7 +230,7 @@ def new():
         """
         Return a new ``<Relationships>`` element.
         """
-        xml = '<Relationships xmlns="%s"/>' % nsmap['pr']
+        xml = '<Relationships xmlns="%s"/>' % nsmap["pr"]
         relationships = parse_xml(xml)
         return relationships
 
@@ -232,7 +239,7 @@ def Relationship_lst(self):
         """
         Return a list containing all the ``<Relationship>`` child elements.
         """
-        return self.findall(qn('pr:Relationship'))
+        return self.findall(qn("pr:Relationship"))
 
     @property
     def xml(self):
@@ -248,6 +255,7 @@ class CT_Types(BaseOxmlElement):
     ``<Types>`` element, the container element for Default and Override
     elements in [Content_Types].xml.
     """
+
     def add_default(self, ext, content_type):
         """
         Add a child ``<Default>`` element with attributes set to parameter
@@ -266,27 +274,27 @@ def add_override(self, partname, content_type):
 
     @property
     def defaults(self):
-        return self.findall(qn('ct:Default'))
+        return self.findall(qn("ct:Default"))
 
     @staticmethod
     def new():
         """
         Return a new ``<Types>`` element.
         """
-        xml = '<Types xmlns="%s"/>' % nsmap['ct']
+        xml = '<Types xmlns="%s"/>' % nsmap["ct"]
         types = parse_xml(xml)
         return types
 
     @property
     def overrides(self):
-        return self.findall(qn('ct:Override'))
+        return self.findall(qn("ct:Override"))
 
 
-ct_namespace = element_class_lookup.get_namespace(nsmap['ct'])
-ct_namespace['Default'] = CT_Default
-ct_namespace['Override'] = CT_Override
-ct_namespace['Types'] = CT_Types
+ct_namespace = element_class_lookup.get_namespace(nsmap["ct"])
+ct_namespace["Default"] = CT_Default
+ct_namespace["Override"] = CT_Override
+ct_namespace["Types"] = CT_Types
 
-pr_namespace = element_class_lookup.get_namespace(nsmap['pr'])
-pr_namespace['Relationship'] = CT_Relationship
-pr_namespace['Relationships'] = CT_Relationships
+pr_namespace = element_class_lookup.get_namespace(nsmap["pr"])
+pr_namespace["Relationship"] = CT_Relationship
+pr_namespace["Relationships"] = CT_Relationships
diff --git a/docx/opc/package.py b/docx/opc/package.py
index 7ba87bab5..2e81d93c6 100644
--- a/docx/opc/package.py
+++ b/docx/opc/package.py
@@ -46,6 +46,7 @@ def iter_rels(self):
         Generate exactly one reference to each relationship in the package by
         performing a depth-first traversal of the rels graph.
         """
+
         def walk_rels(source, visited=None):
             visited = [] if visited is None else visited
             for rel in source.rels.values():
@@ -68,6 +69,7 @@ def iter_parts(self):
         Generate exactly one reference to each of the parts in the package by
         performing a depth-first traversal of the rels graph.
         """
+
         def walk_parts(source, visited=list()):
             for rel in source.rels.values():
                 if rel.is_external:
@@ -195,9 +197,7 @@ def unmarshal(pkg_reader, package, part_factory):
         contents of *pkg_reader*, delegating construction of each part to
         *part_factory*. Package relationships are added to *pkg*.
         """
-        parts = Unmarshaller._unmarshal_parts(
-            pkg_reader, package, part_factory
-        )
+        parts = Unmarshaller._unmarshal_parts(pkg_reader, package, part_factory)
         Unmarshaller._unmarshal_relationships(pkg_reader, package, parts)
         for part in parts.values():
             part.after_unmarshal()
@@ -225,7 +225,8 @@ def _unmarshal_relationships(pkg_reader, package, parts):
         target part in *parts*.
         """
         for source_uri, srel in pkg_reader.iter_srels():
-            source = package if source_uri == '/' else parts[source_uri]
-            target = (srel.target_ref if srel.is_external
-                      else parts[srel.target_partname])
+            source = package if source_uri == "/" else parts[source_uri]
+            target = (
+                srel.target_ref if srel.is_external else parts[srel.target_partname]
+            )
             source.load_rel(srel.reltype, target, srel.rId, srel.is_external)
diff --git a/docx/opc/packuri.py b/docx/opc/packuri.py
index 621ed92e5..f20af84f8 100644
--- a/docx/opc/packuri.py
+++ b/docx/opc/packuri.py
@@ -14,10 +14,11 @@ class PackURI(str):
     Provides access to pack URI components such as the baseURI and the
     filename slice. Behaves as |str| otherwise.
     """
-    _filename_re = re.compile('([a-zA-Z]+)([1-9][0-9]*)?')
+
+    _filename_re = re.compile("([a-zA-Z]+)([1-9][0-9]*)?")
 
     def __new__(cls, pack_uri_str):
-        if not pack_uri_str[0] == '/':
+        if not pack_uri_str[0] == "/":
             tmpl = "PackURI must begin with slash, got '%s'"
             raise ValueError(tmpl % pack_uri_str)
         return str.__new__(cls, pack_uri_str)
@@ -49,7 +50,7 @@ def ext(self):
         """
         # raw_ext is either empty string or starts with period, e.g. '.xml'
         raw_ext = posixpath.splitext(self)[1]
-        return raw_ext[1:] if raw_ext.startswith('.') else raw_ext
+        return raw_ext[1:] if raw_ext.startswith(".") else raw_ext
 
     @property
     def filename(self):
@@ -95,7 +96,7 @@ def relative_ref(self, baseURI):
         """
         # workaround for posixpath bug in 2.6, doesn't generate correct
         # relative path when *start* (second) parameter is root ('/')
-        if baseURI == '/':
+        if baseURI == "/":
             relpath = self[1:]
         else:
             relpath = posixpath.relpath(self, baseURI)
@@ -108,10 +109,10 @@ def rels_uri(self):
         Only produces sensible output if the pack URI is a partname or the
         package pseudo-partname '/'.
         """
-        rels_filename = '%s.rels' % self.filename
-        rels_uri_str = posixpath.join(self.baseURI, '_rels', rels_filename)
+        rels_filename = "%s.rels" % self.filename
+        rels_uri_str = posixpath.join(self.baseURI, "_rels", rels_filename)
         return PackURI(rels_uri_str)
 
 
-PACKAGE_URI = PackURI('/')
-CONTENT_TYPES_URI = PackURI('/[Content_Types].xml')
+PACKAGE_URI = PackURI("/")
+CONTENT_TYPES_URI = PackURI("/[Content_Types].xml")
diff --git a/docx/opc/part.py b/docx/opc/part.py
index 928d3c183..df20253e7 100644
--- a/docx/opc/part.py
+++ b/docx/opc/part.py
@@ -4,9 +4,7 @@
 Open Packaging Convention (OPC) objects related to package parts.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from .compat import cls_method_fn
 from .oxml import serialize_part_xml
@@ -22,6 +20,7 @@ class Part(object):
     intended to be subclassed in client code to implement specific part
     behaviors.
     """
+
     def __init__(self, partname, content_type, blob=None, package=None):
         super(Part, self).__init__()
         self._partname = partname
@@ -160,7 +159,7 @@ def _rel_ref_count(self, rId):
         Return the count of references in this part's XML to the relationship
         identified by *rId*.
         """
-        rIds = self._element.xpath('//@r:id')
+        rIds = self._element.xpath("//@r:id")
         return len([_rId for _rId in rIds if _rId == rId])
 
 
@@ -177,6 +176,7 @@ class PartFactory(object):
     either of these, the class contained in ``PartFactory.default_part_type``
     is used to construct the part, which is by default ``opc.package.Part``.
     """
+
     part_class_selector = None
     part_type_for = {}
     default_part_type = Part
@@ -184,7 +184,7 @@ class PartFactory(object):
     def __new__(cls, partname, content_type, reltype, blob, package):
         PartClass = None
         if cls.part_class_selector is not None:
-            part_class_selector = cls_method_fn(cls, 'part_class_selector')
+            part_class_selector = cls_method_fn(cls, "part_class_selector")
             PartClass = part_class_selector(content_type, reltype)
         if PartClass is None:
             PartClass = cls._part_cls_for(content_type)
@@ -209,10 +209,9 @@ class XmlPart(Part):
     of parsing and reserializing the XML payload and managing relationships
     to other parts.
     """
+
     def __init__(self, partname, content_type, element, package):
-        super(XmlPart, self).__init__(
-            partname, content_type, package=package
-        )
+        super(XmlPart, self).__init__(partname, content_type, package=package)
         self._element = element
 
     @property
diff --git a/docx/opc/parts/coreprops.py b/docx/opc/parts/coreprops.py
index 3c692fb99..7e5b8c17b 100644
--- a/docx/opc/parts/coreprops.py
+++ b/docx/opc/parts/coreprops.py
@@ -4,9 +4,7 @@
 Core properties part, corresponds to ``/docProps/core.xml`` part in package.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from datetime import datetime
 
@@ -22,6 +20,7 @@ class CorePropertiesPart(XmlPart):
     Corresponds to part named ``/docProps/core.xml``, containing the core
     document properties for this document package.
     """
+
     @classmethod
     def default(cls, package):
         """
@@ -30,8 +29,8 @@ def default(cls, package):
         """
         core_properties_part = cls._new(package)
         core_properties = core_properties_part.core_properties
-        core_properties.title = 'Word Document'
-        core_properties.last_modified_by = 'python-docx'
+        core_properties.title = "Word Document"
+        core_properties.last_modified_by = "python-docx"
         core_properties.revision = 1
         core_properties.modified = datetime.utcnow()
         return core_properties_part
@@ -46,9 +45,7 @@ def core_properties(self):
 
     @classmethod
     def _new(cls, package):
-        partname = PackURI('/docProps/core.xml')
+        partname = PackURI("/docProps/core.xml")
         content_type = CT.OPC_CORE_PROPERTIES
         coreProperties = CT_CoreProperties.new()
-        return CorePropertiesPart(
-            partname, content_type, coreProperties, package
-        )
+        return CorePropertiesPart(partname, content_type, coreProperties, package)
diff --git a/docx/opc/phys_pkg.py b/docx/opc/phys_pkg.py
index c86a51994..6d68198df 100644
--- a/docx/opc/phys_pkg.py
+++ b/docx/opc/phys_pkg.py
@@ -19,6 +19,7 @@ class PhysPkgReader(object):
     """
     Factory for physical package reader objects.
     """
+
     def __new__(cls, pkg_file):
         # if *pkg_file* is a string, treat it as a path
         if is_string(pkg_file):
@@ -27,9 +28,7 @@ def __new__(cls, pkg_file):
             elif is_zipfile(pkg_file):
                 reader_cls = _ZipPkgReader
             else:
-                raise PackageNotFoundError(
-                    "Package not found at '%s'" % pkg_file
-                )
+                raise PackageNotFoundError("Package not found at '%s'" % pkg_file)
         else:  # assume it's a stream and pass it to Zip reader to sort out
             reader_cls = _ZipPkgReader
 
@@ -40,6 +39,7 @@ class PhysPkgWriter(object):
     """
     Factory for physical package writer objects.
     """
+
     def __new__(cls, pkg_file):
         return super(PhysPkgWriter, cls).__new__(_ZipPkgWriter)
 
@@ -49,6 +49,7 @@ class _DirPkgReader(PhysPkgReader):
     Implements |PhysPkgReader| interface for an OPC package extracted into a
     directory.
     """
+
     def __init__(self, path):
         """
         *path* is the path to a directory containing an expanded package.
@@ -62,7 +63,7 @@ def blob_for(self, pack_uri):
         directory.
         """
         path = os.path.join(self._path, pack_uri.membername)
-        with open(path, 'rb') as f:
+        with open(path, "rb") as f:
             blob = f.read()
         return blob
 
@@ -96,9 +97,10 @@ class _ZipPkgReader(PhysPkgReader):
     """
     Implements |PhysPkgReader| interface for a zip file OPC package.
     """
+
     def __init__(self, pkg_file):
         super(_ZipPkgReader, self).__init__()
-        self._zipf = ZipFile(pkg_file, 'r')
+        self._zipf = ZipFile(pkg_file, "r")
 
     def blob_for(self, pack_uri):
         """
@@ -136,9 +138,10 @@ class _ZipPkgWriter(PhysPkgWriter):
     """
     Implements |PhysPkgWriter| interface for a zip file OPC package.
     """
+
     def __init__(self, pkg_file):
         super(_ZipPkgWriter, self).__init__()
-        self._zipf = ZipFile(pkg_file, 'w', compression=ZIP_DEFLATED)
+        self._zipf = ZipFile(pkg_file, "w", compression=ZIP_DEFLATED)
 
     def close(self):
         """
diff --git a/docx/opc/pkgreader.py b/docx/opc/pkgreader.py
index ae80b3586..b5180192e 100644
--- a/docx/opc/pkgreader.py
+++ b/docx/opc/pkgreader.py
@@ -19,6 +19,7 @@ class PackageReader(object):
     Provides access to the contents of a zip-format OPC package via its
     :attr:`serialized_parts` and :attr:`pkg_srels` attributes.
     """
+
     def __init__(self, content_types, pkg_srels, sparts):
         super(PackageReader, self).__init__()
         self._pkg_srels = pkg_srels
@@ -68,9 +69,7 @@ def _load_serialized_parts(phys_reader, pkg_srels, content_types):
         part_walker = PackageReader._walk_phys_parts(phys_reader, pkg_srels)
         for partname, blob, reltype, srels in part_walker:
             content_type = content_types[partname]
-            spart = _SerializedPart(
-                partname, content_type, reltype, blob, srels
-            )
+            spart = _SerializedPart(partname, content_type, reltype, blob, srels)
             sparts.append(spart)
         return tuple(sparts)
 
@@ -81,8 +80,7 @@ def _srels_for(phys_reader, source_uri):
         relationships for source identified by *source_uri*.
         """
         rels_xml = phys_reader.rels_xml_for(source_uri)
-        return _SerializedRelationships.load_from_xml(
-            source_uri.baseURI, rels_xml)
+        return _SerializedRelationships.load_from_xml(source_uri.baseURI, rels_xml)
 
     @staticmethod
     def _walk_phys_parts(phys_reader, srels, visited_partnames=None):
@@ -116,6 +114,7 @@ class _ContentTypeMap(object):
     Value type providing dictionary semantics for looking up content type by
     part name, e.g. ``content_type = cti['/ppt/presentation.xml']``.
     """
+
     def __init__(self):
         super(_ContentTypeMap, self).__init__()
         self._overrides = CaseInsensitiveDict()
@@ -169,6 +168,7 @@ class _SerializedPart(object):
     Value object for an OPC package part. Provides access to the partname,
     content type, blob, and serialized relationships for the part.
     """
+
     def __init__(self, partname, content_type, reltype, blob, srels):
         super(_SerializedPart, self).__init__()
         self._partname = partname
@@ -207,6 +207,7 @@ class _SerializedRelationship(object):
     Serialized, in this case, means any target part is referred to via its
     partname rather than a direct link to an in-memory |Part| object.
     """
+
     def __init__(self, baseURI, rel_elm):
         super(_SerializedRelationship, self).__init__()
         self._baseURI = baseURI
@@ -260,13 +261,14 @@ def target_partname(self):
         Use :attr:`target_mode` to check before referencing.
         """
         if self.is_external:
-            msg = ('target_partname attribute on Relationship is undefined w'
-                   'here TargetMode == "External"')
+            msg = (
+                "target_partname attribute on Relationship is undefined w"
+                'here TargetMode == "External"'
+            )
             raise ValueError(msg)
         # lazy-load _target_partname attribute
-        if not hasattr(self, '_target_partname'):
-            self._target_partname = PackURI.from_rel_ref(self._baseURI,
-                                                         self.target_ref)
+        if not hasattr(self, "_target_partname"):
+            self._target_partname = PackURI.from_rel_ref(self._baseURI, self.target_ref)
         return self._target_partname
 
 
@@ -275,6 +277,7 @@ class _SerializedRelationships(object):
     Read-only sequence of |_SerializedRelationship| instances corresponding
     to the relationships item XML passed to constructor.
     """
+
     def __init__(self):
         super(_SerializedRelationships, self).__init__()
         self._srels = []
diff --git a/docx/opc/pkgwriter.py b/docx/opc/pkgwriter.py
index fccda6cd8..1610cbb06 100644
--- a/docx/opc/pkgwriter.py
+++ b/docx/opc/pkgwriter.py
@@ -22,6 +22,7 @@ class PackageWriter(object):
     API method, :meth:`write`, is static, so this class is not intended to
     be instantiated.
     """
+
     @staticmethod
     def write(pkg_file, pkg_rels, parts):
         """
@@ -71,6 +72,7 @@ class _ContentTypesItem(object):
     single interface method is xml_for(), e.g.
     ``_ContentTypesItem.xml_for(parts)``.
     """
+
     def __init__(self):
         self._defaults = CaseInsensitiveDict()
         self._overrides = dict()
@@ -91,8 +93,8 @@ def from_parts(cls, parts):
         ``[Content_Types].xml`` in an OPC package.
         """
         cti = cls()
-        cti._defaults['rels'] = CT.OPC_RELATIONSHIPS
-        cti._defaults['xml'] = CT.XML
+        cti._defaults["rels"] = CT.OPC_RELATIONSHIPS
+        cti._defaults["xml"] = CT.XML
         for part in parts:
             cti._add_content_type(part.partname, part.content_type)
         return cti
diff --git a/docx/opc/rel.py b/docx/opc/rel.py
index 7dba2af8e..a57d02f79 100644
--- a/docx/opc/rel.py
+++ b/docx/opc/rel.py
@@ -4,9 +4,7 @@
 Relationship-related objects.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from .oxml import CT_Relationships
 
@@ -15,6 +13,7 @@ class Relationships(dict):
     """
     Collection object for |_Relationship| instances, having list semantics.
     """
+
     def __init__(self, baseURI):
         super(Relationships, self).__init__()
         self._baseURI = baseURI
@@ -49,9 +48,7 @@ def get_or_add_ext_rel(self, reltype, target_ref):
         rel = self._get_matching(reltype, target_ref, is_external=True)
         if rel is None:
             rId = self._next_rId
-            rel = self.add_relationship(
-                reltype, target_ref, rId, is_external=True
-            )
+            rel = self.add_relationship(reltype, target_ref, rId, is_external=True)
         return rel.rId
 
     def part_with_reltype(self, reltype):
@@ -79,9 +76,7 @@ def xml(self):
         """
         rels_elm = CT_Relationships.new()
         for rel in self.values():
-            rels_elm.add_rel(
-                rel.rId, rel.reltype, rel.target_ref, rel.is_external
-            )
+            rels_elm.add_rel(rel.rId, rel.reltype, rel.target_ref, rel.is_external)
         return rels_elm.xml
 
     def _get_matching(self, reltype, target, is_external=False):
@@ -89,6 +84,7 @@ def _get_matching(self, reltype, target, is_external=False):
         Return relationship of matching *reltype*, *target*, and
         *is_external* from collection, or None if not found.
         """
+
         def matches(rel, reltype, target, is_external):
             if rel.reltype != reltype:
                 return False
@@ -125,8 +121,8 @@ def _next_rId(self):
         Next available rId in collection, starting from 'rId1' and making use
         of any gaps in numbering, e.g. 'rId2' for rIds ['rId1', 'rId3'].
         """
-        for n in range(1, len(self)+2):
-            rId_candidate = 'rId%d' % n  # like 'rId19'
+        for n in range(1, len(self) + 2):
+            rId_candidate = "rId%d" % n  # like 'rId19'
             if rId_candidate not in self:
                 return rId_candidate
 
@@ -135,6 +131,7 @@ class _Relationship(object):
     """
     Value object for relationship to part.
     """
+
     def __init__(self, rId, reltype, target, baseURI, external=False):
         super(_Relationship, self).__init__()
         self._rId = rId
@@ -158,8 +155,10 @@ def rId(self):
     @property
     def target_part(self):
         if self._is_external:
-            raise ValueError("target_part property on _Relationship is undef"
-                             "ined when target mode is External")
+            raise ValueError(
+                "target_part property on _Relationship is undef"
+                "ined when target mode is External"
+            )
         return self._target
 
     @property
diff --git a/docx/opc/shared.py b/docx/opc/shared.py
index 55344483d..15eed35d9 100644
--- a/docx/opc/shared.py
+++ b/docx/opc/shared.py
@@ -15,6 +15,7 @@ class CaseInsensitiveDict(dict):
     assumes str keys, and that it is created empty; keys passed in constructor
     are not accounted for
     """
+
     def __contains__(self, key):
         return super(CaseInsensitiveDict, self).__contains__(key.lower())
 
@@ -22,9 +23,7 @@ def __getitem__(self, key):
         return super(CaseInsensitiveDict, self).__getitem__(key.lower())
 
     def __setitem__(self, key, value):
-        return super(CaseInsensitiveDict, self).__setitem__(
-            key.lower(), value
-        )
+        return super(CaseInsensitiveDict, self).__setitem__(key.lower(), value)
 
 
 def lazyproperty(f):
@@ -33,7 +32,7 @@ def lazyproperty(f):
     to calculate a cached property value. After that, the cached value is
     returned.
     """
-    cache_attr_name = '_%s' % f.__name__  # like '_foobar' for prop 'foobar'
+    cache_attr_name = "_%s" % f.__name__  # like '_foobar' for prop 'foobar'
     docstring = f.__doc__
 
     def get_prop_value(obj):
diff --git a/docx/opc/spec.py b/docx/opc/spec.py
index 60fc38564..87489fcfb 100644
--- a/docx/opc/spec.py
+++ b/docx/opc/spec.py
@@ -8,22 +8,22 @@
 
 
 default_content_types = (
-    ('bin',     CT.PML_PRINTER_SETTINGS),
-    ('bin',     CT.SML_PRINTER_SETTINGS),
-    ('bin',     CT.WML_PRINTER_SETTINGS),
-    ('bmp',     CT.BMP),
-    ('emf',     CT.X_EMF),
-    ('fntdata', CT.X_FONTDATA),
-    ('gif',     CT.GIF),
-    ('jpe',     CT.JPEG),
-    ('jpeg',    CT.JPEG),
-    ('jpg',     CT.JPEG),
-    ('png',     CT.PNG),
-    ('rels',    CT.OPC_RELATIONSHIPS),
-    ('tif',     CT.TIFF),
-    ('tiff',    CT.TIFF),
-    ('wdp',     CT.MS_PHOTO),
-    ('wmf',     CT.X_WMF),
-    ('xlsx',    CT.SML_SHEET),
-    ('xml',     CT.XML),
+    ("bin", CT.PML_PRINTER_SETTINGS),
+    ("bin", CT.SML_PRINTER_SETTINGS),
+    ("bin", CT.WML_PRINTER_SETTINGS),
+    ("bmp", CT.BMP),
+    ("emf", CT.X_EMF),
+    ("fntdata", CT.X_FONTDATA),
+    ("gif", CT.GIF),
+    ("jpe", CT.JPEG),
+    ("jpeg", CT.JPEG),
+    ("jpg", CT.JPEG),
+    ("png", CT.PNG),
+    ("rels", CT.OPC_RELATIONSHIPS),
+    ("tif", CT.TIFF),
+    ("tiff", CT.TIFF),
+    ("wdp", CT.MS_PHOTO),
+    ("wmf", CT.X_WMF),
+    ("xlsx", CT.SML_SHEET),
+    ("xml", CT.XML),
 )
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
index 093c1b45b..36539340c 100644
--- a/docx/oxml/__init__.py
+++ b/docx/oxml/__init__.py
@@ -35,7 +35,7 @@ def register_element_cls(tag, cls):
     element with matching *tag*. *tag* is a string of the form
     ``nspfx:tagroot``, e.g. ``'w:document'``.
     """
-    nspfx, tagroot = tag.split(':')
+    nspfx, tagroot = tag.split(":")
     namespace = element_class_lookup.get_namespace(nsmap[nspfx])
     namespace[tagroot] = cls
 
@@ -55,9 +55,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     nsptag = NamespacePrefixedTag(nsptag_str)
     if nsdecls is None:
         nsdecls = nsptag.nsmap
-    return oxml_parser.makeelement(
-        nsptag.clark_name, attrib=attrs, nsmap=nsdecls
-    )
+    return oxml_parser.makeelement(nsptag.clark_name, attrib=attrs, nsmap=nsdecls)
 
 
 # ===========================================================================
@@ -65,26 +63,30 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 # ===========================================================================
 
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
+
 register_element_cls("w:evenAndOddHeaders", CT_OnOff)
 register_element_cls("w:titlePg", CT_OnOff)
 
 
 from .coreprops import CT_CoreProperties  # noqa
-register_element_cls('cp:coreProperties', CT_CoreProperties)
+
+register_element_cls("cp:coreProperties", CT_CoreProperties)
 
 from .document import CT_Body, CT_Document  # noqa
-register_element_cls('w:body',     CT_Body)
-register_element_cls('w:document', CT_Document)
+
+register_element_cls("w:body", CT_Body)
+register_element_cls("w:document", CT_Document)
 
 from .numbering import CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr  # noqa
-register_element_cls('w:abstractNumId', CT_DecimalNumber)
-register_element_cls('w:ilvl',          CT_DecimalNumber)
-register_element_cls('w:lvlOverride',   CT_NumLvl)
-register_element_cls('w:num',           CT_Num)
-register_element_cls('w:numId',         CT_DecimalNumber)
-register_element_cls('w:numPr',         CT_NumPr)
-register_element_cls('w:numbering',     CT_Numbering)
-register_element_cls('w:startOverride', CT_DecimalNumber)
+
+register_element_cls("w:abstractNumId", CT_DecimalNumber)
+register_element_cls("w:ilvl", CT_DecimalNumber)
+register_element_cls("w:lvlOverride", CT_NumLvl)
+register_element_cls("w:num", CT_Num)
+register_element_cls("w:numId", CT_DecimalNumber)
+register_element_cls("w:numPr", CT_NumPr)
+register_element_cls("w:numbering", CT_Numbering)
+register_element_cls("w:startOverride", CT_DecimalNumber)
 
 from .section import (  # noqa
     CT_HdrFtr,
@@ -94,6 +96,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_SectPr,
     CT_SectType,
 )
+
 register_element_cls("w:footerReference", CT_HdrFtrRef)
 register_element_cls("w:ftr", CT_HdrFtr)
 register_element_cls("w:hdr", CT_HdrFtr)
@@ -104,6 +107,7 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls("w:type", CT_SectType)
 
 from .settings import CT_Settings  # noqa
+
 register_element_cls("w:settings", CT_Settings)
 
 from .shape import (  # noqa
@@ -120,34 +124,36 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_ShapeProperties,
     CT_Transform2D,
 )
-register_element_cls('a:blip',        CT_Blip)
-register_element_cls('a:ext',         CT_PositiveSize2D)
-register_element_cls('a:graphic',     CT_GraphicalObject)
-register_element_cls('a:graphicData', CT_GraphicalObjectData)
-register_element_cls('a:off',         CT_Point2D)
-register_element_cls('a:xfrm',        CT_Transform2D)
-register_element_cls('pic:blipFill',  CT_BlipFillProperties)
-register_element_cls('pic:cNvPr',     CT_NonVisualDrawingProps)
-register_element_cls('pic:nvPicPr',   CT_PictureNonVisual)
-register_element_cls('pic:pic',       CT_Picture)
-register_element_cls('pic:spPr',      CT_ShapeProperties)
-register_element_cls('wp:docPr',      CT_NonVisualDrawingProps)
-register_element_cls('wp:extent',     CT_PositiveSize2D)
-register_element_cls('wp:inline',     CT_Inline)
+
+register_element_cls("a:blip", CT_Blip)
+register_element_cls("a:ext", CT_PositiveSize2D)
+register_element_cls("a:graphic", CT_GraphicalObject)
+register_element_cls("a:graphicData", CT_GraphicalObjectData)
+register_element_cls("a:off", CT_Point2D)
+register_element_cls("a:xfrm", CT_Transform2D)
+register_element_cls("pic:blipFill", CT_BlipFillProperties)
+register_element_cls("pic:cNvPr", CT_NonVisualDrawingProps)
+register_element_cls("pic:nvPicPr", CT_PictureNonVisual)
+register_element_cls("pic:pic", CT_Picture)
+register_element_cls("pic:spPr", CT_ShapeProperties)
+register_element_cls("wp:docPr", CT_NonVisualDrawingProps)
+register_element_cls("wp:extent", CT_PositiveSize2D)
+register_element_cls("wp:inline", CT_Inline)
 
 from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles  # noqa
-register_element_cls('w:basedOn',        CT_String)
-register_element_cls('w:latentStyles',   CT_LatentStyles)
-register_element_cls('w:locked',         CT_OnOff)
-register_element_cls('w:lsdException',   CT_LsdException)
-register_element_cls('w:name',           CT_String)
-register_element_cls('w:next',           CT_String)
-register_element_cls('w:qFormat',        CT_OnOff)
-register_element_cls('w:semiHidden',     CT_OnOff)
-register_element_cls('w:style',          CT_Style)
-register_element_cls('w:styles',         CT_Styles)
-register_element_cls('w:uiPriority',     CT_DecimalNumber)
-register_element_cls('w:unhideWhenUsed', CT_OnOff)
+
+register_element_cls("w:basedOn", CT_String)
+register_element_cls("w:latentStyles", CT_LatentStyles)
+register_element_cls("w:locked", CT_OnOff)
+register_element_cls("w:lsdException", CT_LsdException)
+register_element_cls("w:name", CT_String)
+register_element_cls("w:next", CT_String)
+register_element_cls("w:qFormat", CT_OnOff)
+register_element_cls("w:semiHidden", CT_OnOff)
+register_element_cls("w:style", CT_Style)
+register_element_cls("w:styles", CT_Styles)
+register_element_cls("w:uiPriority", CT_DecimalNumber)
+register_element_cls("w:unhideWhenUsed", CT_OnOff)
 
 from .table import (  # noqa
     CT_Height,
@@ -164,22 +170,23 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_VMerge,
     CT_VerticalJc,
 )
-register_element_cls('w:bidiVisual', CT_OnOff)
-register_element_cls('w:gridCol',    CT_TblGridCol)
-register_element_cls('w:gridSpan',   CT_DecimalNumber)
-register_element_cls('w:tbl',        CT_Tbl)
-register_element_cls('w:tblGrid',    CT_TblGrid)
-register_element_cls('w:tblLayout',  CT_TblLayoutType)
-register_element_cls('w:tblPr',      CT_TblPr)
-register_element_cls('w:tblStyle',   CT_String)
-register_element_cls('w:tc',         CT_Tc)
-register_element_cls('w:tcPr',       CT_TcPr)
-register_element_cls('w:tcW',        CT_TblWidth)
-register_element_cls('w:tr',         CT_Row)
-register_element_cls('w:trHeight',   CT_Height)
-register_element_cls('w:trPr',       CT_TrPr)
-register_element_cls('w:vAlign',     CT_VerticalJc)
-register_element_cls('w:vMerge',     CT_VMerge)
+
+register_element_cls("w:bidiVisual", CT_OnOff)
+register_element_cls("w:gridCol", CT_TblGridCol)
+register_element_cls("w:gridSpan", CT_DecimalNumber)
+register_element_cls("w:tbl", CT_Tbl)
+register_element_cls("w:tblGrid", CT_TblGrid)
+register_element_cls("w:tblLayout", CT_TblLayoutType)
+register_element_cls("w:tblPr", CT_TblPr)
+register_element_cls("w:tblStyle", CT_String)
+register_element_cls("w:tc", CT_Tc)
+register_element_cls("w:tcPr", CT_TcPr)
+register_element_cls("w:tcW", CT_TblWidth)
+register_element_cls("w:tr", CT_Row)
+register_element_cls("w:trHeight", CT_Height)
+register_element_cls("w:trPr", CT_TrPr)
+register_element_cls("w:vAlign", CT_VerticalJc)
+register_element_cls("w:vMerge", CT_VMerge)
 
 from .text.font import (  # noqa
     CT_Color,
@@ -190,37 +197,39 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_Underline,
     CT_VerticalAlignRun,
 )
-register_element_cls('w:b',          CT_OnOff)
-register_element_cls('w:bCs',        CT_OnOff)
-register_element_cls('w:caps',       CT_OnOff)
-register_element_cls('w:color',      CT_Color)
-register_element_cls('w:cs',         CT_OnOff)
-register_element_cls('w:dstrike',    CT_OnOff)
-register_element_cls('w:emboss',     CT_OnOff)
-register_element_cls('w:highlight',  CT_Highlight)
-register_element_cls('w:i',          CT_OnOff)
-register_element_cls('w:iCs',        CT_OnOff)
-register_element_cls('w:imprint',    CT_OnOff)
-register_element_cls('w:noProof',    CT_OnOff)
-register_element_cls('w:oMath',      CT_OnOff)
-register_element_cls('w:outline',    CT_OnOff)
-register_element_cls('w:rFonts',     CT_Fonts)
-register_element_cls('w:rPr',        CT_RPr)
-register_element_cls('w:rStyle',     CT_String)
-register_element_cls('w:rtl',        CT_OnOff)
-register_element_cls('w:shadow',     CT_OnOff)
-register_element_cls('w:smallCaps',  CT_OnOff)
-register_element_cls('w:snapToGrid', CT_OnOff)
-register_element_cls('w:specVanish', CT_OnOff)
-register_element_cls('w:strike',     CT_OnOff)
-register_element_cls('w:sz',         CT_HpsMeasure)
-register_element_cls('w:u',          CT_Underline)
-register_element_cls('w:vanish',     CT_OnOff)
-register_element_cls('w:vertAlign',  CT_VerticalAlignRun)
-register_element_cls('w:webHidden',  CT_OnOff)
+
+register_element_cls("w:b", CT_OnOff)
+register_element_cls("w:bCs", CT_OnOff)
+register_element_cls("w:caps", CT_OnOff)
+register_element_cls("w:color", CT_Color)
+register_element_cls("w:cs", CT_OnOff)
+register_element_cls("w:dstrike", CT_OnOff)
+register_element_cls("w:emboss", CT_OnOff)
+register_element_cls("w:highlight", CT_Highlight)
+register_element_cls("w:i", CT_OnOff)
+register_element_cls("w:iCs", CT_OnOff)
+register_element_cls("w:imprint", CT_OnOff)
+register_element_cls("w:noProof", CT_OnOff)
+register_element_cls("w:oMath", CT_OnOff)
+register_element_cls("w:outline", CT_OnOff)
+register_element_cls("w:rFonts", CT_Fonts)
+register_element_cls("w:rPr", CT_RPr)
+register_element_cls("w:rStyle", CT_String)
+register_element_cls("w:rtl", CT_OnOff)
+register_element_cls("w:shadow", CT_OnOff)
+register_element_cls("w:smallCaps", CT_OnOff)
+register_element_cls("w:snapToGrid", CT_OnOff)
+register_element_cls("w:specVanish", CT_OnOff)
+register_element_cls("w:strike", CT_OnOff)
+register_element_cls("w:sz", CT_HpsMeasure)
+register_element_cls("w:u", CT_Underline)
+register_element_cls("w:vanish", CT_OnOff)
+register_element_cls("w:vertAlign", CT_VerticalAlignRun)
+register_element_cls("w:webHidden", CT_OnOff)
 
 from .text.paragraph import CT_P  # noqa
-register_element_cls('w:p', CT_P)
+
+register_element_cls("w:p", CT_P)
 
 from .text.parfmt import (  # noqa
     CT_Ind,
@@ -230,19 +239,21 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     CT_TabStop,
     CT_TabStops,
 )
-register_element_cls('w:ind',             CT_Ind)
-register_element_cls('w:jc',              CT_Jc)
-register_element_cls('w:keepLines',       CT_OnOff)
-register_element_cls('w:keepNext',        CT_OnOff)
-register_element_cls('w:pageBreakBefore', CT_OnOff)
-register_element_cls('w:pPr',             CT_PPr)
-register_element_cls('w:pStyle',          CT_String)
-register_element_cls('w:spacing',         CT_Spacing)
-register_element_cls('w:tab',             CT_TabStop)
-register_element_cls('w:tabs',            CT_TabStops)
-register_element_cls('w:widowControl',    CT_OnOff)
+
+register_element_cls("w:ind", CT_Ind)
+register_element_cls("w:jc", CT_Jc)
+register_element_cls("w:keepLines", CT_OnOff)
+register_element_cls("w:keepNext", CT_OnOff)
+register_element_cls("w:pageBreakBefore", CT_OnOff)
+register_element_cls("w:pPr", CT_PPr)
+register_element_cls("w:pStyle", CT_String)
+register_element_cls("w:spacing", CT_Spacing)
+register_element_cls("w:tab", CT_TabStop)
+register_element_cls("w:tabs", CT_TabStops)
+register_element_cls("w:widowControl", CT_OnOff)
 
 from .text.run import CT_Br, CT_R, CT_Text  # noqa
-register_element_cls('w:br', CT_Br)
-register_element_cls('w:r',  CT_R)
-register_element_cls('w:t',  CT_Text)
+
+register_element_cls("w:br", CT_Br)
+register_element_cls("w:r", CT_R)
+register_element_cls("w:t", CT_Text)
diff --git a/docx/oxml/coreprops.py b/docx/oxml/coreprops.py
index ed3dd1001..3d4f64e75 100644
--- a/docx/oxml/coreprops.py
+++ b/docx/oxml/coreprops.py
@@ -2,9 +2,7 @@
 
 """Custom element classes for core properties-related XML elements"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import re
 
@@ -24,25 +22,24 @@ class CT_CoreProperties(BaseOxmlElement):
     ('') if the element is not present in the XML. String elements are
     limited in length to 255 unicode characters.
     """
-    category = ZeroOrOne('cp:category', successors=())
-    contentStatus = ZeroOrOne('cp:contentStatus', successors=())
-    created = ZeroOrOne('dcterms:created', successors=())
-    creator = ZeroOrOne('dc:creator', successors=())
-    description = ZeroOrOne('dc:description', successors=())
-    identifier = ZeroOrOne('dc:identifier', successors=())
-    keywords = ZeroOrOne('cp:keywords', successors=())
-    language = ZeroOrOne('dc:language', successors=())
-    lastModifiedBy = ZeroOrOne('cp:lastModifiedBy', successors=())
-    lastPrinted = ZeroOrOne('cp:lastPrinted', successors=())
-    modified = ZeroOrOne('dcterms:modified', successors=())
-    revision = ZeroOrOne('cp:revision', successors=())
-    subject = ZeroOrOne('dc:subject', successors=())
-    title = ZeroOrOne('dc:title', successors=())
-    version = ZeroOrOne('cp:version', successors=())
-
-    _coreProperties_tmpl = (
-        '<cp:coreProperties %s/>\n' % nsdecls('cp', 'dc', 'dcterms')
-    )
+
+    category = ZeroOrOne("cp:category", successors=())
+    contentStatus = ZeroOrOne("cp:contentStatus", successors=())
+    created = ZeroOrOne("dcterms:created", successors=())
+    creator = ZeroOrOne("dc:creator", successors=())
+    description = ZeroOrOne("dc:description", successors=())
+    identifier = ZeroOrOne("dc:identifier", successors=())
+    keywords = ZeroOrOne("cp:keywords", successors=())
+    language = ZeroOrOne("dc:language", successors=())
+    lastModifiedBy = ZeroOrOne("cp:lastModifiedBy", successors=())
+    lastPrinted = ZeroOrOne("cp:lastPrinted", successors=())
+    modified = ZeroOrOne("dcterms:modified", successors=())
+    revision = ZeroOrOne("cp:revision", successors=())
+    subject = ZeroOrOne("dc:subject", successors=())
+    title = ZeroOrOne("dc:title", successors=())
+    version = ZeroOrOne("cp:version", successors=())
+
+    _coreProperties_tmpl = "<cp:coreProperties %s/>\n" % nsdecls("cp", "dc", "dcterms")
 
     @classmethod
     def new(cls):
@@ -58,91 +55,91 @@ def author_text(self):
         """
         The text in the `dc:creator` child element.
         """
-        return self._text_of_element('creator')
+        return self._text_of_element("creator")
 
     @author_text.setter
     def author_text(self, value):
-        self._set_element_text('creator', value)
+        self._set_element_text("creator", value)
 
     @property
     def category_text(self):
-        return self._text_of_element('category')
+        return self._text_of_element("category")
 
     @category_text.setter
     def category_text(self, value):
-        self._set_element_text('category', value)
+        self._set_element_text("category", value)
 
     @property
     def comments_text(self):
-        return self._text_of_element('description')
+        return self._text_of_element("description")
 
     @comments_text.setter
     def comments_text(self, value):
-        self._set_element_text('description', value)
+        self._set_element_text("description", value)
 
     @property
     def contentStatus_text(self):
-        return self._text_of_element('contentStatus')
+        return self._text_of_element("contentStatus")
 
     @contentStatus_text.setter
     def contentStatus_text(self, value):
-        self._set_element_text('contentStatus', value)
+        self._set_element_text("contentStatus", value)
 
     @property
     def created_datetime(self):
-        return self._datetime_of_element('created')
+        return self._datetime_of_element("created")
 
     @created_datetime.setter
     def created_datetime(self, value):
-        self._set_element_datetime('created', value)
+        self._set_element_datetime("created", value)
 
     @property
     def identifier_text(self):
-        return self._text_of_element('identifier')
+        return self._text_of_element("identifier")
 
     @identifier_text.setter
     def identifier_text(self, value):
-        self._set_element_text('identifier', value)
+        self._set_element_text("identifier", value)
 
     @property
     def keywords_text(self):
-        return self._text_of_element('keywords')
+        return self._text_of_element("keywords")
 
     @keywords_text.setter
     def keywords_text(self, value):
-        self._set_element_text('keywords', value)
+        self._set_element_text("keywords", value)
 
     @property
     def language_text(self):
-        return self._text_of_element('language')
+        return self._text_of_element("language")
 
     @language_text.setter
     def language_text(self, value):
-        self._set_element_text('language', value)
+        self._set_element_text("language", value)
 
     @property
     def lastModifiedBy_text(self):
-        return self._text_of_element('lastModifiedBy')
+        return self._text_of_element("lastModifiedBy")
 
     @lastModifiedBy_text.setter
     def lastModifiedBy_text(self, value):
-        self._set_element_text('lastModifiedBy', value)
+        self._set_element_text("lastModifiedBy", value)
 
     @property
     def lastPrinted_datetime(self):
-        return self._datetime_of_element('lastPrinted')
+        return self._datetime_of_element("lastPrinted")
 
     @lastPrinted_datetime.setter
     def lastPrinted_datetime(self, value):
-        self._set_element_datetime('lastPrinted', value)
+        self._set_element_datetime("lastPrinted", value)
 
     @property
     def modified_datetime(self):
-        return self._datetime_of_element('modified')
+        return self._datetime_of_element("modified")
 
     @modified_datetime.setter
     def modified_datetime(self, value):
-        self._set_element_datetime('modified', value)
+        self._set_element_datetime("modified", value)
 
     @property
     def revision_number(self):
@@ -176,27 +173,27 @@ def revision_number(self, value):
 
     @property
     def subject_text(self):
-        return self._text_of_element('subject')
+        return self._text_of_element("subject")
 
     @subject_text.setter
     def subject_text(self, value):
-        self._set_element_text('subject', value)
+        self._set_element_text("subject", value)
 
     @property
     def title_text(self):
-        return self._text_of_element('title')
+        return self._text_of_element("title")
 
     @title_text.setter
     def title_text(self, value):
-        self._set_element_text('title', value)
+        self._set_element_text("title", value)
 
     @property
     def version_text(self):
-        return self._text_of_element('version')
+        return self._text_of_element("version")
 
     @version_text.setter
     def version_text(self, value):
-        self._set_element_text('version', value)
+        self._set_element_text("version", value)
 
     def _datetime_of_element(self, property_name):
         element = getattr(self, property_name)
@@ -213,7 +210,7 @@ def _get_or_add(self, prop_name):
         """
         Return element returned by 'get_or_add_' method for *prop_name*.
         """
-        get_or_add_method_name = 'get_or_add_%s' % prop_name
+        get_or_add_method_name = "get_or_add_%s" % prop_name
         get_or_add_method = getattr(self, get_or_add_method_name)
         element = get_or_add_method()
         return element
@@ -227,17 +224,15 @@ def _offset_dt(cls, dt, offset_str):
         """
         match = cls._offset_pattern.match(offset_str)
         if match is None:
-            raise ValueError(
-                "'%s' is not a valid offset string" % offset_str
-            )
+            raise ValueError("'%s' is not a valid offset string" % offset_str)
         sign, hours_str, minutes_str = match.groups()
-        sign_factor = -1 if sign == '+' else 1
+        sign_factor = -1 if sign == "+" else 1
         hours = int(hours_str) * sign_factor
         minutes = int(minutes_str) * sign_factor
         td = timedelta(hours=hours, minutes=minutes)
         return dt + td
 
-    _offset_pattern = re.compile(r'([+-])(\d\d):(\d\d)')
+    _offset_pattern = re.compile(r"([+-])(\d\d):(\d\d)")
 
     @classmethod
     def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
@@ -248,10 +243,10 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
         # UTC timezone e.g. '2003-12-31T10:14:55Z'
         # numeric timezone e.g. '2003-12-31T10:14:55-08:00'
         templates = (
-            '%Y-%m-%dT%H:%M:%S',
-            '%Y-%m-%d',
-            '%Y-%m',
-            '%Y',
+            "%Y-%m-%dT%H:%M:%S",
+            "%Y-%m-%d",
+            "%Y-%m",
+            "%Y",
         )
         # strptime isn't smart enough to parse literal timezone offsets like
         # '-07:30', so we have to do it ourselves
@@ -275,21 +270,19 @@ def _set_element_datetime(self, prop_name, value):
         Set date/time value of child element having *prop_name* to *value*.
         """
         if not isinstance(value, datetime):
-            tmpl = (
-                "property requires <type 'datetime.datetime'> object, got %s"
-            )
+            tmpl = "property requires <type 'datetime.datetime'> object, got %s"
             raise ValueError(tmpl % type(value))
         element = self._get_or_add(prop_name)
-        dt_str = value.strftime('%Y-%m-%dT%H:%M:%SZ')
+        dt_str = value.strftime("%Y-%m-%dT%H:%M:%SZ")
         element.text = dt_str
-        if prop_name in ('created', 'modified'):
+        if prop_name in ("created", "modified"):
             # These two require an explicit 'xsi:type="dcterms:W3CDTF"'
             # attribute. The first and last line are a hack required to add
             # the xsi namespace to the root element rather than each child
             # element in which it is referenced
-            self.set(qn('xsi:foo'), 'bar')
-            element.set(qn('xsi:type'), 'dcterms:W3CDTF')
-            del self.attrib[qn('xsi:foo')]
+            self.set(qn("xsi:foo"), "bar")
+            element.set(qn("xsi:type"), "dcterms:W3CDTF")
+            del self.attrib[qn("xsi:foo")]
 
     def _set_element_text(self, prop_name, value):
         """Set string value of *name* property to *value*."""
@@ -297,9 +290,7 @@ def _set_element_text(self, prop_name, value):
             value = str(value)
 
         if len(value) > 255:
-            tmpl = (
-                "exceeded 255 char limit for property, got:\n\n'%s'"
-            )
+            tmpl = "exceeded 255 char limit for property, got:\n\n'%s'"
             raise ValueError(tmpl % value)
         element = self._get_or_add(prop_name)
         element.text = value
@@ -311,7 +302,7 @@ def _text_of_element(self, property_name):
         """
         element = getattr(self, property_name)
         if element is None:
-            return ''
+            return ""
         if element.text is None:
-            return ''
+            return ""
         return element.text
diff --git a/docx/oxml/document.py b/docx/oxml/document.py
index 4211b8ed1..5c3e6f2be 100644
--- a/docx/oxml/document.py
+++ b/docx/oxml/document.py
@@ -12,7 +12,8 @@ class CT_Document(BaseOxmlElement):
     """
     ``<w:document>`` element, the root element of a document.xml file.
     """
-    body = ZeroOrOne('w:body')
+
+    body = ZeroOrOne("w:body")
 
     @property
     def sectPr_lst(self):
@@ -20,7 +21,7 @@ def sectPr_lst(self):
         Return a list containing a reference to each ``<w:sectPr>`` element
         in the document, in the order encountered.
         """
-        return self.xpath('.//w:sectPr')
+        return self.xpath(".//w:sectPr")
 
 
 class CT_Body(BaseOxmlElement):
@@ -28,9 +29,10 @@ class CT_Body(BaseOxmlElement):
     ``<w:body>``, the container element for the main document story in
     ``document.xml``.
     """
-    p = ZeroOrMore('w:p', successors=('w:sectPr',))
-    tbl = ZeroOrMore('w:tbl', successors=('w:sectPr',))
-    sectPr = ZeroOrOne('w:sectPr', successors=())
+
+    p = ZeroOrMore("w:p", successors=("w:sectPr",))
+    tbl = ZeroOrMore("w:tbl", successors=("w:sectPr",))
+    sectPr = ZeroOrOne("w:sectPr", successors=())
 
     def add_section_break(self):
         """Return `w:sectPr` element for new section added at end of document.
diff --git a/docx/oxml/ns.py b/docx/oxml/ns.py
index 6b0861284..192f73ce0 100644
--- a/docx/oxml/ns.py
+++ b/docx/oxml/ns.py
@@ -20,7 +20,7 @@
     "r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
     "sl": "http://schemas.openxmlformats.org/schemaLibrary/2006/main",
     "w": "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-    'w14': "http://schemas.microsoft.com/office/word/2010/wordml",
+    "w14": "http://schemas.microsoft.com/office/word/2010/wordml",
     "wp": "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
     "xml": "http://www.w3.org/XML/1998/namespace",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
@@ -34,21 +34,22 @@ class NamespacePrefixedTag(str):
     Value object that knows the semantics of an XML tag having a namespace
     prefix.
     """
+
     def __new__(cls, nstag, *args):
         return super(NamespacePrefixedTag, cls).__new__(cls, nstag)
 
     def __init__(self, nstag):
-        self._pfx, self._local_part = nstag.split(':')
+        self._pfx, self._local_part = nstag.split(":")
         self._ns_uri = nsmap[self._pfx]
 
     @property
     def clark_name(self):
-        return '{%s}%s' % (self._ns_uri, self._local_part)
+        return "{%s}%s" % (self._ns_uri, self._local_part)
 
     @classmethod
     def from_clark_name(cls, clark_name):
-        nsuri, local_name = clark_name[1:].split('}')
-        nstag = '%s:%s' % (pfxmap[nsuri], local_name)
+        nsuri, local_name = clark_name[1:].split("}")
+        nstag = "%s:%s" % (pfxmap[nsuri], local_name)
         return cls(nstag)
 
     @property
@@ -91,7 +92,7 @@ def nsdecls(*prefixes):
     Return a string containing a namespace declaration for each of the
     namespace prefix strings, e.g. 'p', 'ct', passed as *prefixes*.
     """
-    return ' '.join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
+    return " ".join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
 
 
 def nspfxmap(*nspfxs):
@@ -109,6 +110,6 @@ def qn(tag):
     prefixed tag name into a Clark-notation qualified tag name for lxml. For
     example, ``qn('p:cSld')`` returns ``'{http://schemas.../main}cSld'``.
     """
-    prefix, tagroot = tag.split(':')
+    prefix, tagroot = tag.split(":")
     uri = nsmap[prefix]
-    return '{%s}%s' % (uri, tagroot)
+    return "{%s}%s" % (uri, tagroot)
diff --git a/docx/oxml/numbering.py b/docx/oxml/numbering.py
index aeedfa9a0..d5297b2a5 100644
--- a/docx/oxml/numbering.py
+++ b/docx/oxml/numbering.py
@@ -8,7 +8,11 @@
 from .shared import CT_DecimalNumber
 from .simpletypes import ST_DecimalNumber
 from .xmlchemy import (
-    BaseOxmlElement, OneAndOnlyOne, RequiredAttribute, ZeroOrMore, ZeroOrOne
+    BaseOxmlElement,
+    OneAndOnlyOne,
+    RequiredAttribute,
+    ZeroOrMore,
+    ZeroOrOne,
 )
 
 
@@ -18,9 +22,10 @@ class CT_Num(BaseOxmlElement):
     instance, having a required child <w:abstractNumId> that references an
     abstract numbering definition that defines most of the formatting details.
     """
-    abstractNumId = OneAndOnlyOne('w:abstractNumId')
-    lvlOverride = ZeroOrMore('w:lvlOverride')
-    numId = RequiredAttribute('w:numId', ST_DecimalNumber)
+
+    abstractNumId = OneAndOnlyOne("w:abstractNumId")
+    lvlOverride = ZeroOrMore("w:lvlOverride")
+    numId = RequiredAttribute("w:numId", ST_DecimalNumber)
 
     def add_lvlOverride(self, ilvl):
         """
@@ -36,11 +41,9 @@ def new(cls, num_id, abstractNum_id):
         a ``<w:abstractNumId>`` child with val attribute set to
         *abstractNum_id*.
         """
-        num = OxmlElement('w:num')
+        num = OxmlElement("w:num")
         num.numId = num_id
-        abstractNumId = CT_DecimalNumber.new(
-            'w:abstractNumId', abstractNum_id
-        )
+        abstractNumId = CT_DecimalNumber.new("w:abstractNumId", abstractNum_id)
         num.append(abstractNumId)
         return num
 
@@ -50,8 +53,9 @@ class CT_NumLvl(BaseOxmlElement):
     ``<w:lvlOverride>`` element, which identifies a level in a list
     definition to override with settings it contains.
     """
-    startOverride = ZeroOrOne('w:startOverride', successors=('w:lvl',))
-    ilvl = RequiredAttribute('w:ilvl', ST_DecimalNumber)
+
+    startOverride = ZeroOrOne("w:startOverride", successors=("w:lvl",))
+    ilvl = RequiredAttribute("w:ilvl", ST_DecimalNumber)
 
     def add_startOverride(self, val):
         """
@@ -66,10 +70,9 @@ class CT_NumPr(BaseOxmlElement):
     A ``<w:numPr>`` element, a container for numbering properties applied to
     a paragraph.
     """
-    ilvl = ZeroOrOne('w:ilvl', successors=(
-        'w:numId', 'w:numberingChange', 'w:ins'
-    ))
-    numId = ZeroOrOne('w:numId', successors=('w:numberingChange', 'w:ins'))
+
+    ilvl = ZeroOrOne("w:ilvl", successors=("w:numId", "w:numberingChange", "w:ins"))
+    numId = ZeroOrOne("w:numId", successors=("w:numberingChange", "w:ins"))
 
     # @ilvl.setter
     # def _set_ilvl(self, val):
@@ -94,7 +97,8 @@ class CT_Numbering(BaseOxmlElement):
     ``<w:numbering>`` element, the root element of a numbering part, i.e.
     numbering.xml
     """
-    num = ZeroOrMore('w:num', successors=('w:numIdMacAtCleanup',))
+
+    num = ZeroOrMore("w:num", successors=("w:numIdMacAtCleanup",))
 
     def add_num(self, abstractNum_id):
         """
@@ -114,7 +118,7 @@ def num_having_numId(self, numId):
         try:
             return self.xpath(xpath)[0]
         except IndexError:
-            raise KeyError('no <w:num> element with numId %d' % numId)
+            raise KeyError("no <w:num> element with numId %d" % numId)
 
     @property
     def _next_numId(self):
@@ -123,9 +127,9 @@ def _next_numId(self):
         1 and filling any gaps in numbering between existing ``<w:num>``
         elements.
         """
-        numId_strs = self.xpath('./w:num/@w:numId')
+        numId_strs = self.xpath("./w:num/@w:numId")
         num_ids = [int(numId_str) for numId_str in numId_strs]
-        for num in range(1, len(num_ids)+2):
+        for num in range(1, len(num_ids) + 2):
             if num not in num_ids:
                 break
         return num
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
index fc953e74d..e71936774 100644
--- a/docx/oxml/section.py
+++ b/docx/oxml/section.py
@@ -20,38 +20,40 @@
 class CT_HdrFtr(BaseOxmlElement):
     """`w:hdr` and `w:ftr`, the root element for header and footer part respectively"""
 
-    p = ZeroOrMore('w:p', successors=())
-    tbl = ZeroOrMore('w:tbl', successors=())
+    p = ZeroOrMore("w:p", successors=())
+    tbl = ZeroOrMore("w:tbl", successors=())
 
 
 class CT_HdrFtrRef(BaseOxmlElement):
     """`w:headerReference` and `w:footerReference` elements"""
 
-    type_ = RequiredAttribute('w:type', WD_HEADER_FOOTER)
-    rId = RequiredAttribute('r:id', XsdString)
+    type_ = RequiredAttribute("w:type", WD_HEADER_FOOTER)
+    rId = RequiredAttribute("r:id", XsdString)
 
 
 class CT_PageMar(BaseOxmlElement):
     """
     ``<w:pgMar>`` element, defining page margins.
     """
-    top = OptionalAttribute('w:top', ST_SignedTwipsMeasure)
-    right = OptionalAttribute('w:right', ST_TwipsMeasure)
-    bottom = OptionalAttribute('w:bottom', ST_SignedTwipsMeasure)
-    left = OptionalAttribute('w:left', ST_TwipsMeasure)
-    header = OptionalAttribute('w:header', ST_TwipsMeasure)
-    footer = OptionalAttribute('w:footer', ST_TwipsMeasure)
-    gutter = OptionalAttribute('w:gutter', ST_TwipsMeasure)
+
+    top = OptionalAttribute("w:top", ST_SignedTwipsMeasure)
+    right = OptionalAttribute("w:right", ST_TwipsMeasure)
+    bottom = OptionalAttribute("w:bottom", ST_SignedTwipsMeasure)
+    left = OptionalAttribute("w:left", ST_TwipsMeasure)
+    header = OptionalAttribute("w:header", ST_TwipsMeasure)
+    footer = OptionalAttribute("w:footer", ST_TwipsMeasure)
+    gutter = OptionalAttribute("w:gutter", ST_TwipsMeasure)
 
 
 class CT_PageSz(BaseOxmlElement):
     """
     ``<w:pgSz>`` element, defining page dimensions and orientation.
     """
-    w = OptionalAttribute('w:w', ST_TwipsMeasure)
-    h = OptionalAttribute('w:h', ST_TwipsMeasure)
+
+    w = OptionalAttribute("w:w", ST_TwipsMeasure)
+    h = OptionalAttribute("w:h", ST_TwipsMeasure)
     orient = OptionalAttribute(
-        'w:orient', WD_ORIENTATION, default=WD_ORIENTATION.PORTRAIT
+        "w:orient", WD_ORIENTATION, default=WD_ORIENTATION.PORTRAIT
     )
 
 
@@ -59,10 +61,26 @@ class CT_SectPr(BaseOxmlElement):
     """`w:sectPr` element, the container element for section properties"""
 
     _tag_seq = (
-        'w:footnotePr', 'w:endnotePr', 'w:type', 'w:pgSz', 'w:pgMar', 'w:paperSrc',
-        'w:pgBorders', 'w:lnNumType', 'w:pgNumType', 'w:cols', 'w:formProt', 'w:vAlign',
-        'w:noEndnote', 'w:titlePg', 'w:textDirection', 'w:bidi', 'w:rtlGutter',
-        'w:docGrid', 'w:printerSettings', 'w:sectPrChange',
+        "w:footnotePr",
+        "w:endnotePr",
+        "w:type",
+        "w:pgSz",
+        "w:pgMar",
+        "w:paperSrc",
+        "w:pgBorders",
+        "w:lnNumType",
+        "w:pgNumType",
+        "w:cols",
+        "w:formProt",
+        "w:vAlign",
+        "w:noEndnote",
+        "w:titlePg",
+        "w:textDirection",
+        "w:bidi",
+        "w:rtlGutter",
+        "w:docGrid",
+        "w:printerSettings",
+        "w:sectPrChange",
     )
     headerReference = ZeroOrMore("w:headerReference", successors=_tag_seq)
     footerReference = ZeroOrMore("w:footerReference", successors=_tag_seq)
@@ -348,4 +366,5 @@ class CT_SectType(BaseOxmlElement):
     """
     ``<w:sectType>`` element, defining the section start type.
     """
-    val = OptionalAttribute('w:val', WD_SECTION_START)
+
+    val = OptionalAttribute("w:val", WD_SECTION_START)
diff --git a/docx/oxml/settings.py b/docx/oxml/settings.py
index fd319ad70..3fc72e27f 100644
--- a/docx/oxml/settings.py
+++ b/docx/oxml/settings.py
@@ -11,39 +11,104 @@ class CT_Settings(BaseOxmlElement):
     """`w:settings` element, root element for the settings part"""
 
     _tag_seq = (
-        "w:writeProtection", "w:view", "w:zoom", "w:removePersonalInformation",
-        "w:removeDateAndTime", "w:doNotDisplayPageBoundaries",
-        "w:displayBackgroundShape", "w:printPostScriptOverText",
-        "w:printFractionalCharacterWidth", "w:printFormsData", "w:embedTrueTypeFonts",
-        "w:embedSystemFonts", "w:saveSubsetFonts", "w:saveFormsData", "w:mirrorMargins",
-        "w:alignBordersAndEdges", "w:bordersDoNotSurroundHeader",
-        "w:bordersDoNotSurroundFooter", "w:gutterAtTop", "w:hideSpellingErrors",
-        "w:hideGrammaticalErrors", "w:activeWritingStyle", "w:proofState",
-        "w:formsDesign", "w:attachedTemplate", "w:linkStyles",
-        "w:stylePaneFormatFilter", "w:stylePaneSortMethod", "w:documentType",
-        "w:mailMerge", "w:revisionView", "w:trackRevisions", "w:doNotTrackMoves",
-        "w:doNotTrackFormatting", "w:documentProtection", "w:autoFormatOverride",
-        "w:styleLockTheme", "w:styleLockQFSet", "w:defaultTabStop", "w:autoHyphenation",
-        "w:consecutiveHyphenLimit", "w:hyphenationZone", "w:doNotHyphenateCaps",
-        "w:showEnvelope", "w:summaryLength", "w:clickAndTypeStyle",
-        "w:defaultTableStyle", "w:evenAndOddHeaders", "w:bookFoldRevPrinting",
-        "w:bookFoldPrinting", "w:bookFoldPrintingSheets",
-        "w:drawingGridHorizontalSpacing", "w:drawingGridVerticalSpacing",
-        "w:displayHorizontalDrawingGridEvery", "w:displayVerticalDrawingGridEvery",
-        "w:doNotUseMarginsForDrawingGridOrigin", "w:drawingGridHorizontalOrigin",
-        "w:drawingGridVerticalOrigin", "w:doNotShadeFormData", "w:noPunctuationKerning",
-        "w:characterSpacingControl", "w:printTwoOnOne", "w:strictFirstAndLastChars",
-        "w:noLineBreaksAfter", "w:noLineBreaksBefore", "w:savePreviewPicture",
-        "w:doNotValidateAgainstSchema", "w:saveInvalidXml", "w:ignoreMixedContent",
-        "w:alwaysShowPlaceholderText", "w:doNotDemarcateInvalidXml",
-        "w:saveXmlDataOnly", "w:useXSLTWhenSaving", "w:saveThroughXslt",
-        "w:showXMLTags", "w:alwaysMergeEmptyNamespace", "w:updateFields",
-        "w:hdrShapeDefaults", "w:footnotePr", "w:endnotePr", "w:compat", "w:docVars",
-        "w:rsids", "m:mathPr", "w:attachedSchema", "w:themeFontLang",
-        "w:clrSchemeMapping", "w:doNotIncludeSubdocsInStats",
-        "w:doNotAutoCompressPictures", "w:forceUpgrade", "w:captions",
-        "w:readModeInkLockDown", "w:smartTagType", "sl:schemaLibrary",
-        "w:shapeDefaults", "w:doNotEmbedSmartTags", "w:decimalSymbol", "w:listSeparator"
+        "w:writeProtection",
+        "w:view",
+        "w:zoom",
+        "w:removePersonalInformation",
+        "w:removeDateAndTime",
+        "w:doNotDisplayPageBoundaries",
+        "w:displayBackgroundShape",
+        "w:printPostScriptOverText",
+        "w:printFractionalCharacterWidth",
+        "w:printFormsData",
+        "w:embedTrueTypeFonts",
+        "w:embedSystemFonts",
+        "w:saveSubsetFonts",
+        "w:saveFormsData",
+        "w:mirrorMargins",
+        "w:alignBordersAndEdges",
+        "w:bordersDoNotSurroundHeader",
+        "w:bordersDoNotSurroundFooter",
+        "w:gutterAtTop",
+        "w:hideSpellingErrors",
+        "w:hideGrammaticalErrors",
+        "w:activeWritingStyle",
+        "w:proofState",
+        "w:formsDesign",
+        "w:attachedTemplate",
+        "w:linkStyles",
+        "w:stylePaneFormatFilter",
+        "w:stylePaneSortMethod",
+        "w:documentType",
+        "w:mailMerge",
+        "w:revisionView",
+        "w:trackRevisions",
+        "w:doNotTrackMoves",
+        "w:doNotTrackFormatting",
+        "w:documentProtection",
+        "w:autoFormatOverride",
+        "w:styleLockTheme",
+        "w:styleLockQFSet",
+        "w:defaultTabStop",
+        "w:autoHyphenation",
+        "w:consecutiveHyphenLimit",
+        "w:hyphenationZone",
+        "w:doNotHyphenateCaps",
+        "w:showEnvelope",
+        "w:summaryLength",
+        "w:clickAndTypeStyle",
+        "w:defaultTableStyle",
+        "w:evenAndOddHeaders",
+        "w:bookFoldRevPrinting",
+        "w:bookFoldPrinting",
+        "w:bookFoldPrintingSheets",
+        "w:drawingGridHorizontalSpacing",
+        "w:drawingGridVerticalSpacing",
+        "w:displayHorizontalDrawingGridEvery",
+        "w:displayVerticalDrawingGridEvery",
+        "w:doNotUseMarginsForDrawingGridOrigin",
+        "w:drawingGridHorizontalOrigin",
+        "w:drawingGridVerticalOrigin",
+        "w:doNotShadeFormData",
+        "w:noPunctuationKerning",
+        "w:characterSpacingControl",
+        "w:printTwoOnOne",
+        "w:strictFirstAndLastChars",
+        "w:noLineBreaksAfter",
+        "w:noLineBreaksBefore",
+        "w:savePreviewPicture",
+        "w:doNotValidateAgainstSchema",
+        "w:saveInvalidXml",
+        "w:ignoreMixedContent",
+        "w:alwaysShowPlaceholderText",
+        "w:doNotDemarcateInvalidXml",
+        "w:saveXmlDataOnly",
+        "w:useXSLTWhenSaving",
+        "w:saveThroughXslt",
+        "w:showXMLTags",
+        "w:alwaysMergeEmptyNamespace",
+        "w:updateFields",
+        "w:hdrShapeDefaults",
+        "w:footnotePr",
+        "w:endnotePr",
+        "w:compat",
+        "w:docVars",
+        "w:rsids",
+        "m:mathPr",
+        "w:attachedSchema",
+        "w:themeFontLang",
+        "w:clrSchemeMapping",
+        "w:doNotIncludeSubdocsInStats",
+        "w:doNotAutoCompressPictures",
+        "w:forceUpgrade",
+        "w:captions",
+        "w:readModeInkLockDown",
+        "w:smartTagType",
+        "sl:schemaLibrary",
+        "w:shapeDefaults",
+        "w:doNotEmbedSmartTags",
+        "w:decimalSymbol",
+        "w:listSeparator",
     )
     evenAndOddHeaders = ZeroOrOne("w:evenAndOddHeaders", successors=_tag_seq[48:])
     del _tag_seq
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
index 77ca7db8a..885535c71 100644
--- a/docx/oxml/shape.py
+++ b/docx/oxml/shape.py
@@ -7,12 +7,19 @@
 from . import parse_xml
 from .ns import nsdecls
 from .simpletypes import (
-    ST_Coordinate, ST_DrawingElementId, ST_PositiveCoordinate,
-    ST_RelationshipId, XsdString, XsdToken
+    ST_Coordinate,
+    ST_DrawingElementId,
+    ST_PositiveCoordinate,
+    ST_RelationshipId,
+    XsdString,
+    XsdToken,
 )
 from .xmlchemy import (
-    BaseOxmlElement, OneAndOnlyOne, OptionalAttribute, RequiredAttribute,
-    ZeroOrOne
+    BaseOxmlElement,
+    OneAndOnlyOne,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrOne,
 )
 
 
@@ -21,41 +28,44 @@ class CT_Blip(BaseOxmlElement):
     ``<a:blip>`` element, specifies image source and adjustments such as
     alpha and tint.
     """
-    embed = OptionalAttribute('r:embed', ST_RelationshipId)
-    link = OptionalAttribute('r:link', ST_RelationshipId)
+
+    embed = OptionalAttribute("r:embed", ST_RelationshipId)
+    link = OptionalAttribute("r:link", ST_RelationshipId)
 
 
 class CT_BlipFillProperties(BaseOxmlElement):
     """
     ``<pic:blipFill>`` element, specifies picture properties
     """
-    blip = ZeroOrOne('a:blip', successors=(
-        'a:srcRect', 'a:tile', 'a:stretch'
-    ))
+
+    blip = ZeroOrOne("a:blip", successors=("a:srcRect", "a:tile", "a:stretch"))
 
 
 class CT_GraphicalObject(BaseOxmlElement):
     """
     ``<a:graphic>`` element, container for a DrawingML object
     """
-    graphicData = OneAndOnlyOne('a:graphicData')
+
+    graphicData = OneAndOnlyOne("a:graphicData")
 
 
 class CT_GraphicalObjectData(BaseOxmlElement):
     """
     ``<a:graphicData>`` element, container for the XML of a DrawingML object
     """
-    pic = ZeroOrOne('pic:pic')
-    uri = RequiredAttribute('uri', XsdToken)
+
+    pic = ZeroOrOne("pic:pic")
+    uri = RequiredAttribute("uri", XsdToken)
 
 
 class CT_Inline(BaseOxmlElement):
     """
     ``<w:inline>`` element, container for an inline shape.
     """
-    extent = OneAndOnlyOne('wp:extent')
-    docPr = OneAndOnlyOne('wp:docPr')
-    graphic = OneAndOnlyOne('a:graphic')
+
+    extent = OneAndOnlyOne("wp:extent")
+    docPr = OneAndOnlyOne("wp:docPr")
+    graphic = OneAndOnlyOne("a:graphic")
 
     @classmethod
     def new(cls, cx, cy, shape_id, pic):
@@ -67,9 +77,9 @@ def new(cls, cx, cy, shape_id, pic):
         inline.extent.cx = cx
         inline.extent.cy = cy
         inline.docPr.id = shape_id
-        inline.docPr.name = 'Picture %d' % shape_id
+        inline.docPr.name = "Picture %d" % shape_id
         inline.graphic.graphicData.uri = (
-            'http://schemas.openxmlformats.org/drawingml/2006/picture'
+            "http://schemas.openxmlformats.org/drawingml/2006/picture"
         )
         inline.graphic.graphicData._insert_pic(pic)
         return inline
@@ -89,16 +99,16 @@ def new_pic_inline(cls, shape_id, rId, filename, cx, cy):
     @classmethod
     def _inline_xml(cls):
         return (
-            '<wp:inline %s>\n'
+            "<wp:inline %s>\n"
             '  <wp:extent cx="914400" cy="914400"/>\n'
             '  <wp:docPr id="666" name="unnamed"/>\n'
-            '  <wp:cNvGraphicFramePr>\n'
+            "  <wp:cNvGraphicFramePr>\n"
             '    <a:graphicFrameLocks noChangeAspect="1"/>\n'
-            '  </wp:cNvGraphicFramePr>\n'
-            '  <a:graphic>\n'
+            "  </wp:cNvGraphicFramePr>\n"
+            "  <a:graphic>\n"
             '    <a:graphicData uri="URI not set"/>\n'
-            '  </a:graphic>\n'
-            '</wp:inline>' % nsdecls('wp', 'a', 'pic', 'r')
+            "  </a:graphic>\n"
+            "</wp:inline>" % nsdecls("wp", "a", "pic", "r")
         )
 
 
@@ -107,8 +117,9 @@ class CT_NonVisualDrawingProps(BaseOxmlElement):
     Used for ``<wp:docPr>`` element, and perhaps others. Specifies the id and
     name of a DrawingML drawing.
     """
-    id = RequiredAttribute('id', ST_DrawingElementId)
-    name = RequiredAttribute('name', XsdString)
+
+    id = RequiredAttribute("id", ST_DrawingElementId)
+    name = RequiredAttribute("name", XsdString)
 
 
 class CT_NonVisualPictureProperties(BaseOxmlElement):
@@ -122,9 +133,10 @@ class CT_Picture(BaseOxmlElement):
     """
     ``<pic:pic>`` element, a DrawingML picture
     """
-    nvPicPr = OneAndOnlyOne('pic:nvPicPr')
-    blipFill = OneAndOnlyOne('pic:blipFill')
-    spPr = OneAndOnlyOne('pic:spPr')
+
+    nvPicPr = OneAndOnlyOne("pic:nvPicPr")
+    blipFill = OneAndOnlyOne("pic:blipFill")
+    spPr = OneAndOnlyOne("pic:spPr")
 
     @classmethod
     def new(cls, pic_id, filename, rId, cx, cy):
@@ -144,25 +156,25 @@ def new(cls, pic_id, filename, rId, cx, cy):
     @classmethod
     def _pic_xml(cls):
         return (
-            '<pic:pic %s>\n'
-            '  <pic:nvPicPr>\n'
+            "<pic:pic %s>\n"
+            "  <pic:nvPicPr>\n"
             '    <pic:cNvPr id="666" name="unnamed"/>\n'
-            '    <pic:cNvPicPr/>\n'
-            '  </pic:nvPicPr>\n'
-            '  <pic:blipFill>\n'
-            '    <a:blip/>\n'
-            '    <a:stretch>\n'
-            '      <a:fillRect/>\n'
-            '    </a:stretch>\n'
-            '  </pic:blipFill>\n'
-            '  <pic:spPr>\n'
-            '    <a:xfrm>\n'
+            "    <pic:cNvPicPr/>\n"
+            "  </pic:nvPicPr>\n"
+            "  <pic:blipFill>\n"
+            "    <a:blip/>\n"
+            "    <a:stretch>\n"
+            "      <a:fillRect/>\n"
+            "    </a:stretch>\n"
+            "  </pic:blipFill>\n"
+            "  <pic:spPr>\n"
+            "    <a:xfrm>\n"
             '      <a:off x="0" y="0"/>\n'
             '      <a:ext cx="914400" cy="914400"/>\n'
-            '    </a:xfrm>\n'
+            "    </a:xfrm>\n"
             '    <a:prstGeom prst="rect"/>\n'
-            '  </pic:spPr>\n'
-            '</pic:pic>' % nsdecls('pic', 'a', 'r')
+            "  </pic:spPr>\n"
+            "</pic:pic>" % nsdecls("pic", "a", "r")
         )
 
 
@@ -170,7 +182,8 @@ class CT_PictureNonVisual(BaseOxmlElement):
     """
     ``<pic:nvPicPr>`` element, non-visual picture properties
     """
-    cNvPr = OneAndOnlyOne('pic:cNvPr')
+
+    cNvPr = OneAndOnlyOne("pic:cNvPr")
 
 
 class CT_Point2D(BaseOxmlElement):
@@ -178,8 +191,9 @@ class CT_Point2D(BaseOxmlElement):
     Used for ``<a:off>`` element, and perhaps others. Specifies an x, y
     coordinate (point).
     """
-    x = RequiredAttribute('x', ST_Coordinate)
-    y = RequiredAttribute('y', ST_Coordinate)
+
+    x = RequiredAttribute("x", ST_Coordinate)
+    y = RequiredAttribute("y", ST_Coordinate)
 
 
 class CT_PositiveSize2D(BaseOxmlElement):
@@ -187,8 +201,9 @@ class CT_PositiveSize2D(BaseOxmlElement):
     Used for ``<wp:extent>`` element, and perhaps others later. Specifies the
     size of a DrawingML drawing.
     """
-    cx = RequiredAttribute('cx', ST_PositiveCoordinate)
-    cy = RequiredAttribute('cy', ST_PositiveCoordinate)
+
+    cx = RequiredAttribute("cx", ST_PositiveCoordinate)
+    cy = RequiredAttribute("cy", ST_PositiveCoordinate)
 
 
 class CT_PresetGeometry2D(BaseOxmlElement):
@@ -209,10 +224,20 @@ class CT_ShapeProperties(BaseOxmlElement):
     """
     ``<pic:spPr>`` element, specifies size and shape of picture container.
     """
-    xfrm = ZeroOrOne('a:xfrm', successors=(
-        'a:custGeom', 'a:prstGeom', 'a:ln', 'a:effectLst', 'a:effectDag',
-        'a:scene3d', 'a:sp3d', 'a:extLst'
-    ))
+
+    xfrm = ZeroOrOne(
+        "a:xfrm",
+        successors=(
+            "a:custGeom",
+            "a:prstGeom",
+            "a:ln",
+            "a:effectLst",
+            "a:effectDag",
+            "a:scene3d",
+            "a:sp3d",
+            "a:extLst",
+        ),
+    )
 
     @property
     def cx(self):
@@ -256,8 +281,9 @@ class CT_Transform2D(BaseOxmlElement):
     """
     ``<a:xfrm>`` element, specifies size and shape of picture container.
     """
-    off = ZeroOrOne('a:off', successors=('a:ext',))
-    ext = ZeroOrOne('a:ext', successors=())
+
+    off = ZeroOrOne("a:off", successors=("a:ext",))
+    ext = ZeroOrOne("a:ext", successors=())
 
     @property
     def cx(self):
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
index 1e21ba366..4981e9200 100644
--- a/docx/oxml/shared.py
+++ b/docx/oxml/shared.py
@@ -18,7 +18,8 @@ class CT_DecimalNumber(BaseOxmlElement):
     others, containing a text representation of a decimal number (e.g. 42) in
     its ``val`` attribute.
     """
-    val = RequiredAttribute('w:val', ST_DecimalNumber)
+
+    val = RequiredAttribute("w:val", ST_DecimalNumber)
 
     @classmethod
     def new(cls, nsptagname, val):
@@ -26,7 +27,7 @@ def new(cls, nsptagname, val):
         Return a new ``CT_DecimalNumber`` element having tagname *nsptagname*
         and ``val`` attribute set to *val*.
         """
-        return OxmlElement(nsptagname, attrs={qn('w:val'): str(val)})
+        return OxmlElement(nsptagname, attrs={qn("w:val"): str(val)})
 
 
 class CT_OnOff(BaseOxmlElement):
@@ -34,7 +35,8 @@ class CT_OnOff(BaseOxmlElement):
     Used for ``<w:b>``, ``<w:i>`` elements and others, containing a bool-ish
     string in its ``val`` attribute, xsd:boolean plus 'on' and 'off'.
     """
-    val = OptionalAttribute('w:val', ST_OnOff, default=True)
+
+    val = OptionalAttribute("w:val", ST_OnOff, default=True)
 
 
 class CT_String(BaseOxmlElement):
@@ -42,7 +44,8 @@ class CT_String(BaseOxmlElement):
     Used for ``<w:pStyle>`` and ``<w:tblStyle>`` elements and others,
     containing a style name in its ``val`` attribute.
     """
-    val = RequiredAttribute('w:val', ST_String)
+
+    val = RequiredAttribute("w:val", ST_String)
 
     @classmethod
     def new(cls, nsptagname, val):
diff --git a/docx/oxml/simpletypes.py b/docx/oxml/simpletypes.py
index 400a23700..8fb6cb89d 100644
--- a/docx/oxml/simpletypes.py
+++ b/docx/oxml/simpletypes.py
@@ -6,16 +6,13 @@
 type in the associated XML schema.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..exceptions import InvalidXmlError
 from ..shared import Emu, Pt, RGBColor, Twips
 
 
 class BaseSimpleType(object):
-
     @classmethod
     def from_xml(cls, str_value):
         return cls.convert_from_xml(str_value)
@@ -29,17 +26,15 @@ def to_xml(cls, value):
     @classmethod
     def validate_int(cls, value):
         if not isinstance(value, int):
-            raise TypeError(
-                "value must be <type 'int'>, got %s" % type(value)
-            )
+            raise TypeError("value must be <type 'int'>, got %s" % type(value))
 
     @classmethod
     def validate_int_in_range(cls, value, min_inclusive, max_inclusive):
         cls.validate_int(value)
         if value < min_inclusive or value > max_inclusive:
             raise ValueError(
-                "value must be in range %d to %d inclusive, got %d" %
-                (min_inclusive, max_inclusive, value)
+                "value must be in range %d to %d inclusive, got %d"
+                % (min_inclusive, max_inclusive, value)
             )
 
     @classmethod
@@ -51,13 +46,10 @@ def validate_string(cls, value):
                 return value
         except NameError:  # means we're on Python 3
             pass
-        raise TypeError(
-            "value must be a string, got %s" % type(value)
-        )
+        raise TypeError("value must be a string, got %s" % type(value))
 
 
 class BaseIntType(BaseSimpleType):
-
     @classmethod
     def convert_from_xml(cls, str_value):
         return int(str_value)
@@ -72,7 +64,6 @@ def validate(cls, value):
 
 
 class BaseStringType(BaseSimpleType):
-
     @classmethod
     def convert_from_xml(cls, str_value):
         return str_value
@@ -87,14 +78,11 @@ def validate(cls, value):
 
 
 class BaseStringEnumerationType(BaseStringType):
-
     @classmethod
     def validate(cls, value):
         cls.validate_string(value)
         if value not in cls._members:
-            raise ValueError(
-                "must be one of %s, got '%s'" % (cls._members, value)
-            )
+            raise ValueError("must be one of %s, got '%s'" % (cls._members, value))
 
 
 class XsdAnyUri(BaseStringType):
@@ -106,19 +94,17 @@ class XsdAnyUri(BaseStringType):
 
 
 class XsdBoolean(BaseSimpleType):
-
     @classmethod
     def convert_from_xml(cls, str_value):
-        if str_value not in ('1', '0', 'true', 'false'):
+        if str_value not in ("1", "0", "true", "false"):
             raise InvalidXmlError(
-                "value must be one of '1', '0', 'true' or 'false', got '%s'"
-                % str_value
+                "value must be one of '1', '0', 'true' or 'false', got '%s'" % str_value
             )
-        return str_value in ('1', 'true')
+        return str_value in ("1", "true")
 
     @classmethod
     def convert_to_xml(cls, value):
-        return {True: '1', False: '0'}[value]
+        return {True: "1", False: "0"}[value]
 
     @classmethod
     def validate(cls, value):
@@ -134,23 +120,20 @@ class XsdId(BaseStringType):
     String that must begin with a letter or underscore and cannot contain any
     colons. Not fully validated because not used in external API.
     """
+
     pass
 
 
 class XsdInt(BaseIntType):
-
     @classmethod
     def validate(cls, value):
         cls.validate_int_in_range(value, -2147483648, 2147483647)
 
 
 class XsdLong(BaseIntType):
-
     @classmethod
     def validate(cls, value):
-        cls.validate_int_in_range(
-            value, -9223372036854775808, 9223372036854775807
-        )
+        cls.validate_int_in_range(value, -9223372036854775808, 9223372036854775807)
 
 
 class XsdString(BaseStringType):
@@ -168,52 +151,44 @@ class XsdToken(BaseStringType):
     xsd:string with whitespace collapsing, e.g. multiple spaces reduced to
     one, leading and trailing space stripped.
     """
+
     pass
 
 
 class XsdUnsignedInt(BaseIntType):
-
     @classmethod
     def validate(cls, value):
         cls.validate_int_in_range(value, 0, 4294967295)
 
 
 class XsdUnsignedLong(BaseIntType):
-
     @classmethod
     def validate(cls, value):
         cls.validate_int_in_range(value, 0, 18446744073709551615)
 
 
 class ST_BrClear(XsdString):
-
     @classmethod
     def validate(cls, value):
         cls.validate_string(value)
-        valid_values = ('none', 'left', 'right', 'all')
+        valid_values = ("none", "left", "right", "all")
         if value not in valid_values:
-            raise ValueError(
-                "must be one of %s, got '%s'" % (valid_values, value)
-            )
+            raise ValueError("must be one of %s, got '%s'" % (valid_values, value))
 
 
 class ST_BrType(XsdString):
-
     @classmethod
     def validate(cls, value):
         cls.validate_string(value)
-        valid_values = ('page', 'column', 'textWrapping')
+        valid_values = ("page", "column", "textWrapping")
         if value not in valid_values:
-            raise ValueError(
-                "must be one of %s, got '%s'" % (valid_values, value)
-            )
+            raise ValueError("must be one of %s, got '%s'" % (valid_values, value))
 
 
 class ST_Coordinate(BaseIntType):
-
     @classmethod
     def convert_from_xml(cls, str_value):
-        if 'i' in str_value or 'm' in str_value or 'p' in str_value:
+        if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Emu(int(str_value))
 
@@ -223,7 +198,6 @@ def validate(cls, value):
 
 
 class ST_CoordinateUnqualified(XsdLong):
-
     @classmethod
     def validate(cls, value):
         cls.validate_int_in_range(value, -27273042329600, 27273042316900)
@@ -238,10 +212,9 @@ class ST_DrawingElementId(XsdUnsignedInt):
 
 
 class ST_HexColor(BaseStringType):
-
     @classmethod
     def convert_from_xml(cls, str_value):
-        if str_value == 'auto':
+        if str_value == "auto":
             return ST_HexColorAuto.AUTO
         return RGBColor.from_string(str_value)
 
@@ -251,7 +224,7 @@ def convert_to_xml(cls, value):
         Keep alpha hex numerals all uppercase just for consistency.
         """
         # expecting 3-tuple of ints in range 0-255
-        return '%02X%02X%02X' % value
+        return "%02X%02X%02X" % value
 
     @classmethod
     def validate(cls, value):
@@ -267,7 +240,8 @@ class ST_HexColorAuto(XsdStringEnumeration):
     """
     Value for `w:color/[@val="auto"] attribute setting
     """
-    AUTO = 'auto'
+
+    AUTO = "auto"
 
     _members = (AUTO,)
 
@@ -276,11 +250,12 @@ class ST_HpsMeasure(XsdUnsignedLong):
     """
     Half-point measure, e.g. 24.0 represents 12.0 points.
     """
+
     @classmethod
     def convert_from_xml(cls, str_value):
-        if 'm' in str_value or 'n' in str_value or 'p' in str_value:
+        if "m" in str_value or "n" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
-        return Pt(int(str_value)/2.0)
+        return Pt(int(str_value) / 2.0)
 
     @classmethod
     def convert_to_xml(cls, value):
@@ -293,26 +268,25 @@ class ST_Merge(XsdStringEnumeration):
     """
     Valid values for <w:xMerge val=""> attribute
     """
-    CONTINUE = 'continue'
-    RESTART = 'restart'
+
+    CONTINUE = "continue"
+    RESTART = "restart"
 
     _members = (CONTINUE, RESTART)
 
 
 class ST_OnOff(XsdBoolean):
-
     @classmethod
     def convert_from_xml(cls, str_value):
-        if str_value not in ('1', '0', 'true', 'false', 'on', 'off'):
+        if str_value not in ("1", "0", "true", "false", "on", "off"):
             raise InvalidXmlError(
                 "value must be one of '1', '0', 'true', 'false', 'on', or 'o"
                 "ff', got '%s'" % str_value
             )
-        return str_value in ('1', 'true', 'on')
+        return str_value in ("1", "true", "on")
 
 
 class ST_PositiveCoordinate(XsdLong):
-
     @classmethod
     def convert_from_xml(cls, str_value):
         return Emu(int(str_value))
@@ -327,10 +301,9 @@ class ST_RelationshipId(XsdString):
 
 
 class ST_SignedTwipsMeasure(XsdInt):
-
     @classmethod
     def convert_from_xml(cls, str_value):
-        if 'i' in str_value or 'm' in str_value or 'p' in str_value:
+        if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Twips(int(str_value))
 
@@ -346,34 +319,27 @@ class ST_String(XsdString):
 
 
 class ST_TblLayoutType(XsdString):
-
     @classmethod
     def validate(cls, value):
         cls.validate_string(value)
-        valid_values = ('fixed', 'autofit')
+        valid_values = ("fixed", "autofit")
         if value not in valid_values:
-            raise ValueError(
-                "must be one of %s, got '%s'" % (valid_values, value)
-            )
+            raise ValueError("must be one of %s, got '%s'" % (valid_values, value))
 
 
 class ST_TblWidth(XsdString):
-
     @classmethod
     def validate(cls, value):
         cls.validate_string(value)
-        valid_values = ('auto', 'dxa', 'nil', 'pct')
+        valid_values = ("auto", "dxa", "nil", "pct")
         if value not in valid_values:
-            raise ValueError(
-                "must be one of %s, got '%s'" % (valid_values, value)
-            )
+            raise ValueError("must be one of %s, got '%s'" % (valid_values, value))
 
 
 class ST_TwipsMeasure(XsdUnsignedLong):
-
     @classmethod
     def convert_from_xml(cls, str_value):
-        if 'i' in str_value or 'm' in str_value or 'p' in str_value:
+        if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Twips(int(str_value))
 
@@ -385,14 +351,17 @@ def convert_to_xml(cls, value):
 
 
 class ST_UniversalMeasure(BaseSimpleType):
-
     @classmethod
     def convert_from_xml(cls, str_value):
         float_part, units_part = str_value[:-2], str_value[-2:]
         quantity = float(float_part)
         multiplier = {
-            'mm': 36000, 'cm': 360000, 'in': 914400, 'pt': 12700,
-            'pc': 152400, 'pi': 152400
+            "mm": 36000,
+            "cm": 360000,
+            "in": 914400,
+            "pt": 12700,
+            "pc": 152400,
+            "pi": 152400,
         }[units_part]
         emu_value = Emu(int(round(quantity * multiplier)))
         return emu_value
@@ -402,8 +371,9 @@ class ST_VerticalAlignRun(XsdStringEnumeration):
     """
     Valid values for `w:vertAlign/@val`.
     """
-    BASELINE = 'baseline'
-    SUPERSCRIPT = 'superscript'
-    SUBSCRIPT = 'subscript'
+
+    BASELINE = "baseline"
+    SUPERSCRIPT = "superscript"
+    SUBSCRIPT = "subscript"
 
     _members = (BASELINE, SUPERSCRIPT, SUBSCRIPT)
diff --git a/docx/oxml/styles.py b/docx/oxml/styles.py
index 6f27e45eb..96b390baf 100644
--- a/docx/oxml/styles.py
+++ b/docx/oxml/styles.py
@@ -7,8 +7,11 @@
 from ..enum.style import WD_STYLE_TYPE
 from .simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
 from .xmlchemy import (
-    BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrMore,
-    ZeroOrOne
+    BaseOxmlElement,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrMore,
+    ZeroOrOne,
 )
 
 
@@ -18,17 +21,17 @@ def styleId_from_name(name):
     special-case names such as 'Heading 1'.
     """
     return {
-        'caption':   'Caption',
-        'heading 1': 'Heading1',
-        'heading 2': 'Heading2',
-        'heading 3': 'Heading3',
-        'heading 4': 'Heading4',
-        'heading 5': 'Heading5',
-        'heading 6': 'Heading6',
-        'heading 7': 'Heading7',
-        'heading 8': 'Heading8',
-        'heading 9': 'Heading9',
-    }.get(name, name.replace(' ', ''))
+        "caption": "Caption",
+        "heading 1": "Heading1",
+        "heading 2": "Heading2",
+        "heading 3": "Heading3",
+        "heading 4": "Heading4",
+        "heading 5": "Heading5",
+        "heading 6": "Heading6",
+        "heading 7": "Heading7",
+        "heading 8": "Heading8",
+        "heading 9": "Heading9",
+    }.get(name, name.replace(" ", ""))
 
 
 class CT_LatentStyles(BaseOxmlElement):
@@ -37,14 +40,15 @@ class CT_LatentStyles(BaseOxmlElement):
     and containing `w:lsdException` child elements that each override those
     defaults for a named latent style.
     """
-    lsdException = ZeroOrMore('w:lsdException', successors=())
 
-    count = OptionalAttribute('w:count', ST_DecimalNumber)
-    defLockedState = OptionalAttribute('w:defLockedState', ST_OnOff)
-    defQFormat = OptionalAttribute('w:defQFormat', ST_OnOff)
-    defSemiHidden = OptionalAttribute('w:defSemiHidden', ST_OnOff)
-    defUIPriority = OptionalAttribute('w:defUIPriority', ST_DecimalNumber)
-    defUnhideWhenUsed = OptionalAttribute('w:defUnhideWhenUsed', ST_OnOff)
+    lsdException = ZeroOrMore("w:lsdException", successors=())
+
+    count = OptionalAttribute("w:count", ST_DecimalNumber)
+    defLockedState = OptionalAttribute("w:defLockedState", ST_OnOff)
+    defQFormat = OptionalAttribute("w:defQFormat", ST_OnOff)
+    defSemiHidden = OptionalAttribute("w:defSemiHidden", ST_OnOff)
+    defUIPriority = OptionalAttribute("w:defUIPriority", ST_DecimalNumber)
+    defUnhideWhenUsed = OptionalAttribute("w:defUnhideWhenUsed", ST_OnOff)
 
     def bool_prop(self, attr_name):
         """
@@ -78,12 +82,13 @@ class CT_LsdException(BaseOxmlElement):
     ``<w:lsdException>`` element, defining override visibility behaviors for
     a named latent style.
     """
-    locked = OptionalAttribute('w:locked', ST_OnOff)
-    name = RequiredAttribute('w:name', ST_String)
-    qFormat = OptionalAttribute('w:qFormat', ST_OnOff)
-    semiHidden = OptionalAttribute('w:semiHidden', ST_OnOff)
-    uiPriority = OptionalAttribute('w:uiPriority', ST_DecimalNumber)
-    unhideWhenUsed = OptionalAttribute('w:unhideWhenUsed', ST_OnOff)
+
+    locked = OptionalAttribute("w:locked", ST_OnOff)
+    name = RequiredAttribute("w:name", ST_String)
+    qFormat = OptionalAttribute("w:qFormat", ST_OnOff)
+    semiHidden = OptionalAttribute("w:semiHidden", ST_OnOff)
+    uiPriority = OptionalAttribute("w:uiPriority", ST_DecimalNumber)
+    unhideWhenUsed = OptionalAttribute("w:unhideWhenUsed", ST_OnOff)
 
     def delete(self):
         """
@@ -109,29 +114,47 @@ class CT_Style(BaseOxmlElement):
     """
     A ``<w:style>`` element, representing a style definition
     """
+
     _tag_seq = (
-        'w:name', 'w:aliases', 'w:basedOn', 'w:next', 'w:link',
-        'w:autoRedefine', 'w:hidden', 'w:uiPriority', 'w:semiHidden',
-        'w:unhideWhenUsed', 'w:qFormat', 'w:locked', 'w:personal',
-        'w:personalCompose', 'w:personalReply', 'w:rsid', 'w:pPr', 'w:rPr',
-        'w:tblPr', 'w:trPr', 'w:tcPr', 'w:tblStylePr'
+        "w:name",
+        "w:aliases",
+        "w:basedOn",
+        "w:next",
+        "w:link",
+        "w:autoRedefine",
+        "w:hidden",
+        "w:uiPriority",
+        "w:semiHidden",
+        "w:unhideWhenUsed",
+        "w:qFormat",
+        "w:locked",
+        "w:personal",
+        "w:personalCompose",
+        "w:personalReply",
+        "w:rsid",
+        "w:pPr",
+        "w:rPr",
+        "w:tblPr",
+        "w:trPr",
+        "w:tcPr",
+        "w:tblStylePr",
     )
-    name = ZeroOrOne('w:name', successors=_tag_seq[1:])
-    basedOn = ZeroOrOne('w:basedOn', successors=_tag_seq[3:])
-    next = ZeroOrOne('w:next', successors=_tag_seq[4:])
-    uiPriority = ZeroOrOne('w:uiPriority', successors=_tag_seq[8:])
-    semiHidden = ZeroOrOne('w:semiHidden', successors=_tag_seq[9:])
-    unhideWhenUsed = ZeroOrOne('w:unhideWhenUsed', successors=_tag_seq[10:])
-    qFormat = ZeroOrOne('w:qFormat', successors=_tag_seq[11:])
-    locked = ZeroOrOne('w:locked', successors=_tag_seq[12:])
-    pPr = ZeroOrOne('w:pPr', successors=_tag_seq[17:])
-    rPr = ZeroOrOne('w:rPr', successors=_tag_seq[18:])
+    name = ZeroOrOne("w:name", successors=_tag_seq[1:])
+    basedOn = ZeroOrOne("w:basedOn", successors=_tag_seq[3:])
+    next = ZeroOrOne("w:next", successors=_tag_seq[4:])
+    uiPriority = ZeroOrOne("w:uiPriority", successors=_tag_seq[8:])
+    semiHidden = ZeroOrOne("w:semiHidden", successors=_tag_seq[9:])
+    unhideWhenUsed = ZeroOrOne("w:unhideWhenUsed", successors=_tag_seq[10:])
+    qFormat = ZeroOrOne("w:qFormat", successors=_tag_seq[11:])
+    locked = ZeroOrOne("w:locked", successors=_tag_seq[12:])
+    pPr = ZeroOrOne("w:pPr", successors=_tag_seq[17:])
+    rPr = ZeroOrOne("w:rPr", successors=_tag_seq[18:])
     del _tag_seq
 
-    type = OptionalAttribute('w:type', WD_STYLE_TYPE)
-    styleId = OptionalAttribute('w:styleId', ST_String)
-    default = OptionalAttribute('w:default', ST_OnOff)
-    customStyle = OptionalAttribute('w:customStyle', ST_OnOff)
+    type = OptionalAttribute("w:type", WD_STYLE_TYPE)
+    styleId = OptionalAttribute("w:styleId", ST_String)
+    default = OptionalAttribute("w:default", ST_OnOff)
+    customStyle = OptionalAttribute("w:customStyle", ST_OnOff)
 
     @property
     def basedOn_val(self):
@@ -291,9 +314,10 @@ class CT_Styles(BaseOxmlElement):
     ``<w:styles>`` element, the root element of a styles part, i.e.
     styles.xml
     """
-    _tag_seq = ('w:docDefaults', 'w:latentStyles', 'w:style')
-    latentStyles = ZeroOrOne('w:latentStyles', successors=_tag_seq[2:])
-    style = ZeroOrMore('w:style', successors=())
+
+    _tag_seq = ("w:docDefaults", "w:latentStyles", "w:style")
+    latentStyles = ZeroOrOne("w:latentStyles", successors=_tag_seq[2:])
+    style = ZeroOrMore("w:style", successors=())
     del _tag_seq
 
     def add_style_of_type(self, name, style_type, builtin):
@@ -314,8 +338,7 @@ def default_for(self, style_type):
         Return `w:style[@w:type="*{style_type}*][-1]` or |None| if not found.
         """
         default_styles_for_type = [
-            s for s in self._iter_styles()
-            if s.type == style_type and s.default
+            s for s in self._iter_styles() if s.type == style_type and s.default
         ]
         if not default_styles_for_type:
             return None
@@ -348,4 +371,4 @@ def _iter_styles(self):
         """
         Generate each of the `w:style` child elements in document order.
         """
-        return (style for style in self.xpath('w:style'))
+        return (style for style in self.xpath("w:style"))
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
index e55bf9126..f9423da6b 100644
--- a/docx/oxml/table.py
+++ b/docx/oxml/table.py
@@ -2,9 +2,7 @@
 
 """Custom element classes for tables"""
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from . import parse_xml
 from ..enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
@@ -12,11 +10,20 @@
 from .ns import nsdecls, qn
 from ..shared import Emu, Twips
 from .simpletypes import (
-    ST_Merge, ST_TblLayoutType, ST_TblWidth, ST_TwipsMeasure, XsdInt
+    ST_Merge,
+    ST_TblLayoutType,
+    ST_TblWidth,
+    ST_TwipsMeasure,
+    XsdInt,
 )
 from .xmlchemy import (
-    BaseOxmlElement, OneAndOnlyOne, OneOrMore, OptionalAttribute,
-    RequiredAttribute, ZeroOrOne, ZeroOrMore
+    BaseOxmlElement,
+    OneAndOnlyOne,
+    OneOrMore,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrOne,
+    ZeroOrMore,
 )
 
 
@@ -24,17 +31,19 @@ class CT_Height(BaseOxmlElement):
     """
     Used for ``<w:trHeight>`` to specify a row height and row height rule.
     """
-    val = OptionalAttribute('w:val', ST_TwipsMeasure)
-    hRule = OptionalAttribute('w:hRule', WD_ROW_HEIGHT_RULE)
+
+    val = OptionalAttribute("w:val", ST_TwipsMeasure)
+    hRule = OptionalAttribute("w:hRule", WD_ROW_HEIGHT_RULE)
 
 
 class CT_Row(BaseOxmlElement):
     """
     ``<w:tr>`` element
     """
-    tblPrEx = ZeroOrOne('w:tblPrEx')  # custom inserter below
-    trPr = ZeroOrOne('w:trPr')        # custom inserter below
-    tc = ZeroOrMore('w:tc')
+
+    tblPrEx = ZeroOrOne("w:tblPrEx")  # custom inserter below
+    trPr = ZeroOrOne("w:trPr")  # custom inserter below
+    tc = ZeroOrMore("w:tc")
 
     def tc_at_grid_col(self, idx):
         """
@@ -47,8 +56,8 @@ def tc_at_grid_col(self, idx):
                 return tc
             grid_col += tc.grid_span
             if grid_col > idx:
-                raise ValueError('no cell on grid column %d' % idx)
-        raise ValueError('index out of bounds')
+                raise ValueError("no cell on grid column %d" % idx)
+        raise ValueError("index out of bounds")
 
     @property
     def tr_idx(self):
@@ -108,9 +117,10 @@ class CT_Tbl(BaseOxmlElement):
     """
     ``<w:tbl>`` element
     """
-    tblPr = OneAndOnlyOne('w:tblPr')
-    tblGrid = OneAndOnlyOne('w:tblGrid')
-    tr = ZeroOrMore('w:tr')
+
+    tblPr = OneAndOnlyOne("w:tblPr")
+    tblGrid = OneAndOnlyOne("w:tblGrid")
+    tr = ZeroOrMore("w:tr")
 
     @property
     def bidiVisual_val(self):
@@ -182,54 +192,52 @@ def tblStyle_val(self, styleId):
 
     @classmethod
     def _tbl_xml(cls, rows, cols, width):
-        col_width = Emu(width/cols) if cols > 0 else Emu(0)
+        col_width = Emu(width / cols) if cols > 0 else Emu(0)
         return (
-            '<w:tbl %s>\n'
-            '  <w:tblPr>\n'
+            "<w:tbl %s>\n"
+            "  <w:tblPr>\n"
             '    <w:tblW w:type="auto" w:w="0"/>\n'
             '    <w:tblLook w:firstColumn="1" w:firstRow="1"\n'
             '               w:lastColumn="0" w:lastRow="0" w:noHBand="0"\n'
             '               w:noVBand="1" w:val="04A0"/>\n'
-            '  </w:tblPr>\n'
-            '%s'  # tblGrid
-            '%s'  # trs
-            '</w:tbl>\n'
+            "  </w:tblPr>\n"
+            "%s"  # tblGrid
+            "%s"  # trs
+            "</w:tbl>\n"
         ) % (
-            nsdecls('w'),
+            nsdecls("w"),
             cls._tblGrid_xml(cols, col_width),
-            cls._trs_xml(rows, cols, col_width)
+            cls._trs_xml(rows, cols, col_width),
         )
 
     @classmethod
     def _tblGrid_xml(cls, col_count, col_width):
-        xml = '  <w:tblGrid>\n'
+        xml = "  <w:tblGrid>\n"
         for i in range(col_count):
             xml += '    <w:gridCol w:w="%d"/>\n' % col_width.twips
-        xml += '  </w:tblGrid>\n'
+        xml += "  </w:tblGrid>\n"
         return xml
 
     @classmethod
     def _trs_xml(cls, row_count, col_count, col_width):
-        xml = ''
+        xml = ""
         for i in range(row_count):
-            xml += (
-                '  <w:tr>\n'
-                '%s'
-                '  </w:tr>\n'
-            ) % cls._tcs_xml(col_count, col_width)
+            xml += ("  <w:tr>\n" "%s" "  </w:tr>\n") % cls._tcs_xml(
+                col_count, col_width
+            )
         return xml
 
     @classmethod
     def _tcs_xml(cls, col_count, col_width):
-        xml = ''
+        xml = ""
         for i in range(col_count):
             xml += (
-                '    <w:tc>\n'
-                '      <w:tcPr>\n'
+                "    <w:tc>\n"
+                "      <w:tcPr>\n"
                 '        <w:tcW w:type="dxa" w:w="%d"/>\n'
-                '      </w:tcPr>\n'
-                '      <w:p/>\n'
-                '    </w:tc>\n'
+                "      </w:tcPr>\n"
+                "      <w:p/>\n"
+                "    </w:tc>\n"
             ) % col_width.twips
         return xml
 
@@ -239,7 +247,8 @@ class CT_TblGrid(BaseOxmlElement):
     ``<w:tblGrid>`` element, child of ``<w:tbl>``, holds ``<w:gridCol>``
     elements that define column count, width, etc.
     """
-    gridCol = ZeroOrMore('w:gridCol', successors=('w:tblGridChange',))
+
+    gridCol = ZeroOrMore("w:gridCol", successors=("w:tblGridChange",))
 
 
 class CT_TblGridCol(BaseOxmlElement):
@@ -247,7 +256,8 @@ class CT_TblGridCol(BaseOxmlElement):
     ``<w:gridCol>`` element, child of ``<w:tblGrid>``, defines a table
     column.
     """
-    w = OptionalAttribute('w:w', ST_TwipsMeasure)
+
+    w = OptionalAttribute("w:w", ST_TwipsMeasure)
 
     @property
     def gridCol_idx(self):
@@ -263,7 +273,8 @@ class CT_TblLayoutType(BaseOxmlElement):
     ``<w:tblLayout>`` element, specifying whether column widths are fixed or
     can be automatically adjusted based on content.
     """
-    type = OptionalAttribute('w:type', ST_TblLayoutType)
+
+    type = OptionalAttribute("w:type", ST_TblLayoutType)
 
 
 class CT_TblPr(BaseOxmlElement):
@@ -271,17 +282,31 @@ class CT_TblPr(BaseOxmlElement):
     ``<w:tblPr>`` element, child of ``<w:tbl>``, holds child elements that
     define table properties such as style and borders.
     """
+
     _tag_seq = (
-        'w:tblStyle', 'w:tblpPr', 'w:tblOverlap', 'w:bidiVisual',
-        'w:tblStyleRowBandSize', 'w:tblStyleColBandSize', 'w:tblW', 'w:jc',
-        'w:tblCellSpacing', 'w:tblInd', 'w:tblBorders', 'w:shd',
-        'w:tblLayout', 'w:tblCellMar', 'w:tblLook', 'w:tblCaption',
-        'w:tblDescription', 'w:tblPrChange'
+        "w:tblStyle",
+        "w:tblpPr",
+        "w:tblOverlap",
+        "w:bidiVisual",
+        "w:tblStyleRowBandSize",
+        "w:tblStyleColBandSize",
+        "w:tblW",
+        "w:jc",
+        "w:tblCellSpacing",
+        "w:tblInd",
+        "w:tblBorders",
+        "w:shd",
+        "w:tblLayout",
+        "w:tblCellMar",
+        "w:tblLook",
+        "w:tblCaption",
+        "w:tblDescription",
+        "w:tblPrChange",
     )
-    tblStyle = ZeroOrOne('w:tblStyle', successors=_tag_seq[1:])
-    bidiVisual = ZeroOrOne('w:bidiVisual', successors=_tag_seq[4:])
-    jc = ZeroOrOne('w:jc', successors=_tag_seq[8:])
-    tblLayout = ZeroOrOne('w:tblLayout', successors=_tag_seq[13:])
+    tblStyle = ZeroOrOne("w:tblStyle", successors=_tag_seq[1:])
+    bidiVisual = ZeroOrOne("w:bidiVisual", successors=_tag_seq[4:])
+    jc = ZeroOrOne("w:jc", successors=_tag_seq[8:])
+    tblLayout = ZeroOrOne("w:tblLayout", successors=_tag_seq[13:])
     del _tag_seq
 
     @property
@@ -313,12 +338,12 @@ def autofit(self):
         tblLayout = self.tblLayout
         if tblLayout is None:
             return True
-        return False if tblLayout.type == 'fixed' else True
+        return False if tblLayout.type == "fixed" else True
 
     @autofit.setter
     def autofit(self, value):
         tblLayout = self.get_or_add_tblLayout()
-        tblLayout.type = 'autofit' if value else 'fixed'
+        tblLayout.type = "autofit" if value else "fixed"
 
     @property
     def style(self):
@@ -344,11 +369,12 @@ class CT_TblWidth(BaseOxmlElement):
     Used for ``<w:tblW>`` and ``<w:tcW>`` elements and many others, to
     specify a table-related width.
     """
+
     # the type for `w` attr is actually ST_MeasurementOrPercent, but using
     # XsdInt for now because only dxa (twips) values are being used. It's not
     # entirely clear what the semantics are for other values like -01.4mm
-    w = RequiredAttribute('w:w', XsdInt)
-    type = RequiredAttribute('w:type', ST_TblWidth)
+    w = RequiredAttribute("w:w", XsdInt)
+    type = RequiredAttribute("w:type", ST_TblWidth)
 
     @property
     def width(self):
@@ -356,22 +382,22 @@ def width(self):
         Return the EMU length value represented by the combined ``w:w`` and
         ``w:type`` attributes.
         """
-        if self.type != 'dxa':
+        if self.type != "dxa":
             return None
         return Twips(self.w)
 
     @width.setter
     def width(self, value):
-        self.type = 'dxa'
+        self.type = "dxa"
         self.w = Emu(value).twips
 
 
 class CT_Tc(BaseOxmlElement):
     """`w:tc` table cell element"""
 
-    tcPr = ZeroOrOne('w:tcPr')  # bunches of successors, overriding insert
-    p = OneOrMore('w:p')
-    tbl = OneOrMore('w:tbl')
+    tcPr = ZeroOrOne("w:tcPr")  # bunches of successors, overriding insert
+    p = OneOrMore("w:p")
+    tbl = OneOrMore("w:tbl")
 
     @property
     def bottom(self):
@@ -422,7 +448,7 @@ def iter_block_items(self):
         Generate a reference to each of the block-level content elements in
         this cell, in the order they appear.
         """
-        block_item_tags = (qn('w:p'), qn('w:tbl'), qn('w:sdt'))
+        block_item_tags = (qn("w:p"), qn("w:tbl"), qn("w:sdt"))
         for child in self:
             if child.tag in block_item_tags:
                 yield child
@@ -451,11 +477,7 @@ def new(cls):
         Return a new ``<w:tc>`` element, containing an empty paragraph as the
         required EG_BlockLevelElt.
         """
-        return parse_xml(
-            '<w:tc %s>\n'
-            '  <w:p/>\n'
-            '</w:tc>' % nsdecls('w')
-        )
+        return parse_xml("<w:tc %s>\n" "  <w:p/>\n" "</w:tc>" % nsdecls("w"))
 
     @property
     def right(self):
@@ -532,6 +554,7 @@ def _grow_to(self, width, height, top_tc=None):
         horizontal spans and creating continuation cells to form vertical
         spans.
         """
+
         def vMerge_val(top_tc):
             if top_tc is not self:
                 return ST_Merge.CONTINUE
@@ -542,7 +565,7 @@ def vMerge_val(top_tc):
         top_tc = self if top_tc is None else top_tc
         self._span_to_width(width, top_tc, vMerge_val(top_tc))
         if height > 1:
-            self._tc_below._grow_to(width, height-1, top_tc)
+            self._tc_below._grow_to(width, height - 1, top_tc)
 
     def _insert_tcPr(self, tcPr):
         """
@@ -591,7 +614,7 @@ def _next_tc(self):
         The `w:tc` element immediately following this one in this row, or
         |None| if this is the last `w:tc` element in the row.
         """
-        following_tcs = self.xpath('./following-sibling::w:tc')
+        following_tcs = self.xpath("./following-sibling::w:tc")
         return following_tcs[0] if following_tcs else None
 
     def _remove(self):
@@ -607,7 +630,7 @@ def _remove_trailing_empty_p(self):
         """
         block_items = list(self.iter_block_items())
         last_content_elm = block_items[-1]
-        if last_content_elm.tag != qn('w:p'):
+        if last_content_elm.tag != qn("w:p"):
             return
         p = last_content_elm
         if len(p.r_lst) > 0:
@@ -620,20 +643,21 @@ def _span_dimensions(self, other_tc):
         the merged cell formed by using this tc and *other_tc* as opposite
         corner extents.
         """
+
         def raise_on_inverted_L(a, b):
             if a.top == b.top and a.bottom != b.bottom:
-                raise InvalidSpanError('requested span not rectangular')
+                raise InvalidSpanError("requested span not rectangular")
             if a.left == b.left and a.right != b.right:
-                raise InvalidSpanError('requested span not rectangular')
+                raise InvalidSpanError("requested span not rectangular")
 
         def raise_on_tee_shaped(a, b):
             top_most, other = (a, b) if a.top < b.top else (b, a)
             if top_most.top < other.top and top_most.bottom > other.bottom:
-                raise InvalidSpanError('requested span not rectangular')
+                raise InvalidSpanError("requested span not rectangular")
 
             left_most, other = (a, b) if a.left < b.left else (b, a)
             if left_most.left < other.left and left_most.right > other.right:
-                raise InvalidSpanError('requested span not rectangular')
+                raise InvalidSpanError("requested span not rectangular")
 
         raise_on_inverted_L(self, other_tc)
         raise_on_tee_shaped(self, other_tc)
@@ -671,11 +695,12 @@ def _swallow_next_tc(self, grid_width, top_tc):
         |InvalidSpanError| if the width of the resulting cell is greater than
         *grid_width* or if there is no next `<w:tc>` element in the row.
         """
+
         def raise_on_invalid_swallow(next_tc):
             if next_tc is None:
-                raise InvalidSpanError('not enough grid columns')
+                raise InvalidSpanError("not enough grid columns")
             if self.grid_span + next_tc.grid_span > grid_width:
-                raise InvalidSpanError('span is not rectangular')
+                raise InvalidSpanError("span is not rectangular")
 
         next_tc = self._next_tc
         raise_on_invalid_swallow(next_tc)
@@ -689,7 +714,7 @@ def _tbl(self):
         """
         The tbl element this tc element appears in.
         """
-        return self.xpath('./ancestor::w:tbl[position()=1]')[0]
+        return self.xpath("./ancestor::w:tbl[position()=1]")[0]
 
     @property
     def _tc_above(self):
@@ -713,7 +738,7 @@ def _tr(self):
         """
         The tr element this tc element appears in.
         """
-        return self.xpath('./ancestor::w:tr[position()=1]')[0]
+        return self.xpath("./ancestor::w:tr[position()=1]")[0]
 
     @property
     def _tr_above(self):
@@ -724,8 +749,8 @@ def _tr_above(self):
         tr_lst = self._tbl.tr_lst
         tr_idx = tr_lst.index(self._tr)
         if tr_idx == 0:
-            raise ValueError('no tr above topmost tr')
-        return tr_lst[tr_idx-1]
+            raise ValueError("no tr above topmost tr")
+        return tr_lst[tr_idx - 1]
 
     @property
     def _tr_below(self):
@@ -736,7 +761,7 @@ def _tr_below(self):
         tr_lst = self._tbl.tr_lst
         tr_idx = tr_lst.index(self._tr)
         try:
-            return tr_lst[tr_idx+1]
+            return tr_lst[tr_idx + 1]
         except IndexError:
             return None
 
@@ -752,16 +777,31 @@ class CT_TcPr(BaseOxmlElement):
     """
     ``<w:tcPr>`` element, defining table cell properties
     """
+
     _tag_seq = (
-        'w:cnfStyle', 'w:tcW', 'w:gridSpan', 'w:hMerge', 'w:vMerge',
-        'w:tcBorders', 'w:shd', 'w:noWrap', 'w:tcMar', 'w:textDirection',
-        'w:tcFitText', 'w:vAlign', 'w:hideMark', 'w:headers', 'w:cellIns',
-        'w:cellDel', 'w:cellMerge', 'w:tcPrChange'
+        "w:cnfStyle",
+        "w:tcW",
+        "w:gridSpan",
+        "w:hMerge",
+        "w:vMerge",
+        "w:tcBorders",
+        "w:shd",
+        "w:noWrap",
+        "w:tcMar",
+        "w:textDirection",
+        "w:tcFitText",
+        "w:vAlign",
+        "w:hideMark",
+        "w:headers",
+        "w:cellIns",
+        "w:cellDel",
+        "w:cellMerge",
+        "w:tcPrChange",
     )
-    tcW = ZeroOrOne('w:tcW', successors=_tag_seq[2:])
-    gridSpan = ZeroOrOne('w:gridSpan', successors=_tag_seq[3:])
-    vMerge = ZeroOrOne('w:vMerge', successors=_tag_seq[5:])
-    vAlign = ZeroOrOne('w:vAlign', successors=_tag_seq[12:])
+    tcW = ZeroOrOne("w:tcW", successors=_tag_seq[2:])
+    gridSpan = ZeroOrOne("w:gridSpan", successors=_tag_seq[3:])
+    vMerge = ZeroOrOne("w:vMerge", successors=_tag_seq[5:])
+    vAlign = ZeroOrOne("w:vAlign", successors=_tag_seq[12:])
     del _tag_seq
 
     @property
@@ -838,13 +878,25 @@ class CT_TrPr(BaseOxmlElement):
     """
     ``<w:trPr>`` element, defining table row properties
     """
+
     _tag_seq = (
-        'w:cnfStyle', 'w:divId', 'w:gridBefore', 'w:gridAfter', 'w:wBefore',
-        'w:wAfter', 'w:cantSplit', 'w:trHeight', 'w:tblHeader',
-        'w:tblCellSpacing', 'w:jc', 'w:hidden', 'w:ins', 'w:del',
-        'w:trPrChange'
+        "w:cnfStyle",
+        "w:divId",
+        "w:gridBefore",
+        "w:gridAfter",
+        "w:wBefore",
+        "w:wAfter",
+        "w:cantSplit",
+        "w:trHeight",
+        "w:tblHeader",
+        "w:tblCellSpacing",
+        "w:jc",
+        "w:hidden",
+        "w:ins",
+        "w:del",
+        "w:trPrChange",
     )
-    trHeight = ZeroOrOne('w:trHeight', successors=_tag_seq[8:])
+    trHeight = ZeroOrOne("w:trHeight", successors=_tag_seq[8:])
     del _tag_seq
 
     @property
@@ -884,11 +936,13 @@ def trHeight_val(self, value):
 
 class CT_VerticalJc(BaseOxmlElement):
     """`w:vAlign` element, specifying vertical alignment of cell."""
-    val = RequiredAttribute('w:val', WD_CELL_VERTICAL_ALIGNMENT)
+
+    val = RequiredAttribute("w:val", WD_CELL_VERTICAL_ALIGNMENT)
 
 
 class CT_VMerge(BaseOxmlElement):
     """
     ``<w:vMerge>`` element, specifying vertical merging behavior of a cell.
     """
-    val = OptionalAttribute('w:val', ST_Merge, default=ST_Merge.CONTINUE)
+
+    val = OptionalAttribute("w:val", ST_Merge, default=ST_Merge.CONTINUE)
diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
index 810ec2b30..73913af9a 100644
--- a/docx/oxml/text/font.py
+++ b/docx/oxml/text/font.py
@@ -8,12 +8,8 @@
 from ...enum.dml import MSO_THEME_COLOR
 from ...enum.text import WD_COLOR, WD_UNDERLINE
 from ..ns import nsdecls, qn
-from ..simpletypes import (
-    ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
-)
-from ..xmlchemy import (
-    BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
-)
+from ..simpletypes import ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
+from ..xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
 
 
 class CT_Color(BaseOxmlElement):
@@ -21,8 +17,9 @@ class CT_Color(BaseOxmlElement):
     `w:color` element, specifying the color of a font and perhaps other
     objects.
     """
-    val = RequiredAttribute('w:val', ST_HexColor)
-    themeColor = OptionalAttribute('w:themeColor', MSO_THEME_COLOR)
+
+    val = RequiredAttribute("w:val", ST_HexColor)
+    themeColor = OptionalAttribute("w:themeColor", MSO_THEME_COLOR)
 
 
 class CT_Fonts(BaseOxmlElement):
@@ -30,15 +27,17 @@ class CT_Fonts(BaseOxmlElement):
     ``<w:rFonts>`` element, specifying typeface name for the various language
     types.
     """
-    ascii = OptionalAttribute('w:ascii', ST_String)
-    hAnsi = OptionalAttribute('w:hAnsi', ST_String)
+
+    ascii = OptionalAttribute("w:ascii", ST_String)
+    hAnsi = OptionalAttribute("w:hAnsi", ST_String)
 
 
 class CT_Highlight(BaseOxmlElement):
     """
     `w:highlight` element, specifying font highlighting/background color.
     """
-    val = RequiredAttribute('w:val', WD_COLOR)
+
+    val = RequiredAttribute("w:val", WD_COLOR)
 
 
 class CT_HpsMeasure(BaseOxmlElement):
@@ -46,49 +45,83 @@ class CT_HpsMeasure(BaseOxmlElement):
     Used for ``<w:sz>`` element and others, specifying font size in
     half-points.
     """
-    val = RequiredAttribute('w:val', ST_HpsMeasure)
+
+    val = RequiredAttribute("w:val", ST_HpsMeasure)
 
 
 class CT_RPr(BaseOxmlElement):
     """
     ``<w:rPr>`` element, containing the properties for a run.
     """
+
     _tag_seq = (
-        'w:rStyle', 'w:rFonts', 'w:b', 'w:bCs', 'w:i', 'w:iCs', 'w:caps',
-        'w:smallCaps', 'w:strike', 'w:dstrike', 'w:outline', 'w:shadow',
-        'w:emboss', 'w:imprint', 'w:noProof', 'w:snapToGrid', 'w:vanish',
-        'w:webHidden', 'w:color', 'w:spacing', 'w:w', 'w:kern', 'w:position',
-        'w:sz', 'w:szCs', 'w:highlight', 'w:u', 'w:effect', 'w:bdr', 'w:shd',
-        'w:fitText', 'w:vertAlign', 'w:rtl', 'w:cs', 'w:em', 'w:lang',
-        'w:eastAsianLayout', 'w:specVanish', 'w:oMath'
+        "w:rStyle",
+        "w:rFonts",
+        "w:b",
+        "w:bCs",
+        "w:i",
+        "w:iCs",
+        "w:caps",
+        "w:smallCaps",
+        "w:strike",
+        "w:dstrike",
+        "w:outline",
+        "w:shadow",
+        "w:emboss",
+        "w:imprint",
+        "w:noProof",
+        "w:snapToGrid",
+        "w:vanish",
+        "w:webHidden",
+        "w:color",
+        "w:spacing",
+        "w:w",
+        "w:kern",
+        "w:position",
+        "w:sz",
+        "w:szCs",
+        "w:highlight",
+        "w:u",
+        "w:effect",
+        "w:bdr",
+        "w:shd",
+        "w:fitText",
+        "w:vertAlign",
+        "w:rtl",
+        "w:cs",
+        "w:em",
+        "w:lang",
+        "w:eastAsianLayout",
+        "w:specVanish",
+        "w:oMath",
     )
-    rStyle = ZeroOrOne('w:rStyle', successors=_tag_seq[1:])
-    rFonts = ZeroOrOne('w:rFonts', successors=_tag_seq[2:])
-    b = ZeroOrOne('w:b', successors=_tag_seq[3:])
-    bCs = ZeroOrOne('w:bCs', successors=_tag_seq[4:])
-    i = ZeroOrOne('w:i', successors=_tag_seq[5:])
-    iCs = ZeroOrOne('w:iCs', successors=_tag_seq[6:])
-    caps = ZeroOrOne('w:caps', successors=_tag_seq[7:])
-    smallCaps = ZeroOrOne('w:smallCaps', successors=_tag_seq[8:])
-    strike = ZeroOrOne('w:strike', successors=_tag_seq[9:])
-    dstrike = ZeroOrOne('w:dstrike', successors=_tag_seq[10:])
-    outline = ZeroOrOne('w:outline', successors=_tag_seq[11:])
-    shadow = ZeroOrOne('w:shadow', successors=_tag_seq[12:])
-    emboss = ZeroOrOne('w:emboss', successors=_tag_seq[13:])
-    imprint = ZeroOrOne('w:imprint', successors=_tag_seq[14:])
-    noProof = ZeroOrOne('w:noProof', successors=_tag_seq[15:])
-    snapToGrid = ZeroOrOne('w:snapToGrid', successors=_tag_seq[16:])
-    vanish = ZeroOrOne('w:vanish', successors=_tag_seq[17:])
-    webHidden = ZeroOrOne('w:webHidden', successors=_tag_seq[18:])
-    color = ZeroOrOne('w:color', successors=_tag_seq[19:])
-    sz = ZeroOrOne('w:sz', successors=_tag_seq[24:])
-    highlight = ZeroOrOne('w:highlight', successors=_tag_seq[26:])
-    u = ZeroOrOne('w:u', successors=_tag_seq[27:])
-    vertAlign = ZeroOrOne('w:vertAlign', successors=_tag_seq[32:])
-    rtl = ZeroOrOne('w:rtl', successors=_tag_seq[33:])
-    cs = ZeroOrOne('w:cs', successors=_tag_seq[34:])
-    specVanish = ZeroOrOne('w:specVanish', successors=_tag_seq[38:])
-    oMath = ZeroOrOne('w:oMath', successors=_tag_seq[39:])
+    rStyle = ZeroOrOne("w:rStyle", successors=_tag_seq[1:])
+    rFonts = ZeroOrOne("w:rFonts", successors=_tag_seq[2:])
+    b = ZeroOrOne("w:b", successors=_tag_seq[3:])
+    bCs = ZeroOrOne("w:bCs", successors=_tag_seq[4:])
+    i = ZeroOrOne("w:i", successors=_tag_seq[5:])
+    iCs = ZeroOrOne("w:iCs", successors=_tag_seq[6:])
+    caps = ZeroOrOne("w:caps", successors=_tag_seq[7:])
+    smallCaps = ZeroOrOne("w:smallCaps", successors=_tag_seq[8:])
+    strike = ZeroOrOne("w:strike", successors=_tag_seq[9:])
+    dstrike = ZeroOrOne("w:dstrike", successors=_tag_seq[10:])
+    outline = ZeroOrOne("w:outline", successors=_tag_seq[11:])
+    shadow = ZeroOrOne("w:shadow", successors=_tag_seq[12:])
+    emboss = ZeroOrOne("w:emboss", successors=_tag_seq[13:])
+    imprint = ZeroOrOne("w:imprint", successors=_tag_seq[14:])
+    noProof = ZeroOrOne("w:noProof", successors=_tag_seq[15:])
+    snapToGrid = ZeroOrOne("w:snapToGrid", successors=_tag_seq[16:])
+    vanish = ZeroOrOne("w:vanish", successors=_tag_seq[17:])
+    webHidden = ZeroOrOne("w:webHidden", successors=_tag_seq[18:])
+    color = ZeroOrOne("w:color", successors=_tag_seq[19:])
+    sz = ZeroOrOne("w:sz", successors=_tag_seq[24:])
+    highlight = ZeroOrOne("w:highlight", successors=_tag_seq[26:])
+    u = ZeroOrOne("w:u", successors=_tag_seq[27:])
+    vertAlign = ZeroOrOne("w:vertAlign", successors=_tag_seq[32:])
+    rtl = ZeroOrOne("w:rtl", successors=_tag_seq[33:])
+    cs = ZeroOrOne("w:cs", successors=_tag_seq[34:])
+    specVanish = ZeroOrOne("w:specVanish", successors=_tag_seq[38:])
+    oMath = ZeroOrOne("w:oMath", successors=_tag_seq[39:])
     del _tag_seq
 
     def _new_color(self):
@@ -96,7 +129,7 @@ def _new_color(self):
         Override metaclass method to set `w:color/@val` to RGB black on
         create.
         """
-        return parse_xml('<w:color %s w:val="000000"/>' % nsdecls('w'))
+        return parse_xml('<w:color %s w:val="000000"/>' % nsdecls("w"))
 
     @property
     def highlight_val(self):
@@ -276,9 +309,9 @@ def _get_bool_val(self, name):
 
     def _set_bool_val(self, name, value):
         if value is None:
-            getattr(self, '_remove_%s' % name)()
+            getattr(self, "_remove_%s" % name)()
             return
-        element = getattr(self, 'get_or_add_%s' % name)()
+        element = getattr(self, "get_or_add_%s" % name)()
         element.val = value
 
 
@@ -286,12 +319,13 @@ class CT_Underline(BaseOxmlElement):
     """
     ``<w:u>`` element, specifying the underlining style for a run.
     """
+
     @property
     def val(self):
         """
         The underline type corresponding to the ``w:val`` attribute value.
         """
-        val = self.get(qn('w:val'))
+        val = self.get(qn("w:val"))
         underline = WD_UNDERLINE.from_xml(val)
         if underline == WD_UNDERLINE.SINGLE:
             return True
@@ -310,11 +344,12 @@ def val(self, value):
             value = WD_UNDERLINE.NONE
 
         val = WD_UNDERLINE.to_xml(value)
-        self.set(qn('w:val'), val)
+        self.set(qn("w:val"), val)
 
 
 class CT_VerticalAlignRun(BaseOxmlElement):
     """
     ``<w:vertAlign>`` element, specifying subscript or superscript.
     """
-    val = RequiredAttribute('w:val', ST_VerticalAlignRun)
+
+    val = RequiredAttribute("w:val", ST_VerticalAlignRun)
diff --git a/docx/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
index 5e4213776..8386420f6 100644
--- a/docx/oxml/text/paragraph.py
+++ b/docx/oxml/text/paragraph.py
@@ -12,8 +12,9 @@ class CT_P(BaseOxmlElement):
     """
     ``<w:p>`` element, containing the properties and text for a paragraph.
     """
-    pPr = ZeroOrOne('w:pPr')
-    r = ZeroOrMore('w:r')
+
+    pPr = ZeroOrOne("w:pPr")
+    r = ZeroOrMore("w:r")
 
     def _insert_pPr(self, pPr):
         self.insert(0, pPr)
@@ -23,7 +24,7 @@ def add_p_before(self):
         """
         Return a new ``<w:p>`` element inserted directly prior to this one.
         """
-        new_p = OxmlElement('w:p')
+        new_p = OxmlElement("w:p")
         self.addprevious(new_p)
         return new_p
 
@@ -48,7 +49,7 @@ def clear_content(self):
         Remove all child elements, except the ``<w:pPr>`` element if present.
         """
         for child in self[:]:
-            if child.tag == qn('w:pPr'):
+            if child.tag == qn("w:pPr"):
                 continue
             self.remove(child)
 
diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
index 466b11b1b..cae729d57 100644
--- a/docx/oxml/text/parfmt.py
+++ b/docx/oxml/text/parfmt.py
@@ -5,13 +5,19 @@
 """
 
 from ...enum.text import (
-    WD_ALIGN_PARAGRAPH, WD_LINE_SPACING, WD_TAB_ALIGNMENT, WD_TAB_LEADER
+    WD_ALIGN_PARAGRAPH,
+    WD_LINE_SPACING,
+    WD_TAB_ALIGNMENT,
+    WD_TAB_LEADER,
 )
 from ...shared import Length
 from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
 from ..xmlchemy import (
-    BaseOxmlElement, OneOrMore, OptionalAttribute, RequiredAttribute,
-    ZeroOrOne
+    BaseOxmlElement,
+    OneOrMore,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrOne,
 )
 
 
@@ -19,45 +25,75 @@ class CT_Ind(BaseOxmlElement):
     """
     ``<w:ind>`` element, specifying paragraph indentation.
     """
-    left = OptionalAttribute('w:left', ST_SignedTwipsMeasure)
-    right = OptionalAttribute('w:right', ST_SignedTwipsMeasure)
-    firstLine = OptionalAttribute('w:firstLine', ST_TwipsMeasure)
-    hanging = OptionalAttribute('w:hanging', ST_TwipsMeasure)
+
+    left = OptionalAttribute("w:left", ST_SignedTwipsMeasure)
+    right = OptionalAttribute("w:right", ST_SignedTwipsMeasure)
+    firstLine = OptionalAttribute("w:firstLine", ST_TwipsMeasure)
+    hanging = OptionalAttribute("w:hanging", ST_TwipsMeasure)
 
 
 class CT_Jc(BaseOxmlElement):
     """
     ``<w:jc>`` element, specifying paragraph justification.
     """
-    val = RequiredAttribute('w:val', WD_ALIGN_PARAGRAPH)
+
+    val = RequiredAttribute("w:val", WD_ALIGN_PARAGRAPH)
 
 
 class CT_PPr(BaseOxmlElement):
     """
     ``<w:pPr>`` element, containing the properties for a paragraph.
     """
+
     _tag_seq = (
-        'w:pStyle', 'w:keepNext', 'w:keepLines', 'w:pageBreakBefore',
-        'w:framePr', 'w:widowControl', 'w:numPr', 'w:suppressLineNumbers',
-        'w:pBdr', 'w:shd', 'w:tabs', 'w:suppressAutoHyphens', 'w:kinsoku',
-        'w:wordWrap', 'w:overflowPunct', 'w:topLinePunct', 'w:autoSpaceDE',
-        'w:autoSpaceDN', 'w:bidi', 'w:adjustRightInd', 'w:snapToGrid',
-        'w:spacing', 'w:ind', 'w:contextualSpacing', 'w:mirrorIndents',
-        'w:suppressOverlap', 'w:jc', 'w:textDirection', 'w:textAlignment',
-        'w:textboxTightWrap', 'w:outlineLvl', 'w:divId', 'w:cnfStyle',
-        'w:rPr', 'w:sectPr', 'w:pPrChange'
+        "w:pStyle",
+        "w:keepNext",
+        "w:keepLines",
+        "w:pageBreakBefore",
+        "w:framePr",
+        "w:widowControl",
+        "w:numPr",
+        "w:suppressLineNumbers",
+        "w:pBdr",
+        "w:shd",
+        "w:tabs",
+        "w:suppressAutoHyphens",
+        "w:kinsoku",
+        "w:wordWrap",
+        "w:overflowPunct",
+        "w:topLinePunct",
+        "w:autoSpaceDE",
+        "w:autoSpaceDN",
+        "w:bidi",
+        "w:adjustRightInd",
+        "w:snapToGrid",
+        "w:spacing",
+        "w:ind",
+        "w:contextualSpacing",
+        "w:mirrorIndents",
+        "w:suppressOverlap",
+        "w:jc",
+        "w:textDirection",
+        "w:textAlignment",
+        "w:textboxTightWrap",
+        "w:outlineLvl",
+        "w:divId",
+        "w:cnfStyle",
+        "w:rPr",
+        "w:sectPr",
+        "w:pPrChange",
     )
-    pStyle = ZeroOrOne('w:pStyle', successors=_tag_seq[1:])
-    keepNext = ZeroOrOne('w:keepNext', successors=_tag_seq[2:])
-    keepLines = ZeroOrOne('w:keepLines', successors=_tag_seq[3:])
-    pageBreakBefore = ZeroOrOne('w:pageBreakBefore', successors=_tag_seq[4:])
-    widowControl = ZeroOrOne('w:widowControl', successors=_tag_seq[6:])
-    numPr = ZeroOrOne('w:numPr', successors=_tag_seq[7:])
-    tabs = ZeroOrOne('w:tabs', successors=_tag_seq[11:])
-    spacing = ZeroOrOne('w:spacing', successors=_tag_seq[22:])
-    ind = ZeroOrOne('w:ind', successors=_tag_seq[23:])
-    jc = ZeroOrOne('w:jc', successors=_tag_seq[27:])
-    sectPr = ZeroOrOne('w:sectPr', successors=_tag_seq[35:])
+    pStyle = ZeroOrOne("w:pStyle", successors=_tag_seq[1:])
+    keepNext = ZeroOrOne("w:keepNext", successors=_tag_seq[2:])
+    keepLines = ZeroOrOne("w:keepLines", successors=_tag_seq[3:])
+    pageBreakBefore = ZeroOrOne("w:pageBreakBefore", successors=_tag_seq[4:])
+    widowControl = ZeroOrOne("w:widowControl", successors=_tag_seq[6:])
+    numPr = ZeroOrOne("w:numPr", successors=_tag_seq[7:])
+    tabs = ZeroOrOne("w:tabs", successors=_tag_seq[11:])
+    spacing = ZeroOrOne("w:spacing", successors=_tag_seq[22:])
+    ind = ZeroOrOne("w:ind", successors=_tag_seq[23:])
+    jc = ZeroOrOne("w:jc", successors=_tag_seq[27:])
+    sectPr = ZeroOrOne("w:sectPr", successors=_tag_seq[35:])
     del _tag_seq
 
     @property
@@ -311,28 +347,29 @@ class CT_Spacing(BaseOxmlElement):
     ``<w:spacing>`` element, specifying paragraph spacing attributes such as
     space before and line spacing.
     """
-    after = OptionalAttribute('w:after', ST_TwipsMeasure)
-    before = OptionalAttribute('w:before', ST_TwipsMeasure)
-    line = OptionalAttribute('w:line', ST_SignedTwipsMeasure)
-    lineRule = OptionalAttribute('w:lineRule', WD_LINE_SPACING)
+
+    after = OptionalAttribute("w:after", ST_TwipsMeasure)
+    before = OptionalAttribute("w:before", ST_TwipsMeasure)
+    line = OptionalAttribute("w:line", ST_SignedTwipsMeasure)
+    lineRule = OptionalAttribute("w:lineRule", WD_LINE_SPACING)
 
 
 class CT_TabStop(BaseOxmlElement):
     """
     ``<w:tab>`` element, representing an individual tab stop.
     """
-    val = RequiredAttribute('w:val', WD_TAB_ALIGNMENT)
-    leader = OptionalAttribute(
-        'w:leader', WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES
-    )
-    pos = RequiredAttribute('w:pos', ST_SignedTwipsMeasure)
+
+    val = RequiredAttribute("w:val", WD_TAB_ALIGNMENT)
+    leader = OptionalAttribute("w:leader", WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES)
+    pos = RequiredAttribute("w:pos", ST_SignedTwipsMeasure)
 
 
 class CT_TabStops(BaseOxmlElement):
     """
     ``<w:tabs>`` element, container for a sorted sequence of tab stops.
     """
-    tab = OneOrMore('w:tab', successors=())
+
+    tab = OneOrMore("w:tab", successors=())
 
     def insert_tab_in_order(self, pos, align, leader):
         """
diff --git a/docx/oxml/text/run.py b/docx/oxml/text/run.py
index 8f0a62e82..3d3d3cdf6 100644
--- a/docx/oxml/text/run.py
+++ b/docx/oxml/text/run.py
@@ -6,29 +6,29 @@
 
 from ..ns import qn
 from ..simpletypes import ST_BrClear, ST_BrType
-from ..xmlchemy import (
-    BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
-)
+from ..xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
 
 
 class CT_Br(BaseOxmlElement):
     """
     ``<w:br>`` element, indicating a line, page, or column break in a run.
     """
-    type = OptionalAttribute('w:type', ST_BrType)
-    clear = OptionalAttribute('w:clear', ST_BrClear)
+
+    type = OptionalAttribute("w:type", ST_BrType)
+    clear = OptionalAttribute("w:clear", ST_BrClear)
 
 
 class CT_R(BaseOxmlElement):
     """
     ``<w:r>`` element, containing the properties and text for a run.
     """
-    rPr = ZeroOrOne('w:rPr')
-    t = ZeroOrMore('w:t')
-    br = ZeroOrMore('w:br')
-    cr = ZeroOrMore('w:cr')
-    tab = ZeroOrMore('w:tab')
-    drawing = ZeroOrMore('w:drawing')
+
+    rPr = ZeroOrOne("w:rPr")
+    t = ZeroOrMore("w:t")
+    br = ZeroOrMore("w:br")
+    cr = ZeroOrMore("w:cr")
+    tab = ZeroOrMore("w:tab")
+    drawing = ZeroOrMore("w:drawing")
 
     def _insert_rPr(self, rPr):
         self.insert(0, rPr)
@@ -40,7 +40,7 @@ def add_t(self, text):
         """
         t = self._add_t(text=text)
         if len(text.strip()) < len(text):
-            t.set(qn('xml:space'), 'preserve')
+            t.set(qn("xml:space"), "preserve")
         return t
 
     def add_drawing(self, inline_or_anchor):
@@ -87,15 +87,15 @@ def text(self):
         child elements like ``<w:tab/>`` translated to their Python
         equivalent.
         """
-        text = ''
+        text = ""
         for child in self:
-            if child.tag == qn('w:t'):
+            if child.tag == qn("w:t"):
                 t_text = child.text
-                text += t_text if t_text is not None else ''
-            elif child.tag == qn('w:tab'):
-                text += '\t'
-            elif child.tag in (qn('w:br'), qn('w:cr')):
-                text += '\n'
+                text += t_text if t_text is not None else ""
+            elif child.tag == qn("w:tab"):
+                text += "\t"
+            elif child.tag in (qn("w:br"), qn("w:cr")):
+                text += "\n"
         return text
 
     @text.setter
@@ -119,6 +119,7 @@ class _RunContentAppender(object):
     appended. Likewise a newline or carriage return character ('\n', '\r')
     causes a ``<w:cr>`` element to be appended.
     """
+
     def __init__(self, r):
         self._r = r
         self._bfr = []
@@ -150,17 +151,17 @@ def add_char(self, char):
         which must be called at the end of text to ensure any pending
         ``<w:t>`` element is written.
         """
-        if char == '\t':
+        if char == "\t":
             self.flush()
             self._r.add_tab()
-        elif char in '\r\n':
+        elif char in "\r\n":
             self.flush()
             self._r.add_br()
         else:
             self._bfr.append(char)
 
     def flush(self):
-        text = ''.join(self._bfr)
+        text = "".join(self._bfr)
         if text:
             self._r.add_t(text)
         del self._bfr[:]
diff --git a/docx/oxml/xmlchemy.py b/docx/oxml/xmlchemy.py
index 46dbf462b..0fff364dc 100644
--- a/docx/oxml/xmlchemy.py
+++ b/docx/oxml/xmlchemy.py
@@ -23,7 +23,7 @@ def serialize_for_reading(element):
     Serialize *element* to human-readable XML suitable for tests. No XML
     declaration.
     """
-    xml = etree.tostring(element, encoding='unicode', pretty_print=True)
+    xml = etree.tostring(element, encoding="unicode", pretty_print=True)
     return XmlString(xml)
 
 
@@ -39,7 +39,7 @@ class XmlString(Unicode):
     #  front      attrs                                     | text
     #                                                     close
 
-    _xml_elm_line_patt = re.compile(r'( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$')
+    _xml_elm_line_patt = re.compile(r"( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$")
 
     def __eq__(self, other):
         lines = self.splitlines()
@@ -95,10 +95,16 @@ class MetaOxmlElement(type):
     """
     Metaclass for BaseOxmlElement
     """
+
     def __init__(cls, clsname, bases, clsdict):
         dispatchable = (
-            OneAndOnlyOne, OneOrMore, OptionalAttribute, RequiredAttribute,
-            ZeroOrMore, ZeroOrOne, ZeroOrOneChoice
+            OneAndOnlyOne,
+            OneOrMore,
+            OptionalAttribute,
+            RequiredAttribute,
+            ZeroOrMore,
+            ZeroOrOne,
+            ZeroOrOneChoice,
         )
         for key, value in clsdict.items():
             if isinstance(value, dispatchable):
@@ -110,6 +116,7 @@ class BaseAttribute(object):
     Base class for OptionalAttribute and RequiredAttribute, providing common
     methods.
     """
+
     def __init__(self, attr_name, simple_type):
         super(BaseAttribute, self).__init__()
         self._attr_name = attr_name
@@ -136,7 +143,7 @@ def _add_attr_property(self):
 
     @property
     def _clark_name(self):
-        if ':' in self._attr_name:
+        if ":" in self._attr_name:
             return qn(self._attr_name)
         return self._attr_name
 
@@ -147,6 +154,7 @@ class OptionalAttribute(BaseAttribute):
     attribute returns a default value when not present for reading. When
     assigned |None|, the attribute is removed.
     """
+
     def __init__(self, attr_name, simple_type, default=None):
         super(OptionalAttribute, self).__init__(attr_name, simple_type)
         self._default = default
@@ -157,11 +165,13 @@ def _getter(self):
         Return a function object suitable for the "get" side of the attribute
         property descriptor.
         """
+
         def get_attr_value(obj):
             attr_str_value = obj.get(self._clark_name)
             if attr_str_value is None:
                 return self._default
             return self._simple_type.from_xml(attr_str_value)
+
         get_attr_value.__doc__ = self._docstring
         return get_attr_value
 
@@ -172,10 +182,10 @@ def _docstring(self):
         for this attribute.
         """
         return (
-            '%s type-converted value of ``%s`` attribute, or |None| (or spec'
-            'ified default value) if not present. Assigning the default valu'
-            'e causes the attribute to be removed from the element.' %
-            (self._simple_type.__name__, self._attr_name)
+            "%s type-converted value of ``%s`` attribute, or |None| (or spec"
+            "ified default value) if not present. Assigning the default valu"
+            "e causes the attribute to be removed from the element."
+            % (self._simple_type.__name__, self._attr_name)
         )
 
     @property
@@ -184,6 +194,7 @@ def _setter(self):
         Return a function object suitable for the "set" side of the attribute
         property descriptor.
         """
+
         def set_attr_value(obj, value):
             if value is None or value == self._default:
                 if self._clark_name in obj.attrib:
@@ -191,6 +202,7 @@ def set_attr_value(obj, value):
                 return
             str_value = self._simple_type.to_xml(value)
             obj.set(self._clark_name, str_value)
+
         return set_attr_value
 
 
@@ -203,20 +215,23 @@ class RequiredAttribute(BaseAttribute):
     |None| is assigned. Assigning |None| raises |TypeError| or |ValueError|,
     depending on the simple type of the attribute.
     """
+
     @property
     def _getter(self):
         """
         Return a function object suitable for the "get" side of the attribute
         property descriptor.
         """
+
         def get_attr_value(obj):
             attr_str_value = obj.get(self._clark_name)
             if attr_str_value is None:
                 raise InvalidXmlError(
-                    "required '%s' attribute not present on element %s" %
-                    (self._attr_name, obj.tag)
+                    "required '%s' attribute not present on element %s"
+                    % (self._attr_name, obj.tag)
                 )
             return self._simple_type.from_xml(attr_str_value)
+
         get_attr_value.__doc__ = self._docstring
         return get_attr_value
 
@@ -226,9 +241,9 @@ def _docstring(self):
         Return the string to use as the ``__doc__`` attribute of the property
         for this attribute.
         """
-        return (
-            '%s type-converted value of ``%s`` attribute.' %
-            (self._simple_type.__name__, self._attr_name)
+        return "%s type-converted value of ``%s`` attribute." % (
+            self._simple_type.__name__,
+            self._attr_name,
         )
 
     @property
@@ -237,9 +252,11 @@ def _setter(self):
         Return a function object suitable for the "set" side of the attribute
         property descriptor.
         """
+
         def set_attr_value(obj, value):
             str_value = self._simple_type.to_xml(value)
             obj.set(self._clark_name, str_value)
+
         return set_attr_value
 
 
@@ -248,6 +265,7 @@ class _BaseChildElement(object):
     Base class for the child element classes corresponding to varying
     cardinalities, such as ZeroOrOne and ZeroOrMore.
     """
+
     def __init__(self, nsptagname, successors=()):
         super(_BaseChildElement, self).__init__()
         self._nsptagname = nsptagname
@@ -266,6 +284,7 @@ def _add_adder(self):
         Add an ``_add_x()`` method to the element class for this child
         element.
         """
+
         def _add_child(obj, **attrs):
             new_method = getattr(obj, self._new_method_name)
             child = new_method()
@@ -276,8 +295,8 @@ def _add_child(obj, **attrs):
             return child
 
         _add_child.__doc__ = (
-            'Add a new ``<%s>`` child element unconditionally, inserted in t'
-            'he correct sequence.' % self._nsptagname
+            "Add a new ``<%s>`` child element unconditionally, inserted in t"
+            "he correct sequence." % self._nsptagname
         )
         self._add_to_class(self._add_method_name, _add_child)
 
@@ -289,7 +308,7 @@ def _add_creator(self):
         creator = self._creator
         creator.__doc__ = (
             'Return a "loose", newly created ``<%s>`` element having no attri'
-            'butes, text, or children.' % self._nsptagname
+            "butes, text, or children." % self._nsptagname
         )
         self._add_to_class(self._new_method_name, creator)
 
@@ -307,13 +326,14 @@ def _add_inserter(self):
         Add an ``_insert_x()`` method to the element class for this child
         element.
         """
+
         def _insert_child(obj, child):
             obj.insert_element_before(child, *self._successors)
             return child
 
         _insert_child.__doc__ = (
-            'Return the passed ``<%s>`` element after inserting it as a chil'
-            'd in the correct sequence.' % self._nsptagname
+            "Return the passed ``<%s>`` element after inserting it as a chil"
+            "d in the correct sequence." % self._nsptagname
         )
         self._add_to_class(self._insert_method_name, _insert_child)
 
@@ -322,26 +342,27 @@ def _add_list_getter(self):
         Add a read-only ``{prop_name}_lst`` property to the element class to
         retrieve a list of child elements matching this type.
         """
-        prop_name = '%s_lst' % self._prop_name
+        prop_name = "%s_lst" % self._prop_name
         property_ = property(self._list_getter, None, None)
         setattr(self._element_cls, prop_name, property_)
 
     @lazyproperty
     def _add_method_name(self):
-        return '_add_%s' % self._prop_name
+        return "_add_%s" % self._prop_name
 
     def _add_public_adder(self):
         """
         Add a public ``add_x()`` method to the parent element class.
         """
+
         def add_child(obj):
             private_add_method = getattr(obj, self._add_method_name)
             child = private_add_method()
             return child
 
         add_child.__doc__ = (
-            'Add a new ``<%s>`` child element unconditionally, inserted in t'
-            'he correct sequence.' % self._nsptagname
+            "Add a new ``<%s>`` child element unconditionally, inserted in t"
+            "he correct sequence." % self._nsptagname
         )
         self._add_to_class(self._public_add_method_name, add_child)
 
@@ -360,8 +381,10 @@ def _creator(self):
         Return a function object that creates a new, empty element of the
         right type, having no attributes.
         """
+
         def new_child_element(obj):
             return OxmlElement(self._nsptagname)
+
         return new_child_element
 
     @property
@@ -371,17 +394,18 @@ def _getter(self):
         descriptor. This default getter returns the child element with
         matching tag name or |None| if not present.
         """
+
         def get_child_element(obj):
             return obj.find(qn(self._nsptagname))
+
         get_child_element.__doc__ = (
-            '``<%s>`` child element or |None| if not present.'
-            % self._nsptagname
+            "``<%s>`` child element or |None| if not present." % self._nsptagname
         )
         return get_child_element
 
     @lazyproperty
     def _insert_method_name(self):
-        return '_insert_%s' % self._prop_name
+        return "_insert_%s" % self._prop_name
 
     @property
     def _list_getter(self):
@@ -389,11 +413,13 @@ def _list_getter(self):
         Return a function object suitable for the "get" side of a list
         property descriptor.
         """
+
         def get_child_element_list(obj):
             return obj.findall(qn(self._nsptagname))
+
         get_child_element_list.__doc__ = (
-            'A list containing each of the ``<%s>`` child elements, in the o'
-            'rder they appear.' % self._nsptagname
+            "A list containing each of the ``<%s>`` child elements, in the o"
+            "rder they appear." % self._nsptagname
         )
         return get_child_element_list
 
@@ -405,15 +431,15 @@ def _public_add_method_name(self):
         provide a friendlier API to clients having domain appropriate
         parameter names for required attributes.
         """
-        return 'add_%s' % self._prop_name
+        return "add_%s" % self._prop_name
 
     @lazyproperty
     def _remove_method_name(self):
-        return '_remove_%s' % self._prop_name
+        return "_remove_%s" % self._prop_name
 
     @lazyproperty
     def _new_method_name(self):
-        return '_new_%s' % self._prop_name
+        return "_new_%s" % self._prop_name
 
 
 class Choice(_BaseChildElement):
@@ -421,12 +447,12 @@ class Choice(_BaseChildElement):
     Defines a child element belonging to a group, only one of which may
     appear as a child.
     """
+
     @property
     def nsptagname(self):
         return self._nsptagname
 
-    def populate_class_members(
-            self, element_cls, group_prop_name, successors):
+    def populate_class_members(self, element_cls, group_prop_name, successors):
         """
         Add the appropriate methods to *element_cls*.
         """
@@ -445,50 +471,47 @@ def _add_get_or_change_to_method(self):
         Add a ``get_or_change_to_x()`` method to the element class for this
         child element.
         """
+
         def get_or_change_to_child(obj):
             child = getattr(obj, self._prop_name)
             if child is not None:
                 return child
-            remove_group_method = getattr(
-                obj, self._remove_group_method_name
-            )
+            remove_group_method = getattr(obj, self._remove_group_method_name)
             remove_group_method()
             add_method = getattr(obj, self._add_method_name)
             child = add_method()
             return child
 
         get_or_change_to_child.__doc__ = (
-            'Return the ``<%s>`` child, replacing any other group element if'
-            ' found.'
+            "Return the ``<%s>`` child, replacing any other group element if" " found."
         ) % self._nsptagname
-        self._add_to_class(
-            self._get_or_change_to_method_name, get_or_change_to_child
-        )
+        self._add_to_class(self._get_or_change_to_method_name, get_or_change_to_child)
 
     @property
     def _prop_name(self):
         """
         Calculate property name from tag name, e.g. a:schemeClr -> schemeClr.
         """
-        if ':' in self._nsptagname:
-            start = self._nsptagname.index(':') + 1
+        if ":" in self._nsptagname:
+            start = self._nsptagname.index(":") + 1
         else:
             start = 0
         return self._nsptagname[start:]
 
     @lazyproperty
     def _get_or_change_to_method_name(self):
-        return 'get_or_change_to_%s' % self._prop_name
+        return "get_or_change_to_%s" % self._prop_name
 
     @lazyproperty
     def _remove_group_method_name(self):
-        return '_remove_%s' % self._group_prop_name
+        return "_remove_%s" % self._group_prop_name
 
 
 class OneAndOnlyOne(_BaseChildElement):
     """
     Defines a required child element for MetaOxmlElement.
     """
+
     def __init__(self, nsptagname):
         super(OneAndOnlyOne, self).__init__(nsptagname, None)
 
@@ -496,9 +519,7 @@ def populate_class_members(self, element_cls, prop_name):
         """
         Add the appropriate methods to *element_cls*.
         """
-        super(OneAndOnlyOne, self).populate_class_members(
-            element_cls, prop_name
-        )
+        super(OneAndOnlyOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
 
     @property
@@ -507,18 +528,17 @@ def _getter(self):
         Return a function object suitable for the "get" side of the property
         descriptor.
         """
+
         def get_child_element(obj):
             child = obj.find(qn(self._nsptagname))
             if child is None:
                 raise InvalidXmlError(
-                    "required ``<%s>`` child element not present" %
-                    self._nsptagname
+                    "required ``<%s>`` child element not present" % self._nsptagname
                 )
             return child
 
         get_child_element.__doc__ = (
-            'Required ``<%s>`` child element.'
-            % self._nsptagname
+            "Required ``<%s>`` child element." % self._nsptagname
         )
         return get_child_element
 
@@ -528,13 +548,12 @@ class OneOrMore(_BaseChildElement):
     Defines a repeating child element for MetaOxmlElement that must appear at
     least once.
     """
+
     def populate_class_members(self, element_cls, prop_name):
         """
         Add the appropriate methods to *element_cls*.
         """
-        super(OneOrMore, self).populate_class_members(
-            element_cls, prop_name
-        )
+        super(OneOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
         self._add_creator()
         self._add_inserter()
@@ -547,13 +566,12 @@ class ZeroOrMore(_BaseChildElement):
     """
     Defines an optional repeating child element for MetaOxmlElement.
     """
+
     def populate_class_members(self, element_cls, prop_name):
         """
         Add the appropriate methods to *element_cls*.
         """
-        super(ZeroOrMore, self).populate_class_members(
-            element_cls, prop_name
-        )
+        super(ZeroOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
         self._add_creator()
         self._add_inserter()
@@ -566,6 +584,7 @@ class ZeroOrOne(_BaseChildElement):
     """
     Defines an optional child element for MetaOxmlElement.
     """
+
     def populate_class_members(self, element_cls, prop_name):
         """
         Add the appropriate methods to *element_cls*.
@@ -583,14 +602,16 @@ def _add_get_or_adder(self):
         Add a ``get_or_add_x()`` method to the element class for this
         child element.
         """
+
         def get_or_add_child(obj):
             child = getattr(obj, self._prop_name)
             if child is None:
                 add_method = getattr(obj, self._add_method_name)
                 child = add_method()
             return child
+
         get_or_add_child.__doc__ = (
-            'Return the ``<%s>`` child element, newly added if not present.'
+            "Return the ``<%s>`` child element, newly added if not present."
         ) % self._nsptagname
         self._add_to_class(self._get_or_add_method_name, get_or_add_child)
 
@@ -599,16 +620,18 @@ def _add_remover(self):
         Add a ``_remove_x()`` method to the element class for this child
         element.
         """
+
         def _remove_child(obj):
             obj.remove_all(self._nsptagname)
+
         _remove_child.__doc__ = (
-            'Remove all ``<%s>`` child elements.'
+            "Remove all ``<%s>`` child elements."
         ) % self._nsptagname
         self._add_to_class(self._remove_method_name, _remove_child)
 
     @lazyproperty
     def _get_or_add_method_name(self):
-        return 'get_or_add_%s' % self._prop_name
+        return "get_or_add_%s" % self._prop_name
 
 
 class ZeroOrOneChoice(_BaseChildElement):
@@ -616,6 +639,7 @@ class ZeroOrOneChoice(_BaseChildElement):
     Correspondes to an ``EG_*`` element group where at most one of its
     members may appear as a child.
     """
+
     def __init__(self, choices, successors=()):
         self._choices = choices
         self._successors = successors
@@ -624,9 +648,7 @@ def populate_class_members(self, element_cls, prop_name):
         """
         Add the appropriate methods to *element_cls*.
         """
-        super(ZeroOrOneChoice, self).populate_class_members(
-            element_cls, prop_name
-        )
+        super(ZeroOrOneChoice, self).populate_class_members(element_cls, prop_name)
         self._add_choice_getter()
         for choice in self._choices:
             choice.populate_class_members(
@@ -649,16 +671,15 @@ def _add_group_remover(self):
         Add a ``_remove_eg_x()`` method to the element class for this choice
         group.
         """
+
         def _remove_choice_group(obj):
             for tagname in self._member_nsptagnames:
                 obj.remove_all(tagname)
 
         _remove_choice_group.__doc__ = (
-            'Remove the current choice group child element if present.'
-        )
-        self._add_to_class(
-            self._remove_choice_group_method_name, _remove_choice_group
+            "Remove the current choice group child element if present."
         )
+        self._add_to_class(self._remove_choice_group_method_name, _remove_choice_group)
 
     @property
     def _choice_getter(self):
@@ -666,11 +687,13 @@ def _choice_getter(self):
         Return a function object suitable for the "get" side of the property
         descriptor.
         """
+
         def get_group_member_element(obj):
             return obj.first_child_found_in(*self._member_nsptagnames)
+
         get_group_member_element.__doc__ = (
-            'Return the child element belonging to this element group, or '
-            '|None| if no member child is present.'
+            "Return the child element belonging to this element group, or "
+            "|None| if no member child is present."
         )
         return get_group_member_element
 
@@ -684,7 +707,7 @@ def _member_nsptagnames(self):
 
     @lazyproperty
     def _remove_choice_group_method_name(self):
-        return '_remove_%s' % self._prop_name
+        return "_remove_%s" % self._prop_name
 
 
 class _OxmlElementBase(etree.ElementBase):
@@ -699,7 +722,9 @@ class _OxmlElementBase(etree.ElementBase):
 
     def __repr__(self):
         return "<%s '<%s>' at 0x%0x>" % (
-            self.__class__.__name__, self._nsptag, id(self)
+            self.__class__.__name__,
+            self._nsptag,
+            id(self),
         )
 
     def first_child_found_in(self, *tagnames):
@@ -745,9 +770,7 @@ def xpath(self, xpath_str):
         Override of ``lxml`` _Element.xpath() method to provide standard Open
         XML namespace mapping (``nsmap``) in centralized location.
         """
-        return super(BaseOxmlElement, self).xpath(
-            xpath_str, namespaces=nsmap
-        )
+        return super(BaseOxmlElement, self).xpath(xpath_str, namespaces=nsmap)
 
     @property
     def _nsptag(self):
@@ -755,5 +778,5 @@ def _nsptag(self):
 
 
 BaseOxmlElement = MetaOxmlElement(
-    'BaseOxmlElement', (etree.ElementBase,), dict(_OxmlElementBase.__dict__)
+    "BaseOxmlElement", (etree.ElementBase,), dict(_OxmlElementBase.__dict__)
 )
diff --git a/docx/package.py b/docx/package.py
index 9f5ccc667..07f0718a2 100644
--- a/docx/package.py
+++ b/docx/package.py
@@ -104,10 +104,12 @@ def _next_image_partname(self, ext):
         partname is unique by number, without regard to the extension. *ext*
         does not include the leading period.
         """
+
         def image_partname(n):
-            return PackURI('/word/media/image%d.%s' % (n, ext))
+            return PackURI("/word/media/image%d.%s" % (n, ext))
+
         used_numbers = [image_part.partname.idx for image_part in self]
-        for n in range(1, len(self)+1):
+        for n in range(1, len(self) + 1):
             if n not in used_numbers:
                 return image_partname(n)
-        return image_partname(len(self)+1)
+        return image_partname(len(self) + 1)
diff --git a/docx/parts/hdrftr.py b/docx/parts/hdrftr.py
index 549805b2a..22ea874a0 100644
--- a/docx/parts/hdrftr.py
+++ b/docx/parts/hdrftr.py
@@ -26,9 +26,9 @@ def new(cls, package):
     def _default_footer_xml(cls):
         """Return bytes containing XML for a default footer part."""
         path = os.path.join(
-            os.path.split(__file__)[0], '..', 'templates', 'default-footer.xml'
+            os.path.split(__file__)[0], "..", "templates", "default-footer.xml"
         )
-        with open(path, 'rb') as f:
+        with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
 
@@ -48,8 +48,8 @@ def new(cls, package):
     def _default_header_xml(cls):
         """Return bytes containing XML for a default header part."""
         path = os.path.join(
-            os.path.split(__file__)[0], '..', 'templates', 'default-header.xml'
+            os.path.split(__file__)[0], "..", "templates", "default-header.xml"
         )
-        with open(path, 'rb') as f:
+        with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
diff --git a/docx/parts/image.py b/docx/parts/image.py
index 6ece20d80..a235b465f 100644
--- a/docx/parts/image.py
+++ b/docx/parts/image.py
@@ -4,9 +4,7 @@
 The proxy class for an image part, and related objects.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import hashlib
 
@@ -20,6 +18,7 @@ class ImagePart(Part):
     An image part. Corresponds to the target part of a relationship with type
     RELATIONSHIP_TYPE.IMAGE.
     """
+
     def __init__(self, partname, content_type, blob, image=None):
         super(ImagePart, self).__init__(partname, content_type, blob)
         self._image = image
@@ -57,7 +56,7 @@ def filename(self):
         """
         if self._image is not None:
             return self._image.filename
-        return 'image.%s' % self.partname.ext
+        return "image.%s" % self.partname.ext
 
     @classmethod
     def from_image(cls, image, partname):
diff --git a/docx/parts/numbering.py b/docx/parts/numbering.py
index e324c5aac..8bcd271a3 100644
--- a/docx/parts/numbering.py
+++ b/docx/parts/numbering.py
@@ -4,9 +4,7 @@
 |NumberingPart| and closely related objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..opc.part import XmlPart
 from ..shared import lazyproperty
@@ -17,6 +15,7 @@ class NumberingPart(XmlPart):
     Proxy for the numbering.xml part containing numbering definitions for
     a document or glossary.
     """
+
     @classmethod
     def new(cls):
         """
@@ -39,6 +38,7 @@ class _NumberingDefinitions(object):
     Collection of |_NumberingDefinition| instances corresponding to the
     ``<w:num>`` elements in a numbering part.
     """
+
     def __init__(self, numbering_elm):
         super(_NumberingDefinitions, self).__init__()
         self._numbering = numbering_elm
diff --git a/docx/parts/settings.py b/docx/parts/settings.py
index a701b1726..e0f751b34 100644
--- a/docx/parts/settings.py
+++ b/docx/parts/settings.py
@@ -4,9 +4,7 @@
 |SettingsPart| and closely related objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
 
@@ -21,13 +19,14 @@ class SettingsPart(XmlPart):
     """
     Document-level settings part of a WordprocessingML (WML) package.
     """
+
     @classmethod
     def default(cls, package):
         """
         Return a newly created settings part, containing a default
         `w:settings` element tree.
         """
-        partname = PackURI('/word/settings.xml')
+        partname = PackURI("/word/settings.xml")
         content_type = CT.WML_SETTINGS
         element = parse_xml(cls._default_settings_xml())
         return cls(partname, content_type, element, package)
@@ -46,9 +45,8 @@ def _default_settings_xml(cls):
         Return a bytestream containing XML for a default settings part.
         """
         path = os.path.join(
-            os.path.split(__file__)[0], '..', 'templates',
-            'default-settings.xml'
+            os.path.split(__file__)[0], "..", "templates", "default-settings.xml"
         )
-        with open(path, 'rb') as f:
+        with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
diff --git a/docx/parts/story.py b/docx/parts/story.py
index 129b8f1cc..49cfa396b 100644
--- a/docx/parts/story.py
+++ b/docx/parts/story.py
@@ -66,7 +66,7 @@ def next_id(self):
         the existing id sequence are not filled. The id attribute value is unique in the
         document, without regard to the element type it appears on.
         """
-        id_str_lst = self._element.xpath('//@id')
+        id_str_lst = self._element.xpath("//@id")
         used_ids = [int(id_str) for id_str in id_str_lst if id_str.isdigit()]
         if not used_ids:
             return 1
diff --git a/docx/parts/styles.py b/docx/parts/styles.py
index 00c7cb3c3..a16b4188f 100644
--- a/docx/parts/styles.py
+++ b/docx/parts/styles.py
@@ -4,9 +4,7 @@
 Provides StylesPart and related objects
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
 
@@ -22,13 +20,14 @@ class StylesPart(XmlPart):
     Proxy for the styles.xml part containing style definitions for a document
     or glossary.
     """
+
     @classmethod
     def default(cls, package):
         """
         Return a newly created styles part, containing a default set of
         elements.
         """
-        partname = PackURI('/word/styles.xml')
+        partname = PackURI("/word/styles.xml")
         content_type = CT.WML_STYLES
         element = parse_xml(cls._default_styles_xml())
         return cls(partname, content_type, element, package)
@@ -47,9 +46,8 @@ def _default_styles_xml(cls):
         Return a bytestream containing XML for a default styles part.
         """
         path = os.path.join(
-            os.path.split(__file__)[0], '..', 'templates',
-            'default-styles.xml'
+            os.path.split(__file__)[0], "..", "templates", "default-styles.xml"
         )
-        with open(path, 'rb') as f:
+        with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
diff --git a/docx/shape.py b/docx/shape.py
index e4f885d73..036118d46 100644
--- a/docx/shape.py
+++ b/docx/shape.py
@@ -5,9 +5,7 @@
 a document.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from .enum.shape import WD_INLINE_SHAPE
 from .oxml.ns import nsmap
@@ -19,6 +17,7 @@ class InlineShapes(Parented):
     Sequence of |InlineShape| instances, supporting len(), iteration, and
     indexed access.
     """
+
     def __init__(self, body_elm, parent):
         super(InlineShapes, self).__init__(parent)
         self._body = body_elm
@@ -43,7 +42,7 @@ def __len__(self):
     @property
     def _inline_lst(self):
         body = self._body
-        xpath = '//w:p/w:r/w:drawing/wp:inline'
+        xpath = "//w:p/w:r/w:drawing/wp:inline"
         return body.xpath(xpath)
 
 
@@ -52,6 +51,7 @@ class InlineShape(object):
     Proxy for an ``<wp:inline>`` element, representing the container for an
     inline graphical object.
     """
+
     def __init__(self, inline):
         super(InlineShape, self).__init__()
         self._inline = inline
@@ -78,14 +78,14 @@ def type(self):
         """
         graphicData = self._inline.graphic.graphicData
         uri = graphicData.uri
-        if uri == nsmap['pic']:
+        if uri == nsmap["pic"]:
             blip = graphicData.pic.blipFill.blip
             if blip.link is not None:
                 return WD_INLINE_SHAPE.LINKED_PICTURE
             return WD_INLINE_SHAPE.PICTURE
-        if uri == nsmap['c']:
+        if uri == nsmap["c"]:
             return WD_INLINE_SHAPE.CHART
-        if uri == nsmap['dgm']:
+        if uri == nsmap["dgm"]:
             return WD_INLINE_SHAPE.SMART_ART
         return WD_INLINE_SHAPE.NOT_IMPLEMENTED
 
diff --git a/docx/shared.py b/docx/shared.py
index 919964325..ea855a21c 100644
--- a/docx/shared.py
+++ b/docx/shared.py
@@ -14,6 +14,7 @@ class Length(int):
     36,000 to the mm. Provides convenience unit conversion methods in the form
     of read-only properties. Immutable.
     """
+
     _EMUS_PER_INCH = 914400
     _EMUS_PER_CM = 360000
     _EMUS_PER_MM = 36000
@@ -71,6 +72,7 @@ class Inches(Length):
     Convenience constructor for length in inches, e.g.
     ``width = Inches(0.5)``.
     """
+
     def __new__(cls, inches):
         emu = int(inches * Length._EMUS_PER_INCH)
         return Length.__new__(cls, emu)
@@ -81,6 +83,7 @@ class Cm(Length):
     Convenience constructor for length in centimeters, e.g.
     ``height = Cm(12)``.
     """
+
     def __new__(cls, cm):
         emu = int(cm * Length._EMUS_PER_CM)
         return Length.__new__(cls, emu)
@@ -91,6 +94,7 @@ class Emu(Length):
     Convenience constructor for length in English Metric Units, e.g.
     ``width = Emu(457200)``.
     """
+
     def __new__(cls, emu):
         return Length.__new__(cls, int(emu))
 
@@ -100,6 +104,7 @@ class Mm(Length):
     Convenience constructor for length in millimeters, e.g.
     ``width = Mm(240.5)``.
     """
+
     def __new__(cls, mm):
         emu = int(mm * Length._EMUS_PER_MM)
         return Length.__new__(cls, emu)
@@ -109,6 +114,7 @@ class Pt(Length):
     """
     Convenience value class for specifying a length in points
     """
+
     def __new__(cls, points):
         emu = int(points * Length._EMUS_PER_PT)
         return Length.__new__(cls, emu)
@@ -119,6 +125,7 @@ class Twips(Length):
     Convenience constructor for length in twips, e.g. ``width = Twips(42)``.
     A twip is a twentieth of a point, 635 EMU.
     """
+
     def __new__(cls, twips):
         emu = int(twips * Length._EMUS_PER_TWIP)
         return Length.__new__(cls, emu)
@@ -128,21 +135,22 @@ class RGBColor(tuple):
     """
     Immutable value object defining a particular RGB color.
     """
+
     def __new__(cls, r, g, b):
-        msg = 'RGBColor() takes three integer values 0-255'
+        msg = "RGBColor() takes three integer values 0-255"
         for val in (r, g, b):
             if not isinstance(val, int) or val < 0 or val > 255:
                 raise ValueError(msg)
         return super(RGBColor, cls).__new__(cls, (r, g, b))
 
     def __repr__(self):
-        return 'RGBColor(0x%02x, 0x%02x, 0x%02x)' % self
+        return "RGBColor(0x%02x, 0x%02x, 0x%02x)" % self
 
     def __str__(self):
         """
         Return a hex string rgb value, like '3C2F80'
         """
-        return '%02X%02X%02X' % self
+        return "%02X%02X%02X" % self
 
     @classmethod
     def from_string(cls, rgb_hex_str):
@@ -161,7 +169,7 @@ def lazyproperty(f):
     to calculate a cached property value. After that, the cached value is
     returned.
     """
-    cache_attr_name = '_%s' % f.__name__  # like '_foobar' for prop 'foobar'
+    cache_attr_name = "_%s" % f.__name__  # like '_foobar' for prop 'foobar'
     docstring = f.__doc__
 
     def get_prop_value(obj):
@@ -193,7 +201,7 @@ class ElementProxy(object):
     type of class in python-docx other than custom element (oxml) classes.
     """
 
-    __slots__ = ('_element', '_parent')
+    __slots__ = ("_element", "_parent")
 
     def __init__(self, element, parent=None):
         self._element = element
@@ -238,6 +246,7 @@ class Parented(object):
     such as add or drop a relationship. Provides ``self._parent`` attribute
     to subclasses.
     """
+
     def __init__(self, parent):
         super(Parented, self).__init__()
         self._parent = parent
diff --git a/docx/styles/__init__.py b/docx/styles/__init__.py
index 63ebaa2b6..61d011d38 100644
--- a/docx/styles/__init__.py
+++ b/docx/styles/__init__.py
@@ -4,9 +4,7 @@
 Sub-package module for docx.styles sub-package.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 
 class BabelFish(object):
@@ -16,18 +14,18 @@ class BabelFish(object):
     """
 
     style_aliases = (
-        ('Caption', 'caption'),
-        ('Footer', 'footer'),
-        ('Header', 'header'),
-        ('Heading 1', 'heading 1'),
-        ('Heading 2', 'heading 2'),
-        ('Heading 3', 'heading 3'),
-        ('Heading 4', 'heading 4'),
-        ('Heading 5', 'heading 5'),
-        ('Heading 6', 'heading 6'),
-        ('Heading 7', 'heading 7'),
-        ('Heading 8', 'heading 8'),
-        ('Heading 9', 'heading 9'),
+        ("Caption", "caption"),
+        ("Footer", "footer"),
+        ("Header", "header"),
+        ("Heading 1", "heading 1"),
+        ("Heading 2", "heading 2"),
+        ("Heading 3", "heading 3"),
+        ("Heading 4", "heading 4"),
+        ("Heading 5", "heading 5"),
+        ("Heading 6", "heading 6"),
+        ("Heading 7", "heading 7"),
+        ("Heading 8", "heading 8"),
+        ("Heading 9", "heading 9"),
     )
 
     internal_style_names = dict(style_aliases)
@@ -47,6 +45,4 @@ def internal2ui(cls, internal_style_name):
         Return the user interface style name corresponding to
         *internal_style_name*, such as 'Heading 1' for 'heading 1'.
         """
-        return cls.ui_style_names.get(
-            internal_style_name, internal_style_name
-        )
+        return cls.ui_style_names.get(internal_style_name, internal_style_name)
diff --git a/docx/styles/latent.py b/docx/styles/latent.py
index 99b1514ff..6f723692b 100644
--- a/docx/styles/latent.py
+++ b/docx/styles/latent.py
@@ -4,9 +4,7 @@
 Latent style-related objects.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from . import BabelFish
 from ..shared import ElementProxy
@@ -67,11 +65,11 @@ def default_to_hidden(self):
         to be hidden. A hidden style does not appear in the recommended list
         or in the style gallery.
         """
-        return self._element.bool_prop('defSemiHidden')
+        return self._element.bool_prop("defSemiHidden")
 
     @default_to_hidden.setter
     def default_to_hidden(self, value):
-        self._element.set_bool_prop('defSemiHidden', value)
+        self._element.set_bool_prop("defSemiHidden", value)
 
     @property
     def default_to_locked(self):
@@ -82,11 +80,11 @@ def default_to_locked(self):
         behavior is only active when formatting protection is turned on for
         the document (via the Developer menu).
         """
-        return self._element.bool_prop('defLockedState')
+        return self._element.bool_prop("defLockedState")
 
     @default_to_locked.setter
     def default_to_locked(self, value):
-        self._element.set_bool_prop('defLockedState', value)
+        self._element.set_bool_prop("defLockedState", value)
 
     @property
     def default_to_quick_style(self):
@@ -94,11 +92,11 @@ def default_to_quick_style(self):
         Boolean specifying whether the default behavior for latent styles is
         to appear in the style gallery when not hidden.
         """
-        return self._element.bool_prop('defQFormat')
+        return self._element.bool_prop("defQFormat")
 
     @default_to_quick_style.setter
     def default_to_quick_style(self, value):
-        self._element.set_bool_prop('defQFormat', value)
+        self._element.set_bool_prop("defQFormat", value)
 
     @property
     def default_to_unhide_when_used(self):
@@ -106,11 +104,11 @@ def default_to_unhide_when_used(self):
         Boolean specifying whether the default behavior for latent styles is
         to be unhidden when first applied to content.
         """
-        return self._element.bool_prop('defUnhideWhenUsed')
+        return self._element.bool_prop("defUnhideWhenUsed")
 
     @default_to_unhide_when_used.setter
     def default_to_unhide_when_used(self, value):
-        self._element.set_bool_prop('defUnhideWhenUsed', value)
+        self._element.set_bool_prop("defUnhideWhenUsed", value)
 
     @property
     def load_count(self):
@@ -155,11 +153,11 @@ def hidden(self):
         the recommended list. |None| indicates the effective value is
         inherited from the parent ``<w:latentStyles>`` element.
         """
-        return self._element.on_off_prop('semiHidden')
+        return self._element.on_off_prop("semiHidden")
 
     @hidden.setter
     def hidden(self, value):
-        self._element.set_on_off_prop('semiHidden', value)
+        self._element.set_on_off_prop("semiHidden", value)
 
     @property
     def locked(self):
@@ -170,11 +168,11 @@ def locked(self):
         only active when formatting protection is turned on for the document
         (via the Developer menu).
         """
-        return self._element.on_off_prop('locked')
+        return self._element.on_off_prop("locked")
 
     @locked.setter
     def locked(self, value):
-        self._element.set_on_off_prop('locked', value)
+        self._element.set_on_off_prop("locked", value)
 
     @property
     def name(self):
@@ -202,11 +200,11 @@ def quick_style(self):
         effective value should be inherited from the default values in its
         parent |LatentStyles| object.
         """
-        return self._element.on_off_prop('qFormat')
+        return self._element.on_off_prop("qFormat")
 
     @quick_style.setter
     def quick_style(self, value):
-        self._element.set_on_off_prop('qFormat', value)
+        self._element.set_on_off_prop("qFormat", value)
 
     @property
     def unhide_when_used(self):
@@ -217,8 +215,8 @@ def unhide_when_used(self):
         inherited from the default specified by its parent |LatentStyles|
         object.
         """
-        return self._element.on_off_prop('unhideWhenUsed')
+        return self._element.on_off_prop("unhideWhenUsed")
 
     @unhide_when_used.setter
     def unhide_when_used(self, value):
-        self._element.set_on_off_prop('unhideWhenUsed', value)
+        self._element.set_on_off_prop("unhideWhenUsed", value)
diff --git a/docx/styles/style.py b/docx/styles/style.py
index 24371b231..ff63a819b 100644
--- a/docx/styles/style.py
+++ b/docx/styles/style.py
@@ -4,9 +4,7 @@
 Style object hierarchy.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from . import BabelFish
 from ..enum.style import WD_STYLE_TYPE
@@ -23,8 +21,8 @@ def StyleFactory(style_elm):
     style_cls = {
         WD_STYLE_TYPE.PARAGRAPH: _ParagraphStyle,
         WD_STYLE_TYPE.CHARACTER: _CharacterStyle,
-        WD_STYLE_TYPE.TABLE:     _TableStyle,
-        WD_STYLE_TYPE.LIST:      _NumberingStyle
+        WD_STYLE_TYPE.TABLE: _TableStyle,
+        WD_STYLE_TYPE.LIST: _NumberingStyle,
     }[style_elm.type]
 
     return style_cls(style_elm)
@@ -211,7 +209,7 @@ class _ParagraphStyle(_CharacterStyle):
     __slots__ = ()
 
     def __repr__(self):
-        return '_ParagraphStyle(\'%s\') id: %s' % (self.name, id(self))
+        return "_ParagraphStyle('%s') id: %s" % (self.name, id(self))
 
     @property
     def next_paragraph_style(self):
@@ -254,7 +252,7 @@ class _TableStyle(_ParagraphStyle):
     __slots__ = ()
 
     def __repr__(self):
-        return '_TableStyle(\'%s\') id: %s' % (self.name, id(self))
+        return "_TableStyle('%s') id: %s" % (self.name, id(self))
 
 
 class _NumberingStyle(BaseStyle):
diff --git a/docx/styles/styles.py b/docx/styles/styles.py
index f9f1cd2fb..d09fbd137 100644
--- a/docx/styles/styles.py
+++ b/docx/styles/styles.py
@@ -44,8 +44,8 @@ def __getitem__(self, key):
         style_elm = self._element.get_by_id(key)
         if style_elm is not None:
             msg = (
-                'style lookup by style_id is deprecated. Use style name as '
-                'key instead.'
+                "style lookup by style_id is deprecated. Use style name as "
+                "key instead."
             )
             warn(msg, UserWarning, stacklevel=2)
             return StyleFactory(style_elm)
@@ -67,9 +67,7 @@ def add_style(self, name, style_type, builtin=False):
         style_name = BabelFish.ui2internal(name)
         if style_name in self:
             raise ValueError("document already contains style '%s'" % name)
-        style = self._element.add_style_of_type(
-            style_name, style_type, builtin
-        )
+        style = self._element.add_style_of_type(style_name, style_type, builtin)
         return StyleFactory(style)
 
     def default(self, style_type):
@@ -145,8 +143,7 @@ def _get_style_id_from_style(self, style, style_type):
         """
         if style.type != style_type:
             raise ValueError(
-                "assigned style is type %s, need type %s" %
-                (style.type, style_type)
+                "assigned style is type %s, need type %s" % (style.type, style_type)
             )
         if style == self.default(style_type):
             return None
diff --git a/docx/table.py b/docx/table.py
index b3bc090fb..bd4e1e277 100644
--- a/docx/table.py
+++ b/docx/table.py
@@ -16,6 +16,7 @@ class Table(Parented):
     """
     Proxy class for a WordprocessingML ``<w:tbl>`` element.
     """
+
     def __init__(self, tbl, parent):
         super(Table, self).__init__(parent)
         self._element = self._tbl = tbl
@@ -130,9 +131,7 @@ def style(self):
 
     @style.setter
     def style(self, style_or_name):
-        style_id = self.part.get_style_id(
-            style_or_name, WD_STYLE_TYPE.TABLE
-        )
+        style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.TABLE)
         self._tbl.tblStyle_val = style_id
 
     @property
@@ -196,7 +195,7 @@ def __init__(self, tc, parent):
         super(_Cell, self).__init__(tc, parent)
         self._tc = self._element = tc
 
-    def add_paragraph(self, text='', style=None):
+    def add_paragraph(self, text="", style=None):
         """
         Return a paragraph newly added to the end of the content in this
         cell. If present, *text* is added to the paragraph in a single run.
@@ -255,7 +254,7 @@ def text(self):
         a string to this property replaces all existing content with a single
         paragraph containing the assigned text in a single run.
         """
-        return '\n'.join(p.text for p in self.paragraphs)
+        return "\n".join(p.text for p in self.paragraphs)
 
     @text.setter
     def text(self, text):
@@ -303,6 +302,7 @@ class _Column(Parented):
     """
     Table column
     """
+
     def __init__(self, gridCol, parent):
         super(_Column, self).__init__(parent)
         self._gridCol = gridCol
@@ -346,6 +346,7 @@ class _Columns(Parented):
     Sequence of |_Column| instances corresponding to the columns in a table.
     Supports ``len()``, iteration and indexed access.
     """
+
     def __init__(self, tbl, parent):
         super(_Columns, self).__init__(parent)
         self._tbl = tbl
@@ -389,6 +390,7 @@ class _Row(Parented):
     """
     Table row
     """
+
     def __init__(self, tr, parent):
         super(_Row, self).__init__(parent)
         self._tr = self._element = tr
@@ -445,6 +447,7 @@ class _Rows(Parented):
     Sequence of |_Row| objects corresponding to the rows in a table.
     Supports ``len()``, iteration, indexed access, and slicing.
     """
+
     def __init__(self, tbl, parent):
         super(_Rows, self).__init__(parent)
         self._tbl = tbl
diff --git a/docx/text/font.py b/docx/text/font.py
index 162832101..5a88e8af5 100644
--- a/docx/text/font.py
+++ b/docx/text/font.py
@@ -4,9 +4,7 @@
 Font-related proxy objects.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..dml.color import ColorFormat
 from ..shared import ElementProxy
@@ -26,22 +24,22 @@ def all_caps(self):
         """
         Read/write. Causes text in this font to appear in capital letters.
         """
-        return self._get_bool_prop('caps')
+        return self._get_bool_prop("caps")
 
     @all_caps.setter
     def all_caps(self, value):
-        self._set_bool_prop('caps', value)
+        self._set_bool_prop("caps", value)
 
     @property
     def bold(self):
         """
         Read/write. Causes text in this font to appear in bold.
         """
-        return self._get_bool_prop('b')
+        return self._get_bool_prop("b")
 
     @bold.setter
     def bold(self, value):
-        self._set_bool_prop('b', value)
+        self._set_bool_prop("b", value)
 
     @property
     def color(self):
@@ -58,11 +56,11 @@ def complex_script(self):
         run to be treated as complex script regardless of their Unicode
         values.
         """
-        return self._get_bool_prop('cs')
+        return self._get_bool_prop("cs")
 
     @complex_script.setter
     def complex_script(self, value):
-        self._set_bool_prop('cs', value)
+        self._set_bool_prop("cs", value)
 
     @property
     def cs_bold(self):
@@ -70,11 +68,11 @@ def cs_bold(self):
         Read/write tri-state value. When |True|, causes the complex script
         characters in the run to be displayed in bold typeface.
         """
-        return self._get_bool_prop('bCs')
+        return self._get_bool_prop("bCs")
 
     @cs_bold.setter
     def cs_bold(self, value):
-        self._set_bool_prop('bCs', value)
+        self._set_bool_prop("bCs", value)
 
     @property
     def cs_italic(self):
@@ -82,11 +80,11 @@ def cs_italic(self):
         Read/write tri-state value. When |True|, causes the complex script
         characters in the run to be displayed in italic typeface.
         """
-        return self._get_bool_prop('iCs')
+        return self._get_bool_prop("iCs")
 
     @cs_italic.setter
     def cs_italic(self, value):
-        self._set_bool_prop('iCs', value)
+        self._set_bool_prop("iCs", value)
 
     @property
     def double_strike(self):
@@ -94,11 +92,11 @@ def double_strike(self):
         Read/write tri-state value. When |True|, causes the text in the run
         to appear with double strikethrough.
         """
-        return self._get_bool_prop('dstrike')
+        return self._get_bool_prop("dstrike")
 
     @double_strike.setter
     def double_strike(self, value):
-        self._set_bool_prop('dstrike', value)
+        self._set_bool_prop("dstrike", value)
 
     @property
     def emboss(self):
@@ -106,11 +104,11 @@ def emboss(self):
         Read/write tri-state value. When |True|, causes the text in the run
         to appear as if raised off the page in relief.
         """
-        return self._get_bool_prop('emboss')
+        return self._get_bool_prop("emboss")
 
     @emboss.setter
     def emboss(self, value):
-        self._set_bool_prop('emboss', value)
+        self._set_bool_prop("emboss", value)
 
     @property
     def hidden(self):
@@ -119,11 +117,11 @@ def hidden(self):
         to be hidden from display, unless applications settings force hidden
         text to be shown.
         """
-        return self._get_bool_prop('vanish')
+        return self._get_bool_prop("vanish")
 
     @hidden.setter
     def hidden(self, value):
-        self._set_bool_prop('vanish', value)
+        self._set_bool_prop("vanish", value)
 
     @property
     def highlight_color(self):
@@ -148,11 +146,11 @@ def italic(self):
         to appear in italics. |None| indicates the effective value is
         inherited from the style hierarchy.
         """
-        return self._get_bool_prop('i')
+        return self._get_bool_prop("i")
 
     @italic.setter
     def italic(self, value):
-        self._set_bool_prop('i', value)
+        self._set_bool_prop("i", value)
 
     @property
     def imprint(self):
@@ -160,11 +158,11 @@ def imprint(self):
         Read/write tri-state value. When |True|, causes the text in the run
         to appear as if pressed into the page.
         """
-        return self._get_bool_prop('imprint')
+        return self._get_bool_prop("imprint")
 
     @imprint.setter
     def imprint(self, value):
-        self._set_bool_prop('imprint', value)
+        self._set_bool_prop("imprint", value)
 
     @property
     def math(self):
@@ -172,11 +170,11 @@ def math(self):
         Read/write tri-state value. When |True|, specifies this run contains
         WML that should be handled as though it was Office Open XML Math.
         """
-        return self._get_bool_prop('oMath')
+        return self._get_bool_prop("oMath")
 
     @math.setter
     def math(self, value):
-        self._set_bool_prop('oMath', value)
+        self._set_bool_prop("oMath", value)
 
     @property
     def name(self):
@@ -204,11 +202,11 @@ def no_proof(self):
         of this run should not report any errors when the document is scanned
         for spelling and grammar.
         """
-        return self._get_bool_prop('noProof')
+        return self._get_bool_prop("noProof")
 
     @no_proof.setter
     def no_proof(self, value):
-        self._set_bool_prop('noProof', value)
+        self._set_bool_prop("noProof", value)
 
     @property
     def outline(self):
@@ -217,11 +215,11 @@ def outline(self):
         run to appear as if they have an outline, by drawing a one pixel wide
         border around the inside and outside borders of each character glyph.
         """
-        return self._get_bool_prop('outline')
+        return self._get_bool_prop("outline")
 
     @outline.setter
     def outline(self, value):
-        self._set_bool_prop('outline', value)
+        self._set_bool_prop("outline", value)
 
     @property
     def rtl(self):
@@ -229,11 +227,11 @@ def rtl(self):
         Read/write tri-state value. When |True| causes the text in the run
         to have right-to-left characteristics.
         """
-        return self._get_bool_prop('rtl')
+        return self._get_bool_prop("rtl")
 
     @rtl.setter
     def rtl(self, value):
-        self._set_bool_prop('rtl', value)
+        self._set_bool_prop("rtl", value)
 
     @property
     def shadow(self):
@@ -241,11 +239,11 @@ def shadow(self):
         Read/write tri-state value. When |True| causes the text in the run
         to appear as if each character has a shadow.
         """
-        return self._get_bool_prop('shadow')
+        return self._get_bool_prop("shadow")
 
     @shadow.setter
     def shadow(self, value):
-        self._set_bool_prop('shadow', value)
+        self._set_bool_prop("shadow", value)
 
     @property
     def size(self):
@@ -280,11 +278,11 @@ def small_caps(self):
         characters in the run to appear as capital letters two points smaller
         than the font size specified for the run.
         """
-        return self._get_bool_prop('smallCaps')
+        return self._get_bool_prop("smallCaps")
 
     @small_caps.setter
     def small_caps(self, value):
-        self._set_bool_prop('smallCaps', value)
+        self._set_bool_prop("smallCaps", value)
 
     @property
     def snap_to_grid(self):
@@ -293,11 +291,11 @@ def snap_to_grid(self):
         document grid characters per line settings defined in the docGrid
         element when laying out the characters in this run.
         """
-        return self._get_bool_prop('snapToGrid')
+        return self._get_bool_prop("snapToGrid")
 
     @snap_to_grid.setter
     def snap_to_grid(self, value):
-        self._set_bool_prop('snapToGrid', value)
+        self._set_bool_prop("snapToGrid", value)
 
     @property
     def spec_vanish(self):
@@ -308,11 +306,11 @@ def spec_vanish(self):
         narrow, specialized use related to the table of contents. Consult the
         spec (§17.3.2.36) for more details.
         """
-        return self._get_bool_prop('specVanish')
+        return self._get_bool_prop("specVanish")
 
     @spec_vanish.setter
     def spec_vanish(self, value):
-        self._set_bool_prop('specVanish', value)
+        self._set_bool_prop("specVanish", value)
 
     @property
     def strike(self):
@@ -321,11 +319,11 @@ def strike(self):
         to appear with a single horizontal line through the center of the
         line.
         """
-        return self._get_bool_prop('strike')
+        return self._get_bool_prop("strike")
 
     @strike.setter
     def strike(self, value):
-        self._set_bool_prop('strike', value)
+        self._set_bool_prop("strike", value)
 
     @property
     def subscript(self):
@@ -388,11 +386,11 @@ def web_hidden(self):
         of this run shall be hidden when the document is displayed in web
         page view.
         """
-        return self._get_bool_prop('webHidden')
+        return self._get_bool_prop("webHidden")
 
     @web_hidden.setter
     def web_hidden(self, value):
-        self._set_bool_prop('webHidden', value)
+        self._set_bool_prop("webHidden", value)
 
     def _get_bool_prop(self, name):
         """
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
index 4fb583b94..d349e5378 100644
--- a/docx/text/paragraph.py
+++ b/docx/text/paragraph.py
@@ -4,9 +4,7 @@
 Paragraph-related proxy types.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..enum.style import WD_STYLE_TYPE
 from .parfmt import ParagraphFormat
@@ -18,6 +16,7 @@ class Paragraph(Parented):
     """
     Proxy object wrapping ``<w:p>`` element.
     """
+
     def __init__(self, p, parent):
         super(Paragraph, self).__init__(parent)
         self._p = self._element = p
@@ -107,9 +106,7 @@ def style(self):
 
     @style.setter
     def style(self, style_or_name):
-        style_id = self.part.get_style_id(
-            style_or_name, WD_STYLE_TYPE.PARAGRAPH
-        )
+        style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.PARAGRAPH)
         self._p.style = style_id
 
     @property
@@ -126,7 +123,7 @@ def text(self):
         Paragraph-level formatting, such as style, is preserved. All
         run-level formatting, such as bold or italic, is removed.
         """
-        text = ''
+        text = ""
         for run in self.runs:
             text += run.text
         return text
diff --git a/docx/text/parfmt.py b/docx/text/parfmt.py
index 37206729c..6d9215549 100644
--- a/docx/text/parfmt.py
+++ b/docx/text/parfmt.py
@@ -4,9 +4,7 @@
 Paragraph-related proxy types.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..enum.text import WD_LINE_SPACING
 from ..shared import ElementProxy, Emu, lazyproperty, Length, Pt, Twips
@@ -20,7 +18,7 @@ class ParagraphFormat(ElementProxy):
     control.
     """
 
-    __slots__ = ('_tab_stops',)
+    __slots__ = ("_tab_stops",)
 
     @property
     def alignment(self):
@@ -153,9 +151,7 @@ def line_spacing_rule(self):
         pPr = self._element.pPr
         if pPr is None:
             return None
-        return self._line_spacing_rule(
-            pPr.spacing_line, pPr.spacing_lineRule
-        )
+        return self._line_spacing_rule(pPr.spacing_line, pPr.spacing_lineRule)
 
     @line_spacing_rule.setter
     def line_spacing_rule(self, value):
diff --git a/docx/text/run.py b/docx/text/run.py
index 97d6da7db..88c37fa3c 100644
--- a/docx/text/run.py
+++ b/docx/text/run.py
@@ -21,6 +21,7 @@ class Run(Parented):
     not specified directly on the run and its effective value is taken from
     the style hierarchy.
     """
+
     def __init__(self, r, parent):
         super(Run, self).__init__(parent)
         self._r = self._element = self.element = r
@@ -33,12 +34,12 @@ def add_break(self, break_type=WD_BREAK.LINE):
         *break_type* defaults to `WD_BREAK.LINE`.
         """
         type_, clear = {
-            WD_BREAK.LINE:             (None,           None),
-            WD_BREAK.PAGE:             ('page',         None),
-            WD_BREAK.COLUMN:           ('column',       None),
-            WD_BREAK.LINE_CLEAR_LEFT:  ('textWrapping', 'left'),
-            WD_BREAK.LINE_CLEAR_RIGHT: ('textWrapping', 'right'),
-            WD_BREAK.LINE_CLEAR_ALL:   ('textWrapping', 'all'),
+            WD_BREAK.LINE: (None, None),
+            WD_BREAK.PAGE: ("page", None),
+            WD_BREAK.COLUMN: ("column", None),
+            WD_BREAK.LINE_CLEAR_LEFT: ("textWrapping", "left"),
+            WD_BREAK.LINE_CLEAR_RIGHT: ("textWrapping", "right"),
+            WD_BREAK.LINE_CLEAR_ALL: ("textWrapping", "all"),
         }[break_type]
         br = self._r.add_br()
         if type_ is not None:
@@ -133,9 +134,7 @@ def style(self):
 
     @style.setter
     def style(self, style_or_name):
-        style_id = self.part.get_style_id(
-            style_or_name, WD_STYLE_TYPE.CHARACTER
-        )
+        style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.CHARACTER)
         self._r.style = style_id
 
     @property
@@ -186,6 +185,7 @@ class _Text(object):
     """
     Proxy object wrapping ``<w:t>`` element.
     """
+
     def __init__(self, t_elm):
         super(_Text, self).__init__()
         self._t = t_elm
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
index c22b9bc91..6915285cf 100644
--- a/docx/text/tabstops.py
+++ b/docx/text/tabstops.py
@@ -4,9 +4,7 @@
 Tabstop-related proxy types.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..shared import ElementProxy
 from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
@@ -21,7 +19,7 @@ class TabStops(ElementProxy):
     directly.
     """
 
-    __slots__ = ('_pPr')
+    __slots__ = "_pPr"
 
     def __init__(self, element):
         super(TabStops, self).__init__(element, None)
@@ -35,7 +33,7 @@ def __delitem__(self, idx):
         try:
             tabs.remove(tabs[idx])
         except (AttributeError, IndexError):
-            raise IndexError('tab index out of range')
+            raise IndexError("tab index out of range")
 
         if len(tabs) == 0:
             self._pPr.remove(tabs)
@@ -46,7 +44,7 @@ def __getitem__(self, idx):
         """
         tabs = self._pPr.tabs
         if tabs is None:
-            raise IndexError('TabStops object is empty')
+            raise IndexError("TabStops object is empty")
         tab = tabs.tab_lst[idx]
         return TabStop(tab)
 
@@ -66,8 +64,9 @@ def __len__(self):
             return 0
         return len(tabs.tab_lst)
 
-    def add_tab_stop(self, position, alignment=WD_TAB_ALIGNMENT.LEFT,
-                     leader=WD_TAB_LEADER.SPACES):
+    def add_tab_stop(
+        self, position, alignment=WD_TAB_ALIGNMENT.LEFT, leader=WD_TAB_LEADER.SPACES
+    ):
         """
         Add a new tab stop at *position*, a |Length| object specifying the
         location of the tab stop relative to the paragraph edge. A negative
@@ -94,7 +93,7 @@ class TabStop(ElementProxy):
     list semantics on its containing |TabStops| object.
     """
 
-    __slots__ = ('_tab')
+    __slots__ = "_tab"
 
     def __init__(self, element):
         super(TabStop, self).__init__(element, None)
diff --git a/features/environment.py b/features/environment.py
index e144106cf..f180da73c 100644
--- a/features/environment.py
+++ b/features/environment.py
@@ -7,9 +7,7 @@
 
 import os
 
-scratch_dir = os.path.abspath(
-    os.path.join(os.path.split(__file__)[0], '_scratch')
-)
+scratch_dir = os.path.abspath(os.path.join(os.path.split(__file__)[0], "_scratch"))
 
 
 def before_all(context):
diff --git a/features/steps/api.py b/features/steps/api.py
index a3325567b..1c66c4c89 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -15,32 +15,35 @@
 
 # given ====================================================
 
-@given('I have python-docx installed')
+
+@given("I have python-docx installed")
 def given_I_have_python_docx_installed(context):
     pass
 
 
 # when =====================================================
 
-@when('I call docx.Document() with no arguments')
+
+@when("I call docx.Document() with no arguments")
 def when_I_call_docx_Document_with_no_arguments(context):
     context.document = Document()
 
 
-@when('I call docx.Document() with the path of a .docx file')
+@when("I call docx.Document() with the path of a .docx file")
 def when_I_call_docx_Document_with_the_path_of_a_docx_file(context):
-    context.document = Document(test_docx('doc-default'))
+    context.document = Document(test_docx("doc-default"))
 
 
 # then =====================================================
 
-@then('document is a Document object')
+
+@then("document is a Document object")
 def then_document_is_a_Document_object(context):
     document = context.document
     assert isinstance(document, docx.document.Document)
 
 
-@then('the last paragraph contains the text I specified')
+@then("the last paragraph contains the text I specified")
 def then_last_p_contains_specified_text(context):
     document = context.document
     text = context.paragraph_text
@@ -48,15 +51,15 @@ def then_last_p_contains_specified_text(context):
     assert p.text == text
 
 
-@then('the last paragraph has the style I specified')
+@then("the last paragraph has the style I specified")
 def then_the_last_paragraph_has_the_style_I_specified(context):
     document, expected_style = context.document, context.style
     paragraph = document.paragraphs[-1]
     assert paragraph.style == expected_style
 
 
-@then('the last paragraph is the empty paragraph I added')
+@then("the last paragraph is the empty paragraph I added")
 def then_last_p_is_empty_paragraph_added(context):
     document = context.document
     p = document.paragraphs[-1]
-    assert p.text == ''
+    assert p.text == ""
diff --git a/features/steps/block.py b/features/steps/block.py
index 1eee70cd2..686da2c99 100644
--- a/features/steps/block.py
+++ b/features/steps/block.py
@@ -14,12 +14,13 @@
 
 # given ===================================================
 
-@given('a document containing a table')
+
+@given("a document containing a table")
 def given_a_document_containing_a_table(context):
-    context.document = Document(test_docx('blk-containing-table'))
+    context.document = Document(test_docx("blk-containing-table"))
 
 
-@given('a paragraph')
+@given("a paragraph")
 def given_a_paragraph(context):
     context.document = Document()
     context.paragraph = context.document.add_paragraph()
@@ -27,13 +28,14 @@ def given_a_paragraph(context):
 
 # when ====================================================
 
-@when('I add a paragraph')
+
+@when("I add a paragraph")
 def when_add_paragraph(context):
     document = context.document
     context.p = document.add_paragraph()
 
 
-@when('I add a table')
+@when("I add a table")
 def when_add_table(context):
     rows, cols = 2, 2
     context.document.add_table(rows, cols)
@@ -41,13 +43,14 @@ def when_add_table(context):
 
 # then =====================================================
 
-@then('I can access the table')
+
+@then("I can access the table")
 def then_can_access_table(context):
     table = context.document.tables[-1]
     assert isinstance(table, Table)
 
 
-@then('the new table appears in the document')
+@then("the new table appears in the document")
 def then_new_table_appears_in_document(context):
     table = context.document.tables[-1]
     assert isinstance(table, Table)
diff --git a/features/steps/cell.py b/features/steps/cell.py
index d1385c921..4ec633ae3 100644
--- a/features/steps/cell.py
+++ b/features/steps/cell.py
@@ -15,30 +15,33 @@
 
 # given ===================================================
 
-@given('a table cell')
+
+@given("a table cell")
 def given_a_table_cell(context):
-    table = Document(test_docx('tbl-2x2-table')).tables[0]
+    table = Document(test_docx("tbl-2x2-table")).tables[0]
     context.cell = table.cell(0, 0)
 
 
 # when =====================================================
 
-@when('I add a 2 x 2 table into the first cell')
+
+@when("I add a 2 x 2 table into the first cell")
 def when_I_add_a_2x2_table_into_the_first_cell(context):
     context.table_ = context.cell.add_table(2, 2)
 
 
-@when('I assign a string to the cell text attribute')
+@when("I assign a string to the cell text attribute")
 def when_assign_string_to_cell_text_attribute(context):
     cell = context.cell
-    text = 'foobar'
+    text = "foobar"
     cell.text = text
     context.expected_text = text
 
 
 # then =====================================================
 
-@then('cell.tables[0] is a 2 x 2 table')
+
+@then("cell.tables[0] is a 2 x 2 table")
 def then_cell_tables_0_is_a_2x2_table(context):
     cell = context.cell
     table = cell.tables[0]
@@ -46,7 +49,7 @@ def then_cell_tables_0_is_a_2x2_table(context):
     assert len(table.columns) == 2
 
 
-@then('the cell contains the string I assigned')
+@then("the cell contains the string I assigned")
 def then_cell_contains_string_assigned(context):
     cell, expected_text = context.cell, context.expected_text
     text = cell.paragraphs[0].runs[0].text
diff --git a/features/steps/coreprops.py b/features/steps/coreprops.py
index dc6be2e6c..e13c5f8fb 100644
--- a/features/steps/coreprops.py
+++ b/features/steps/coreprops.py
@@ -4,9 +4,7 @@
 Gherkin step implementations for core properties-related features.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from datetime import datetime, timedelta
 
@@ -20,19 +18,21 @@
 
 # given ===================================================
 
-@given('a document having known core properties')
+
+@given("a document having known core properties")
 def given_a_document_having_known_core_properties(context):
-    context.document = Document(test_docx('doc-coreprops'))
+    context.document = Document(test_docx("doc-coreprops"))
 
 
-@given('a document having no core properties part')
+@given("a document having no core properties part")
 def given_a_document_having_no_core_properties_part(context):
-    context.document = Document(test_docx('doc-no-coreprops'))
+    context.document = Document(test_docx("doc-no-coreprops"))
 
 
 # when ====================================================
 
-@when('I access the core properties object')
+
+@when("I access the core properties object")
 def when_I_access_the_core_properties_object(context):
     context.document.core_properties
 
@@ -40,21 +40,21 @@ def when_I_access_the_core_properties_object(context):
 @when("I assign new values to the properties")
 def when_I_assign_new_values_to_the_properties(context):
     context.propvals = (
-        ('author',           'Creator'),
-        ('category',         'Category'),
-        ('comments',         'Description'),
-        ('content_status',   'Content Status'),
-        ('created',          datetime(2013, 6, 15, 12, 34, 56)),
-        ('identifier',       'Identifier'),
-        ('keywords',         'key; word; keyword'),
-        ('language',         'Language'),
-        ('last_modified_by', 'Last Modified By'),
-        ('last_printed',     datetime(2013, 6, 15, 12, 34, 56)),
-        ('modified',         datetime(2013, 6, 15, 12, 34, 56)),
-        ('revision',         9),
-        ('subject',          'Subject'),
-        ('title',            'Title'),
-        ('version',          'Version'),
+        ("author", "Creator"),
+        ("category", "Category"),
+        ("comments", "Description"),
+        ("content_status", "Content Status"),
+        ("created", datetime(2013, 6, 15, 12, 34, 56)),
+        ("identifier", "Identifier"),
+        ("keywords", "key; word; keyword"),
+        ("language", "Language"),
+        ("last_modified_by", "Last Modified By"),
+        ("last_printed", datetime(2013, 6, 15, 12, 34, 56)),
+        ("modified", datetime(2013, 6, 15, 12, 34, 56)),
+        ("revision", 9),
+        ("subject", "Subject"),
+        ("title", "Title"),
+        ("version", "Version"),
     )
     core_properties = context.document.core_properties
     for name, value in context.propvals:
@@ -63,11 +63,12 @@ def when_I_assign_new_values_to_the_properties(context):
 
 # then ====================================================
 
-@then('a core properties part with default values is added')
+
+@then("a core properties part with default values is added")
 def then_a_core_properties_part_with_default_values_is_added(context):
     core_properties = context.document.core_properties
-    assert core_properties.title == 'Word Document'
-    assert core_properties.last_modified_by == 'python-docx'
+    assert core_properties.title == "Word Document"
+    assert core_properties.last_modified_by == "python-docx"
     assert core_properties.revision == 1
     # core_properties.modified only stores time with seconds resolution, so
     # comparison needs to be a little loose (within two seconds)
@@ -76,45 +77,47 @@ def then_a_core_properties_part_with_default_values_is_added(context):
     assert modified_timedelta < max_expected_timedelta
 
 
-@then('I can access the core properties object')
+@then("I can access the core properties object")
 def then_I_can_access_the_core_properties_object(context):
     document = context.document
     core_properties = document.core_properties
     assert isinstance(core_properties, CoreProperties)
 
 
-@then('the core property values match the known values')
+@then("the core property values match the known values")
 def then_the_core_property_values_match_the_known_values(context):
     known_propvals = (
-        ('author',           'Steve Canny'),
-        ('category',         'Category'),
-        ('comments',         'Description'),
-        ('content_status',   'Content Status'),
-        ('created',          datetime(2014, 12, 13, 22, 2, 0)),
-        ('identifier',       'Identifier'),
-        ('keywords',         'key; word; keyword'),
-        ('language',         'Language'),
-        ('last_modified_by', 'Steve Canny'),
-        ('last_printed',     datetime(2014, 12, 13, 22, 2, 42)),
-        ('modified',         datetime(2014, 12, 13, 22, 6, 0)),
-        ('revision',         2),
-        ('subject',          'Subject'),
-        ('title',            'Title'),
-        ('version',          '0.7.1a3'),
+        ("author", "Steve Canny"),
+        ("category", "Category"),
+        ("comments", "Description"),
+        ("content_status", "Content Status"),
+        ("created", datetime(2014, 12, 13, 22, 2, 0)),
+        ("identifier", "Identifier"),
+        ("keywords", "key; word; keyword"),
+        ("language", "Language"),
+        ("last_modified_by", "Steve Canny"),
+        ("last_printed", datetime(2014, 12, 13, 22, 2, 42)),
+        ("modified", datetime(2014, 12, 13, 22, 6, 0)),
+        ("revision", 2),
+        ("subject", "Subject"),
+        ("title", "Title"),
+        ("version", "0.7.1a3"),
     )
     core_properties = context.document.core_properties
     for name, expected_value in known_propvals:
         value = getattr(core_properties, name)
-        assert value == expected_value, (
-            "got '%s' for core property '%s'" % (value, name)
+        assert value == expected_value, "got '%s' for core property '%s'" % (
+            value,
+            name,
         )
 
 
-@then('the core property values match the new values')
+@then("the core property values match the new values")
 def then_the_core_property_values_match_the_new_values(context):
     core_properties = context.document.core_properties
     for name, expected_value in context.propvals:
         value = getattr(core_properties, name)
-        assert value == expected_value, (
-            "got '%s' for core property '%s'" % (value, name)
+        assert value == expected_value, "got '%s' for core property '%s'" % (
+            value,
+            name,
         )
diff --git a/features/steps/document.py b/features/steps/document.py
index a8e4d1adf..2aae3e191 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -22,39 +22,40 @@
 
 # given ===================================================
 
-@given('a blank document')
+
+@given("a blank document")
 def given_a_blank_document(context):
-    context.document = Document(test_docx('doc-word-default-blank'))
+    context.document = Document(test_docx("doc-word-default-blank"))
 
 
-@given('a document having built-in styles')
+@given("a document having built-in styles")
 def given_a_document_having_builtin_styles(context):
     context.document = Document()
 
 
-@given('a document having inline shapes')
+@given("a document having inline shapes")
 def given_a_document_having_inline_shapes(context):
-    context.document = Document(test_docx('shp-inline-shape-access'))
+    context.document = Document(test_docx("shp-inline-shape-access"))
 
 
-@given('a document having sections')
+@given("a document having sections")
 def given_a_document_having_sections(context):
-    context.document = Document(test_docx('doc-access-sections'))
+    context.document = Document(test_docx("doc-access-sections"))
 
 
-@given('a document having styles')
+@given("a document having styles")
 def given_a_document_having_styles(context):
-    context.document = Document(test_docx('sty-having-styles-part'))
+    context.document = Document(test_docx("sty-having-styles-part"))
 
 
-@given('a document having three tables')
+@given("a document having three tables")
 def given_a_document_having_three_tables(context):
-    context.document = Document(test_docx('tbl-having-tables'))
+    context.document = Document(test_docx("tbl-having-tables"))
 
 
-@given('a single-section document having portrait layout')
+@given("a single-section document having portrait layout")
 def given_a_single_section_document_having_portrait_layout(context):
-    context.document = Document(test_docx('doc-add-section'))
+    context.document = Document(test_docx("doc-add-section"))
     section = context.document.sections[-1]
     context.original_dimensions = (section.page_width, section.page_height)
 
@@ -66,55 +67,56 @@ def given_a_single_section_Document_object_with_headers_and_footers(context):
 
 # when ====================================================
 
-@when('I add a 2 x 2 table specifying only row and column count')
+
+@when("I add a 2 x 2 table specifying only row and column count")
 def when_add_2x2_table_specifying_only_row_and_col_count(context):
     document = context.document
     document.add_table(rows=2, cols=2)
 
 
-@when('I add a 2 x 2 table specifying style \'{style_name}\'')
+@when("I add a 2 x 2 table specifying style '{style_name}'")
 def when_add_2x2_table_specifying_style_name(context, style_name):
     document = context.document
     document.add_table(rows=2, cols=2, style=style_name)
 
 
-@when('I add a heading specifying level={level}')
+@when("I add a heading specifying level={level}")
 def when_add_heading_specifying_level(context, level):
     context.document.add_heading(level=int(level))
 
 
-@when('I add a heading specifying only its text')
+@when("I add a heading specifying only its text")
 def when_add_heading_specifying_only_its_text(context):
     document = context.document
-    context.heading_text = text = 'Spam vs. Eggs'
+    context.heading_text = text = "Spam vs. Eggs"
     document.add_heading(text)
 
 
-@when('I add a page break to the document')
+@when("I add a page break to the document")
 def when_add_page_break_to_document(context):
     document = context.document
     document.add_page_break()
 
 
-@when('I add a paragraph specifying its style as a {kind}')
+@when("I add a paragraph specifying its style as a {kind}")
 def when_I_add_a_paragraph_specifying_its_style_as_a(context, kind):
     document = context.document
-    style = context.style = document.styles['Heading 1']
+    style = context.style = document.styles["Heading 1"]
     style_spec = {
-        'style object': style,
-        'style name':   'Heading 1',
+        "style object": style,
+        "style name": "Heading 1",
     }[kind]
     document.add_paragraph(style=style_spec)
 
 
-@when('I add a paragraph specifying its text')
+@when("I add a paragraph specifying its text")
 def when_add_paragraph_specifying_text(context):
     document = context.document
-    context.paragraph_text = 'foobar'
+    context.paragraph_text = "foobar"
     document.add_paragraph(context.paragraph_text)
 
 
-@when('I add a paragraph without specifying text or style')
+@when("I add a paragraph without specifying text or style")
 def when_add_paragraph_without_specifying_text_or_style(context):
     document = context.document
     document.add_paragraph()
@@ -124,39 +126,38 @@ def when_add_paragraph_without_specifying_text_or_style(context):
 def when_add_picture_specifying_width_and_height(context):
     document = context.document
     context.picture = document.add_picture(
-        test_file('monty-truth.png'),
-        width=Inches(1.75), height=Inches(2.5)
+        test_file("monty-truth.png"), width=Inches(1.75), height=Inches(2.5)
     )
 
 
-@when('I add a picture specifying a height of 1.5 inches')
+@when("I add a picture specifying a height of 1.5 inches")
 def when_add_picture_specifying_height(context):
     document = context.document
     context.picture = document.add_picture(
-        test_file('monty-truth.png'), height=Inches(1.5)
+        test_file("monty-truth.png"), height=Inches(1.5)
     )
 
 
-@when('I add a picture specifying a width of 1.5 inches')
+@when("I add a picture specifying a width of 1.5 inches")
 def when_add_picture_specifying_width(context):
     document = context.document
     context.picture = document.add_picture(
-        test_file('monty-truth.png'), width=Inches(1.5)
+        test_file("monty-truth.png"), width=Inches(1.5)
     )
 
 
-@when('I add a picture specifying only the image file')
+@when("I add a picture specifying only the image file")
 def when_add_picture_specifying_only_image_file(context):
     document = context.document
-    context.picture = document.add_picture(test_file('monty-truth.png'))
+    context.picture = document.add_picture(test_file("monty-truth.png"))
 
 
-@when('I add an even-page section to the document')
+@when("I add an even-page section to the document")
 def when_I_add_an_even_page_section_to_the_document(context):
     context.section = context.document.add_section(WD_SECTION.EVEN_PAGE)
 
 
-@when('I change the new section layout to landscape')
+@when("I change the new section layout to landscape")
 def when_I_change_the_new_section_layout_to_landscape(context):
     new_height, new_width = context.original_dimensions
     section = context.section
@@ -172,14 +173,15 @@ def when_I_execute_section_eq_document_add_section(context):
 
 # then ====================================================
 
-@then('document.inline_shapes is an InlineShapes object')
+
+@then("document.inline_shapes is an InlineShapes object")
 def then_document_inline_shapes_is_an_InlineShapes_object(context):
     document = context.document
     inline_shapes = document.inline_shapes
     assert isinstance(inline_shapes, InlineShapes)
 
 
-@then('document.paragraphs is a list containing three paragraphs')
+@then("document.paragraphs is a list containing three paragraphs")
 def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
     document = context.document
     paragraphs = document.paragraphs
@@ -189,20 +191,20 @@ def then_document_paragraphs_is_a_list_containing_three_paragraphs(context):
         assert isinstance(paragraph, Paragraph)
 
 
-@then('document.sections is a Sections object')
+@then("document.sections is a Sections object")
 def then_document_sections_is_a_Sections_object(context):
     sections = context.document.sections
-    msg = 'document.sections not instance of Sections'
+    msg = "document.sections not instance of Sections"
     assert isinstance(sections, Sections), msg
 
 
-@then('document.styles is a Styles object')
+@then("document.styles is a Styles object")
 def then_document_styles_is_a_Styles_object(context):
     styles = context.document.styles
     assert isinstance(styles, Styles)
 
 
-@then('document.tables is a list containing three tables')
+@then("document.tables is a list containing three tables")
 def then_document_tables_is_a_list_containing_three_tables(context):
     document = context.document
     tables = document.tables
@@ -212,7 +214,7 @@ def then_document_tables_is_a_list_containing_three_tables(context):
         assert isinstance(table, Table)
 
 
-@then('the document contains a 2 x 2 table')
+@then("the document contains a 2 x 2 table")
 def then_the_document_contains_a_2x2_table(context):
     table = context.document.tables[-1]
     assert isinstance(table, Table)
@@ -221,12 +223,12 @@ def then_the_document_contains_a_2x2_table(context):
     context.table_ = table
 
 
-@then('the document has two sections')
+@then("the document has two sections")
 def then_the_document_has_two_sections(context):
     assert len(context.document.sections) == 2
 
 
-@then('the first section is portrait')
+@then("the first section is portrait")
 def then_the_first_section_is_portrait(context):
     first_section = context.document.sections[0]
     expected_width, expected_height = context.original_dimensions
@@ -235,16 +237,16 @@ def then_the_first_section_is_portrait(context):
     assert first_section.page_height == expected_height
 
 
-@then('the last paragraph contains only a page break')
+@then("the last paragraph contains only a page break")
 def then_last_paragraph_contains_only_a_page_break(context):
     document = context.document
     paragraph = document.paragraphs[-1]
     assert len(paragraph.runs) == 1
     assert len(paragraph.runs[0]._r) == 1
-    assert paragraph.runs[0]._r[0].type == 'page'
+    assert paragraph.runs[0]._r[0].type == "page"
 
 
-@then('the last paragraph contains the heading text')
+@then("the last paragraph contains the heading text")
 def then_last_p_contains_heading_text(context):
     document = context.document
     text = context.heading_text
@@ -252,7 +254,7 @@ def then_last_p_contains_heading_text(context):
     assert paragraph.text == text
 
 
-@then('the second section is landscape')
+@then("the second section is landscape")
 def then_the_second_section_is_landscape(context):
     new_section = context.document.sections[-1]
     expected_height, expected_width = context.original_dimensions
@@ -261,10 +263,8 @@ def then_the_second_section_is_landscape(context):
     assert new_section.page_height == expected_height
 
 
-@then('the style of the last paragraph is \'{style_name}\'')
+@then("the style of the last paragraph is '{style_name}'")
 def then_the_style_of_the_last_paragraph_is_style(context, style_name):
     document = context.document
     paragraph = document.paragraphs[-1]
-    assert paragraph.style.name == style_name, (
-        'got %s' % paragraph.style.name
-    )
+    assert paragraph.style.name == style_name, "got %s" % paragraph.style.name
diff --git a/features/steps/font.py b/features/steps/font.py
index 60f308d86..ed6e51f25 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -4,9 +4,7 @@
 Step implementations for font-related features.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from behave import given, then, when
 
@@ -21,137 +19,137 @@
 
 # given ===================================================
 
-@given('a font')
+
+@given("a font")
 def given_a_font(context):
-    document = Document(test_docx('txt-font-props'))
+    document = Document(test_docx("txt-font-props"))
     context.font = document.paragraphs[0].runs[0].font
 
 
-@given('a font having {color} highlighting')
+@given("a font having {color} highlighting")
 def given_a_font_having_color_highlighting(context, color):
     paragraph_index = {
-        'no':           0,
-        'yellow':       1,
-        'bright green': 2,
+        "no": 0,
+        "yellow": 1,
+        "bright green": 2,
     }[color]
-    document = Document(test_docx('txt-font-highlight-color'))
+    document = Document(test_docx("txt-font-highlight-color"))
     context.font = document.paragraphs[paragraph_index].runs[0].font
 
 
-@given('a font having {type} color')
+@given("a font having {type} color")
 def given_a_font_having_type_color(context, type):
-    run_idx = ['no', 'auto', 'an RGB', 'a theme'].index(type)
-    document = Document(test_docx('fnt-color'))
+    run_idx = ["no", "auto", "an RGB", "a theme"].index(type)
+    document = Document(test_docx("fnt-color"))
     context.font = document.paragraphs[0].runs[run_idx].font
 
 
-@given('a font having typeface name {name}')
+@given("a font having typeface name {name}")
 def given_a_font_having_typeface_name(context, name):
-    document = Document(test_docx('txt-font-props'))
+    document = Document(test_docx("txt-font-props"))
     style_name = {
-        'not specified': 'Normal',
-        'Avenir Black':  'Having Typeface',
+        "not specified": "Normal",
+        "Avenir Black": "Having Typeface",
     }[name]
     context.font = document.styles[style_name].font
 
 
-@given('a font having {underline_type} underline')
+@given("a font having {underline_type} underline")
 def given_a_font_having_type_underline(context, underline_type):
     style_name = {
-        'inherited': 'Normal',
-        'no':        'None Underlined',
-        'single':    'Underlined',
-        'double':    'Double Underlined',
+        "inherited": "Normal",
+        "no": "None Underlined",
+        "single": "Underlined",
+        "double": "Double Underlined",
     }[underline_type]
-    document = Document(test_docx('txt-font-props'))
+    document = Document(test_docx("txt-font-props"))
     context.font = document.styles[style_name].font
 
 
-@given('a font having {vertAlign_state} vertical alignment')
+@given("a font having {vertAlign_state} vertical alignment")
 def given_a_font_having_vertAlign_state(context, vertAlign_state):
     style_name = {
-        'inherited':   'Normal',
-        'subscript':   'Subscript',
-        'superscript': 'Superscript',
+        "inherited": "Normal",
+        "subscript": "Subscript",
+        "superscript": "Superscript",
     }[vertAlign_state]
-    document = Document(test_docx('txt-font-props'))
+    document = Document(test_docx("txt-font-props"))
     context.font = document.styles[style_name].font
 
 
-@given('a font of size {size}')
+@given("a font of size {size}")
 def given_a_font_of_size(context, size):
-    document = Document(test_docx('txt-font-props'))
+    document = Document(test_docx("txt-font-props"))
     style_name = {
-        'unspecified': 'Normal',
-        '14 pt':       'Having Typeface',
-        '18 pt':       'Large Size',
+        "unspecified": "Normal",
+        "14 pt": "Having Typeface",
+        "18 pt": "Large Size",
     }[size]
     context.font = document.styles[style_name].font
 
 
 # when ====================================================
 
-@when('I assign {value} to font.color.rgb')
+
+@when("I assign {value} to font.color.rgb")
 def when_I_assign_value_to_font_color_rgb(context, value):
     font = context.font
-    new_value = None if value == 'None' else RGBColor.from_string(value)
+    new_value = None if value == "None" else RGBColor.from_string(value)
     font.color.rgb = new_value
 
 
-@when('I assign {value} to font.color.theme_color')
+@when("I assign {value} to font.color.theme_color")
 def when_I_assign_value_to_font_color_theme_color(context, value):
     font = context.font
-    new_value = None if value == 'None' else getattr(MSO_THEME_COLOR, value)
+    new_value = None if value == "None" else getattr(MSO_THEME_COLOR, value)
     font.color.theme_color = new_value
 
 
-@when('I assign {value} to font.highlight_color')
+@when("I assign {value} to font.highlight_color")
 def when_I_assign_value_to_font_highlight_color(context, value):
     font = context.font
-    expected_value = (
-        None if value == 'None' else getattr(WD_COLOR_INDEX, value)
-    )
+    expected_value = None if value == "None" else getattr(WD_COLOR_INDEX, value)
     font.highlight_color = expected_value
 
 
-@when('I assign {value} to font.name')
+@when("I assign {value} to font.name")
 def when_I_assign_value_to_font_name(context, value):
     font = context.font
-    value = None if value == 'None' else value
+    value = None if value == "None" else value
     font.name = value
 
 
-@when('I assign {value} to font.size')
+@when("I assign {value} to font.size")
 def when_I_assign_value_str_to_font_size(context, value):
-    value = None if value == 'None' else int(value)
+    value = None if value == "None" else int(value)
     font = context.font
     font.size = value
 
 
-@when('I assign {value} to font.underline')
+@when("I assign {value} to font.underline")
 def when_I_assign_value_to_font_underline(context, value):
     new_value = {
-        'True':                True,
-        'False':               False,
-        'None':                None,
-        'WD_UNDERLINE.SINGLE': WD_UNDERLINE.SINGLE,
-        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
+        "True": True,
+        "False": False,
+        "None": None,
+        "WD_UNDERLINE.SINGLE": WD_UNDERLINE.SINGLE,
+        "WD_UNDERLINE.DOUBLE": WD_UNDERLINE.DOUBLE,
     }[value]
     font = context.font
     font.underline = new_value
 
 
-@when('I assign {value} to font.{sub_super}script')
+@when("I assign {value} to font.{sub_super}script")
 def when_I_assign_value_to_font_sub_super(context, value, sub_super):
     font = context.font
     name = {
-        'sub':   'subscript',
-        'super': 'superscript',
+        "sub": "subscript",
+        "super": "superscript",
     }[sub_super]
     new_value = {
-        'None':  None,
-        'True':  True,
-        'False': False,
+        "None": None,
+        "True": True,
+        "False": False,
     }[value]
 
     setattr(font, name, new_value)
@@ -159,82 +157,77 @@ def when_I_assign_value_to_font_sub_super(context, value, sub_super):
 
 # then =====================================================
 
-@then('font.color is a ColorFormat object')
+
+@then("font.color is a ColorFormat object")
 def then_font_color_is_a_ColorFormat_object(context):
     font = context.font
     assert isinstance(font.color, ColorFormat)
 
 
-@then('font.color.rgb is {value}')
+@then("font.color.rgb is {value}")
 def then_font_color_rgb_is_value(context, value):
     font = context.font
-    expected_value = None if value == 'None' else RGBColor.from_string(value)
+    expected_value = None if value == "None" else RGBColor.from_string(value)
     assert font.color.rgb == expected_value
 
 
-@then('font.color.theme_color is {value}')
+@then("font.color.theme_color is {value}")
 def then_font_color_theme_color_is_value(context, value):
     font = context.font
-    expected_value = (
-        None if value == 'None' else getattr(MSO_THEME_COLOR, value)
-    )
+    expected_value = None if value == "None" else getattr(MSO_THEME_COLOR, value)
     assert font.color.theme_color == expected_value
 
 
-@then('font.color.type is {value}')
+@then("font.color.type is {value}")
 def then_font_color_type_is_value(context, value):
     font = context.font
-    expected_value = (
-        None if value == 'None' else getattr(MSO_COLOR_TYPE, value)
-    )
+    expected_value = None if value == "None" else getattr(MSO_COLOR_TYPE, value)
     assert font.color.type == expected_value
 
 
-@then('font.highlight_color is {value}')
+@then("font.highlight_color is {value}")
 def then_font_highlight_color_is_value(context, value):
     font = context.font
-    expected_value = (
-        None if value == 'None' else getattr(WD_COLOR_INDEX, value)
-    )
+    expected_value = None if value == "None" else getattr(WD_COLOR_INDEX, value)
     assert font.highlight_color == expected_value
 
 
-@then('font.name is {value}')
+@then("font.name is {value}")
 def then_font_name_is_value(context, value):
     font = context.font
-    value = None if value == 'None' else value
+    value = None if value == "None" else value
     assert font.name == value
 
 
-@then('font.size is {value}')
+@then("font.size is {value}")
 def then_font_size_is_value(context, value):
-    value = None if value == 'None' else int(value)
+    value = None if value == "None" else int(value)
     font = context.font
     assert font.size == value
 
 
-@then('font.underline is {value}')
+@then("font.underline is {value}")
 def then_font_underline_is_value(context, value):
     expected_value = {
-        'None':                None,
-        'True':                True,
-        'False':               False,
-        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
+        "None": None,
+        "True": True,
+        "False": False,
+        "WD_UNDERLINE.DOUBLE": WD_UNDERLINE.DOUBLE,
     }[value]
     font = context.font
     assert font.underline == expected_value
 
 
-@then('font.{sub_super}script is {value}')
+@then("font.{sub_super}script is {value}")
 def then_font_sub_super_is_value(context, sub_super, value):
     name = {
-        'sub':   'subscript',
-        'super': 'superscript',
+        "sub": "subscript",
+        "super": "superscript",
     }[sub_super]
     expected_value = {
-        'None':  None,
-        'True':  True,
-        'False': False,
+        "None": None,
+        "True": True,
+        "False": False,
     }[value]
     font = context.font
     actual_value = getattr(font, name)
diff --git a/features/steps/hdrftr.py b/features/steps/hdrftr.py
index 786673dbd..4f0e3b915 100644
--- a/features/steps/hdrftr.py
+++ b/features/steps/hdrftr.py
@@ -13,6 +13,7 @@
 
 # given ====================================================
 
+
 @given("a _Footer object {with_or_no} footer definition as footer")
 def given_a_Footer_object_with_or_no_footer_definition(context, with_or_no):
     section_idx = {"with a": 0, "with no": 1}[with_or_no]
@@ -51,12 +52,13 @@ def given_the_next_Header_object_with_no_header_definition(context):
 
 # when =====================================================
 
-@when("I assign \"Normal\" to footer.paragraphs[0].style")
+
+@when('I assign "Normal" to footer.paragraphs[0].style')
 def when_I_assign_Body_Text_to_footer_style(context):
     context.footer.paragraphs[0].style = "Normal"
 
 
-@when("I assign \"Normal\" to header.paragraphs[0].style")
+@when('I assign "Normal" to header.paragraphs[0].style')
 def when_I_assign_Body_Text_to_header_style(context):
     context.header.paragraphs[0].style = "Normal"
 
@@ -78,6 +80,7 @@ def when_I_call_run_add_picture(context):
 
 # then =====================================================
 
+
 @then("footer.is_linked_to_previous is {value}")
 def then_footer_is_linked_to_previous_is_value(context, value):
     actual = context.footer.is_linked_to_previous
@@ -85,7 +88,7 @@ def then_footer_is_linked_to_previous_is_value(context, value):
     assert actual == expected, "footer.is_linked_to_previous is %s" % actual
 
 
-@then("footer.paragraphs[0].style.name == \"Normal\"")
+@then('footer.paragraphs[0].style.name == "Normal"')
 def then_footer_paragraphs_0_style_name_eq_Normal(context):
     actual = context.footer.paragraphs[0].style.name
     expected = "Normal"
@@ -113,7 +116,7 @@ def then_header_is_linked_to_previous_is_value(context, value):
     assert actual == expected, "header.is_linked_to_previous is %s" % actual
 
 
-@then("header.paragraphs[0].style.name == \"Normal\"")
+@then('header.paragraphs[0].style.name == "Normal"')
 def then_header_paragraphs_0_style_name_eq_Normal(context):
     actual = context.header.paragraphs[0].style.name
     expected = "Normal"
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
index 6733bfc13..cd64a7861 100644
--- a/features/steps/helpers.py
+++ b/features/steps/helpers.py
@@ -12,22 +12,19 @@ def absjoin(*paths):
 
 
 thisdir = os.path.split(__file__)[0]
-scratch_dir = absjoin(thisdir, '../_scratch')
+scratch_dir = absjoin(thisdir, "../_scratch")
 
 # scratch output docx file -------------
-saved_docx_path = absjoin(scratch_dir, 'test_out.docx')
+saved_docx_path = absjoin(scratch_dir, "test_out.docx")
 
-bool_vals = {
-    'True':  True,
-    'False': False
-}
+bool_vals = {"True": True, "False": False}
 
-test_text = 'python-docx was here!'
+test_text = "python-docx was here!"
 
 tri_state_vals = {
-    'True':  True,
-    'False': False,
-    'None':  None,
+    "True": True,
+    "False": False,
+    "None": None,
 }
 
 
@@ -35,11 +32,11 @@ def test_docx(name):
     """
     Return the absolute path to test .docx file with root name *name*.
     """
-    return absjoin(thisdir, 'test_files', '%s.docx' % name)
+    return absjoin(thisdir, "test_files", "%s.docx" % name)
 
 
 def test_file(name):
     """
     Return the absolute path to file with *name* in test_files directory
     """
-    return absjoin(thisdir, 'test_files', '%s' % name)
+    return absjoin(thisdir, "test_files", "%s" % name)
diff --git a/features/steps/image.py b/features/steps/image.py
index ee2a35c17..7f80baa59 100644
--- a/features/steps/image.py
+++ b/features/steps/image.py
@@ -15,59 +15,67 @@
 
 # given ===================================================
 
-@given('the image file \'{filename}\'')
+
+@given("the image file '{filename}'")
 def given_image_filename(context, filename):
     context.image_path = test_file(filename)
 
 
 # when ====================================================
 
-@when('I construct an image using the image path')
+
+@when("I construct an image using the image path")
 def when_construct_image_using_path(context):
     context.image = Image.from_file(context.image_path)
 
 
 # then ====================================================
 
-@then('the image has content type \'{mime_type}\'')
+
+@then("the image has content type '{mime_type}'")
 def then_image_has_content_type(context, mime_type):
     content_type = context.image.content_type
-    assert content_type == mime_type, (
-        "expected MIME type '%s', got '%s'" % (mime_type, content_type)
+    assert content_type == mime_type, "expected MIME type '%s', got '%s'" % (
+        mime_type,
+        content_type,
     )
 
 
-@then('the image has {horz_dpi_str} horizontal dpi')
+@then("the image has {horz_dpi_str} horizontal dpi")
 def then_image_has_horizontal_dpi(context, horz_dpi_str):
     expected_horz_dpi = int(horz_dpi_str)
     horz_dpi = context.image.horz_dpi
-    assert horz_dpi == expected_horz_dpi, (
-        "expected horizontal dpi %d, got %d" % (expected_horz_dpi, horz_dpi)
+    assert horz_dpi == expected_horz_dpi, "expected horizontal dpi %d, got %d" % (
+        expected_horz_dpi,
+        horz_dpi,
     )
 
 
-@then('the image has {vert_dpi_str} vertical dpi')
+@then("the image has {vert_dpi_str} vertical dpi")
 def then_image_has_vertical_dpi(context, vert_dpi_str):
     expected_vert_dpi = int(vert_dpi_str)
     vert_dpi = context.image.vert_dpi
-    assert vert_dpi == expected_vert_dpi, (
-        "expected vertical dpi %d, got %d" % (expected_vert_dpi, vert_dpi)
+    assert vert_dpi == expected_vert_dpi, "expected vertical dpi %d, got %d" % (
+        expected_vert_dpi,
+        vert_dpi,
     )
 
 
-@then('the image is {px_height_str} pixels high')
+@then("the image is {px_height_str} pixels high")
 def then_image_is_cx_pixels_high(context, px_height_str):
     expected_px_height = int(px_height_str)
     px_height = context.image.px_height
-    assert px_height == expected_px_height, (
-        "expected pixel height %d, got %d" % (expected_px_height, px_height)
+    assert px_height == expected_px_height, "expected pixel height %d, got %d" % (
+        expected_px_height,
+        px_height,
     )
 
 
-@then('the image is {px_width_str} pixels wide')
+@then("the image is {px_width_str} pixels wide")
 def then_image_is_cx_pixels_wide(context, px_width_str):
     expected_px_width = int(px_width_str)
     px_width = context.image.px_width
-    assert px_width == expected_px_width, (
-        "expected pixel width %d, got %d" % (expected_px_width, px_width)
+    assert px_width == expected_px_width, "expected pixel width %d, got %d" % (
+        expected_px_width,
+        px_width,
     )
diff --git a/features/steps/numbering.py b/features/steps/numbering.py
index ea41cdeb5..2a20fd087 100644
--- a/features/steps/numbering.py
+++ b/features/steps/numbering.py
@@ -13,14 +13,16 @@
 
 # given ===================================================
 
-@given('a document having a numbering part')
+
+@given("a document having a numbering part")
 def given_a_document_having_a_numbering_part(context):
-    context.document = Document(test_docx('num-having-numbering-part'))
+    context.document = Document(test_docx("num-having-numbering-part"))
 
 
 # when ====================================================
 
-@when('I get the numbering part from the document')
+
+@when("I get the numbering part from the document")
 def when_get_numbering_part_from_document(context):
     document = context.document
     context.numbering_part = document.part.numbering_part
@@ -28,7 +30,8 @@ def when_get_numbering_part_from_document(context):
 
 # then =====================================================
 
-@then('the numbering part has the expected numbering definitions')
+
+@then("the numbering part has the expected numbering definitions")
 def then_numbering_part_has_expected_numbering_definitions(context):
     numbering_part = context.numbering_part
     assert len(numbering_part.numbering_definitions) == 10
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index 3f47df9f1..d372983a0 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -15,83 +15,86 @@
 
 # given ===================================================
 
-@given('a document containing three paragraphs')
+
+@given("a document containing three paragraphs")
 def given_a_document_containing_three_paragraphs(context):
     document = Document()
-    document.add_paragraph('foo')
-    document.add_paragraph('bar')
-    document.add_paragraph('baz')
+    document.add_paragraph("foo")
+    document.add_paragraph("bar")
+    document.add_paragraph("baz")
     context.document = document
 
 
-@given('a paragraph having {align_type} alignment')
+@given("a paragraph having {align_type} alignment")
 def given_a_paragraph_align_type_alignment(context, align_type):
     paragraph_idx = {
-        'inherited': 0,
-        'left':      1,
-        'center':    2,
-        'right':     3,
-        'justified': 4,
+        "inherited": 0,
+        "left": 1,
+        "center": 2,
+        "right": 3,
+        "justified": 4,
     }[align_type]
-    document = Document(test_docx('par-alignment'))
+    document = Document(test_docx("par-alignment"))
     context.paragraph = document.paragraphs[paragraph_idx]
 
 
-@given('a paragraph having {style_state} style')
+@given("a paragraph having {style_state} style")
 def given_a_paragraph_having_style(context, style_state):
     paragraph_idx = {
-        'no specified': 0,
-        'a missing':    1,
-        'Heading 1':    2,
-        'Body Text':    3,
+        "no specified": 0,
+        "a missing": 1,
+        "Heading 1": 2,
+        "Body Text": 3,
     }[style_state]
-    document = context.document = Document(test_docx('par-known-styles'))
+    document = context.document = Document(test_docx("par-known-styles"))
     context.paragraph = document.paragraphs[paragraph_idx]
 
 
-@given('a paragraph with content and formatting')
+@given("a paragraph with content and formatting")
 def given_a_paragraph_with_content_and_formatting(context):
-    document = Document(test_docx('par-known-paragraphs'))
+    document = Document(test_docx("par-known-paragraphs"))
     context.paragraph = document.paragraphs[0]
 
 
 # when ====================================================
 
-@when('I add a run to the paragraph')
+
+@when("I add a run to the paragraph")
 def when_add_new_run_to_paragraph(context):
     context.run = context.p.add_run()
 
 
-@when('I assign a {style_type} to paragraph.style')
+@when("I assign a {style_type} to paragraph.style")
 def when_I_assign_a_style_type_to_paragraph_style(context, style_type):
     paragraph = context.paragraph
-    style = context.style = context.document.styles['Heading 1']
+    style = context.style = context.document.styles["Heading 1"]
     style_spec = {
-        'style object': style,
-        'style name':   'Heading 1',
+        "style object": style,
+        "style name": "Heading 1",
     }[style_type]
     paragraph.style = style_spec
 
 
-@when('I clear the paragraph content')
+@when("I clear the paragraph content")
 def when_I_clear_the_paragraph_content(context):
     context.paragraph.clear()
 
 
-@when('I insert a paragraph above the second paragraph')
+@when("I insert a paragraph above the second paragraph")
 def when_I_insert_a_paragraph_above_the_second_paragraph(context):
     paragraph = context.document.paragraphs[1]
-    paragraph.insert_paragraph_before('foobar', 'Heading1')
+    paragraph.insert_paragraph_before("foobar", "Heading1")
 
 
-@when('I set the paragraph text')
+@when("I set the paragraph text")
 def when_I_set_the_paragraph_text(context):
-    context.paragraph.text = 'bar\tfoo\r'
+    context.paragraph.text = "bar\tfoo\r"
 
 
 # then =====================================================
 
-@then('paragraph.paragraph_format is its ParagraphFormat object')
+
+@then("paragraph.paragraph_format is its ParagraphFormat object")
 def then_paragraph_paragraph_format_is_its_parfmt_object(context):
     paragraph = context.paragraph
     paragraph_format = paragraph.paragraph_format
@@ -99,24 +102,24 @@ def then_paragraph_paragraph_format_is_its_parfmt_object(context):
     assert paragraph_format.element is paragraph._element
 
 
-@then('paragraph.style is {value_key}')
+@then("paragraph.style is {value_key}")
 def then_paragraph_style_is_value(context, value_key):
     styles = context.document.styles
     expected_value = {
-        'Normal':    styles['Normal'],
-        'Heading 1': styles['Heading 1'],
-        'Body Text': styles['Body Text'],
+        "Normal": styles["Normal"],
+        "Heading 1": styles["Heading 1"],
+        "Body Text": styles["Body Text"],
     }[value_key]
     paragraph = context.paragraph
     assert paragraph.style == expected_value
 
 
-@then('the document contains four paragraphs')
+@then("the document contains four paragraphs")
 def then_the_document_contains_four_paragraphs(context):
     assert len(context.document.paragraphs) == 4
 
 
-@then('the document contains the text I added')
+@then("the document contains the text I added")
 def then_document_contains_text_I_added(context):
     document = Document(saved_docx_path)
     paragraphs = document.paragraphs
@@ -125,46 +128,46 @@ def then_document_contains_text_I_added(context):
     assert r.text == test_text
 
 
-@then('the paragraph alignment property value is {align_value}')
+@then("the paragraph alignment property value is {align_value}")
 def then_the_paragraph_alignment_prop_value_is_value(context, align_value):
     expected_value = {
-        'None':                      None,
-        'WD_ALIGN_PARAGRAPH.LEFT':   WD_ALIGN_PARAGRAPH.LEFT,
-        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
-        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
+        "None": None,
+        "WD_ALIGN_PARAGRAPH.LEFT": WD_ALIGN_PARAGRAPH.LEFT,
+        "WD_ALIGN_PARAGRAPH.CENTER": WD_ALIGN_PARAGRAPH.CENTER,
+        "WD_ALIGN_PARAGRAPH.RIGHT": WD_ALIGN_PARAGRAPH.RIGHT,
     }[align_value]
     assert context.paragraph.alignment == expected_value
 
 
-@then('the paragraph formatting is preserved')
+@then("the paragraph formatting is preserved")
 def then_the_paragraph_formatting_is_preserved(context):
     paragraph = context.paragraph
-    assert paragraph.style.name == 'Heading 1'
+    assert paragraph.style.name == "Heading 1"
 
 
-@then('the paragraph has no content')
+@then("the paragraph has no content")
 def then_the_paragraph_has_no_content(context):
-    assert context.paragraph.text == ''
+    assert context.paragraph.text == ""
 
 
-@then('the paragraph has the style I set')
+@then("the paragraph has the style I set")
 def then_the_paragraph_has_the_style_I_set(context):
     paragraph, expected_style = context.paragraph, context.style
     assert paragraph.style == expected_style
 
 
-@then('the paragraph has the text I set')
+@then("the paragraph has the text I set")
 def then_the_paragraph_has_the_text_I_set(context):
-    assert context.paragraph.text == 'bar\tfoo\n'
+    assert context.paragraph.text == "bar\tfoo\n"
 
 
-@then('the style of the second paragraph matches the style I set')
+@then("the style of the second paragraph matches the style I set")
 def then_the_style_of_the_second_paragraph_matches_the_style_I_set(context):
     second_paragraph = context.document.paragraphs[1]
-    assert second_paragraph.style.name == 'Heading 1'
+    assert second_paragraph.style.name == "Heading 1"
 
 
-@then('the text of the second paragraph matches the text I set')
+@then("the text of the second paragraph matches the text I set")
 def then_the_text_of_the_second_paragraph_matches_the_text_I_set(context):
     second_paragraph = context.document.paragraphs[1]
-    assert second_paragraph.text == 'foobar'
+    assert second_paragraph.text == "foobar"
diff --git a/features/steps/parfmt.py b/features/steps/parfmt.py
index f3203f7e5..197cf1626 100644
--- a/features/steps/parfmt.py
+++ b/features/steps/parfmt.py
@@ -4,9 +4,7 @@
 Step implementations for paragraph format-related features.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from behave import given, then, when
 
@@ -20,156 +18,157 @@
 
 # given ===================================================
 
-@given('a paragraph format')
+
+@given("a paragraph format")
 def given_a_paragraph_format(context):
-    document = Document(test_docx('tab-stops'))
+    document = Document(test_docx("tab-stops"))
     context.paragraph_format = document.paragraphs[0].paragraph_format
 
 
-@given('a paragraph format having {prop_name} set {setting}')
+@given("a paragraph format having {prop_name} set {setting}")
 def given_a_paragraph_format_having_prop_set(context, prop_name, setting):
     style_name = {
-        'to inherit': 'Normal',
-        'On':         'Base',
-        'Off':        'Citation',
+        "to inherit": "Normal",
+        "On": "Base",
+        "Off": "Citation",
     }[setting]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.paragraph_format = document.styles[style_name].paragraph_format
 
 
-@given('a paragraph format having {setting} line spacing')
+@given("a paragraph format having {setting} line spacing")
 def given_a_paragraph_format_having_setting_line_spacing(context, setting):
     style_name = {
-        'inherited': 'Normal',
-        '14 pt':     'Base',
-        'double':    'Citation',
+        "inherited": "Normal",
+        "14 pt": "Base",
+        "double": "Citation",
     }[setting]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.paragraph_format = document.styles[style_name].paragraph_format
 
 
-@given('a paragraph format having {setting} space {side}')
+@given("a paragraph format having {setting} space {side}")
 def given_a_paragraph_format_having_setting_spacing(context, setting, side):
-    style_name = 'Normal' if setting == 'inherited' else 'Base'
-    document = Document(test_docx('sty-known-styles'))
+    style_name = "Normal" if setting == "inherited" else "Base"
+    document = Document(test_docx("sty-known-styles"))
     context.paragraph_format = document.styles[style_name].paragraph_format
 
 
-@given('a paragraph format having {type} alignment')
+@given("a paragraph format having {type} alignment")
 def given_a_paragraph_format_having_align_type_alignment(context, type):
     style_name = {
-        'inherited': 'Normal',
-        'center':    'Base',
-        'right':     'Citation',
+        "inherited": "Normal",
+        "center": "Base",
+        "right": "Citation",
     }[type]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.paragraph_format = document.styles[style_name].paragraph_format
 
 
-@given('a paragraph format having {type} indent of {value}')
+@given("a paragraph format having {type} indent of {value}")
 def given_a_paragraph_format_having_type_indent_value(context, type, value):
     style_name = {
-        'inherit':  'Normal',
-        '18 pt':    'Base',
-        '17.3 pt':  'Base',
-        '-17.3 pt': 'Citation',
-        '46.1 pt':  'Citation',
+        "inherit": "Normal",
+        "18 pt": "Base",
+        "17.3 pt": "Base",
+        "-17.3 pt": "Citation",
+        "46.1 pt": "Citation",
     }[value]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.paragraph_format = document.styles[style_name].paragraph_format
 
 
 # when ====================================================
 
-@when('I assign {value} to paragraph_format.line_spacing')
+
+@when("I assign {value} to paragraph_format.line_spacing")
 def when_I_assign_value_to_paragraph_format_line_spacing(context, value):
     new_value = {
-        'Pt(14)': Pt(14),
-        '2':      2,
+        "Pt(14)": Pt(14),
+        "2": 2,
     }.get(value)
     new_value = float(value) if new_value is None else new_value
     context.paragraph_format.line_spacing = new_value
 
 
-@when('I assign {value} to paragraph_format.line_spacing_rule')
+@when("I assign {value} to paragraph_format.line_spacing_rule")
 def when_I_assign_value_to_paragraph_format_line_rule(context, value):
     new_value = {
-        'None':                           None,
-        'WD_LINE_SPACING.EXACTLY':        WD_LINE_SPACING.EXACTLY,
-        'WD_LINE_SPACING.MULTIPLE':       WD_LINE_SPACING.MULTIPLE,
-        'WD_LINE_SPACING.SINGLE':         WD_LINE_SPACING.SINGLE,
-        'WD_LINE_SPACING.DOUBLE':         WD_LINE_SPACING.DOUBLE,
-        'WD_LINE_SPACING.AT_LEAST':       WD_LINE_SPACING.AT_LEAST,
-        'WD_LINE_SPACING.ONE_POINT_FIVE': WD_LINE_SPACING.ONE_POINT_FIVE,
+        "None": None,
+        "WD_LINE_SPACING.EXACTLY": WD_LINE_SPACING.EXACTLY,
+        "WD_LINE_SPACING.MULTIPLE": WD_LINE_SPACING.MULTIPLE,
+        "WD_LINE_SPACING.SINGLE": WD_LINE_SPACING.SINGLE,
+        "WD_LINE_SPACING.DOUBLE": WD_LINE_SPACING.DOUBLE,
+        "WD_LINE_SPACING.AT_LEAST": WD_LINE_SPACING.AT_LEAST,
+        "WD_LINE_SPACING.ONE_POINT_FIVE": WD_LINE_SPACING.ONE_POINT_FIVE,
     }[value]
     paragraph_format = context.paragraph_format
     paragraph_format.line_spacing_rule = new_value
 
 
-@when('I assign {value} to paragraph_format.alignment')
+@when("I assign {value} to paragraph_format.alignment")
 def when_I_assign_value_to_paragraph_format_alignment(context, value):
     new_value = {
-        'None':                      None,
-        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
-        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
+        "None": None,
+        "WD_ALIGN_PARAGRAPH.CENTER": WD_ALIGN_PARAGRAPH.CENTER,
+        "WD_ALIGN_PARAGRAPH.RIGHT": WD_ALIGN_PARAGRAPH.RIGHT,
     }[value]
     paragraph_format = context.paragraph_format
     paragraph_format.alignment = new_value
 
 
-@when('I assign {value} to paragraph_format.space_{side}')
+@when("I assign {value} to paragraph_format.space_{side}")
 def when_I_assign_value_to_paragraph_format_space(context, value, side):
     paragraph_format = context.paragraph_format
-    prop_name = 'space_%s' % side
+    prop_name = "space_%s" % side
     new_value = {
-        'None':   None,
-        'Pt(12)': Pt(12),
-        'Pt(18)': Pt(18),
+        "None": None,
+        "Pt(12)": Pt(12),
+        "Pt(18)": Pt(18),
     }[value]
     setattr(paragraph_format, prop_name, new_value)
 
 
-@when('I assign {value} to paragraph_format.{type_}_indent')
+@when("I assign {value} to paragraph_format.{type_}_indent")
 def when_I_assign_value_to_paragraph_format_indent(context, value, type_):
     paragraph_format = context.paragraph_format
-    prop_name = '%s_indent' % type_
-    value = None if value == 'None' else Pt(float(value.split()[0]))
+    prop_name = "%s_indent" % type_
+    value = None if value == "None" else Pt(float(value.split()[0]))
     setattr(paragraph_format, prop_name, value)
 
 
-@when('I assign {value} to paragraph_format.{prop_name}')
+@when("I assign {value} to paragraph_format.{prop_name}")
 def when_I_assign_value_to_paragraph_format_prop(context, value, prop_name):
     paragraph_format = context.paragraph_format
-    value = {'None': None, 'True': True, 'False': False}[value]
+    value = {"None": None, "True": True, "False": False}[value]
     setattr(paragraph_format, prop_name, value)
 
 
 # then =====================================================
 
-@then('paragraph_format.tab_stops is a TabStops object')
+
+@then("paragraph_format.tab_stops is a TabStops object")
 def then_paragraph_format_tab_stops_is_a_tabstops_object(context):
     tab_stops = context.paragraph_format.tab_stops
     assert isinstance(tab_stops, TabStops)
 
 
-@then('paragraph_format.alignment is {value}')
+@then("paragraph_format.alignment is {value}")
 def then_paragraph_format_alignment_is_value(context, value):
     expected_value = {
-        'None':                      None,
-        'WD_ALIGN_PARAGRAPH.LEFT':   WD_ALIGN_PARAGRAPH.LEFT,
-        'WD_ALIGN_PARAGRAPH.CENTER': WD_ALIGN_PARAGRAPH.CENTER,
-        'WD_ALIGN_PARAGRAPH.RIGHT':  WD_ALIGN_PARAGRAPH.RIGHT,
+        "None": None,
+        "WD_ALIGN_PARAGRAPH.LEFT": WD_ALIGN_PARAGRAPH.LEFT,
+        "WD_ALIGN_PARAGRAPH.CENTER": WD_ALIGN_PARAGRAPH.CENTER,
+        "WD_ALIGN_PARAGRAPH.RIGHT": WD_ALIGN_PARAGRAPH.RIGHT,
     }[value]
     paragraph_format = context.paragraph_format
     assert paragraph_format.alignment == expected_value
 
 
-@then('paragraph_format.line_spacing is {value}')
+@then("paragraph_format.line_spacing is {value}")
 def then_paragraph_format_line_spacing_is_value(context, value):
     expected_value = (
-        None if value == 'None' else
-        float(value) if '.' in value else
-        int(value)
+        None if value == "None" else float(value) if "." in value else int(value)
     )
     paragraph_format = context.paragraph_format
 
@@ -179,42 +178,42 @@ def then_paragraph_format_line_spacing_is_value(context, value):
         assert abs(paragraph_format.line_spacing - expected_value) < 0.001
 
 
-@then('paragraph_format.line_spacing_rule is {value}')
+@then("paragraph_format.line_spacing_rule is {value}")
 def then_paragraph_format_line_spacing_rule_is_value(context, value):
     expected_value = {
-        'None':                           None,
-        'WD_LINE_SPACING.EXACTLY':        WD_LINE_SPACING.EXACTLY,
-        'WD_LINE_SPACING.MULTIPLE':       WD_LINE_SPACING.MULTIPLE,
-        'WD_LINE_SPACING.SINGLE':         WD_LINE_SPACING.SINGLE,
-        'WD_LINE_SPACING.DOUBLE':         WD_LINE_SPACING.DOUBLE,
-        'WD_LINE_SPACING.AT_LEAST':       WD_LINE_SPACING.AT_LEAST,
-        'WD_LINE_SPACING.ONE_POINT_FIVE': WD_LINE_SPACING.ONE_POINT_FIVE,
+        "None": None,
+        "WD_LINE_SPACING.EXACTLY": WD_LINE_SPACING.EXACTLY,
+        "WD_LINE_SPACING.MULTIPLE": WD_LINE_SPACING.MULTIPLE,
+        "WD_LINE_SPACING.SINGLE": WD_LINE_SPACING.SINGLE,
+        "WD_LINE_SPACING.DOUBLE": WD_LINE_SPACING.DOUBLE,
+        "WD_LINE_SPACING.AT_LEAST": WD_LINE_SPACING.AT_LEAST,
+        "WD_LINE_SPACING.ONE_POINT_FIVE": WD_LINE_SPACING.ONE_POINT_FIVE,
     }[value]
     paragraph_format = context.paragraph_format
     assert paragraph_format.line_spacing_rule == expected_value
 
 
-@then('paragraph_format.space_{side} is {value}')
+@then("paragraph_format.space_{side} is {value}")
 def then_paragraph_format_space_side_is_value(context, side, value):
-    expected_value = None if value == 'None' else int(value)
-    prop_name = 'space_%s' % side
+    expected_value = None if value == "None" else int(value)
+    prop_name = "space_%s" % side
     paragraph_format = context.paragraph_format
     actual_value = getattr(paragraph_format, prop_name)
     assert actual_value == expected_value
 
 
-@then('paragraph_format.{type_}_indent is {value}')
+@then("paragraph_format.{type_}_indent is {value}")
 def then_paragraph_format_type_indent_is_value(context, type_, value):
-    expected_value = None if value == 'None' else int(value)
-    prop_name = '%s_indent' % type_
+    expected_value = None if value == "None" else int(value)
+    prop_name = "%s_indent" % type_
     paragraph_format = context.paragraph_format
     actual_value = getattr(paragraph_format, prop_name)
     assert actual_value == expected_value
 
 
-@then('paragraph_format.{prop_name} is {value}')
+@then("paragraph_format.{prop_name} is {value}")
 def then_paragraph_format_prop_name_is_value(context, prop_name, value):
-    expected_value = {'None': None, 'True': True, 'False': False}[value]
+    expected_value = {"None": None, "True": True, "False": False}[value]
     paragraph_format = context.paragraph_format
     actual_value = getattr(paragraph_format, prop_name)
     assert actual_value == expected_value
diff --git a/features/steps/section.py b/features/steps/section.py
index 91209eac1..1eae8017c 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -18,6 +18,7 @@
 
 # given ====================================================
 
+
 @given("a Section object as section")
 def given_a_Section_object_as_section(context):
     context.section = Document(test_docx("sct-section-props")).sections[-1]
@@ -29,105 +30,104 @@ def given_a_Section_object_with_or_without_first_page_header(context, with_or_wi
     context.section = Document(test_docx("sct-first-page-hdrftr")).sections[section_idx]
 
 
-@given('a section collection containing 3 sections')
+@given("a section collection containing 3 sections")
 def given_a_section_collection_containing_3_sections(context):
-    document = Document(test_docx('doc-access-sections'))
+    document = Document(test_docx("doc-access-sections"))
     context.sections = document.sections
 
 
-@given('a section having known page dimension')
+@given("a section having known page dimension")
 def given_a_section_having_known_page_dimension(context):
-    document = Document(test_docx('sct-section-props'))
+    document = Document(test_docx("sct-section-props"))
     context.section = document.sections[-1]
 
 
-@given('a section having known page margins')
+@given("a section having known page margins")
 def given_a_section_having_known_page_margins(context):
-    document = Document(test_docx('sct-section-props'))
+    document = Document(test_docx("sct-section-props"))
     context.section = document.sections[0]
 
 
-@given('a section having start type {start_type}')
+@given("a section having start type {start_type}")
 def given_a_section_having_start_type(context, start_type):
     section_idx = {
-        'CONTINUOUS': 0,
-        'NEW_PAGE':   1,
-        'ODD_PAGE':   2,
-        'EVEN_PAGE':  3,
-        'NEW_COLUMN': 4,
+        "CONTINUOUS": 0,
+        "NEW_PAGE": 1,
+        "ODD_PAGE": 2,
+        "EVEN_PAGE": 3,
+        "NEW_COLUMN": 4,
     }[start_type]
-    document = Document(test_docx('sct-section-props'))
+    document = Document(test_docx("sct-section-props"))
     context.section = document.sections[section_idx]
 
 
-@given('a section known to have {orientation} orientation')
+@given("a section known to have {orientation} orientation")
 def given_a_section_having_known_orientation(context, orientation):
-    section_idx = {
-        'landscape': 0,
-        'portrait':  1
-    }[orientation]
-    document = Document(test_docx('sct-section-props'))
+    section_idx = {"landscape": 0, "portrait": 1}[orientation]
+    document = Document(test_docx("sct-section-props"))
     context.section = document.sections[section_idx]
 
 
 # when =====================================================
 
+
 @when("I assign {bool_val} to section.different_first_page_header_footer")
 def when_I_assign_value_to_section_different_first_page_hdrftr(context, bool_val):
     context.section.different_first_page_header_footer = eval(bool_val)
 
 
-@when('I set the {margin_side} margin to {inches} inches')
+@when("I set the {margin_side} margin to {inches} inches")
 def when_I_set_the_margin_side_length(context, margin_side, inches):
     prop_name = {
-        'left':   'left_margin',
-        'right':  'right_margin',
-        'top':    'top_margin',
-        'bottom': 'bottom_margin',
-        'gutter': 'gutter',
-        'header': 'header_distance',
-        'footer': 'footer_distance',
+        "left": "left_margin",
+        "right": "right_margin",
+        "top": "top_margin",
+        "bottom": "bottom_margin",
+        "gutter": "gutter",
+        "header": "header_distance",
+        "footer": "footer_distance",
     }[margin_side]
     new_value = Inches(float(inches))
     setattr(context.section, prop_name, new_value)
 
 
-@when('I set the section orientation to {orientation}')
+@when("I set the section orientation to {orientation}")
 def when_I_set_the_section_orientation(context, orientation):
     new_orientation = {
-        'WD_ORIENT.PORTRAIT':  WD_ORIENT.PORTRAIT,
-        'WD_ORIENT.LANDSCAPE': WD_ORIENT.LANDSCAPE,
-        'None':                None,
+        "WD_ORIENT.PORTRAIT": WD_ORIENT.PORTRAIT,
+        "WD_ORIENT.LANDSCAPE": WD_ORIENT.LANDSCAPE,
+        "None": None,
     }[orientation]
     context.section.orientation = new_orientation
 
 
-@when('I set the section page height to {y} inches')
+@when("I set the section page height to {y} inches")
 def when_I_set_the_section_page_height_to_y_inches(context, y):
     context.section.page_height = Inches(float(y))
 
 
-@when('I set the section page width to {x} inches')
+@when("I set the section page width to {x} inches")
 def when_I_set_the_section_page_width_to_x_inches(context, x):
     context.section.page_width = Inches(float(x))
 
 
-@when('I set the section start type to {start_type}')
+@when("I set the section start type to {start_type}")
 def when_I_set_the_section_start_type_to_start_type(context, start_type):
     new_start_type = {
-        'None':       None,
-        'CONTINUOUS': WD_SECTION.CONTINUOUS,
-        'EVEN_PAGE':  WD_SECTION.EVEN_PAGE,
-        'NEW_COLUMN': WD_SECTION.NEW_COLUMN,
-        'NEW_PAGE':   WD_SECTION.NEW_PAGE,
-        'ODD_PAGE':   WD_SECTION.ODD_PAGE,
+        "None": None,
+        "CONTINUOUS": WD_SECTION.CONTINUOUS,
+        "EVEN_PAGE": WD_SECTION.EVEN_PAGE,
+        "NEW_COLUMN": WD_SECTION.NEW_COLUMN,
+        "NEW_PAGE": WD_SECTION.NEW_PAGE,
+        "ODD_PAGE": WD_SECTION.ODD_PAGE,
     }[start_type]
     context.section.start_type = new_start_type
 
 
 # then =====================================================
 
-@then('I can access a section by index')
+
+@then("I can access a section by index")
 def then_I_can_access_a_section_by_index(context):
     sections = context.sections
     for idx in range(3):
@@ -135,7 +135,7 @@ def then_I_can_access_a_section_by_index(context):
         assert isinstance(section, Section)
 
 
-@then('I can iterate over the sections')
+@then("I can iterate over the sections")
 def then_I_can_iterate_over_the_sections(context):
     sections = context.sections
     actual_count = 0
@@ -145,12 +145,10 @@ def then_I_can_iterate_over_the_sections(context):
     assert actual_count == 3
 
 
-@then('len(sections) is 3')
+@then("len(sections) is 3")
 def then_len_sections_is_3(context):
     sections = context.sections
-    assert len(sections) == 3, (
-        'expected len(sections) of 3, got %s' % len(sections)
-    )
+    assert len(sections) == 3, "expected len(sections) of 3, got %s" % len(sections)
 
 
 @then("section.different_first_page_header_footer is {bool_val}")
@@ -208,53 +206,54 @@ def then_section_header_is_a_Header_object(context):
 def then_section_hdrftr_prop_is_linked_to_previous_is_True(context, propname):
     actual = getattr(context.section, propname).is_linked_to_previous
     expected = True
-    assert actual == expected, (
-        "section.%s.is_linked_to_previous is %s" % (propname, actual)
+    assert actual == expected, "section.%s.is_linked_to_previous is %s" % (
+        propname,
+        actual,
     )
 
 
-@then('the reported {margin_side} margin is {inches} inches')
+@then("the reported {margin_side} margin is {inches} inches")
 def then_the_reported_margin_is_inches(context, margin_side, inches):
     prop_name = {
-        'left':   'left_margin',
-        'right':  'right_margin',
-        'top':    'top_margin',
-        'bottom': 'bottom_margin',
-        'gutter': 'gutter',
-        'header': 'header_distance',
-        'footer': 'footer_distance',
+        "left": "left_margin",
+        "right": "right_margin",
+        "top": "top_margin",
+        "bottom": "bottom_margin",
+        "gutter": "gutter",
+        "header": "header_distance",
+        "footer": "footer_distance",
     }[margin_side]
     expected_value = Inches(float(inches))
     actual_value = getattr(context.section, prop_name)
     assert actual_value == expected_value
 
 
-@then('the reported page orientation is {orientation}')
+@then("the reported page orientation is {orientation}")
 def then_the_reported_page_orientation_is_orientation(context, orientation):
     expected_value = {
-        'WD_ORIENT.LANDSCAPE': WD_ORIENT.LANDSCAPE,
-        'WD_ORIENT.PORTRAIT':  WD_ORIENT.PORTRAIT,
+        "WD_ORIENT.LANDSCAPE": WD_ORIENT.LANDSCAPE,
+        "WD_ORIENT.PORTRAIT": WD_ORIENT.PORTRAIT,
     }[orientation]
     assert context.section.orientation == expected_value
 
 
-@then('the reported page width is {x} inches')
+@then("the reported page width is {x} inches")
 def then_the_reported_page_width_is_width(context, x):
     assert context.section.page_width == Inches(float(x))
 
 
-@then('the reported page height is {y} inches')
+@then("the reported page height is {y} inches")
 def then_the_reported_page_height_is_11_inches(context, y):
     assert context.section.page_height == Inches(float(y))
 
 
-@then('the reported section start type is {start_type}')
+@then("the reported section start type is {start_type}")
 def then_the_reported_section_start_type_is_type(context, start_type):
     expected_start_type = {
-        'CONTINUOUS': WD_SECTION.CONTINUOUS,
-        'EVEN_PAGE':  WD_SECTION.EVEN_PAGE,
-        'NEW_COLUMN': WD_SECTION.NEW_COLUMN,
-        'NEW_PAGE':   WD_SECTION.NEW_PAGE,
-        'ODD_PAGE':   WD_SECTION.ODD_PAGE,
+        "CONTINUOUS": WD_SECTION.CONTINUOUS,
+        "EVEN_PAGE": WD_SECTION.EVEN_PAGE,
+        "NEW_COLUMN": WD_SECTION.NEW_COLUMN,
+        "NEW_PAGE": WD_SECTION.NEW_PAGE,
+        "ODD_PAGE": WD_SECTION.ODD_PAGE,
     }[start_type]
     assert context.section.start_type == expected_start_type
diff --git a/features/steps/settings.py b/features/steps/settings.py
index f770f8c19..9c6d94e2d 100644
--- a/features/steps/settings.py
+++ b/features/steps/settings.py
@@ -14,26 +14,28 @@
 
 # given ====================================================
 
-@given('a document having a settings part')
+
+@given("a document having a settings part")
 def given_a_document_having_a_settings_part(context):
-    context.document = Document(test_docx('doc-word-default-blank'))
+    context.document = Document(test_docx("doc-word-default-blank"))
 
 
-@given('a document having no settings part')
+@given("a document having no settings part")
 def given_a_document_having_no_settings_part(context):
-    context.document = Document(test_docx('set-no-settings-part'))
+    context.document = Document(test_docx("set-no-settings-part"))
 
 
 @given("a Settings object {with_or_without} odd and even page headers as settings")
 def given_a_Settings_object_with_or_without_odd_and_even_hdrs(context, with_or_without):
-    testfile_name = {
-        "with": "doc-odd-even-hdrs", "without": "sct-section-props"
-    }[with_or_without]
+    testfile_name = {"with": "doc-odd-even-hdrs", "without": "sct-section-props"}[
+        with_or_without
+    ]
     context.settings = Document(test_docx(testfile_name)).settings
 
 
 # when =====================================================
 
+
 @when("I assign {bool_val} to settings.odd_and_even_pages_header_footer")
 def when_I_assign_value_to_settings_odd_and_even_pages_header_footer(context, bool_val):
     context.settings.odd_and_even_pages_header_footer = eval(bool_val)
@@ -41,7 +43,8 @@ def when_I_assign_value_to_settings_odd_and_even_pages_header_footer(context, bo
 
 # then =====================================================
 
-@then('document.settings is a Settings object')
+
+@then("document.settings is a Settings object")
 def then_document_settings_is_a_Settings_object(context):
     document = context.document
     assert type(document.settings) is Settings
diff --git a/features/steps/shape.py b/features/steps/shape.py
index 1a8d0c60c..b35b385ad 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -20,36 +20,38 @@
 
 # given ===================================================
 
-@given('an inline shape collection containing five shapes')
+
+@given("an inline shape collection containing five shapes")
 def given_an_inline_shape_collection_containing_five_shapes(context):
-    docx_path = test_docx('shp-inline-shape-access')
+    docx_path = test_docx("shp-inline-shape-access")
     document = Document(docx_path)
     context.inline_shapes = document.inline_shapes
 
 
-@given('an inline shape of known dimensions')
+@given("an inline shape of known dimensions")
 def given_inline_shape_of_known_dimensions(context):
-    document = Document(test_docx('shp-inline-shape-access'))
+    document = Document(test_docx("shp-inline-shape-access"))
     context.inline_shape = document.inline_shapes[0]
 
 
-@given('an inline shape known to be {shp_of_type}')
+@given("an inline shape known to be {shp_of_type}")
 def given_inline_shape_known_to_be_shape_of_type(context, shp_of_type):
     inline_shape_idx = {
-        'an embedded picture':  0,
-        'a linked picture':     1,
-        'a link+embed picture': 2,
-        'a smart art diagram':  3,
-        'a chart':              4,
+        "an embedded picture": 0,
+        "a linked picture": 1,
+        "a link+embed picture": 2,
+        "a smart art diagram": 3,
+        "a chart": 4,
     }[shp_of_type]
-    docx_path = test_docx('shp-inline-shape-access')
+    docx_path = test_docx("shp-inline-shape-access")
     document = Document(docx_path)
     context.inline_shape = document.inline_shapes[inline_shape_idx]
 
 
 # when =====================================================
 
-@when('I change the dimensions of the inline shape')
+
+@when("I change the dimensions of the inline shape")
 def when_change_dimensions_of_inline_shape(context):
     inline_shape = context.inline_shape
     inline_shape.width = Inches(1)
@@ -58,7 +60,8 @@ def when_change_dimensions_of_inline_shape(context):
 
 # then =====================================================
 
-@then('I can access each inline shape by index')
+
+@then("I can access each inline shape by index")
 def then_can_access_each_inline_shape_by_index(context):
     inline_shapes = context.inline_shapes
     for idx in range(2):
@@ -66,7 +69,7 @@ def then_can_access_each_inline_shape_by_index(context):
         assert isinstance(inline_shape, InlineShape)
 
 
-@then('I can iterate over the inline shape collection')
+@then("I can iterate over the inline shape collection")
 def then_can_iterate_over_inline_shape_collection(context):
     inline_shapes = context.inline_shapes
     shape_count = 0
@@ -74,38 +77,39 @@ def then_can_iterate_over_inline_shape_collection(context):
         shape_count += 1
         assert isinstance(inline_shape, InlineShape)
     expected_count = 5
-    assert shape_count == expected_count, (
-        'expected %d, got %d' % (expected_count, shape_count)
+    assert shape_count == expected_count, "expected %d, got %d" % (
+        expected_count,
+        shape_count,
     )
 
 
-@then('its inline shape type is {shape_type}')
+@then("its inline shape type is {shape_type}")
 def then_inline_shape_type_is_shape_type(context, shape_type):
     expected_value = {
-        'WD_INLINE_SHAPE.CHART':          WD_INLINE_SHAPE.CHART,
-        'WD_INLINE_SHAPE.LINKED_PICTURE': WD_INLINE_SHAPE.LINKED_PICTURE,
-        'WD_INLINE_SHAPE.PICTURE':        WD_INLINE_SHAPE.PICTURE,
-        'WD_INLINE_SHAPE.SMART_ART':      WD_INLINE_SHAPE.SMART_ART,
+        "WD_INLINE_SHAPE.CHART": WD_INLINE_SHAPE.CHART,
+        "WD_INLINE_SHAPE.LINKED_PICTURE": WD_INLINE_SHAPE.LINKED_PICTURE,
+        "WD_INLINE_SHAPE.PICTURE": WD_INLINE_SHAPE.PICTURE,
+        "WD_INLINE_SHAPE.SMART_ART": WD_INLINE_SHAPE.SMART_ART,
     }[shape_type]
     inline_shape = context.inline_shape
     assert inline_shape.type == expected_value
 
 
-@then('the dimensions of the inline shape match the known values')
+@then("the dimensions of the inline shape match the known values")
 def then_dimensions_of_inline_shape_match_known_values(context):
     inline_shape = context.inline_shape
-    assert inline_shape.width == 1778000, 'got %s' % inline_shape.width
-    assert inline_shape.height == 711200, 'got %s' % inline_shape.height
+    assert inline_shape.width == 1778000, "got %s" % inline_shape.width
+    assert inline_shape.height == 711200, "got %s" % inline_shape.height
 
 
-@then('the dimensions of the inline shape match the new values')
+@then("the dimensions of the inline shape match the new values")
 def then_dimensions_of_inline_shape_match_new_values(context):
     inline_shape = context.inline_shape
-    assert inline_shape.width == 914400, 'got %s' % inline_shape.width
-    assert inline_shape.height == 457200, 'got %s' % inline_shape.height
+    assert inline_shape.width == 914400, "got %s" % inline_shape.width
+    assert inline_shape.height == 457200, "got %s" % inline_shape.height
 
 
-@then('the document contains the inline picture')
+@then("the document contains the inline picture")
 def then_the_document_contains_the_inline_picture(context):
     document = context.document
     picture_shape = document.inline_shapes[0]
@@ -113,42 +117,41 @@ def then_the_document_contains_the_inline_picture(context):
     rId = blip.embed
     image_part = document.part.related_parts[rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
-    expected_sha1 = '79769f1e202add2e963158b532e36c2c0f76a70c'
-    assert image_sha1 == expected_sha1, (
-        "image SHA1 doesn't match, expected %s, got %s" %
-        (expected_sha1, image_sha1)
-    )
+    expected_sha1 = "79769f1e202add2e963158b532e36c2c0f76a70c"
+    assert (
+        image_sha1 == expected_sha1
+    ), "image SHA1 doesn't match, expected %s, got %s" % (expected_sha1, image_sha1)
 
 
-@then('the length of the inline shape collection is 5')
+@then("the length of the inline shape collection is 5")
 def then_len_of_inline_shape_collection_is_5(context):
     inline_shapes = context.inline_shapes
     shape_count = len(inline_shapes)
-    assert shape_count == 5, 'got %s' % shape_count
+    assert shape_count == 5, "got %s" % shape_count
 
 
-@then('the picture has its native width and height')
+@then("the picture has its native width and height")
 def then_picture_has_native_width_and_height(context):
     picture = context.picture
-    assert picture.width == 1905000, 'got %d' % picture.width
-    assert picture.height == 2717800, 'got %d' % picture.height
+    assert picture.width == 1905000, "got %d" % picture.width
+    assert picture.height == 2717800, "got %d" % picture.height
 
 
-@then('picture.height is {inches} inches')
+@then("picture.height is {inches} inches")
 def then_picture_height_is_value(context, inches):
     expected_value = {
-        '2.14': 1956816,
-        '2.5':  2286000,
+        "2.14": 1956816,
+        "2.5": 2286000,
     }[inches]
     picture = context.picture
-    assert picture.height == expected_value, 'got %d' % picture.height
+    assert picture.height == expected_value, "got %d" % picture.height
 
 
-@then('picture.width is {inches} inches')
+@then("picture.width is {inches} inches")
 def then_picture_width_is_value(context, inches):
     expected_value = {
-        '1.05':  961402,
-        '1.75': 1600200,
+        "1.05": 961402,
+        "1.75": 1600200,
     }[inches]
     picture = context.picture
-    assert picture.width == expected_value, 'got %d' % picture.width
+    assert picture.width == expected_value, "got %d" % picture.width
diff --git a/features/steps/shared.py b/features/steps/shared.py
index 5e82e24a6..c5e2881fe 100644
--- a/features/steps/shared.py
+++ b/features/steps/shared.py
@@ -15,14 +15,16 @@
 
 # given ===================================================
 
-@given('a document')
+
+@given("a document")
 def given_a_document(context):
     context.document = Document()
 
 
 # when ====================================================
 
-@when('I save the document')
+
+@when("I save the document")
 def when_save_document(context):
     if os.path.isfile(saved_docx_path):
         os.remove(saved_docx_path)
diff --git a/features/steps/styles.py b/features/steps/styles.py
index 01927bcd7..c4b34be85 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -16,266 +16,266 @@
 from helpers import bool_vals, test_docx, tri_state_vals
 
 style_types = {
-    'WD_STYLE_TYPE.CHARACTER': WD_STYLE_TYPE.CHARACTER,
-    'WD_STYLE_TYPE.PARAGRAPH': WD_STYLE_TYPE.PARAGRAPH,
-    'WD_STYLE_TYPE.LIST':      WD_STYLE_TYPE.LIST,
-    'WD_STYLE_TYPE.TABLE':     WD_STYLE_TYPE.TABLE,
+    "WD_STYLE_TYPE.CHARACTER": WD_STYLE_TYPE.CHARACTER,
+    "WD_STYLE_TYPE.PARAGRAPH": WD_STYLE_TYPE.PARAGRAPH,
+    "WD_STYLE_TYPE.LIST": WD_STYLE_TYPE.LIST,
+    "WD_STYLE_TYPE.TABLE": WD_STYLE_TYPE.TABLE,
 }
 
 
 # given ===================================================
 
-@given('a document having a styles part')
+
+@given("a document having a styles part")
 def given_a_document_having_a_styles_part(context):
-    docx_path = test_docx('sty-having-styles-part')
+    docx_path = test_docx("sty-having-styles-part")
     context.document = Document(docx_path)
 
 
-@given('a document having known styles')
+@given("a document having known styles")
 def given_a_document_having_known_styles(context):
-    docx_path = test_docx('sty-known-styles')
+    docx_path = test_docx("sty-known-styles")
     document = Document(docx_path)
     context.document = document
     context.style_count = len(document.styles)
 
 
-@given('a document having no styles part')
+@given("a document having no styles part")
 def given_a_document_having_no_styles_part(context):
-    docx_path = test_docx('sty-having-no-styles-part')
+    docx_path = test_docx("sty-having-no-styles-part")
     context.document = Document(docx_path)
 
 
-@given('a latent style collection')
+@given("a latent style collection")
 def given_a_latent_style_collection(context):
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.latent_styles = document.styles.latent_styles
 
 
-@given('a latent style having a known name')
+@given("a latent style having a known name")
 def given_a_latent_style_having_a_known_name(context):
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     latent_styles = list(document.styles.latent_styles)
     context.latent_style = latent_styles[0]  # should be 'Normal'
 
 
-@given('a latent style having priority of {setting}')
+@given("a latent style having priority of {setting}")
 def given_a_latent_style_having_priority_of_setting(context, setting):
     latent_style_name = {
-        '42':         'Normal',
-        'no setting': 'Subtitle',
+        "42": "Normal",
+        "no setting": "Subtitle",
     }[setting]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     latent_styles = document.styles.latent_styles
     context.latent_style = latent_styles[latent_style_name]
 
 
-@given('a latent style having {prop_name} set {setting}')
+@given("a latent style having {prop_name} set {setting}")
 def given_a_latent_style_having_prop_setting(context, prop_name, setting):
     latent_style_name = {
-        'on':         'Normal',
-        'off':        'Title',
-        'no setting': 'Subtitle',
+        "on": "Normal",
+        "off": "Title",
+        "no setting": "Subtitle",
     }[setting]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     latent_styles = document.styles.latent_styles
     context.latent_style = latent_styles[latent_style_name]
 
 
-@given('a latent styles object with known defaults')
+@given("a latent styles object with known defaults")
 def given_a_latent_styles_object_with_known_defaults(context):
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.latent_styles = document.styles.latent_styles
 
 
-@given('a style based on {base_style}')
+@given("a style based on {base_style}")
 def given_a_style_based_on_setting(context, base_style):
     style_name = {
-        'no style': 'Base',
-        'Normal':   'Sub Normal',
-        'Base':     'Citation',
+        "no style": "Base",
+        "Normal": "Sub Normal",
+        "Base": "Citation",
     }[base_style]
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.styles = document.styles
     context.style = document.styles[style_name]
 
 
-@given('a style having a known {attr_name}')
+@given("a style having a known {attr_name}")
 def given_a_style_having_a_known_attr_name(context, attr_name):
-    docx_path = test_docx('sty-having-styles-part')
+    docx_path = test_docx("sty-having-styles-part")
     document = Document(docx_path)
-    context.style = document.styles['Normal']
+    context.style = document.styles["Normal"]
 
 
-@given('a style having hidden set {setting}')
+@given("a style having hidden set {setting}")
 def given_a_style_having_hidden_set_setting(context, setting):
-    document = Document(test_docx('sty-behav-props'))
+    document = Document(test_docx("sty-behav-props"))
     style_name = {
-        'on':         'Foo',
-        'off':        'Bar',
-        'no setting': 'Baz',
+        "on": "Foo",
+        "off": "Bar",
+        "no setting": "Baz",
     }[setting]
     context.style = document.styles[style_name]
 
 
-@given('a style having locked set {setting}')
+@given("a style having locked set {setting}")
 def given_a_style_having_locked_setting(context, setting):
-    document = Document(test_docx('sty-behav-props'))
+    document = Document(test_docx("sty-behav-props"))
     style_name = {
-        'on':         'Foo',
-        'off':        'Bar',
-        'no setting': 'Baz',
+        "on": "Foo",
+        "off": "Bar",
+        "no setting": "Baz",
     }[setting]
     context.style = document.styles[style_name]
 
 
-@given('a style having next paragraph style set to {setting}')
+@given("a style having next paragraph style set to {setting}")
 def given_a_style_having_next_paragraph_style_setting(context, setting):
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     style_name = {
-        'Sub Normal': 'Citation',
-        'Foobar':     'Sub Normal',
-        'Base':       'Foo',
-        'no setting': 'Base',
+        "Sub Normal": "Citation",
+        "Foobar": "Sub Normal",
+        "Base": "Foo",
+        "no setting": "Base",
     }[setting]
     context.styles = document.styles
     context.style = document.styles[style_name]
 
 
-@given('a style having priority of {setting}')
+@given("a style having priority of {setting}")
 def given_a_style_having_priority_of_setting(context, setting):
-    document = Document(test_docx('sty-behav-props'))
+    document = Document(test_docx("sty-behav-props"))
     style_name = {
-        'no setting': 'Baz',
-        '42':         'Foo',
+        "no setting": "Baz",
+        "42": "Foo",
     }[setting]
     context.style = document.styles[style_name]
 
 
-@given('a style having quick-style set {setting}')
+@given("a style having quick-style set {setting}")
 def given_a_style_having_quick_style_setting(context, setting):
-    document = Document(test_docx('sty-behav-props'))
+    document = Document(test_docx("sty-behav-props"))
     style_name = {
-        'on':         'Foo',
-        'off':        'Bar',
-        'no setting': 'Baz',
+        "on": "Foo",
+        "off": "Bar",
+        "no setting": "Baz",
     }[setting]
     context.style = document.styles[style_name]
 
 
-@given('a style having unhide-when-used set {setting}')
+@given("a style having unhide-when-used set {setting}")
 def given_a_style_having_unhide_when_used_setting(context, setting):
-    document = Document(test_docx('sty-behav-props'))
+    document = Document(test_docx("sty-behav-props"))
     style_name = {
-        'on':         'Foo',
-        'off':        'Bar',
-        'no setting': 'Baz',
+        "on": "Foo",
+        "off": "Bar",
+        "no setting": "Baz",
     }[setting]
     context.style = document.styles[style_name]
 
 
-@given('a style of type {style_type}')
+@given("a style of type {style_type}")
 def given_a_style_of_type(context, style_type):
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     name = {
-        'WD_STYLE_TYPE.CHARACTER': 'Default Paragraph Font',
-        'WD_STYLE_TYPE.LIST':      'No List',
-        'WD_STYLE_TYPE.PARAGRAPH': 'Normal',
-        'WD_STYLE_TYPE.TABLE':     'Normal Table',
+        "WD_STYLE_TYPE.CHARACTER": "Default Paragraph Font",
+        "WD_STYLE_TYPE.LIST": "No List",
+        "WD_STYLE_TYPE.PARAGRAPH": "Normal",
+        "WD_STYLE_TYPE.TABLE": "Normal Table",
     }[style_type]
     context.style = document.styles[name]
 
 
-@given('the style collection of a document')
+@given("the style collection of a document")
 def given_the_style_collection_of_a_document(context):
-    document = Document(test_docx('sty-known-styles'))
+    document = Document(test_docx("sty-known-styles"))
     context.styles = document.styles
 
 
 # when =====================================================
 
-@when('I add a latent style named \'Foobar\'')
+
+@when("I add a latent style named 'Foobar'")
 def when_I_add_a_latent_style_named_Foobar(context):
     latent_styles = context.document.styles.latent_styles
     context.latent_styles = latent_styles
     context.latent_style_count = len(latent_styles)
-    latent_styles.add_latent_style('Foobar')
+    latent_styles.add_latent_style("Foobar")
 
 
-@when('I assign a new name to the style')
+@when("I assign a new name to the style")
 def when_I_assign_a_new_name_to_the_style(context):
-    context.style.name = 'Foobar'
+    context.style.name = "Foobar"
 
 
-@when('I assign a new value to style.style_id')
+@when("I assign a new value to style.style_id")
 def when_I_assign_a_new_value_to_style_style_id(context):
-    context.style.style_id = 'Foo42'
+    context.style.style_id = "Foo42"
 
 
-@when('I assign {value} to latent_style.{prop_name}')
+@when("I assign {value} to latent_style.{prop_name}")
 def when_I_assign_value_to_latent_style_prop(context, value, prop_name):
     latent_style = context.latent_style
-    new_value = (
-        tri_state_vals[value] if value in tri_state_vals else int(value)
-    )
+    new_value = tri_state_vals[value] if value in tri_state_vals else int(value)
     setattr(latent_style, prop_name, new_value)
 
 
-@when('I assign {value} to latent_styles.{prop_name}')
+@when("I assign {value} to latent_styles.{prop_name}")
 def when_I_assign_value_to_latent_styles_prop(context, value, prop_name):
     latent_styles = context.latent_styles
     new_value = bool_vals[value] if value in bool_vals else int(value)
     setattr(latent_styles, prop_name, new_value)
 
 
-@when('I assign {value_key} to style.base_style')
+@when("I assign {value_key} to style.base_style")
 def when_I_assign_value_to_style_base_style(context, value_key):
     value = {
-        'None':               None,
-        'styles[\'Normal\']': context.styles['Normal'],
-        'styles[\'Base\']':   context.styles['Base'],
+        "None": None,
+        "styles['Normal']": context.styles["Normal"],
+        "styles['Base']": context.styles["Base"],
     }[value_key]
     context.style.base_style = value
 
 
-@when('I assign {value} to style.hidden')
+@when("I assign {value} to style.hidden")
 def when_I_assign_value_to_style_hidden(context, value):
     style, new_value = context.style, tri_state_vals[value]
     style.hidden = new_value
 
 
-@when('I assign {value} to style.locked')
+@when("I assign {value} to style.locked")
 def when_I_assign_value_to_style_locked(context, value):
     style, new_value = context.style, bool_vals[value]
     style.locked = new_value
 
 
-@when('I assign {value} to style.next_paragraph_style')
+@when("I assign {value} to style.next_paragraph_style")
 def when_I_assign_value_to_style_next_paragraph_style(context, value):
     styles, style = context.styles, context.style
-    new_value = None if value == 'None' else styles[value]
+    new_value = None if value == "None" else styles[value]
     style.next_paragraph_style = new_value
 
 
-@when('I assign {value} to style.priority')
+@when("I assign {value} to style.priority")
 def when_I_assign_value_to_style_priority(context, value):
     style = context.style
-    new_value = None if value == 'None' else int(value)
+    new_value = None if value == "None" else int(value)
     style.priority = new_value
 
 
-@when('I assign {value} to style.quick_style')
+@when("I assign {value} to style.quick_style")
 def when_I_assign_value_to_style_quick_style(context, value):
     style, new_value = context.style, bool_vals[value]
     style.quick_style = new_value
 
 
-@when('I assign {value} to style.unhide_when_used')
+@when("I assign {value} to style.unhide_when_used")
 def when_I_assign_value_to_style_unhide_when_used(context, value):
     style, new_value = context.style, bool_vals[value]
     style.unhide_when_used = new_value
 
 
-@when('I call add_style(\'{name}\', {type_str}, builtin={builtin_str})')
+@when("I call add_style('{name}', {type_str}, builtin={builtin_str})")
 def when_I_call_add_style(context, name, type_str, builtin_str):
     styles = context.document.styles
     type = style_types[type_str]
@@ -283,70 +283,71 @@ def when_I_call_add_style(context, name, type_str, builtin_str):
     styles.add_style(name, type, builtin=builtin)
 
 
-@when('I delete a latent style')
+@when("I delete a latent style")
 def when_I_delete_a_latent_style(context):
     latent_styles = context.document.styles.latent_styles
     context.latent_styles = latent_styles
     context.latent_style_count = len(latent_styles)
-    latent_styles['Normal'].delete()
+    latent_styles["Normal"].delete()
 
 
-@when('I delete a style')
+@when("I delete a style")
 def when_I_delete_a_style(context):
-    context.document.styles['No List'].delete()
+    context.document.styles["No List"].delete()
 
 
 # then =====================================================
 
-@then('I can access a latent style by name')
+
+@then("I can access a latent style by name")
 def then_I_can_access_a_latent_style_by_name(context):
     latent_styles = context.latent_styles
-    latent_style = latent_styles['Colorful Shading']
+    latent_style = latent_styles["Colorful Shading"]
     assert isinstance(latent_style, _LatentStyle)
 
 
-@then('I can access a style by its UI name')
+@then("I can access a style by its UI name")
 def then_I_can_access_a_style_by_its_UI_name(context):
     styles = context.document.styles
-    style = styles['Default Paragraph Font']
+    style = styles["Default Paragraph Font"]
     assert isinstance(style, BaseStyle)
 
 
-@then('I can access a style by style id')
+@then("I can access a style by style id")
 def then_I_can_access_a_style_by_style_id(context):
     styles = context.document.styles
-    style = styles['DefaultParagraphFont']
+    style = styles["DefaultParagraphFont"]
     assert isinstance(style, BaseStyle)
 
 
-@then('I can iterate over its styles')
+@then("I can iterate over its styles")
 def then_I_can_iterate_over_its_styles(context):
     styles = [s for s in context.document.styles]
     assert len(styles) > 0
     assert all(isinstance(s, BaseStyle) for s in styles)
 
 
-@then('I can iterate over the latent styles')
+@then("I can iterate over the latent styles")
 def then_I_can_iterate_over_the_latent_styles(context):
     latent_styles = [ls for ls in context.latent_styles]
     assert len(latent_styles) == 137
     assert all(isinstance(ls, _LatentStyle) for ls in latent_styles)
 
 
-@then('latent_style.name is the known name')
+@then("latent_style.name is the known name")
 def then_latent_style_name_is_the_known_name(context):
     latent_style = context.latent_style
-    assert latent_style.name == 'Normal'
+    assert latent_style.name == "Normal"
 
 
-@then('latent_style.priority is {value}')
+@then("latent_style.priority is {value}")
 def then_latent_style_priority_is_value(context, value):
     latent_style = context.latent_style
-    expected_value = None if value == 'None' else int(value)
+    expected_value = None if value == "None" else int(value)
     assert latent_style.priority == expected_value
 
 
-@then('latent_style.{prop_name} is {value}')
+@then("latent_style.{prop_name} is {value}")
 def then_latent_style_prop_name_is_value(context, prop_name, value):
     latent_style = context.latent_style
     actual_value = getattr(latent_style, prop_name)
@@ -354,14 +355,14 @@ def then_latent_style_prop_name_is_value(context, prop_name, value):
     assert actual_value == expected_value
 
 
-@then('latent_styles[\'Foobar\'] is a latent style')
+@then("latent_styles['Foobar'] is a latent style")
 def then_latentStyles_Foobar_is_a_latent_style(context):
     latent_styles = context.latent_styles
-    latent_style = latent_styles['Foobar']
+    latent_style = latent_styles["Foobar"]
     assert isinstance(latent_style, _LatentStyle)
 
 
-@then('latent_styles.{prop_name} is {value}')
+@then("latent_styles.{prop_name} is {value}")
 def then_latent_styles_prop_name_is_value(context, prop_name, value):
     latent_styles = context.latent_styles
     expected_value = bool_vals[value] if value in bool_vals else int(value)
@@ -369,35 +370,35 @@ def then_latent_styles_prop_name_is_value(context, prop_name, value):
     assert actual_value == expected_value
 
 
-@then('len(latent_styles) is 137')
+@then("len(latent_styles) is 137")
 def then_len_latent_styles_is_137(context):
     assert len(context.latent_styles) == 137
 
 
-@then('len(styles) is {style_count_str}')
+@then("len(styles) is {style_count_str}")
 def then_len_styles_is_style_count(context, style_count_str):
     assert len(context.document.styles) == int(style_count_str)
 
 
-@then('style.base_style is {value_key}')
+@then("style.base_style is {value_key}")
 def then_style_base_style_is_value(context, value_key):
     expected_value = {
-        'None':               None,
-        'styles[\'Normal\']': context.styles['Normal'],
-        'styles[\'Base\']':   context.styles['Base'],
+        "None": None,
+        "styles['Normal']": context.styles["Normal"],
+        "styles['Base']": context.styles["Base"],
     }[value_key]
     style = context.style
     assert style.base_style == expected_value
 
 
-@then('style.builtin is {builtin_str}')
+@then("style.builtin is {builtin_str}")
 def then_style_builtin_is_builtin(context, builtin_str):
     style = context.style
     builtin = bool_vals[builtin_str]
     assert style.builtin == builtin
 
 
-@then('style.font is the Font object for the style')
+@then("style.font is the Font object for the style")
 def then_style_font_is_the_Font_object_for_the_style(context):
     style = context.style
     font = style.font
@@ -405,37 +406,37 @@ def then_style_font_is_the_Font_object_for_the_style(context):
     assert font.element is style.element
 
 
-@then('style.hidden is {value}')
+@then("style.hidden is {value}")
 def then_style_hidden_is_value(context, value):
     style, expected_value = context.style, tri_state_vals[value]
     assert style.hidden is expected_value
 
 
-@then('style.locked is {value}')
+@then("style.locked is {value}")
 def then_style_locked_is_value(context, value):
     style, expected_value = context.style, bool_vals[value]
     assert style.locked is expected_value
 
 
-@then('style.name is the {which} name')
+@then("style.name is the {which} name")
 def then_style_name_is_the_which_name(context, which):
     expected_name = {
-        'known': 'Normal',
-        'new':   'Foobar',
+        "known": "Normal",
+        "new": "Foobar",
     }[which]
     style = context.style
     assert style.name == expected_name
 
 
-@then('style.next_paragraph_style is {value}')
+@then("style.next_paragraph_style is {value}")
 def then_style_next_paragraph_style_is_value(context, value):
     style, styles = context.style, context.styles
     actual_value = style.next_paragraph_style
     expected_value = styles[value]
-    assert actual_value == expected_value, 'got %s' % actual_value
+    assert actual_value == expected_value, "got %s" % actual_value
 
 
-@then('style.paragraph_format is the ParagraphFormat object for the style')
+@then("style.paragraph_format is the ParagraphFormat object for the style")
 def then_style_paragraph_format_is_the_ParagraphFormat_object(context):
     style = context.style
     paragraph_format = style.paragraph_format
@@ -443,49 +444,49 @@ def then_style_paragraph_format_is_the_ParagraphFormat_object(context):
     assert paragraph_format.element is style.element
 
 
-@then('style.priority is {value}')
+@then("style.priority is {value}")
 def then_style_priority_is_value(context, value):
     style = context.style
-    expected_value = None if value == 'None' else int(value)
+    expected_value = None if value == "None" else int(value)
     assert style.priority == expected_value
 
 
-@then('style.quick_style is {value}')
+@then("style.quick_style is {value}")
 def then_style_quick_style_is_value(context, value):
     style, expected_value = context.style, bool_vals[value]
     assert style.quick_style is expected_value
 
 
-@then('style.style_id is the {which} style id')
+@then("style.style_id is the {which} style id")
 def then_style_style_id_is_the_which_style_id(context, which):
     expected_style_id = {
-        'known': 'Normal',
-        'new':   'Foo42',
+        "known": "Normal",
+        "new": "Foo42",
     }[which]
     style = context.style
     assert style.style_id == expected_style_id
 
 
-@then('style.type is the known type')
+@then("style.type is the known type")
 def then_style_type_is_the_known_type(context):
     style = context.style
     assert style.type == WD_STYLE_TYPE.PARAGRAPH
 
 
-@then('style.type is {type_str}')
+@then("style.type is {type_str}")
 def then_style_type_is_type(context, type_str):
     style = context.style
     style_type = style_types[type_str]
     assert style.type == style_type
 
 
-@then('style.unhide_when_used is {value}')
+@then("style.unhide_when_used is {value}")
 def then_style_unhide_when_used_is_value(context, value):
     style, expected_value = context.style, bool_vals[value]
     assert style.unhide_when_used is expected_value
 
 
-@then('styles.latent_styles is the LatentStyles object for the document')
+@then("styles.latent_styles is the LatentStyles object for the document")
 def then_styles_latent_styles_is_the_LatentStyles_object(context):
     styles = context.styles
     context.latent_styles = latent_styles = styles.latent_styles
@@ -493,34 +494,34 @@ def then_styles_latent_styles_is_the_LatentStyles_object(context):
     assert latent_styles.element is styles.element.latentStyles
 
 
-@then('styles[\'{name}\'] is a style')
+@then("styles['{name}'] is a style")
 def then_styles_name_is_a_style(context, name):
     styles = context.document.styles
     style = context.style = styles[name]
     assert isinstance(style, BaseStyle)
 
 
-@then('the deleted latent style is not in the latent styles collection')
+@then("the deleted latent style is not in the latent styles collection")
 def then_the_deleted_latent_style_is_not_in_the_collection(context):
     latent_styles = context.latent_styles
     try:
-        latent_styles['Normal']
+        latent_styles["Normal"]
     except KeyError:
         return
-    raise AssertionError('Latent style not deleted')
+    raise AssertionError("Latent style not deleted")
 
 
-@then('the deleted style is not in the styles collection')
+@then("the deleted style is not in the styles collection")
 def then_the_deleted_style_is_not_in_the_styles_collection(context):
     document = context.document
     try:
-        document.styles['No List']
+        document.styles["No List"]
     except KeyError:
         return
-    raise AssertionError('Style not deleted')
+    raise AssertionError("Style not deleted")
 
 
-@then('the document has one additional latent style')
+@then("the document has one additional latent style")
 def then_the_document_has_one_additional_latent_style(context):
     latent_styles = context.document.styles.latent_styles
     latent_style_count = len(latent_styles)
@@ -528,7 +529,7 @@ def then_the_document_has_one_additional_latent_style(context):
     assert latent_style_count == expected_count
 
 
-@then('the document has one additional style')
+@then("the document has one additional style")
 def then_the_document_has_one_additional_style(context):
     document = context.document
     style_count = len(document.styles)
@@ -536,14 +537,14 @@ def then_the_document_has_one_additional_style(context):
     assert style_count == expected_style_count
 
 
-@then('the document has one fewer latent styles')
+@then("the document has one fewer latent styles")
 def then_the_document_has_one_fewer_latent_styles(context):
     latent_style_count = len(context.latent_styles)
     expected_count = context.latent_style_count - 1
     assert latent_style_count == expected_count
 
 
-@then('the document has one fewer styles')
+@then("the document has one fewer styles")
 def then_the_document_has_one_fewer_styles(context):
     document = context.document
     style_count = len(document.styles)
diff --git a/features/steps/table.py b/features/steps/table.py
index dc6001941..83751d1f2 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -4,17 +4,13 @@
 Step implementations for table-related features
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from behave import given, then, when
 
 from docx import Document
 from docx.enum.table import WD_ALIGN_VERTICAL  # noqa
-from docx.enum.table import (
-    WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
-)
+from docx.enum.table import WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
 from docx.shared import Inches
 from docx.table import _Column, _Columns, _Row, _Rows
 
@@ -23,269 +19,258 @@
 
 # given ===================================================
 
-@given('a 2 x 2 table')
+
+@given("a 2 x 2 table")
 def given_a_2x2_table(context):
     context.table_ = Document().add_table(rows=2, cols=2)
 
 
-@given('a 3x3 table having {span_state}')
+@given("a 3x3 table having {span_state}")
 def given_a_3x3_table_having_span_state(context, span_state):
     table_idx = {
-        'only uniform cells': 0,
-        'a horizontal span':  1,
-        'a vertical span':    2,
-        'a combined span':    3,
+        "only uniform cells": 0,
+        "a horizontal span": 1,
+        "a vertical span": 2,
+        "a combined span": 3,
     }[span_state]
-    document = Document(test_docx('tbl-cell-access'))
+    document = Document(test_docx("tbl-cell-access"))
     context.table_ = document.tables[table_idx]
 
 
-@given('a _Cell object with {state} vertical alignment as cell')
+@given("a _Cell object with {state} vertical alignment as cell")
 def given_a_Cell_object_with_vertical_alignment_as_cell(context, state):
     table_idx = {
-        'inherited': 0,
-        'bottom':    1,
-        'center':    2,
-        'top':       3,
+        "inherited": 0,
+        "bottom": 1,
+        "center": 2,
+        "top": 3,
     }[state]
-    document = Document(test_docx('tbl-props'))
+    document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
     context.cell = table.cell(0, 0)
 
 
-@given('a column collection having two columns')
+@given("a column collection having two columns")
 def given_a_column_collection_having_two_columns(context):
-    docx_path = test_docx('blk-containing-table')
+    docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     context.columns = document.tables[0].columns
 
 
-@given('a row collection having two rows')
+@given("a row collection having two rows")
 def given_a_row_collection_having_two_rows(context):
-    docx_path = test_docx('blk-containing-table')
+    docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     context.rows = document.tables[0].rows
 
 
-@given('a table')
+@given("a table")
 def given_a_table(context):
     context.table_ = Document().add_table(rows=2, cols=2)
 
 
-@given('a table cell having a width of {width}')
+@given("a table cell having a width of {width}")
 def given_a_table_cell_having_a_width_of_width(context, width):
-    table_idx = {'no explicit setting': 0, '1 inch': 1, '2 inches': 2}[width]
-    document = Document(test_docx('tbl-props'))
+    table_idx = {"no explicit setting": 0, "1 inch": 1, "2 inches": 2}[width]
+    document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
     cell = table.cell(0, 0)
     context.cell = cell
 
 
-@given('a table column having a width of {width_desc}')
+@given("a table column having a width of {width_desc}")
 def given_a_table_having_a_width_of_width_desc(context, width_desc):
     col_idx = {
-        'no explicit setting': 0,
-        '1440':                1,
+        "no explicit setting": 0,
+        "1440": 1,
     }[width_desc]
-    docx_path = test_docx('tbl-col-props')
+    docx_path = test_docx("tbl-col-props")
     document = Document(docx_path)
     context.column = document.tables[0].columns[col_idx]
 
 
-@given('a table having {alignment} alignment')
+@given("a table having {alignment} alignment")
 def given_a_table_having_alignment_alignment(context, alignment):
     table_idx = {
-        'inherited': 3,
-        'left':      4,
-        'right':     5,
-        'center':    6,
+        "inherited": 3,
+        "left": 4,
+        "right": 5,
+        "center": 6,
     }[alignment]
-    docx_path = test_docx('tbl-props')
+    docx_path = test_docx("tbl-props")
     document = Document(docx_path)
     context.table_ = document.tables[table_idx]
 
 
-@given('a table having an autofit layout of {autofit}')
+@given("a table having an autofit layout of {autofit}")
 def given_a_table_having_an_autofit_layout_of_autofit(context, autofit):
     tbl_idx = {
-        'no explicit setting': 0,
-        'autofit':             1,
-        'fixed':               2,
+        "no explicit setting": 0,
+        "autofit": 1,
+        "fixed": 2,
     }[autofit]
-    document = Document(test_docx('tbl-props'))
+    document = Document(test_docx("tbl-props"))
     context.table_ = document.tables[tbl_idx]
 
 
-@given('a table having {style} style')
+@given("a table having {style} style")
 def given_a_table_having_style(context, style):
     table_idx = {
-        'no explicit': 0,
-        'Table Grid':  1,
-        'Light Shading - Accent 1': 2,
+        "no explicit": 0,
+        "Table Grid": 1,
+        "Light Shading - Accent 1": 2,
     }[style]
-    document = Document(test_docx('tbl-having-applied-style'))
+    document = Document(test_docx("tbl-having-applied-style"))
     context.document = document
     context.table_ = document.tables[table_idx]
 
 
-@given('a table having table direction set {setting}')
+@given("a table having table direction set {setting}")
 def given_a_table_having_table_direction_setting(context, setting):
-    table_idx = [
-        'to inherit',
-        'right-to-left',
-        'left-to-right'
-    ].index(setting)
-    document = Document(test_docx('tbl-on-off-props'))
+    table_idx = ["to inherit", "right-to-left", "left-to-right"].index(setting)
+    document = Document(test_docx("tbl-on-off-props"))
     context.table_ = document.tables[table_idx]
 
 
-@given('a table having two columns')
+@given("a table having two columns")
 def given_a_table_having_two_columns(context):
-    docx_path = test_docx('blk-containing-table')
+    docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     # context.table is used internally by behave, underscore added
     # to distinguish this one
     context.table_ = document.tables[0]
 
 
-@given('a table having two rows')
+@given("a table having two rows")
 def given_a_table_having_two_rows(context):
-    docx_path = test_docx('blk-containing-table')
+    docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     context.table_ = document.tables[0]
 
 
-@given('a table row having height of {state}')
+@given("a table row having height of {state}")
 def given_a_table_row_having_height_of_state(context, state):
-    table_idx = {
-        'no explicit setting': 0,
-        '2 inches':            2,
-        '3 inches':            3
-    }[state]
-    document = Document(test_docx('tbl-props'))
+    table_idx = {"no explicit setting": 0, "2 inches": 2, "3 inches": 3}[state]
+    document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
     context.row = table.rows[0]
 
 
-@given('a table row having height rule {state}')
+@given("a table row having height rule {state}")
 def given_a_table_row_having_height_rule_state(context, state):
-    table_idx = {
-        'no explicit setting': 0,
-        'automatic':           1,
-        'at least':            2,
-        'exactly':             3
-    }[state]
-    document = Document(test_docx('tbl-props'))
+    table_idx = {"no explicit setting": 0, "automatic": 1, "at least": 2, "exactly": 3}[
+        state
+    ]
+    document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
     context.row = table.rows[0]
 
 
 # when =====================================================
 
-@when('I add a 1.0 inch column to the table')
+
+@when("I add a 1.0 inch column to the table")
 def when_I_add_a_1_inch_column_to_table(context):
     context.column = context.table_.add_column(Inches(1.0))
 
 
-@when('I add a row to the table')
+@when("I add a row to the table")
 def when_add_row_to_table(context):
     table = context.table_
     context.row = table.add_row()
 
 
-@when('I assign {value} to cell.vertical_alignment')
+@when("I assign {value} to cell.vertical_alignment")
 def when_I_assign_value_to_cell_vertical_alignment(context, value):
     context.cell.vertical_alignment = eval(value)
 
 
-@when('I assign {value} to row.height')
+@when("I assign {value} to row.height")
 def when_I_assign_value_to_row_height(context, value):
-    new_value = None if value == 'None' else int(value)
+    new_value = None if value == "None" else int(value)
     context.row.height = new_value
 
 
-@when('I assign {value} to row.height_rule')
+@when("I assign {value} to row.height_rule")
 def when_I_assign_value_to_row_height_rule(context, value):
-    new_value = (
-        None if value == 'None' else getattr(WD_ROW_HEIGHT_RULE, value)
-    )
+    new_value = None if value == "None" else getattr(WD_ROW_HEIGHT_RULE, value)
     context.row.height_rule = new_value
 
 
-@when('I assign {value_str} to table.alignment')
+@when("I assign {value_str} to table.alignment")
 def when_I_assign_value_to_table_alignment(context, value_str):
     value = {
-        'None':                      None,
-        'WD_TABLE_ALIGNMENT.LEFT':   WD_TABLE_ALIGNMENT.LEFT,
-        'WD_TABLE_ALIGNMENT.RIGHT':  WD_TABLE_ALIGNMENT.RIGHT,
-        'WD_TABLE_ALIGNMENT.CENTER': WD_TABLE_ALIGNMENT.CENTER,
+        "None": None,
+        "WD_TABLE_ALIGNMENT.LEFT": WD_TABLE_ALIGNMENT.LEFT,
+        "WD_TABLE_ALIGNMENT.RIGHT": WD_TABLE_ALIGNMENT.RIGHT,
+        "WD_TABLE_ALIGNMENT.CENTER": WD_TABLE_ALIGNMENT.CENTER,
     }[value_str]
     table = context.table_
     table.alignment = value
 
 
-@when('I assign {value} to table.style')
+@when("I assign {value} to table.style")
 def when_apply_value_to_table_style(context, value):
     table, styles = context.table_, context.document.styles
-    if value == 'None':
+    if value == "None":
         new_value = None
-    elif value.startswith('styles['):
-        new_value = styles[value.split('\'')[1]]
+    elif value.startswith("styles["):
+        new_value = styles[value.split("'")[1]]
     else:
         new_value = styles[value]
     table.style = new_value
 
 
-@when('I assign {value} to table.table_direction')
+@when("I assign {value} to table.table_direction")
 def when_assign_value_to_table_table_direction(context, value):
-    new_value = (
-        None if value == 'None' else getattr(WD_TABLE_DIRECTION, value)
-    )
+    new_value = None if value == "None" else getattr(WD_TABLE_DIRECTION, value)
     context.table_.table_direction = new_value
 
 
-@when('I merge from cell {origin} to cell {other}')
+@when("I merge from cell {origin} to cell {other}")
 def when_I_merge_from_cell_origin_to_cell_other(context, origin, other):
     def cell(table, idx):
         row, col = idx // 3, idx % 3
         return table.cell(row, col)
+
     a_idx, b_idx = int(origin) - 1, int(other) - 1
     table = context.table_
     a, b = cell(table, a_idx), cell(table, b_idx)
     a.merge(b)
 
 
-@when('I set the cell width to {width}')
+@when("I set the cell width to {width}")
 def when_I_set_the_cell_width_to_width(context, width):
-    new_value = {'1 inch': Inches(1)}[width]
+    new_value = {"1 inch": Inches(1)}[width]
     context.cell.width = new_value
 
 
-@when('I set the column width to {width_emu}')
+@when("I set the column width to {width_emu}")
 def when_I_set_the_column_width_to_width_emu(context, width_emu):
-    new_value = None if width_emu == 'None' else int(width_emu)
+    new_value = None if width_emu == "None" else int(width_emu)
     context.column.width = new_value
 
 
-@when('I set the table autofit to {setting}')
+@when("I set the table autofit to {setting}")
 def when_I_set_the_table_autofit_to_setting(context, setting):
-    new_value = {'autofit': True, 'fixed': False}[setting]
+    new_value = {"autofit": True, "fixed": False}[setting]
     table = context.table_
     table.autofit = new_value
 
 
 # then =====================================================
 
-@then('cell.vertical_alignment is {value}')
+
+@then("cell.vertical_alignment is {value}")
 def then_cell_vertical_alignment_is_value(context, value):
     expected_value = eval(value)
     actual_value = context.cell.vertical_alignment
     assert actual_value is expected_value, (
-        'cell.vertical_alignment is %s' % actual_value
+        "cell.vertical_alignment is %s" % actual_value
     )
 
 
-@then('I can access a collection column by index')
+@then("I can access a collection column by index")
 def then_can_access_collection_column_by_index(context):
     columns = context.columns
     for idx in range(2):
@@ -293,7 +278,7 @@ def then_can_access_collection_column_by_index(context):
         assert isinstance(column, _Column)
 
 
-@then('I can access a collection row by index')
+@then("I can access a collection row by index")
 def then_can_access_collection_row_by_index(context):
     rows = context.rows
     for idx in range(2):
@@ -301,21 +286,21 @@ def then_can_access_collection_row_by_index(context):
         assert isinstance(row, _Row)
 
 
-@then('I can access the column collection of the table')
+@then("I can access the column collection of the table")
 def then_can_access_column_collection_of_table(context):
     table = context.table_
     columns = table.columns
     assert isinstance(columns, _Columns)
 
 
-@then('I can access the row collection of the table')
+@then("I can access the row collection of the table")
 def then_can_access_row_collection_of_table(context):
     table = context.table_
     rows = table.rows
     assert isinstance(rows, _Rows)
 
 
-@then('I can iterate over the column collection')
+@then("I can iterate over the column collection")
 def then_can_iterate_over_column_collection(context):
     columns = context.columns
     actual_count = 0
@@ -325,7 +310,7 @@ def then_can_iterate_over_column_collection(context):
     assert actual_count == 2
 
 
-@then('I can iterate over the row collection')
+@then("I can iterate over the row collection")
 def then_can_iterate_over_row_collection(context):
     rows = context.rows
     actual_count = 0
@@ -335,163 +320,161 @@ def then_can_iterate_over_row_collection(context):
     assert actual_count == 2
 
 
-@then('row.height is {value}')
+@then("row.height is {value}")
 def then_row_height_is_value(context, value):
-    expected_height = None if value == 'None' else int(value)
+    expected_height = None if value == "None" else int(value)
     actual_height = context.row.height
-    assert actual_height == expected_height, (
-        'expected %s, got %s' % (expected_height, actual_height)
+    assert actual_height == expected_height, "expected %s, got %s" % (
+        expected_height,
+        actual_height,
     )
 
 
-@then('row.height_rule is {value}')
+@then("row.height_rule is {value}")
 def then_row_height_rule_is_value(context, value):
-    expected_rule = (
-        None if value == 'None' else getattr(WD_ROW_HEIGHT_RULE, value)
-    )
+    expected_rule = None if value == "None" else getattr(WD_ROW_HEIGHT_RULE, value)
     actual_rule = context.row.height_rule
-    assert actual_rule == expected_rule, (
-        'expected %s, got %s' % (expected_rule, actual_rule)
+    assert actual_rule == expected_rule, "expected %s, got %s" % (
+        expected_rule,
+        actual_rule,
     )
 
 
-@then('table.alignment is {value_str}')
+@then("table.alignment is {value_str}")
 def then_table_alignment_is_value(context, value_str):
     value = {
-        'None':                      None,
-        'WD_TABLE_ALIGNMENT.LEFT':   WD_TABLE_ALIGNMENT.LEFT,
-        'WD_TABLE_ALIGNMENT.RIGHT':  WD_TABLE_ALIGNMENT.RIGHT,
-        'WD_TABLE_ALIGNMENT.CENTER': WD_TABLE_ALIGNMENT.CENTER,
+        "None": None,
+        "WD_TABLE_ALIGNMENT.LEFT": WD_TABLE_ALIGNMENT.LEFT,
+        "WD_TABLE_ALIGNMENT.RIGHT": WD_TABLE_ALIGNMENT.RIGHT,
+        "WD_TABLE_ALIGNMENT.CENTER": WD_TABLE_ALIGNMENT.CENTER,
     }[value_str]
     table = context.table_
-    assert table.alignment == value, 'got %s' % table.alignment
+    assert table.alignment == value, "got %s" % table.alignment
 
 
-@then('table.cell({row}, {col}).text is {expected_text}')
+@then("table.cell({row}, {col}).text is {expected_text}")
 def then_table_cell_row_col_text_is_text(context, row, col, expected_text):
     table = context.table_
     row_idx, col_idx = int(row), int(col)
     cell_text = table.cell(row_idx, col_idx).text
-    assert cell_text == expected_text, 'got %s' % cell_text
+    assert cell_text == expected_text, "got %s" % cell_text
 
 
-@then('table.style is styles[\'{style_name}\']')
+@then("table.style is styles['{style_name}']")
 def then_table_style_is_styles_style_name(context, style_name):
     table, styles = context.table_, context.document.styles
     expected_style = styles[style_name]
     assert table.style == expected_style, "got '%s'" % table.style
 
 
-@then('table.table_direction is {value}')
+@then("table.table_direction is {value}")
 def then_table_table_direction_is_value(context, value):
-    expected_value = (
-        None if value == 'None' else getattr(WD_TABLE_DIRECTION, value)
-    )
+    expected_value = None if value == "None" else getattr(WD_TABLE_DIRECTION, value)
     actual_value = context.table_.table_direction
     assert actual_value == expected_value, "got '%s'" % actual_value
 
 
-@then('the column cells text is {expected_text}')
+@then("the column cells text is {expected_text}")
 def then_the_column_cells_text_is_expected_text(context, expected_text):
     table = context.table_
-    cells_text = ' '.join(c.text for col in table.columns for c in col.cells)
-    assert cells_text == expected_text, 'got %s' % cells_text
+    cells_text = " ".join(c.text for col in table.columns for c in col.cells)
+    assert cells_text == expected_text, "got %s" % cells_text
 
 
-@then('the length of the column collection is 2')
+@then("the length of the column collection is 2")
 def then_len_of_column_collection_is_2(context):
     columns = context.table_.columns
     assert len(columns) == 2
 
 
-@then('the length of the row collection is 2')
+@then("the length of the row collection is 2")
 def then_len_of_row_collection_is_2(context):
     rows = context.table_.rows
     assert len(rows) == 2
 
 
-@then('the new column has 2 cells')
+@then("the new column has 2 cells")
 def then_new_column_has_2_cells(context):
     assert len(context.column.cells) == 2
 
 
-@then('the new column is 1.0 inches wide')
+@then("the new column is 1.0 inches wide")
 def then_new_column_is_1_inches_wide(context):
     assert context.column.width == Inches(1)
 
 
-@then('the new row has 2 cells')
+@then("the new row has 2 cells")
 def then_new_row_has_2_cells(context):
     assert len(context.row.cells) == 2
 
 
-@then('the reported autofit setting is {autofit}')
+@then("the reported autofit setting is {autofit}")
 def then_the_reported_autofit_setting_is_autofit(context, autofit):
-    expected_value = {'autofit': True, 'fixed': False}[autofit]
+    expected_value = {"autofit": True, "fixed": False}[autofit]
     table = context.table_
     assert table.autofit is expected_value
 
 
-@then('the reported column width is {width_emu}')
+@then("the reported column width is {width_emu}")
 def then_the_reported_column_width_is_width_emu(context, width_emu):
-    expected_value = None if width_emu == 'None' else int(width_emu)
-    assert context.column.width == expected_value, (
-        'got %s' % context.column.width
-    )
+    expected_value = None if width_emu == "None" else int(width_emu)
+    assert context.column.width == expected_value, "got %s" % context.column.width
 
 
-@then('the reported width of the cell is {width}')
+@then("the reported width of the cell is {width}")
 def then_the_reported_width_of_the_cell_is_width(context, width):
-    expected_width = {'None': None, '1 inch': Inches(1)}[width]
+    expected_width = {"None": None, "1 inch": Inches(1)}[width]
     actual_width = context.cell.width
-    assert actual_width == expected_width, (
-        'expected %s, got %s' % (expected_width, actual_width)
+    assert actual_width == expected_width, "expected %s, got %s" % (
+        expected_width,
+        actual_width,
     )
 
 
-@then('the row cells text is {encoded_text}')
+@then("the row cells text is {encoded_text}")
 def then_the_row_cells_text_is_expected_text(context, encoded_text):
-    expected_text = encoded_text.replace('\\', '\n')
+    expected_text = encoded_text.replace("\\", "\n")
     table = context.table_
-    cells_text = ' '.join(c.text for row in table.rows for c in row.cells)
-    assert cells_text == expected_text, 'got %s' % cells_text
+    cells_text = " ".join(c.text for row in table.rows for c in row.cells)
+    assert cells_text == expected_text, "got %s" % cells_text
 
 
-@then('the table has {count} columns')
+@then("the table has {count} columns")
 def then_table_has_count_columns(context, count):
     column_count = int(count)
     columns = context.table_.columns
     assert len(columns) == column_count
 
 
-@then('the table has {count} rows')
+@then("the table has {count} rows")
 def then_table_has_count_rows(context, count):
     row_count = int(count)
     rows = context.table_.rows
     assert len(rows) == row_count
 
 
-@then('the width of cell {n_str} is {inches_str} inches')
+@then("the width of cell {n_str} is {inches_str} inches")
 def then_the_width_of_cell_n_is_x_inches(context, n_str, inches_str):
     def _cell(table, idx):
         row, col = idx // 3, idx % 3
         return table.cell(row, col)
+
     idx, inches = int(n_str) - 1, float(inches_str)
     cell = _cell(context.table_, idx)
-    assert cell.width == Inches(inches), 'got %s' % cell.width.inches
+    assert cell.width == Inches(inches), "got %s" % cell.width.inches
 
 
-@then('the width of each cell is {inches} inches')
+@then("the width of each cell is {inches} inches")
 def then_the_width_of_each_cell_is_inches(context, inches):
     table = context.table_
     expected_width = Inches(float(inches))
     for cell in table._cells:
-        assert cell.width == expected_width, 'got %s' % cell.width.inches
+        assert cell.width == expected_width, "got %s" % cell.width.inches
 
 
-@then('the width of each column is {inches} inches')
+@then("the width of each column is {inches} inches")
 def then_the_width_of_each_column_is_inches(context, inches):
     table = context.table_
     expected_width = Inches(float(inches))
     for column in table.columns:
-        assert column.width == expected_width, 'got %s' % column.width.inches
+        assert column.width == expected_width, "got %s" % column.width.inches
diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
index 4a6b442e0..b360d480e 100644
--- a/features/steps/tabstops.py
+++ b/features/steps/tabstops.py
@@ -16,71 +16,73 @@
 
 # given ===================================================
 
-@given('a tab_stops having {count} tab stops')
+
+@given("a tab_stops having {count} tab stops")
 def given_a_tab_stops_having_count_tab_stops(context, count):
-    paragraph_idx = {'0': 0, '3': 1}[count]
-    document = Document(test_docx('tab-stops'))
+    paragraph_idx = {"0": 0, "3": 1}[count]
+    document = Document(test_docx("tab-stops"))
     paragraph_format = document.paragraphs[paragraph_idx].paragraph_format
     context.tab_stops = paragraph_format.tab_stops
 
 
-@given('a tab stop 0.5 inches {in_or_out} from the paragraph left edge')
+@given("a tab stop 0.5 inches {in_or_out} from the paragraph left edge")
 def given_a_tab_stop_inches_from_paragraph_left_edge(context, in_or_out):
-    tab_idx = {'out': 0, 'in': 1}[in_or_out]
-    document = Document(test_docx('tab-stops'))
+    tab_idx = {"out": 0, "in": 1}[in_or_out]
+    document = Document(test_docx("tab-stops"))
     paragraph_format = document.paragraphs[2].paragraph_format
     context.tab_stops = paragraph_format.tab_stops
     context.tab_stop = paragraph_format.tab_stops[tab_idx]
 
 
-@given('a tab stop having {alignment} alignment')
+@given("a tab stop having {alignment} alignment")
 def given_a_tab_stop_having_alignment_alignment(context, alignment):
-    tab_idx = {'LEFT': 0, 'CENTER': 1, 'RIGHT': 2}[alignment]
-    document = Document(test_docx('tab-stops'))
+    tab_idx = {"LEFT": 0, "CENTER": 1, "RIGHT": 2}[alignment]
+    document = Document(test_docx("tab-stops"))
     paragraph_format = document.paragraphs[1].paragraph_format
     context.tab_stop = paragraph_format.tab_stops[tab_idx]
 
 
-@given('a tab stop having {leader} leader')
+@given("a tab stop having {leader} leader")
 def given_a_tab_stop_having_leader_leader(context, leader):
-    tab_idx = {'no specified': 0, 'a dotted': 2}[leader]
-    document = Document(test_docx('tab-stops'))
+    tab_idx = {"no specified": 0, "a dotted": 2}[leader]
+    document = Document(test_docx("tab-stops"))
     paragraph_format = document.paragraphs[1].paragraph_format
     context.tab_stop = paragraph_format.tab_stops[tab_idx]
 
 
 # when ====================================================
 
-@when('I add a tab stop')
+
+@when("I add a tab stop")
 def when_I_add_a_tab_stop(context):
     tab_stops = context.tab_stops
     tab_stops.add_tab_stop(Inches(1.75))
 
 
-@when('I assign {member} to tab_stop.alignment')
+@when("I assign {member} to tab_stop.alignment")
 def when_I_assign_member_to_tab_stop_alignment(context, member):
     value = getattr(WD_TAB_ALIGNMENT, member)
     context.tab_stop.alignment = value
 
 
-@when('I assign {member} to tab_stop.leader')
+@when("I assign {member} to tab_stop.leader")
 def when_I_assign_member_to_tab_stop_leader(context, member):
     value = getattr(WD_TAB_LEADER, member)
     context.tab_stop.leader = value
 
 
-@when('I assign {value} to tab_stop.position')
+@when("I assign {value} to tab_stop.position")
 def when_I_assign_value_to_tab_stop_value(context, value):
     context.tab_stop.position = int(value)
 
 
-@when('I call tab_stops.clear_all()')
+@when("I call tab_stops.clear_all()")
 def when_I_call_tab_stops_clear_all(context):
     tab_stops = context.tab_stops
     tab_stops.clear_all()
 
 
-@when('I remove a tab stop')
+@when("I remove a tab stop")
 def when_I_remove_a_tab_stop(context):
     tab_stops = context.tab_stops
     del tab_stops[1]
@@ -88,7 +90,8 @@ def when_I_remove_a_tab_stop(context):
 
 # then =====================================================
 
-@then('I can access a tab stop by index')
+
+@then("I can access a tab stop by index")
 def then_I_can_access_a_tab_stop_by_index(context):
     tab_stops = context.tab_stops
     for idx in range(3):
@@ -96,48 +99,48 @@ def then_I_can_access_a_tab_stop_by_index(context):
         assert isinstance(tab_stop, TabStop)
 
 
-@then('I can iterate the TabStops object')
+@then("I can iterate the TabStops object")
 def then_I_can_iterate_the_TabStops_object(context):
     items = [ts for ts in context.tab_stops]
     assert len(items) == 3
     assert all(isinstance(item, TabStop) for item in items)
 
 
-@then('len(tab_stops) is {count}')
+@then("len(tab_stops) is {count}")
 def then_len_tab_stops_is_count(context, count):
     tab_stops = context.tab_stops
     assert len(tab_stops) == int(count)
 
 
-@then('tab_stop.alignment is {alignment}')
+@then("tab_stop.alignment is {alignment}")
 def then_tab_stop_alignment_is_alignment(context, alignment):
     expected_value = getattr(WD_TAB_ALIGNMENT, alignment)
     tab_stop = context.tab_stop
     assert tab_stop.alignment == expected_value
 
 
-@then('tab_stop.leader is {leader}')
+@then("tab_stop.leader is {leader}")
 def then_tab_stop_leader_is_leader(context, leader):
     expected_value = getattr(WD_TAB_LEADER, leader)
     tab_stop = context.tab_stop
     assert tab_stop.leader == expected_value
 
 
-@then('tab_stop.position is {position}')
+@then("tab_stop.position is {position}")
 def then_tab_stop_position_is_position(context, position):
     tab_stop = context.tab_stop
     assert tab_stop.position == int(position)
 
 
-@then('the removed tab stop is no longer present in tab_stops')
+@then("the removed tab stop is no longer present in tab_stops")
 def then_the_removed_tab_stop_is_no_longer_present_in_tab_stops(context):
     tab_stops = context.tab_stops
     assert tab_stops[0].position == Inches(1)
     assert tab_stops[1].position == Inches(3)
 
 
-@then('the tab stops are sequenced in position order')
+@then("the tab stops are sequenced in position order")
 def then_the_tab_stops_are_sequenced_in_position_order(context):
     tab_stops = context.tab_stops
     for idx in range(len(tab_stops) - 1):
-        assert tab_stops[idx].position < tab_stops[idx+1].position
+        assert tab_stops[idx].position < tab_stops[idx + 1].position
diff --git a/features/steps/text.py b/features/steps/text.py
index cc56c930c..57451a1bb 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -22,7 +22,8 @@
 
 # given ===================================================
 
-@given('a run')
+
+@given("a run")
 def given_a_run(context):
     document = Document()
     run = document.add_paragraph().add_run()
@@ -30,22 +31,22 @@ def given_a_run(context):
     context.run = run
 
 
-@given('a run having {bool_prop_name} set on')
+@given("a run having {bool_prop_name} set on")
 def given_a_run_having_bool_prop_set_on(context, bool_prop_name):
     run = Document().add_paragraph().add_run()
     setattr(run, bool_prop_name, True)
     context.run = run
 
 
-@given('a run having known text and formatting')
+@given("a run having known text and formatting")
 def given_a_run_having_known_text_and_formatting(context):
-    run = Document().add_paragraph().add_run('foobar')
+    run = Document().add_paragraph().add_run("foobar")
     run.bold = True
     run.italic = True
     context.run = run
 
 
-@given('a run having mixed text content')
+@given("a run having mixed text content")
 def given_a_run_having_mixed_text_content(context):
     """
     Mixed here meaning it contains ``<w:tab/>``, ``<w:cr/>``, etc. elements.
@@ -60,40 +61,40 @@ def given_a_run_having_mixed_text_content(context):
           <w:drawing/>
           <w:br/>
           <w:t>jkl</w:t>
-        </w:r>""" % nsdecls('w')
+        </w:r>""" % nsdecls(
+        "w"
+    )
     r = parse_xml(r_xml)
     context.run = Run(r, None)
 
 
-@given('a run having {underline_type} underline')
+@given("a run having {underline_type} underline")
 def given_a_run_having_underline_type(context, underline_type):
-    run_idx = {
-        'inherited': 0, 'no': 1, 'single': 2, 'double': 3
-    }[underline_type]
-    document = Document(test_docx('run-enumerated-props'))
+    run_idx = {"inherited": 0, "no": 1, "single": 2, "double": 3}[underline_type]
+    document = Document(test_docx("run-enumerated-props"))
     context.run = document.paragraphs[0].runs[run_idx]
 
 
-@given('a run having {style} style')
+@given("a run having {style} style")
 def given_a_run_having_style(context, style):
     run_idx = {
-        'no explicit': 0,
-        'Emphasis':    1,
-        'Strong':      2,
+        "no explicit": 0,
+        "Emphasis": 1,
+        "Strong": 2,
     }[style]
-    context.document = document = Document(test_docx('run-char-style'))
+    context.document = document = Document(test_docx("run-char-style"))
     context.run = document.paragraphs[0].runs[run_idx]
 
 
-@given('a run inside a table cell retrieved from {cell_source}')
+@given("a run inside a table cell retrieved from {cell_source}")
 def given_a_run_inside_a_table_cell_from_source(context, cell_source):
     document = Document()
     table = document.add_table(rows=2, cols=2)
-    if cell_source == 'Table.cell':
+    if cell_source == "Table.cell":
         cell = table.cell(0, 0)
-    elif cell_source == 'Table.row.cells':
+    elif cell_source == "Table.row.cells":
         cell = table.rows[0].cells[1]
-    elif cell_source == 'Table.column.cells':
+    elif cell_source == "Table.column.cells":
         cell = table.columns[1].cells[0]
     run = cell.paragraphs[0].add_run()
     context.document = document
@@ -102,202 +103,203 @@ def given_a_run_inside_a_table_cell_from_source(context, cell_source):
 
 # when ====================================================
 
-@when('I add a column break')
+
+@when("I add a column break")
 def when_add_column_break(context):
     run = context.run
     run.add_break(WD_BREAK.COLUMN)
 
 
-@when('I add a line break')
+@when("I add a line break")
 def when_add_line_break(context):
     run = context.run
     run.add_break()
 
 
-@when('I add a page break')
+@when("I add a page break")
 def when_add_page_break(context):
     run = context.run
     run.add_break(WD_BREAK.PAGE)
 
 
-@when('I add a picture to the run')
+@when("I add a picture to the run")
 def when_I_add_a_picture_to_the_run(context):
     run = context.run
-    run.add_picture(test_file('monty-truth.png'))
+    run.add_picture(test_file("monty-truth.png"))
 
 
-@when('I add a run specifying its text')
+@when("I add a run specifying its text")
 def when_I_add_a_run_specifying_its_text(context):
     context.run = context.paragraph.add_run(test_text)
 
 
-@when('I add a run specifying the character style Emphasis')
+@when("I add a run specifying the character style Emphasis")
 def when_I_add_a_run_specifying_the_character_style_Emphasis(context):
-    context.run = context.paragraph.add_run(test_text, 'Emphasis')
+    context.run = context.paragraph.add_run(test_text, "Emphasis")
 
 
-@when('I add a tab')
+@when("I add a tab")
 def when_I_add_a_tab(context):
     context.run.add_tab()
 
 
-@when('I add text to the run')
+@when("I add text to the run")
 def when_I_add_text_to_the_run(context):
     context.run.add_text(test_text)
 
 
-@when('I assign mixed text to the text property')
+@when("I assign mixed text to the text property")
 def when_I_assign_mixed_text_to_the_text_property(context):
-    context.run.text = 'abc\tdef\nghi\rjkl'
+    context.run.text = "abc\tdef\nghi\rjkl"
 
 
-@when('I assign {value_str} to its {bool_prop_name} property')
+@when("I assign {value_str} to its {bool_prop_name} property")
 def when_assign_true_to_bool_run_prop(context, value_str, bool_prop_name):
-    value = {'True': True, 'False': False, 'None': None}[value_str]
+    value = {"True": True, "False": False, "None": None}[value_str]
     run = context.run
     setattr(run, bool_prop_name, value)
 
 
-@when('I assign {value} to run.style')
+@when("I assign {value} to run.style")
 def when_I_assign_value_to_run_style(context, value):
-    if value == 'None':
+    if value == "None":
         new_value = None
-    elif value.startswith('styles['):
-        new_value = context.document.styles[value.split('\'')[1]]
+    elif value.startswith("styles["):
+        new_value = context.document.styles[value.split("'")[1]]
     else:
         new_value = context.document.styles[value]
 
     context.run.style = new_value
 
 
-@when('I clear the run')
+@when("I clear the run")
 def when_I_clear_the_run(context):
     context.run.clear()
 
 
-@when('I set the run underline to {underline_value}')
+@when("I set the run underline to {underline_value}")
 def when_I_set_the_run_underline_to_value(context, underline_value):
     new_value = {
-        'True': True, 'False': False, 'None': None,
-        'WD_UNDERLINE.SINGLE': WD_UNDERLINE.SINGLE,
-        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE,
+        "True": True,
+        "False": False,
+        "None": None,
+        "WD_UNDERLINE.SINGLE": WD_UNDERLINE.SINGLE,
+        "WD_UNDERLINE.DOUBLE": WD_UNDERLINE.DOUBLE,
     }[underline_value]
     context.run.underline = new_value
 
 
 # then =====================================================
 
-@then('it is a column break')
+
+@then("it is a column break")
 def then_type_is_column_break(context):
     attrib = context.last_child.attrib
-    assert attrib == {qn('w:type'): 'column'}
+    assert attrib == {qn("w:type"): "column"}
 
 
-@then('it is a line break')
+@then("it is a line break")
 def then_type_is_line_break(context):
     attrib = context.last_child.attrib
     assert attrib == {}
 
 
-@then('it is a page break')
+@then("it is a page break")
 def then_type_is_page_break(context):
     attrib = context.last_child.attrib
-    assert attrib == {qn('w:type'): 'page'}
+    assert attrib == {qn("w:type"): "page"}
 
 
-@then('run.font is the Font object for the run')
+@then("run.font is the Font object for the run")
 def then_run_font_is_the_Font_object_for_the_run(context):
     run, font = context.run, context.run.font
     assert isinstance(font, Font)
     assert font.element is run.element
 
 
-@then('run.style is styles[\'{style_name}\']')
+@then("run.style is styles['{style_name}']")
 def then_run_style_is_style(context, style_name):
     expected_value = context.document.styles[style_name]
     run = context.run
-    assert run.style == expected_value, 'got %s' % run.style
+    assert run.style == expected_value, "got %s" % run.style
 
 
-@then('the last item in the run is a break')
+@then("the last item in the run is a break")
 def then_last_item_in_run_is_a_break(context):
     run = context.run
     context.last_child = run._r[-1]
-    expected_tag = (
-        '{http://schemas.openxmlformats.org/wordprocessingml/2006/main}br'
-    )
+    expected_tag = "{http://schemas.openxmlformats.org/wordprocessingml/2006/main}br"
     assert context.last_child.tag == expected_tag
 
 
-@then('the picture appears at the end of the run')
+@then("the picture appears at the end of the run")
 def then_the_picture_appears_at_the_end_of_the_run(context):
     run = context.run
     r = run._r
     blip_rId = r.xpath(
-        './w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/'
-        'a:blip/@r:embed'
+        "./w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/"
+        "a:blip/@r:embed"
     )[0]
     image_part = run.part.related_parts[blip_rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
-    expected_sha1 = '79769f1e202add2e963158b532e36c2c0f76a70c'
-    assert image_sha1 == expected_sha1, (
-        "image SHA1 doesn't match, expected %s, got %s" %
-        (expected_sha1, image_sha1)
-    )
+    expected_sha1 = "79769f1e202add2e963158b532e36c2c0f76a70c"
+    assert (
+        image_sha1 == expected_sha1
+    ), "image SHA1 doesn't match, expected %s, got %s" % (expected_sha1, image_sha1)
 
 
-@then('the run appears in {boolean_prop_name} unconditionally')
+@then("the run appears in {boolean_prop_name} unconditionally")
 def then_run_appears_in_boolean_prop_name(context, boolean_prop_name):
     run = context.run
     assert getattr(run, boolean_prop_name) is True
 
 
-@then('the run appears with its inherited {boolean_prop_name} setting')
+@then("the run appears with its inherited {boolean_prop_name} setting")
 def then_run_inherits_bool_prop_value(context, boolean_prop_name):
     run = context.run
     assert getattr(run, boolean_prop_name) is None
 
 
-@then('the run appears without {boolean_prop_name} unconditionally')
+@then("the run appears without {boolean_prop_name} unconditionally")
 def then_run_appears_without_bool_prop(context, boolean_prop_name):
     run = context.run
     assert getattr(run, boolean_prop_name) is False
 
 
-@then('the run contains no text')
+@then("the run contains no text")
 def then_the_run_contains_no_text(context):
-    assert context.run.text == ''
+    assert context.run.text == ""
 
 
-@then('the run contains the text I specified')
+@then("the run contains the text I specified")
 def then_the_run_contains_the_text_I_specified(context):
     assert context.run.text == test_text
 
 
-@then('the run formatting is preserved')
+@then("the run formatting is preserved")
 def then_the_run_formatting_is_preserved(context):
     assert context.run.bold is True
     assert context.run.italic is True
 
 
-@then('the run underline property value is {underline_value}')
+@then("the run underline property value is {underline_value}")
 def then_the_run_underline_property_value_is(context, underline_value):
     expected_value = {
-        'None': None, 'False': False, 'True': True,
-        'WD_UNDERLINE.DOUBLE': WD_UNDERLINE.DOUBLE
+        "None": None,
+        "False": False,
+        "True": True,
+        "WD_UNDERLINE.DOUBLE": WD_UNDERLINE.DOUBLE,
     }[underline_value]
     assert context.run.underline == expected_value
 
 
-@then('the tab appears at the end of the run')
+@then("the tab appears at the end of the run")
 def then_the_tab_appears_at_the_end_of_the_run(context):
     r = context.run._r
-    tab = r.find(qn('w:tab'))
+    tab = r.find(qn("w:tab"))
     assert tab is not None
 
 
-@then('the text of the run represents the textual run content')
+@then("the text of the run represents the textual run content")
 def then_the_text_of_the_run_represents_the_textual_run_content(context):
-    assert context.run.text == 'abc\tdef\nghi\njkl', (
-        'got \'%s\'' % context.run.text
-    )
+    assert context.run.text == "abc\tdef\nghi\njkl", "got '%s'" % context.run.text
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index 32091daba..421f72922 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -4,9 +4,7 @@
 Test suite for docx.dml.color module.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
 from docx.dml.color import ColorFormat
@@ -18,7 +16,6 @@
 
 
 class DescribeColorFormat(object):
-
     def it_knows_its_color_type(self, type_fixture):
         color_format, expected_value = type_fixture
         assert color_format.type == expected_value
@@ -43,86 +40,109 @@ def it_can_change_its_theme_color(self, theme_color_set_fixture):
 
     # fixtures ---------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:r',                                                  None),
-        ('w:r/w:rPr',                                            None),
-        ('w:r/w:rPr/w:color{w:val=auto}',                        None),
-        ('w:r/w:rPr/w:color{w:val=4224FF}',                      '4224ff'),
-        ('w:r/w:rPr/w:color{w:val=auto,w:themeColor=accent1}',   None),
-        ('w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}', 'f00ba9'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:color{w:val=auto}", None),
+            ("w:r/w:rPr/w:color{w:val=4224FF}", "4224ff"),
+            ("w:r/w:rPr/w:color{w:val=auto,w:themeColor=accent1}", None),
+            ("w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}", "f00ba9"),
+        ]
+    )
     def rgb_get_fixture(self, request):
         r_cxml, rgb = request.param
         color_format = ColorFormat(element(r_cxml))
         expected_value = None if rgb is None else RGBColor.from_string(rgb)
         return color_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r', RGBColor(10, 20, 30), 'w:r/w:rPr/w:color{w:val=0A141E}'),
-        ('w:r/w:rPr', RGBColor(1, 2, 3), 'w:r/w:rPr/w:color{w:val=010203}'),
-        ('w:r/w:rPr/w:color{w:val=123abc}', RGBColor(42, 24, 99),
-         'w:r/w:rPr/w:color{w:val=2A1863}'),
-        ('w:r/w:rPr/w:color{w:val=auto}', RGBColor(16, 17, 18),
-         'w:r/w:rPr/w:color{w:val=101112}'),
-        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}',
-         RGBColor(24, 42, 99), 'w:r/w:rPr/w:color{w:val=182A63}'),
-        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}',
-         None, 'w:r/w:rPr'),
-        ('w:r', None, 'w:r'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", RGBColor(10, 20, 30), "w:r/w:rPr/w:color{w:val=0A141E}"),
+            ("w:r/w:rPr", RGBColor(1, 2, 3), "w:r/w:rPr/w:color{w:val=010203}"),
+            (
+                "w:r/w:rPr/w:color{w:val=123abc}",
+                RGBColor(42, 24, 99),
+                "w:r/w:rPr/w:color{w:val=2A1863}",
+            ),
+            (
+                "w:r/w:rPr/w:color{w:val=auto}",
+                RGBColor(16, 17, 18),
+                "w:r/w:rPr/w:color{w:val=101112}",
+            ),
+            (
+                "w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}",
+                RGBColor(24, 42, 99),
+                "w:r/w:rPr/w:color{w:val=182A63}",
+            ),
+            ("w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}", None, "w:r/w:rPr"),
+            ("w:r", None, "w:r"),
+        ]
+    )
     def rgb_set_fixture(self, request):
         r_cxml, new_value, expected_cxml = request.param
         color_format = ColorFormat(element(r_cxml))
         expected_xml = xml(expected_cxml)
         return color_format, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                                                None),
-        ('w:r/w:rPr',                                          None),
-        ('w:r/w:rPr/w:color{w:val=auto}',                      None),
-        ('w:r/w:rPr/w:color{w:val=4224FF}',                    None),
-        ('w:r/w:rPr/w:color{w:themeColor=accent1}',            'ACCENT_1'),
-        ('w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=dark1}', 'DARK_1'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:color{w:val=auto}", None),
+            ("w:r/w:rPr/w:color{w:val=4224FF}", None),
+            ("w:r/w:rPr/w:color{w:themeColor=accent1}", "ACCENT_1"),
+            ("w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=dark1}", "DARK_1"),
+        ]
+    )
     def theme_color_get_fixture(self, request):
         r_cxml, value = request.param
         color_format = ColorFormat(element(r_cxml))
-        expected_value = (
-            None if value is None else getattr(MSO_THEME_COLOR, value)
-        )
+        expected_value = None if value is None else getattr(MSO_THEME_COLOR, value)
         return color_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r', 'ACCENT_1',
-         'w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent1}'),
-        ('w:r/w:rPr', 'ACCENT_2',
-         'w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent2}'),
-        ('w:r/w:rPr/w:color{w:val=101112}', 'ACCENT_3',
-         'w:r/w:rPr/w:color{w:val=101112,w:themeColor=accent3}'),
-        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}', 'LIGHT_2',
-         'w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=light2}'),
-        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}', None,
-         'w:r/w:rPr'),
-        ('w:r', None, 'w:r'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", "ACCENT_1", "w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent1}"),
+            (
+                "w:r/w:rPr",
+                "ACCENT_2",
+                "w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent2}",
+            ),
+            (
+                "w:r/w:rPr/w:color{w:val=101112}",
+                "ACCENT_3",
+                "w:r/w:rPr/w:color{w:val=101112,w:themeColor=accent3}",
+            ),
+            (
+                "w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}",
+                "LIGHT_2",
+                "w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=light2}",
+            ),
+            ("w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}", None, "w:r/w:rPr"),
+            ("w:r", None, "w:r"),
+        ]
+    )
     def theme_color_set_fixture(self, request):
         r_cxml, member, expected_cxml = request.param
         color_format = ColorFormat(element(r_cxml))
-        new_value = (
-            None if member is None else getattr(MSO_THEME_COLOR, member)
-        )
+        new_value = None if member is None else getattr(MSO_THEME_COLOR, member)
         expected_xml = xml(expected_cxml)
         return color_format, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                                   None),
-        ('w:r/w:rPr',                             None),
-        ('w:r/w:rPr/w:color{w:val=auto}',         MSO_COLOR_TYPE.AUTO),
-        ('w:r/w:rPr/w:color{w:val=4224FF}',       MSO_COLOR_TYPE.RGB),
-        ('w:r/w:rPr/w:color{w:themeColor=dark1}', MSO_COLOR_TYPE.THEME),
-        ('w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}',
-         MSO_COLOR_TYPE.THEME),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:color{w:val=auto}", MSO_COLOR_TYPE.AUTO),
+            ("w:r/w:rPr/w:color{w:val=4224FF}", MSO_COLOR_TYPE.RGB),
+            ("w:r/w:rPr/w:color{w:themeColor=dark1}", MSO_COLOR_TYPE.THEME),
+            (
+                "w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}",
+                MSO_COLOR_TYPE.THEME,
+            ),
+        ]
+    )
     def type_fixture(self, request):
         r_cxml, expected_value = request.param
         color_format = ColorFormat(element(r_cxml))
diff --git a/tests/image/test_bmp.py b/tests/image/test_bmp.py
index 37961369a..9eb371643 100644
--- a/tests/image/test_bmp.py
+++ b/tests/image/test_bmp.py
@@ -16,12 +16,11 @@
 
 
 class DescribeBmp(object):
-
     def it_can_construct_from_a_bmp_stream(self, Bmp__init__):
         cx, cy, horz_dpi, vert_dpi = 26, 43, 200, 96
         bytes_ = (
-            b'fillerfillerfiller\x1A\x00\x00\x00\x2B\x00\x00\x00'
-            b'fillerfiller\xB8\x1E\x00\x00\x00\x00\x00\x00'
+            b"fillerfillerfiller\x1A\x00\x00\x00\x2B\x00\x00\x00"
+            b"fillerfiller\xB8\x1E\x00\x00\x00\x00\x00\x00"
         )
         stream = BytesIO(bytes_)
 
@@ -36,7 +35,7 @@ def it_knows_its_content_type(self):
 
     def it_knows_its_default_ext(self):
         bmp = Bmp(None, None, None, None)
-        assert bmp.default_ext == 'bmp'
+        assert bmp.default_ext == "bmp"
 
     # fixtures -------------------------------------------------------
 
diff --git a/tests/image/test_gif.py b/tests/image/test_gif.py
index 707419f5c..fc00af690 100644
--- a/tests/image/test_gif.py
+++ b/tests/image/test_gif.py
@@ -14,10 +14,9 @@
 
 
 class DescribeGif(object):
-
     def it_can_construct_from_a_gif_stream(self, Gif__init__):
         cx, cy = 42, 24
-        bytes_ = b'filler\x2A\x00\x18\x00'
+        bytes_ = b"filler\x2A\x00\x18\x00"
         stream = BytesIO(bytes_)
 
         gif = Gif.from_stream(stream)
@@ -31,7 +30,7 @@ def it_knows_its_content_type(self):
 
     def it_knows_its_default_ext(self):
         gif = Gif(None, None, None, None)
-        assert gif.default_ext == 'gif'
+        assert gif.default_ext == "gif"
 
     # fixture components ---------------------------------------------
 
diff --git a/tests/image/test_helpers.py b/tests/image/test_helpers.py
index 6091f4883..8716257d7 100644
--- a/tests/image/test_helpers.py
+++ b/tests/image/test_helpers.py
@@ -14,12 +14,10 @@
 
 
 class DescribeStreamReader(object):
-
-    def it_can_read_a_string_of_specified_len_at_offset(
-            self, read_str_fixture):
+    def it_can_read_a_string_of_specified_len_at_offset(self, read_str_fixture):
         stream_rdr, expected_string = read_str_fixture
         s = stream_rdr.read_str(6, 2)
-        assert s == 'foobar'
+        assert s == "foobar"
 
     def it_raises_on_unexpected_EOF(self, read_str_fixture):
         stream_rdr = read_str_fixture[0]
@@ -33,10 +31,12 @@ def it_can_read_a_long(self, read_long_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (BIG_ENDIAN,    b'\xBE\x00\x00\x00\x2A\xEF', 1, 42),
-        (LITTLE_ENDIAN, b'\xBE\xEF\x2A\x00\x00\x00', 2, 42),
-    ])
+    @pytest.fixture(
+        params=[
+            (BIG_ENDIAN, b"\xBE\x00\x00\x00\x2A\xEF", 1, 42),
+            (LITTLE_ENDIAN, b"\xBE\xEF\x2A\x00\x00\x00", 2, 42),
+        ]
+    )
     def read_long_fixture(self, request):
         byte_order, bytes_, offset, expected_int = request.param
         stream = BytesIO(bytes_)
@@ -45,7 +45,7 @@ def read_long_fixture(self, request):
 
     @pytest.fixture
     def read_str_fixture(self):
-        stream = BytesIO(b'\x01\x02foobar\x03\x04')
+        stream = BytesIO(b"\x01\x02foobar\x03\x04")
         stream_rdr = StreamReader(stream, BIG_ENDIAN)
-        expected_string = 'foobar'
+        expected_string = "foobar"
         return stream_rdr, expected_string
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index 07f9d0666..5893f053c 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -30,7 +30,6 @@
 
 
 class DescribeImage(object):
-
     def it_can_construct_from_an_image_blob(
         self, blob_, BytesIO_, _from_stream_, stream_, image_
     ):
@@ -41,9 +40,7 @@ def it_can_construct_from_an_image_blob(
         assert image is image_
 
     def it_can_construct_from_an_image_path(self, from_path_fixture):
-        image_path, _from_stream_, stream_, blob, filename, image_ = (
-            from_path_fixture
-        )
+        image_path, _from_stream_, stream_, blob, filename, image_ = from_path_fixture
         image = Image.from_file(image_path)
         _from_stream_.assert_called_once_with(stream_, blob, filename)
         assert image is image_
@@ -66,7 +63,7 @@ def it_can_construct_from_an_image_stream(self, from_stream_fixture):
         assert isinstance(image, Image)
 
     def it_provides_access_to_the_image_blob(self):
-        blob = b'foobar'
+        blob = b"foobar"
         image = Image(blob, None, None)
         assert image.blob == blob
 
@@ -103,25 +100,23 @@ def it_can_scale_its_dimensions(self, scale_fixture):
         assert isinstance(scaled_height, Length)
 
     def it_knows_the_image_filename(self):
-        filename = 'foobar.png'
+        filename = "foobar.png"
         image = Image(None, filename, None)
         assert image.filename == filename
 
     def it_knows_the_image_filename_extension(self):
-        image = Image(None, 'foobar.png', None)
-        assert image.ext == 'png'
+        image = Image(None, "foobar.png", None)
+        assert image.ext == "png"
 
     def it_knows_the_sha1_of_its_image(self):
-        blob = b'fO0Bar'
+        blob = b"fO0Bar"
         image = Image(blob, None, None)
-        assert image.sha1 == '4921e7002ddfba690a937d54bda226a7b8bdeb68'
+        assert image.sha1 == "4921e7002ddfba690a937d54bda226a7b8bdeb68"
 
     def it_correctly_characterizes_known_images(self, known_image_fixture):
         image_path, characteristics = known_image_fixture
-        ext, content_type, px_width, px_height, horz_dpi, vert_dpi = (
-            characteristics
-        )
-        with open(test_file(image_path), 'rb') as stream:
+        ext, content_type, px_width, px_height, horz_dpi, vert_dpi = characteristics
+        with open(test_file(image_path), "rb") as stream:
             image = Image.from_file(stream)
             assert image.content_type == content_type
             assert image.ext == ext
@@ -134,7 +129,7 @@ def it_correctly_characterizes_known_images(self, known_image_fixture):
 
     @pytest.fixture
     def content_type_fixture(self, image_header_):
-        content_type = 'image/foobar'
+        content_type = "image/foobar"
         image_header_.content_type = content_type
         return image_header_, content_type
 
@@ -154,54 +149,61 @@ def dpi_fixture(self, image_header_):
 
     @pytest.fixture
     def from_filelike_fixture(self, _from_stream_, image_):
-        image_path = test_file('python-icon.png')
-        with open(image_path, 'rb') as f:
+        image_path = test_file("python-icon.png")
+        with open(image_path, "rb") as f:
             blob = f.read()
         image_stream = BytesIO(blob)
         return image_stream, _from_stream_, blob, image_
 
     @pytest.fixture
     def from_path_fixture(self, _from_stream_, BytesIO_, stream_, image_):
-        filename = 'python-icon.png'
+        filename = "python-icon.png"
         image_path = test_file(filename)
-        with open(image_path, 'rb') as f:
+        with open(image_path, "rb") as f:
             blob = f.read()
         return image_path, _from_stream_, stream_, blob, filename, image_
 
-    @pytest.fixture(params=['foobar.png', None])
+    @pytest.fixture(params=["foobar.png", None])
     def from_stream_fixture(
-            self, request, stream_, blob_, _ImageHeaderFactory_,
-            image_header_, Image__init_):
+        self, request, stream_, blob_, _ImageHeaderFactory_, image_header_, Image__init_
+    ):
         filename_in = request.param
-        filename_out = 'image.png' if filename_in is None else filename_in
+        filename_out = "image.png" if filename_in is None else filename_in
         return (
-            stream_, blob_, filename_in, _ImageHeaderFactory_, image_header_,
-            Image__init_, filename_out
+            stream_,
+            blob_,
+            filename_in,
+            _ImageHeaderFactory_,
+            image_header_,
+            Image__init_,
+            filename_out,
         )
 
     @pytest.fixture(params=[0, 1, 2, 3, 4, 5, 6, 7, 8])
     def known_image_fixture(self, request):
         cases = (
-            ('python.bmp',       ('bmp',  CT.BMP,   211,   71,  96,  96)),
-            ('sonic.gif',        ('gif',  CT.GIF,   290,  360,  72,  72)),
-            ('python-icon.jpeg', ('jpg',  CT.JPEG,  204,  204,  72,  72)),
-            ('300-dpi.jpg',      ('jpg',  CT.JPEG, 1504, 1936, 300, 300)),
-            ('monty-truth.png',  ('png',  CT.PNG,   150,  214,  72,  72)),
-            ('150-dpi.png',      ('png',  CT.PNG,   901, 1350, 150, 150)),
-            ('300-dpi.png',      ('png',  CT.PNG,   860,  579, 300, 300)),
-            ('72-dpi.tiff',      ('tiff', CT.TIFF,   48,   48,  72,  72)),
-            ('300-dpi.TIF',      ('tiff', CT.TIFF, 2464, 3248, 300, 300)),
+            ("python.bmp", ("bmp", CT.BMP, 211, 71, 96, 96)),
+            ("sonic.gif", ("gif", CT.GIF, 290, 360, 72, 72)),
+            ("python-icon.jpeg", ("jpg", CT.JPEG, 204, 204, 72, 72)),
+            ("300-dpi.jpg", ("jpg", CT.JPEG, 1504, 1936, 300, 300)),
+            ("monty-truth.png", ("png", CT.PNG, 150, 214, 72, 72)),
+            ("150-dpi.png", ("png", CT.PNG, 901, 1350, 150, 150)),
+            ("300-dpi.png", ("png", CT.PNG, 860, 579, 300, 300)),
+            ("72-dpi.tiff", ("tiff", CT.TIFF, 48, 48, 72, 72)),
+            ("300-dpi.TIF", ("tiff", CT.TIFF, 2464, 3248, 300, 300)),
             # ('CVS_LOGO.WMF',     ('wmf',  CT.X_WMF, 149,   59,  72,  72)),
         )
         image_filename, characteristics = cases[request.param]
         return image_filename, characteristics
 
-    @pytest.fixture(params=[
-        (None, None, 1000, 2000),
-        (100,  None,  100,  200),
-        (None,  500,  250,  500),
-        (1500, 1500, 1500, 1500),
-    ])
+    @pytest.fixture(
+        params=[
+            (None, None, 1000, 2000),
+            (100, None, 100, 200),
+            (None, 500, 250, 500),
+            (1500, 1500, 1500, 1500),
+        ]
+    )
     def scale_fixture(self, request, width_prop_, height_prop_):
         width, height, scaled_width, scaled_height = request.param
         width_prop_.return_value = Emu(1000)
@@ -224,9 +226,7 @@ def blob_(self, request):
 
     @pytest.fixture
     def BytesIO_(self, request, stream_):
-        return class_mock(
-            request, 'docx.image.image.BytesIO', return_value=stream_
-        )
+        return class_mock(request, "docx.image.image.BytesIO", return_value=stream_)
 
     @pytest.fixture
     def filename_(self, request):
@@ -235,12 +235,12 @@ def filename_(self, request):
     @pytest.fixture
     def _from_stream_(self, request, image_):
         return method_mock(
-            request, Image, '_from_stream', autospec=False, return_value=image_
+            request, Image, "_from_stream", autospec=False, return_value=image_
         )
 
     @pytest.fixture
     def height_prop_(self, request):
-        return property_mock(request, Image, 'height')
+        return property_mock(request, Image, "height")
 
     @pytest.fixture
     def image_(self, request):
@@ -249,13 +249,12 @@ def image_(self, request):
     @pytest.fixture
     def _ImageHeaderFactory_(self, request, image_header_):
         return function_mock(
-            request, 'docx.image.image._ImageHeaderFactory',
-            return_value=image_header_
+            request, "docx.image.image._ImageHeaderFactory", return_value=image_header_
         )
 
     @pytest.fixture
     def image_header_(self, request):
-        return instance_mock(request, BaseImageHeader, default_ext='png')
+        return instance_mock(request, BaseImageHeader, default_ext="png")
 
     @pytest.fixture
     def Image__init_(self, request):
@@ -267,37 +266,37 @@ def stream_(self, request):
 
     @pytest.fixture
     def width_prop_(self, request):
-        return property_mock(request, Image, 'width')
+        return property_mock(request, Image, "width")
 
 
 class Describe_ImageHeaderFactory(object):
-
-    def it_constructs_the_right_class_for_a_given_image_stream(
-            self, call_fixture):
+    def it_constructs_the_right_class_for_a_given_image_stream(self, call_fixture):
         stream, expected_class = call_fixture
         image_header = _ImageHeaderFactory(stream)
         assert isinstance(image_header, expected_class)
 
     def it_raises_on_unrecognized_image_stream(self):
-        stream = BytesIO(b'foobar 666 not an image stream')
+        stream = BytesIO(b"foobar 666 not an image stream")
         with pytest.raises(UnrecognizedImageError):
             _ImageHeaderFactory(stream)
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('python-icon.png',   Png),
-        ('python-icon.jpeg',  Jfif),
-        ('exif-420-dpi.jpg',  Exif),
-        ('sonic.gif',         Gif),
-        ('72-dpi.tiff',       Tiff),
-        ('little-endian.tif', Tiff),
-        ('python.bmp',        Bmp),
-    ])
+    @pytest.fixture(
+        params=[
+            ("python-icon.png", Png),
+            ("python-icon.jpeg", Jfif),
+            ("exif-420-dpi.jpg", Exif),
+            ("sonic.gif", Gif),
+            ("72-dpi.tiff", Tiff),
+            ("little-endian.tif", Tiff),
+            ("python.bmp", Bmp),
+        ]
+    )
     def call_fixture(self, request):
         image_filename, expected_class = request.param
         image_path = test_file(image_filename)
-        with open(image_path, 'rb') as f:
+        with open(image_path, "rb") as f:
             blob = f.read()
         image_stream = BytesIO(blob)
         image_stream.seek(666)
@@ -305,7 +304,6 @@ def call_fixture(self, request):
 
 
 class DescribeBaseImageHeader(object):
-
     def it_defines_content_type_as_an_abstract_property(self):
         base_image_header = BaseImageHeader(None, None, None, None)
         with pytest.raises(NotImplementedError):
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index cbbc869bb..759bd94cc 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -35,22 +35,18 @@
 
 
 class DescribeJpeg(object):
-
     def it_knows_its_content_type(self):
         jpeg = Jpeg(None, None, None, None)
         assert jpeg.content_type == MIME_TYPE.JPEG
 
     def it_knows_its_default_ext(self):
         jpeg = Jpeg(None, None, None, None)
-        assert jpeg.default_ext == 'jpg'
+        assert jpeg.default_ext == "jpg"
 
     class DescribeExif(object):
-
         def it_can_construct_from_an_exif_stream(self, from_exif_fixture):
             # fixture ----------------------
-            stream_, _JfifMarkers_, cx, cy, horz_dpi, vert_dpi = (
-                from_exif_fixture
-            )
+            stream_, _JfifMarkers_, cx, cy, horz_dpi, vert_dpi = from_exif_fixture
             # exercise ---------------------
             exif = Exif.from_stream(stream_)
             # verify -----------------------
@@ -62,11 +58,8 @@ def it_can_construct_from_an_exif_stream(self, from_exif_fixture):
             assert exif.vert_dpi == vert_dpi
 
     class DescribeJfif(object):
-
         def it_can_construct_from_a_jfif_stream(self, from_jfif_fixture):
-            stream_, _JfifMarkers_, cx, cy, horz_dpi, vert_dpi = (
-                from_jfif_fixture
-            )
+            stream_, _JfifMarkers_, cx, cy, horz_dpi, vert_dpi = from_jfif_fixture
             jfif = Jfif.from_stream(stream_)
             _JfifMarkers_.from_stream.assert_called_once_with(stream_)
             assert isinstance(jfif, Jfif)
@@ -85,9 +78,7 @@ def from_exif_fixture(self, stream_, _JfifMarkers_, jfif_markers_):
         jfif_markers_.sof.px_height = px_height
         jfif_markers_.app1.horz_dpi = horz_dpi
         jfif_markers_.app1.vert_dpi = vert_dpi
-        return (
-            stream_, _JfifMarkers_, px_width, px_height, horz_dpi, vert_dpi
-        )
+        return (stream_, _JfifMarkers_, px_width, px_height, horz_dpi, vert_dpi)
 
     @pytest.fixture
     def from_jfif_fixture(self, stream_, _JfifMarkers_, jfif_markers_):
@@ -97,13 +88,11 @@ def from_jfif_fixture(self, stream_, _JfifMarkers_, jfif_markers_):
         jfif_markers_.sof.px_height = px_height
         jfif_markers_.app0.horz_dpi = horz_dpi
         jfif_markers_.app0.vert_dpi = vert_dpi
-        return (
-            stream_, _JfifMarkers_, px_width, px_height, horz_dpi, vert_dpi
-        )
+        return (stream_, _JfifMarkers_, px_width, px_height, horz_dpi, vert_dpi)
 
     @pytest.fixture
     def _JfifMarkers_(self, request, jfif_markers_):
-        _JfifMarkers_ = class_mock(request, 'docx.image.jpeg._JfifMarkers')
+        _JfifMarkers_ = class_mock(request, "docx.image.jpeg._JfifMarkers")
         _JfifMarkers_.from_stream.return_value = jfif_markers_
         return _JfifMarkers_
 
@@ -117,9 +106,8 @@ def stream_(self, request):
 
 
 class Describe_JfifMarkers(object):
-
     def it_can_construct_from_a_jfif_stream(
-            self, stream_, _MarkerParser_, _JfifMarkers__init_, soi_, app0_, sof_, sos_
+        self, stream_, _MarkerParser_, _JfifMarkers__init_, soi_, app0_, sof_, sos_
     ):
         marker_lst = [soi_, app0_, sof_, sos_]
 
@@ -163,15 +151,11 @@ def it_raises_if_it_cant_find_the_SOF_marker(self, no_sof_fixture):
 
     @pytest.fixture
     def app0_(self, request):
-        return instance_mock(
-            request, _App0Marker, marker_code=JPEG_MARKER_CODE.APP0
-        )
+        return instance_mock(request, _App0Marker, marker_code=JPEG_MARKER_CODE.APP0)
 
     @pytest.fixture
     def app1_(self, request):
-        return instance_mock(
-            request, _App1Marker, marker_code=JPEG_MARKER_CODE.APP1
-        )
+        return instance_mock(request, _App1Marker, marker_code=JPEG_MARKER_CODE.APP1)
 
     @pytest.fixture
     def app0_fixture(self, soi_, app0_, eoi_):
@@ -187,9 +171,7 @@ def app1_fixture(self, soi_, app1_, eoi_):
 
     @pytest.fixture
     def eoi_(self, request):
-        return instance_mock(
-            request, _SofMarker, marker_code=JPEG_MARKER_CODE.EOI
-        )
+        return instance_mock(request, _SofMarker, marker_code=JPEG_MARKER_CODE.EOI)
 
     @pytest.fixture
     def _JfifMarkers__init_(self, request):
@@ -203,7 +185,7 @@ def marker_parser_(self, request, markers_all_):
 
     @pytest.fixture
     def _MarkerParser_(self, request, marker_parser_):
-        _MarkerParser_ = class_mock(request, 'docx.image.jpeg._MarkerParser')
+        _MarkerParser_ = class_mock(request, "docx.image.jpeg._MarkerParser")
         _MarkerParser_.from_stream.return_value = marker_parser_
         return _MarkerParser_
 
@@ -228,9 +210,7 @@ def no_sof_fixture(self, soi_, eoi_):
 
     @pytest.fixture
     def sof_(self, request):
-        return instance_mock(
-            request, _SofMarker, marker_code=JPEG_MARKER_CODE.SOF0
-        )
+        return instance_mock(request, _SofMarker, marker_code=JPEG_MARKER_CODE.SOF0)
 
     @pytest.fixture
     def sof_fixture(self, soi_, sof_, eoi_):
@@ -240,15 +220,11 @@ def sof_fixture(self, soi_, sof_, eoi_):
 
     @pytest.fixture
     def soi_(self, request):
-        return instance_mock(
-            request, _Marker, marker_code=JPEG_MARKER_CODE.SOI
-        )
+        return instance_mock(request, _Marker, marker_code=JPEG_MARKER_CODE.SOI)
 
     @pytest.fixture
     def sos_(self, request):
-        return instance_mock(
-            request, _Marker, marker_code=JPEG_MARKER_CODE.SOS
-        )
+        return instance_mock(request, _Marker, marker_code=JPEG_MARKER_CODE.SOS)
 
     @pytest.fixture
     def stream_(self, request):
@@ -256,7 +232,6 @@ def stream_(self, request):
 
 
 class Describe_Marker(object):
-
     def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
         stream, marker_code, offset, _Marker__init_, length = from_stream_fixture
 
@@ -267,13 +242,15 @@ def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (JPEG_MARKER_CODE.SOI,  2,  0),
-        (JPEG_MARKER_CODE.APP0, 4, 16),
-    ])
+    @pytest.fixture(
+        params=[
+            (JPEG_MARKER_CODE.SOI, 2, 0),
+            (JPEG_MARKER_CODE.APP0, 4, 16),
+        ]
+    )
     def from_stream_fixture(self, request, _Marker__init_):
         marker_code, offset, length = request.param
-        bytes_ = b'\xFF\xD8\xFF\xE0\x00\x10'
+        bytes_ = b"\xFF\xD8\xFF\xE0\x00\x10"
         stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         return stream_reader, marker_code, offset, _Marker__init_, length
 
@@ -283,9 +260,8 @@ def _Marker__init_(self, request):
 
 
 class Describe_App0Marker(object):
-
     def it_can_construct_from_a_stream_and_offset(self, _App0Marker__init_):
-        bytes_ = b'\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18'
+        bytes_ = b"\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.APP0, 0, 16
         density_units, x_density, y_density = 1, 42, 24
         stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
@@ -299,9 +275,7 @@ def it_can_construct_from_a_stream_and_offset(self, _App0Marker__init_):
 
     def it_knows_the_image_dpi(self, dpi_fixture):
         density_units, x_density, y_density, horz_dpi, vert_dpi = dpi_fixture
-        app0 = _App0Marker(
-            None, None, None, density_units, x_density, y_density
-        )
+        app0 = _App0Marker(None, None, None, density_units, x_density, y_density)
         assert app0.horz_dpi == horz_dpi
         assert app0.vert_dpi == vert_dpi
 
@@ -311,24 +285,23 @@ def it_knows_the_image_dpi(self, dpi_fixture):
     def _App0Marker__init_(self, request):
         return initializer_mock(request, _App0Marker)
 
-    @pytest.fixture(params=[
-        (0, 100, 200,  72,  72),
-        (1, 100, 200, 100, 200),
-        (2, 100, 200, 254, 508),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, 100, 200, 72, 72),
+            (1, 100, 200, 100, 200),
+            (2, 100, 200, 254, 508),
+        ]
+    )
     def dpi_fixture(self, request):
-        density_units, x_density, y_density, horz_dpi, vert_dpi = (
-            request.param
-        )
+        density_units, x_density, y_density, horz_dpi, vert_dpi = request.param
         return density_units, x_density, y_density, horz_dpi, vert_dpi
 
 
 class Describe_App1Marker(object):
-
     def it_can_construct_from_a_stream_and_offset(
         self, _App1Marker__init_, _tiff_from_exif_segment_
     ):
-        bytes_ = b'\x00\x42Exif\x00\x00'
+        bytes_ = b"\x00\x42Exif\x00\x00"
         marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
         horz_dpi, vert_dpi = 42, 24
         stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
@@ -342,7 +315,7 @@ def it_can_construct_from_a_stream_and_offset(
         assert isinstance(app1_marker, _App1Marker)
 
     def it_can_construct_from_non_Exif_APP1_segment(self, _App1Marker__init_):
-        bytes_ = b'\x00\x42Foobar'
+        bytes_ = b"\x00\x42Foobar"
         marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
         stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
 
@@ -353,8 +326,7 @@ def it_can_construct_from_non_Exif_APP1_segment(self, _App1Marker__init_):
         )
         assert isinstance(app1_marker, _App1Marker)
 
-    def it_gets_a_tiff_from_its_Exif_segment_to_help_construct(
-            self, get_tiff_fixture):
+    def it_gets_a_tiff_from_its_Exif_segment_to_help_construct(self, get_tiff_fixture):
         stream, offset, length = get_tiff_fixture[:3]
         BytesIO_, segment_bytes, substream_ = get_tiff_fixture[3:6]
         Tiff_, tiff_ = get_tiff_fixture[6:]
@@ -377,18 +349,22 @@ def _App1Marker__init_(self, request):
 
     @pytest.fixture
     def BytesIO_(self, request, substream_):
-        return class_mock(
-            request, 'docx.image.jpeg.BytesIO', return_value=substream_
-        )
+        return class_mock(request, "docx.image.jpeg.BytesIO", return_value=substream_)
 
     @pytest.fixture
     def get_tiff_fixture(self, request, BytesIO_, substream_, Tiff_, tiff_):
-        bytes_ = b'xfillerxMM\x00*\x00\x00\x00\x42'
+        bytes_ = b"xfillerxMM\x00*\x00\x00\x00\x42"
         stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         offset, segment_length, segment_bytes = 0, 16, bytes_[8:]
         return (
-            stream_reader, offset, segment_length, BytesIO_, segment_bytes,
-            substream_, Tiff_, tiff_
+            stream_reader,
+            offset,
+            segment_length,
+            BytesIO_,
+            segment_bytes,
+            substream_,
+            Tiff_,
+            tiff_,
         )
 
     @pytest.fixture
@@ -397,7 +373,7 @@ def substream_(self, request):
 
     @pytest.fixture
     def Tiff_(self, request, tiff_):
-        Tiff_ = class_mock(request, 'docx.image.jpeg.Tiff')
+        Tiff_ = class_mock(request, "docx.image.jpeg.Tiff")
         Tiff_.from_stream.return_value = tiff_
         return Tiff_
 
@@ -408,15 +384,17 @@ def tiff_(self, request):
     @pytest.fixture
     def _tiff_from_exif_segment_(self, request, tiff_):
         return method_mock(
-            request, _App1Marker, '_tiff_from_exif_segment', autospec=False,
-            return_value=tiff_
+            request,
+            _App1Marker,
+            "_tiff_from_exif_segment",
+            autospec=False,
+            return_value=tiff_,
         )
 
 
 class Describe_SofMarker(object):
-
     def it_can_construct_from_a_stream_and_offset(self, request, _SofMarker__init_):
-        bytes_ = b'\x00\x11\x00\x00\x2A\x00\x18'
+        bytes_ = b"\x00\x11\x00\x00\x2A\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.SOF0, 0, 17
         px_width, px_height = 24, 42
         stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
@@ -441,27 +419,33 @@ def _SofMarker__init_(self, request):
 
 
 class Describe_MarkerFactory(object):
-
     def it_constructs_the_appropriate_marker_object(self, call_fixture):
         marker_code, stream_, offset_, marker_cls_ = call_fixture
         marker = _MarkerFactory(marker_code, stream_, offset_)
-        marker_cls_.from_stream.assert_called_once_with(
-            stream_, marker_code, offset_
-        )
+        marker_cls_.from_stream.assert_called_once_with(stream_, marker_code, offset_)
         assert marker is marker_cls_.from_stream.return_value
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        JPEG_MARKER_CODE.APP0,
-        JPEG_MARKER_CODE.APP1,
-        JPEG_MARKER_CODE.SOF0,
-        JPEG_MARKER_CODE.SOF7,
-        JPEG_MARKER_CODE.SOS,
-    ])
+    @pytest.fixture(
+        params=[
+            JPEG_MARKER_CODE.APP0,
+            JPEG_MARKER_CODE.APP1,
+            JPEG_MARKER_CODE.SOF0,
+            JPEG_MARKER_CODE.SOF7,
+            JPEG_MARKER_CODE.SOS,
+        ]
+    )
     def call_fixture(
-            self, request, stream_, offset_, _App0Marker_, _App1Marker_,
-            _SofMarker_, _Marker_):
+        self,
+        request,
+        stream_,
+        offset_,
+        _App0Marker_,
+        _App1Marker_,
+        _SofMarker_,
+        _Marker_,
+    ):
         marker_code = request.param
         if marker_code == JPEG_MARKER_CODE.APP0:
             marker_cls_ = _App0Marker_
@@ -475,15 +459,15 @@ def call_fixture(
 
     @pytest.fixture
     def _App0Marker_(self, request):
-        return class_mock(request, 'docx.image.jpeg._App0Marker')
+        return class_mock(request, "docx.image.jpeg._App0Marker")
 
     @pytest.fixture
     def _App1Marker_(self, request):
-        return class_mock(request, 'docx.image.jpeg._App1Marker')
+        return class_mock(request, "docx.image.jpeg._App1Marker")
 
     @pytest.fixture
     def _Marker_(self, request):
-        return class_mock(request, 'docx.image.jpeg._Marker')
+        return class_mock(request, "docx.image.jpeg._Marker")
 
     @pytest.fixture
     def offset_(self, request):
@@ -491,7 +475,7 @@ def offset_(self, request):
 
     @pytest.fixture
     def _SofMarker_(self, request):
-        return class_mock(request, 'docx.image.jpeg._SofMarker')
+        return class_mock(request, "docx.image.jpeg._SofMarker")
 
     @pytest.fixture
     def stream_(self, request):
@@ -499,7 +483,6 @@ def stream_(self, request):
 
 
 class Describe_MarkerFinder(object):
-
     def it_can_construct_from_a_stream(self, stream_, _MarkerFinder__init_):
         marker_finder = _MarkerFinder.from_stream(stream_)
 
@@ -517,18 +500,20 @@ def it_can_find_the_next_marker_after_a_given_offset(self, next_fixture):
     def _MarkerFinder__init_(self, request):
         return initializer_mock(request, _MarkerFinder)
 
-    @pytest.fixture(params=[
-        (0, JPEG_MARKER_CODE.SOI,   2),
-        (1, JPEG_MARKER_CODE.APP0,  4),
-        (2, JPEG_MARKER_CODE.APP0,  4),
-        (3, JPEG_MARKER_CODE.EOI,  12),
-        (4, JPEG_MARKER_CODE.EOI,  12),
-        (6, JPEG_MARKER_CODE.EOI,  12),
-        (8, JPEG_MARKER_CODE.EOI,  12),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, JPEG_MARKER_CODE.SOI, 2),
+            (1, JPEG_MARKER_CODE.APP0, 4),
+            (2, JPEG_MARKER_CODE.APP0, 4),
+            (3, JPEG_MARKER_CODE.EOI, 12),
+            (4, JPEG_MARKER_CODE.EOI, 12),
+            (6, JPEG_MARKER_CODE.EOI, 12),
+            (8, JPEG_MARKER_CODE.EOI, 12),
+        ]
+    )
     def next_fixture(self, request):
         start, marker_code, segment_offset = request.param
-        bytes_ = b'\xFF\xD8\xFF\xE0\x00\x01\xFF\x00\xFF\xFF\xFF\xD9'
+        bytes_ = b"\xFF\xD8\xFF\xE0\x00\x01\xFF\x00\xFF\xFF\xFF\xD9"
         stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         marker_finder = _MarkerFinder(stream_reader)
         expected_code_and_offset = (marker_code, segment_offset)
@@ -540,7 +525,6 @@ def stream_(self, request):
 
 
 class Describe_MarkerParser(object):
-
     def it_can_construct_from_a_jfif_stream(
         self, stream_, StreamReader_, _MarkerParser__init_, stream_reader_
     ):
@@ -550,16 +534,20 @@ def it_can_construct_from_a_jfif_stream(
         _MarkerParser__init_.assert_called_once_with(ANY, stream_reader_)
         assert isinstance(marker_parser, _MarkerParser)
 
-    def it_can_iterate_over_the_jfif_markers_in_its_stream(
-            self, iter_markers_fixture):
-        (marker_parser, stream_, _MarkerFinder_, marker_finder_,
-         _MarkerFactory_, marker_codes, offsets,
-         marker_lst) = iter_markers_fixture
+    def it_can_iterate_over_the_jfif_markers_in_its_stream(self, iter_markers_fixture):
+        (
+            marker_parser,
+            stream_,
+            _MarkerFinder_,
+            marker_finder_,
+            _MarkerFactory_,
+            marker_codes,
+            offsets,
+            marker_lst,
+        ) = iter_markers_fixture
         markers = [marker for marker in marker_parser.iter_markers()]
         _MarkerFinder_.from_stream.assert_called_once_with(stream_)
-        assert marker_finder_.next.call_args_list == [
-            call(0), call(2), call(20)
-        ]
+        assert marker_finder_.next.call_args_list == [call(0), call(2), call(20)]
         assert _MarkerFactory_.call_args_list == [
             call(marker_codes[0], stream_, offsets[0]),
             call(marker_codes[1], stream_, offsets[1]),
@@ -579,34 +567,48 @@ def eoi_(self, request):
 
     @pytest.fixture
     def iter_markers_fixture(
-            self, stream_reader_, _MarkerFinder_, marker_finder_,
-            _MarkerFactory_, soi_, app0_, eoi_):
+        self,
+        stream_reader_,
+        _MarkerFinder_,
+        marker_finder_,
+        _MarkerFactory_,
+        soi_,
+        app0_,
+        eoi_,
+    ):
         marker_parser = _MarkerParser(stream_reader_)
         offsets = [2, 4, 22]
         marker_lst = [soi_, app0_, eoi_]
         marker_finder_.next.side_effect = [
-            (JPEG_MARKER_CODE.SOI,  offsets[0]),
+            (JPEG_MARKER_CODE.SOI, offsets[0]),
             (JPEG_MARKER_CODE.APP0, offsets[1]),
-            (JPEG_MARKER_CODE.EOI,  offsets[2]),
+            (JPEG_MARKER_CODE.EOI, offsets[2]),
         ]
         marker_codes = [
-            JPEG_MARKER_CODE.SOI, JPEG_MARKER_CODE.APP0, JPEG_MARKER_CODE.EOI
+            JPEG_MARKER_CODE.SOI,
+            JPEG_MARKER_CODE.APP0,
+            JPEG_MARKER_CODE.EOI,
         ]
         return (
-            marker_parser, stream_reader_, _MarkerFinder_, marker_finder_,
-            _MarkerFactory_, marker_codes, offsets, marker_lst
+            marker_parser,
+            stream_reader_,
+            _MarkerFinder_,
+            marker_finder_,
+            _MarkerFactory_,
+            marker_codes,
+            offsets,
+            marker_lst,
         )
 
     @pytest.fixture
     def _MarkerFactory_(self, request, soi_, app0_, eoi_):
         return class_mock(
-            request, 'docx.image.jpeg._MarkerFactory',
-            side_effect=[soi_, app0_, eoi_]
+            request, "docx.image.jpeg._MarkerFactory", side_effect=[soi_, app0_, eoi_]
         )
 
     @pytest.fixture
     def _MarkerFinder_(self, request, marker_finder_):
-        _MarkerFinder_ = class_mock(request, 'docx.image.jpeg._MarkerFinder')
+        _MarkerFinder_ = class_mock(request, "docx.image.jpeg._MarkerFinder")
         _MarkerFinder_.from_stream.return_value = marker_finder_
         return _MarkerFinder_
 
@@ -629,8 +631,7 @@ def stream_(self, request):
     @pytest.fixture
     def StreamReader_(self, request, stream_reader_):
         return class_mock(
-            request, 'docx.image.jpeg.StreamReader',
-            return_value=stream_reader_
+            request, "docx.image.jpeg.StreamReader", return_value=stream_reader_
         )
 
     @pytest.fixture
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index 21ed66fa3..71b2c7e14 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -11,8 +11,14 @@
 from docx.image.exceptions import InvalidImageStreamError
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.png import (
-    _Chunk, _Chunks, _ChunkFactory, _ChunkParser, _IHDRChunk, _pHYsChunk,
-    Png, _PngParser
+    _Chunk,
+    _Chunks,
+    _ChunkFactory,
+    _ChunkParser,
+    _IHDRChunk,
+    _pHYsChunk,
+    Png,
+    _PngParser,
 )
 
 from ..unitutil.mock import (
@@ -27,9 +33,8 @@
 
 
 class DescribePng(object):
-
     def it_can_construct_from_a_png_stream(
-            self, stream_, _PngParser_, png_parser_, Png__init__
+        self, stream_, _PngParser_, png_parser_, Png__init__
     ):
         px_width, px_height, horz_dpi, vert_dpi = 42, 24, 36, 63
         png_parser_.px_width = px_width
@@ -51,7 +56,7 @@ def it_knows_its_content_type(self):
 
     def it_knows_its_default_ext(self):
         png = Png(None, None, None, None)
-        assert png.default_ext == 'png'
+        assert png.default_ext == "png"
 
     # fixtures -------------------------------------------------------
 
@@ -61,7 +66,7 @@ def Png__init__(self, request):
 
     @pytest.fixture
     def _PngParser_(self, request, png_parser_):
-        _PngParser_ = class_mock(request, 'docx.image.png._PngParser')
+        _PngParser_ = class_mock(request, "docx.image.png._PngParser")
         _PngParser_.parse.return_value = png_parser_
         return _PngParser_
 
@@ -75,7 +80,6 @@ def stream_(self, request):
 
 
 class Describe_PngParser(object):
-
     def it_can_parse_the_headers_of_a_PNG_stream(
         self, stream_, _Chunks_, _PngParser__init_, chunks_
     ):
@@ -104,7 +108,7 @@ def it_defaults_image_dpi_to_72(self, no_dpi_fixture):
 
     @pytest.fixture
     def _Chunks_(self, request, chunks_):
-        _Chunks_ = class_mock(request, 'docx.image.png._Chunks')
+        _Chunks_ = class_mock(request, "docx.image.png._Chunks")
         _Chunks_.from_stream.return_value = chunks_
         return _Chunks_
 
@@ -130,9 +134,7 @@ def dpi_fixture(self, chunks_):
         png_parser = _PngParser(chunks_)
         return png_parser, horz_dpi, vert_dpi
 
-    @pytest.fixture(params=[
-        (-1, -1), (0, 1000), (None, 1000), (1, 0), (1, None)
-    ])
+    @pytest.fixture(params=[(-1, -1), (0, 1000), (None, 1000), (1, 0), (1, None)])
     def no_dpi_fixture(self, request, chunks_):
         """
         Scenarios are: 1) no pHYs chunk in PNG stream, 2) units specifier
@@ -158,7 +160,6 @@ def stream_(self, request):
 
 
 class Describe_Chunks(object):
-
     def it_can_construct_from_a_stream(
         self, stream_, _ChunkParser_, chunk_parser_, _Chunks__init_
     ):
@@ -189,7 +190,7 @@ def it_raises_if_theres_no_IHDR_chunk(self, no_IHDR_fixture):
 
     @pytest.fixture
     def _ChunkParser_(self, request, chunk_parser_):
-        _ChunkParser_ = class_mock(request, 'docx.image.png._ChunkParser')
+        _ChunkParser_ = class_mock(request, "docx.image.png._ChunkParser")
         _ChunkParser_.from_stream.return_value = chunk_parser_
         return _ChunkParser_
 
@@ -209,9 +210,7 @@ def IHDR_fixture(self, IHDR_chunk_, pHYs_chunk_):
 
     @pytest.fixture
     def IHDR_chunk_(self, request):
-        return instance_mock(
-            request, _IHDRChunk, type_name=PNG_CHUNK_TYPE.IHDR
-        )
+        return instance_mock(request, _IHDRChunk, type_name=PNG_CHUNK_TYPE.IHDR)
 
     @pytest.fixture
     def no_IHDR_fixture(self, pHYs_chunk_):
@@ -221,9 +220,7 @@ def no_IHDR_fixture(self, pHYs_chunk_):
 
     @pytest.fixture
     def pHYs_chunk_(self, request):
-        return instance_mock(
-            request, _pHYsChunk, type_name=PNG_CHUNK_TYPE.pHYs
-        )
+        return instance_mock(request, _pHYsChunk, type_name=PNG_CHUNK_TYPE.pHYs)
 
     @pytest.fixture(params=[True, False])
     def pHYs_fixture(self, request, IHDR_chunk_, pHYs_chunk_):
@@ -241,7 +238,6 @@ def stream_(self, request):
 
 
 class Describe_ChunkParser(object):
-
     def it_can_construct_from_a_stream(
         self, stream_, StreamReader_, stream_rdr_, _ChunkParser__init_
     ):
@@ -267,8 +263,7 @@ def it_can_iterate_over_the_chunks_in_its_png_stream(
         ]
         assert chunks == chunk_lst
 
-    def it_iterates_over_the_chunk_offsets_to_help_parse(
-            self, iter_offsets_fixture):
+    def it_iterates_over_the_chunk_offsets_to_help_parse(self, iter_offsets_fixture):
         chunk_parser, expected_chunk_offsets = iter_offsets_fixture
         chunk_offsets = [co for co in chunk_parser._iter_chunk_offsets()]
         assert chunk_offsets == expected_chunk_offsets
@@ -286,8 +281,7 @@ def chunk_2_(self, request):
     @pytest.fixture
     def _ChunkFactory_(self, request, chunk_lst_):
         return function_mock(
-            request, 'docx.image.png._ChunkFactory',
-            side_effect=chunk_lst_
+            request, "docx.image.png._ChunkFactory", side_effect=chunk_lst_
         )
 
     @pytest.fixture
@@ -305,13 +299,15 @@ def _iter_chunk_offsets_(self, request):
             (PNG_CHUNK_TYPE.pHYs, 4),
         )
         return method_mock(
-            request, _ChunkParser, '_iter_chunk_offsets',
-            return_value=iter(chunk_offsets)
+            request,
+            _ChunkParser,
+            "_iter_chunk_offsets",
+            return_value=iter(chunk_offsets),
         )
 
     @pytest.fixture
     def iter_offsets_fixture(self):
-        bytes_ = b'-filler-\x00\x00\x00\x00IHDRxxxx\x00\x00\x00\x00IEND'
+        bytes_ = b"-filler-\x00\x00\x00\x00IHDRxxxx\x00\x00\x00\x00IEND"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         chunk_parser = _ChunkParser(stream_rdr)
         expected_chunk_offsets = [
@@ -323,7 +319,7 @@ def iter_offsets_fixture(self):
     @pytest.fixture
     def StreamReader_(self, request, stream_rdr_):
         return class_mock(
-            request, 'docx.image.png.StreamReader', return_value=stream_rdr_
+            request, "docx.image.png.StreamReader", return_value=stream_rdr_
         )
 
     @pytest.fixture
@@ -336,24 +332,22 @@ def stream_rdr_(self, request):
 
 
 class Describe_ChunkFactory(object):
-
     def it_constructs_the_appropriate_Chunk_subclass(self, call_fixture):
         chunk_type, stream_rdr_, offset, chunk_cls_ = call_fixture
         chunk = _ChunkFactory(chunk_type, stream_rdr_, offset)
-        chunk_cls_.from_offset.assert_called_once_with(
-            chunk_type, stream_rdr_, offset
-        )
+        chunk_cls_.from_offset.assert_called_once_with(chunk_type, stream_rdr_, offset)
         assert isinstance(chunk, _Chunk)
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        PNG_CHUNK_TYPE.IHDR,
-        PNG_CHUNK_TYPE.pHYs,
-        PNG_CHUNK_TYPE.IEND,
-    ])
-    def call_fixture(
-            self, request, _IHDRChunk_, _pHYsChunk_, _Chunk_, stream_rdr_):
+    @pytest.fixture(
+        params=[
+            PNG_CHUNK_TYPE.IHDR,
+            PNG_CHUNK_TYPE.pHYs,
+            PNG_CHUNK_TYPE.IEND,
+        ]
+    )
+    def call_fixture(self, request, _IHDRChunk_, _pHYsChunk_, _Chunk_, stream_rdr_):
         chunk_type = request.param
         chunk_cls_ = {
             PNG_CHUNK_TYPE.IHDR: _IHDRChunk_,
@@ -365,7 +359,7 @@ def call_fixture(
 
     @pytest.fixture
     def _Chunk_(self, request, chunk_):
-        _Chunk_ = class_mock(request, 'docx.image.png._Chunk')
+        _Chunk_ = class_mock(request, "docx.image.png._Chunk")
         _Chunk_.from_offset.return_value = chunk_
         return _Chunk_
 
@@ -375,7 +369,7 @@ def chunk_(self, request):
 
     @pytest.fixture
     def _IHDRChunk_(self, request, ihdr_chunk_):
-        _IHDRChunk_ = class_mock(request, 'docx.image.png._IHDRChunk')
+        _IHDRChunk_ = class_mock(request, "docx.image.png._IHDRChunk")
         _IHDRChunk_.from_offset.return_value = ihdr_chunk_
         return _IHDRChunk_
 
@@ -385,7 +379,7 @@ def ihdr_chunk_(self, request):
 
     @pytest.fixture
     def _pHYsChunk_(self, request, phys_chunk_):
-        _pHYsChunk_ = class_mock(request, 'docx.image.png._pHYsChunk')
+        _pHYsChunk_ = class_mock(request, "docx.image.png._pHYsChunk")
         _pHYsChunk_.from_offset.return_value = phys_chunk_
         return _pHYsChunk_
 
@@ -399,16 +393,14 @@ def stream_rdr_(self, request):
 
 
 class Describe_Chunk(object):
-
     def it_can_construct_from_a_stream_and_offset(self):
-        chunk_type = 'fOOB'
+        chunk_type = "fOOB"
         chunk = _Chunk.from_offset(chunk_type, None, None)
         assert isinstance(chunk, _Chunk)
         assert chunk.type_name == chunk_type
 
 
 class Describe_IHDRChunk(object):
-
     def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
         stream_rdr, offset, px_width, px_height = from_offset_fixture
         ihdr_chunk = _IHDRChunk.from_offset(None, stream_rdr, offset)
@@ -420,14 +412,13 @@ def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
 
     @pytest.fixture
     def from_offset_fixture(self):
-        bytes_ = b'\x00\x00\x00\x2A\x00\x00\x00\x18'
+        bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x18"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         offset, px_width, px_height = 0, 42, 24
         return stream_rdr, offset, px_width, px_height
 
 
 class Describe_pHYsChunk(object):
-
     def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
         stream_rdr, offset = from_offset_fixture[:2]
         horz_px_per_unit, vert_px_per_unit = from_offset_fixture[2:4]
@@ -442,12 +433,7 @@ def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
 
     @pytest.fixture
     def from_offset_fixture(self):
-        bytes_ = b'\x00\x00\x00\x2A\x00\x00\x00\x18\x01'
+        bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x18\x01"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
-        offset, horz_px_per_unit, vert_px_per_unit, units_specifier = (
-            0, 42, 24, 1
-        )
-        return (
-            stream_rdr, offset, horz_px_per_unit, vert_px_per_unit,
-            units_specifier
-        )
+        offset, horz_px_per_unit, vert_px_per_unit, units_specifier = (0, 42, 24, 1)
+        return (stream_rdr, offset, horz_px_per_unit, vert_px_per_unit, units_specifier)
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index 277df5f21..a5f07acdb 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -35,7 +35,6 @@
 
 
 class DescribeTiff(object):
-
     def it_can_construct_from_a_tiff_stream(
         self, stream_, _TiffParser_, tiff_parser_, Tiff__init_
     ):
@@ -60,7 +59,7 @@ def it_knows_its_content_type(self):
 
     def it_knows_its_default_ext(self):
         tiff = Tiff(None, None, None, None)
-        assert tiff.default_ext == 'tiff'
+        assert tiff.default_ext == "tiff"
 
     # fixtures -------------------------------------------------------
 
@@ -70,7 +69,7 @@ def Tiff__init_(self, request):
 
     @pytest.fixture
     def _TiffParser_(self, request, tiff_parser_):
-        _TiffParser_ = class_mock(request, 'docx.image.tiff._TiffParser')
+        _TiffParser_ = class_mock(request, "docx.image.tiff._TiffParser")
         _TiffParser_.parse.return_value = tiff_parser_
         return _TiffParser_
 
@@ -84,7 +83,6 @@ def stream_(self, request):
 
 
 class Describe_TiffParser(object):
-
     def it_can_parse_the_properties_from_a_tiff_stream(
         self,
         stream_,
@@ -98,9 +96,7 @@ def it_can_parse_the_properties_from_a_tiff_stream(
         tiff_parser = _TiffParser.parse(stream_)
 
         _make_stream_reader_.assert_called_once_with(stream_)
-        _IfdEntries_.from_stream.assert_called_once_with(
-            stream_rdr_, ifd0_offset_
-        )
+        _IfdEntries_.from_stream.assert_called_once_with(stream_rdr_, ifd0_offset_)
         _TiffParser__init_.assert_called_once_with(ANY, ifd_entries_)
         assert isinstance(tiff_parser, _TiffParser)
 
@@ -113,7 +109,7 @@ def it_makes_a_stream_reader_to_help_parse(self, mk_stream_rdr_fixture):
     def it_knows_image_width_and_height_after_parsing(self):
         px_width, px_height = 42, 24
         entries = {
-            TIFF_TAG.IMAGE_WIDTH:  px_width,
+            TIFF_TAG.IMAGE_WIDTH: px_width,
             TIFF_TAG.IMAGE_LENGTH: px_height,
         }
         ifd_entries = _IfdEntries(entries)
@@ -128,13 +124,15 @@ def it_knows_the_horz_and_vert_dpi_after_parsing(self, dpi_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (1,     150,  240,  72,  72),
-        (2,      42,   24,  42,  24),
-        (3,     100,  200, 254, 508),
-        (2,    None, None,  72,  72),
-        (None,   96,  100,  96, 100),
-    ])
+    @pytest.fixture(
+        params=[
+            (1, 150, 240, 72, 72),
+            (2, 42, 24, 42, 24),
+            (3, 100, 200, 254, 508),
+            (2, None, None, 72, 72),
+            (None, 96, 100, 96, 100),
+        ]
+    )
     def dpi_fixture(self, request):
         resolution_unit, x_resolution, y_resolution = request.param[:3]
         expected_horz_dpi, expected_vert_dpi = request.param[3:]
@@ -152,7 +150,7 @@ def dpi_fixture(self, request):
 
     @pytest.fixture
     def _IfdEntries_(self, request, ifd_entries_):
-        _IfdEntries_ = class_mock(request, 'docx.image.tiff._IfdEntries')
+        _IfdEntries_ = class_mock(request, "docx.image.tiff._IfdEntries")
         _IfdEntries_.from_stream.return_value = ifd_entries_
         return _IfdEntries_
 
@@ -169,15 +167,17 @@ def _make_stream_reader_(self, request, stream_rdr_):
         return method_mock(
             request,
             _TiffParser,
-            '_make_stream_reader',
+            "_make_stream_reader",
             autospec=False,
-            return_value=stream_rdr_
+            return_value=stream_rdr_,
         )
 
-    @pytest.fixture(params=[
-        (b'MM\x00*', BIG_ENDIAN),
-        (b'II*\x00', LITTLE_ENDIAN),
-    ])
+    @pytest.fixture(
+        params=[
+            (b"MM\x00*", BIG_ENDIAN),
+            (b"II*\x00", LITTLE_ENDIAN),
+        ]
+    )
     def mk_stream_rdr_fixture(self, request, StreamReader_, stream_rdr_):
         bytes_, endian = request.param
         stream = BytesIO(bytes_)
@@ -190,7 +190,7 @@ def stream_(self, request):
     @pytest.fixture
     def StreamReader_(self, request, stream_rdr_):
         return class_mock(
-            request, 'docx.image.tiff.StreamReader', return_value=stream_rdr_
+            request, "docx.image.tiff.StreamReader", return_value=stream_rdr_
         )
 
     @pytest.fixture
@@ -205,7 +205,6 @@ def _TiffParser__init_(self, request):
 
 
 class Describe_IfdEntries(object):
-
     def it_can_construct_from_a_stream_and_offset(
         self,
         stream_,
@@ -226,7 +225,7 @@ def it_can_construct_from_a_stream_and_offset(
         assert isinstance(ifd_entries, _IfdEntries)
 
     def it_has_basic_mapping_semantics(self):
-        key, value = 1, 'foobar'
+        key, value = 1, "foobar"
         entries = {key: value}
         ifd_entries = _IfdEntries(entries)
         assert key in ifd_entries
@@ -249,7 +248,7 @@ def _IfdEntries__init_(self, request):
     @pytest.fixture
     def _IfdParser_(self, request, ifd_parser_):
         return class_mock(
-            request, 'docx.image.tiff._IfdParser', return_value=ifd_parser_
+            request, "docx.image.tiff._IfdParser", return_value=ifd_parser_
         )
 
     @pytest.fixture
@@ -266,11 +265,14 @@ def stream_(self, request):
 
 
 class Describe_IfdParser(object):
-
-    def it_can_iterate_through_the_directory_entries_in_an_IFD(
-            self, iter_fixture):
-        (ifd_parser, _IfdEntryFactory_, stream_rdr, offsets,
-         expected_entries) = iter_fixture
+    def it_can_iterate_through_the_directory_entries_in_an_IFD(self, iter_fixture):
+        (
+            ifd_parser,
+            _IfdEntryFactory_,
+            stream_rdr,
+            offsets,
+            expected_entries,
+        ) = iter_fixture
         entries = [e for e in ifd_parser.iter_entries()]
         assert _IfdEntryFactory_.call_args_list == [
             call(stream_rdr, offsets[0]),
@@ -291,24 +293,21 @@ def ifd_entry_2_(self, request):
     @pytest.fixture
     def _IfdEntryFactory_(self, request, ifd_entry_, ifd_entry_2_):
         return function_mock(
-            request, 'docx.image.tiff._IfdEntryFactory',
-            side_effect=[ifd_entry_, ifd_entry_2_]
+            request,
+            "docx.image.tiff._IfdEntryFactory",
+            side_effect=[ifd_entry_, ifd_entry_2_],
         )
 
     @pytest.fixture
     def iter_fixture(self, _IfdEntryFactory_, ifd_entry_, ifd_entry_2_):
-        stream_rdr = StreamReader(BytesIO(b'\x00\x02'), BIG_ENDIAN)
+        stream_rdr = StreamReader(BytesIO(b"\x00\x02"), BIG_ENDIAN)
         offsets = [2, 14]
         ifd_parser = _IfdParser(stream_rdr, offset=0)
         expected_entries = [ifd_entry_, ifd_entry_2_]
-        return (
-            ifd_parser, _IfdEntryFactory_, stream_rdr, offsets,
-            expected_entries
-        )
+        return (ifd_parser, _IfdEntryFactory_, stream_rdr, offsets, expected_entries)
 
 
 class Describe_IfdEntryFactory(object):
-
     def it_constructs_the_right_class_for_a_given_ifd_entry(self, fixture):
         stream_rdr, offset, entry_cls_, ifd_entry_ = fixture
         ifd_entry = _IfdEntryFactory(stream_rdr, offset)
@@ -317,25 +316,34 @@ def it_constructs_the_right_class_for_a_given_ifd_entry(self, fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (b'\x66\x66\x00\x01', 'BYTE'),
-        (b'\x66\x66\x00\x02', 'ASCII'),
-        (b'\x66\x66\x00\x03', 'SHORT'),
-        (b'\x66\x66\x00\x04', 'LONG'),
-        (b'\x66\x66\x00\x05', 'RATIONAL'),
-        (b'\x66\x66\x00\x06', 'CUSTOM'),
-    ])
+    @pytest.fixture(
+        params=[
+            (b"\x66\x66\x00\x01", "BYTE"),
+            (b"\x66\x66\x00\x02", "ASCII"),
+            (b"\x66\x66\x00\x03", "SHORT"),
+            (b"\x66\x66\x00\x04", "LONG"),
+            (b"\x66\x66\x00\x05", "RATIONAL"),
+            (b"\x66\x66\x00\x06", "CUSTOM"),
+        ]
+    )
     def fixture(
-            self, request, ifd_entry_, _IfdEntry_, _AsciiIfdEntry_,
-            _ShortIfdEntry_, _LongIfdEntry_, _RationalIfdEntry_):
+        self,
+        request,
+        ifd_entry_,
+        _IfdEntry_,
+        _AsciiIfdEntry_,
+        _ShortIfdEntry_,
+        _LongIfdEntry_,
+        _RationalIfdEntry_,
+    ):
         bytes_, entry_type = request.param
         entry_cls_ = {
-            'BYTE':     _IfdEntry_,
-            'ASCII':    _AsciiIfdEntry_,
-            'SHORT':    _ShortIfdEntry_,
-            'LONG':     _LongIfdEntry_,
-            'RATIONAL': _RationalIfdEntry_,
-            'CUSTOM':   _IfdEntry_,
+            "BYTE": _IfdEntry_,
+            "ASCII": _AsciiIfdEntry_,
+            "SHORT": _ShortIfdEntry_,
+            "LONG": _LongIfdEntry_,
+            "RATIONAL": _RationalIfdEntry_,
+            "CUSTOM": _IfdEntry_,
         }[entry_type]
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         offset = 0
@@ -347,35 +355,31 @@ def ifd_entry_(self, request):
 
     @pytest.fixture
     def _IfdEntry_(self, request, ifd_entry_):
-        _IfdEntry_ = class_mock(request, 'docx.image.tiff._IfdEntry')
+        _IfdEntry_ = class_mock(request, "docx.image.tiff._IfdEntry")
         _IfdEntry_.from_stream.return_value = ifd_entry_
         return _IfdEntry_
 
     @pytest.fixture
     def _AsciiIfdEntry_(self, request, ifd_entry_):
-        _AsciiIfdEntry_ = class_mock(
-            request, 'docx.image.tiff._AsciiIfdEntry')
+        _AsciiIfdEntry_ = class_mock(request, "docx.image.tiff._AsciiIfdEntry")
         _AsciiIfdEntry_.from_stream.return_value = ifd_entry_
         return _AsciiIfdEntry_
 
     @pytest.fixture
     def _ShortIfdEntry_(self, request, ifd_entry_):
-        _ShortIfdEntry_ = class_mock(
-            request, 'docx.image.tiff._ShortIfdEntry')
+        _ShortIfdEntry_ = class_mock(request, "docx.image.tiff._ShortIfdEntry")
         _ShortIfdEntry_.from_stream.return_value = ifd_entry_
         return _ShortIfdEntry_
 
     @pytest.fixture
     def _LongIfdEntry_(self, request, ifd_entry_):
-        _LongIfdEntry_ = class_mock(
-            request, 'docx.image.tiff._LongIfdEntry')
+        _LongIfdEntry_ = class_mock(request, "docx.image.tiff._LongIfdEntry")
         _LongIfdEntry_.from_stream.return_value = ifd_entry_
         return _LongIfdEntry_
 
     @pytest.fixture
     def _RationalIfdEntry_(self, request, ifd_entry_):
-        _RationalIfdEntry_ = class_mock(
-            request, 'docx.image.tiff._RationalIfdEntry')
+        _RationalIfdEntry_ = class_mock(request, "docx.image.tiff._RationalIfdEntry")
         _RationalIfdEntry_.from_stream.return_value = ifd_entry_
         return _RationalIfdEntry_
 
@@ -385,11 +389,10 @@ def offset_(self, request):
 
 
 class Describe_IfdEntry(object):
-
     def it_can_construct_from_a_stream_and_offset(
         self, _parse_value_, _IfdEntry__init_, value_
     ):
-        bytes_ = b'\x00\x01\x66\x66\x00\x00\x00\x02\x00\x00\x00\x03'
+        bytes_ = b"\x00\x01\x66\x66\x00\x00\x00\x02\x00\x00\x00\x03"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         offset, tag_code, value_count, value_offset = 0, 1, 2, 3
         _parse_value_.return_value = value_
@@ -415,7 +418,7 @@ def _IfdEntry__init_(self, request):
 
     @pytest.fixture
     def _parse_value_(self, request):
-        return method_mock(request, _IfdEntry, '_parse_value',  autospec=False)
+        return method_mock(request, _IfdEntry, "_parse_value", autospec=False)
 
     @pytest.fixture
     def value_(self, request):
@@ -423,36 +426,32 @@ def value_(self, request):
 
 
 class Describe_AsciiIfdEntry(object):
-
     def it_can_parse_an_ascii_string_IFD_entry(self):
-        bytes_ = b'foobar\x00'
+        bytes_ = b"foobar\x00"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         val = _AsciiIfdEntry._parse_value(stream_rdr, None, 7, 0)
-        assert val == 'foobar'
+        assert val == "foobar"
 
 
 class Describe_ShortIfdEntry(object):
-
     def it_can_parse_a_short_int_IFD_entry(self):
-        bytes_ = b'foobaroo\x00\x2A'
+        bytes_ = b"foobaroo\x00\x2A"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         val = _ShortIfdEntry._parse_value(stream_rdr, 0, 1, None)
         assert val == 42
 
 
 class Describe_LongIfdEntry(object):
-
     def it_can_parse_a_long_int_IFD_entry(self):
-        bytes_ = b'foobaroo\x00\x00\x00\x2A'
+        bytes_ = b"foobaroo\x00\x00\x00\x2A"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         val = _LongIfdEntry._parse_value(stream_rdr, 0, 1, None)
         assert val == 42
 
 
 class Describe_RationalIfdEntry(object):
-
     def it_can_parse_a_rational_IFD_entry(self):
-        bytes_ = b'\x00\x00\x00\x2A\x00\x00\x00\x54'
+        bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x54"
         stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
         val = _RationalIfdEntry._parse_value(stream_rdr, None, 1, 0)
         assert val == 0.5
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
index 921a885d3..66222cef7 100644
--- a/tests/opc/parts/test_coreprops.py
+++ b/tests/opc/parts/test_coreprops.py
@@ -4,9 +4,7 @@
 Unit test suite for the docx.opc.parts.coreprops module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from datetime import datetime, timedelta
 
@@ -20,7 +18,6 @@
 
 
 class DescribeCorePropertiesPart(object):
-
     def it_provides_access_to_its_core_props_object(self, coreprops_fixture):
         core_properties_part, CoreProperties_ = coreprops_fixture
         core_properties = core_properties_part.core_properties
@@ -31,8 +28,8 @@ def it_can_create_a_default_core_properties_part(self):
         core_properties_part = CorePropertiesPart.default(None)
         assert isinstance(core_properties_part, CorePropertiesPart)
         core_properties = core_properties_part.core_properties
-        assert core_properties.title == 'Word Document'
-        assert core_properties.last_modified_by == 'python-docx'
+        assert core_properties.title == "Word Document"
+        assert core_properties.last_modified_by == "python-docx"
         assert core_properties.revision == 1
         delta = datetime.utcnow() - core_properties.modified
         max_expected_delta = timedelta(seconds=2)
@@ -49,7 +46,7 @@ def coreprops_fixture(self, element_, CoreProperties_):
 
     @pytest.fixture
     def CoreProperties_(self, request):
-        return class_mock(request, 'docx.opc.parts.coreprops.CoreProperties')
+        return class_mock(request, "docx.opc.parts.coreprops.CoreProperties")
 
     @pytest.fixture
     def element_(self, request):
diff --git a/tests/opc/test_coreprops.py b/tests/opc/test_coreprops.py
index 47195f597..97da5dead 100644
--- a/tests/opc/test_coreprops.py
+++ b/tests/opc/test_coreprops.py
@@ -4,9 +4,7 @@
 Unit test suite for the docx.opc.coreprops module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -17,7 +15,6 @@
 
 
 class DescribeCoreProperties(object):
-
     def it_knows_the_string_property_values(self, text_prop_get_fixture):
         core_properties, prop_name, expected_value = text_prop_get_fixture
         actual_value = getattr(core_properties, prop_name)
@@ -34,9 +31,7 @@ def it_knows_the_date_property_values(self, date_prop_get_fixture):
         assert actual_datetime == expected_datetime
 
     def it_can_change_the_date_property_values(self, date_prop_set_fixture):
-        core_properties, prop_name, value, expected_xml = (
-            date_prop_set_fixture
-        )
+        core_properties, prop_name, value, expected_xml = date_prop_set_fixture
         setattr(core_properties, prop_name, value)
         assert core_properties._element.xml == expected_xml
 
@@ -51,23 +46,42 @@ def it_can_change_the_revision_number(self, revision_set_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('created',      datetime(2012, 11, 17, 16, 37, 40)),
-        ('last_printed', datetime(2014,  6,  4,  4, 28)),
-        ('modified',     None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("created", datetime(2012, 11, 17, 16, 37, 40)),
+            ("last_printed", datetime(2014, 6, 4, 4, 28)),
+            ("modified", None),
+        ]
+    )
     def date_prop_get_fixture(self, request, core_properties):
         prop_name, expected_datetime = request.param
         return core_properties, prop_name, expected_datetime
 
-    @pytest.fixture(params=[
-        ('created', 'dcterms:created', datetime(2001, 2, 3, 4, 5),
-         '2001-02-03T04:05:00Z', ' xsi:type="dcterms:W3CDTF"'),
-        ('last_printed', 'cp:lastPrinted', datetime(2014, 6, 4, 4),
-         '2014-06-04T04:00:00Z', ''),
-        ('modified', 'dcterms:modified', datetime(2005, 4, 3, 2, 1),
-         '2005-04-03T02:01:00Z', ' xsi:type="dcterms:W3CDTF"'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "created",
+                "dcterms:created",
+                datetime(2001, 2, 3, 4, 5),
+                "2001-02-03T04:05:00Z",
+                ' xsi:type="dcterms:W3CDTF"',
+            ),
+            (
+                "last_printed",
+                "cp:lastPrinted",
+                datetime(2014, 6, 4, 4),
+                "2014-06-04T04:00:00Z",
+                "",
+            ),
+            (
+                "modified",
+                "dcterms:modified",
+                datetime(2005, 4, 3, 2, 1),
+                "2005-04-03T02:01:00Z",
+                ' xsi:type="dcterms:W3CDTF"',
+            ),
+        ]
+    )
     def date_prop_set_fixture(self, request):
         prop_name, tagname, value, str_val, attrs = request.param
         coreProperties = self.coreProperties(None, None)
@@ -75,56 +89,62 @@ def date_prop_set_fixture(self, request):
         expected_xml = self.coreProperties(tagname, str_val, attrs)
         return core_properties, prop_name, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('42', 42), (None, 0), ('foobar', 0), ('-17', 0), ('32.7', 0)
-    ])
+    @pytest.fixture(
+        params=[("42", 42), (None, 0), ("foobar", 0), ("-17", 0), ("32.7", 0)]
+    )
     def revision_get_fixture(self, request):
         str_val, expected_revision = request.param
-        tagname = '' if str_val is None else 'cp:revision'
+        tagname = "" if str_val is None else "cp:revision"
         coreProperties = self.coreProperties(tagname, str_val)
         core_properties = CoreProperties(parse_xml(coreProperties))
         return core_properties, expected_revision
 
-    @pytest.fixture(params=[
-        (42, '42'),
-    ])
+    @pytest.fixture(
+        params=[
+            (42, "42"),
+        ]
+    )
     def revision_set_fixture(self, request):
         value, str_val = request.param
         coreProperties = self.coreProperties(None, None)
         core_properties = CoreProperties(parse_xml(coreProperties))
-        expected_xml = self.coreProperties('cp:revision', str_val)
+        expected_xml = self.coreProperties("cp:revision", str_val)
         return core_properties, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('author',           'python-docx'),
-        ('category',         ''),
-        ('comments',         ''),
-        ('content_status',   'DRAFT'),
-        ('identifier',       'GXS 10.2.1ab'),
-        ('keywords',         'foo bar baz'),
-        ('language',         'US-EN'),
-        ('last_modified_by', 'Steve Canny'),
-        ('subject',          'Spam'),
-        ('title',            'Word Document'),
-        ('version',          '1.2.88'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("author", "python-docx"),
+            ("category", ""),
+            ("comments", ""),
+            ("content_status", "DRAFT"),
+            ("identifier", "GXS 10.2.1ab"),
+            ("keywords", "foo bar baz"),
+            ("language", "US-EN"),
+            ("last_modified_by", "Steve Canny"),
+            ("subject", "Spam"),
+            ("title", "Word Document"),
+            ("version", "1.2.88"),
+        ]
+    )
     def text_prop_get_fixture(self, request, core_properties):
         prop_name, expected_value = request.param
         return core_properties, prop_name, expected_value
 
-    @pytest.fixture(params=[
-        ('author',           'dc:creator',        'scanny'),
-        ('category',         'cp:category',       'silly stories'),
-        ('comments',         'dc:description',    'Bar foo to you'),
-        ('content_status',   'cp:contentStatus',  'FINAL'),
-        ('identifier',       'dc:identifier',     'GT 5.2.xab'),
-        ('keywords',         'cp:keywords',       'dog cat moo'),
-        ('language',         'dc:language',       'GB-EN'),
-        ('last_modified_by', 'cp:lastModifiedBy', 'Billy Bob'),
-        ('subject',          'dc:subject',        'Eggs'),
-        ('title',            'dc:title',          'Dissertation'),
-        ('version',          'cp:version',        '81.2.8'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("author", "dc:creator", "scanny"),
+            ("category", "cp:category", "silly stories"),
+            ("comments", "dc:description", "Bar foo to you"),
+            ("content_status", "cp:contentStatus", "FINAL"),
+            ("identifier", "dc:identifier", "GT 5.2.xab"),
+            ("keywords", "cp:keywords", "dog cat moo"),
+            ("language", "dc:language", "GB-EN"),
+            ("last_modified_by", "cp:lastModifiedBy", "Billy Bob"),
+            ("subject", "dc:subject", "Eggs"),
+            ("title", "dc:title", "Dissertation"),
+            ("version", "cp:version", "81.2.8"),
+        ]
+    )
     def text_prop_set_fixture(self, request):
         prop_name, tagname, value = request.param
         coreProperties = self.coreProperties(None, None)
@@ -134,7 +154,7 @@ def text_prop_set_fixture(self, request):
 
     # fixture components ---------------------------------------------
 
-    def coreProperties(self, tagname, str_val, attrs=''):
+    def coreProperties(self, tagname, str_val, attrs=""):
         tmpl = (
             '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/'
             'package/2006/metadata/core-properties" xmlns:dc="http://purl.or'
@@ -143,38 +163,36 @@ def coreProperties(self, tagname, str_val, attrs=''):
             'www.w3.org/2001/XMLSchema-instance">%s</cp:coreProperties>\n'
         )
         if not tagname:
-            child_element = ''
+            child_element = ""
         elif not str_val:
-            child_element = '\n  <%s%s/>\n' % (tagname, attrs)
+            child_element = "\n  <%s%s/>\n" % (tagname, attrs)
         else:
-            child_element = (
-                '\n  <%s%s>%s</%s>\n' % (tagname, attrs, str_val, tagname)
-            )
+            child_element = "\n  <%s%s>%s</%s>\n" % (tagname, attrs, str_val, tagname)
         return tmpl % child_element
 
     @pytest.fixture
     def core_properties(self):
         element = parse_xml(
-            b'<?xml version=\'1.0\' encoding=\'UTF-8\' standalone=\'yes\'?>'
+            b"<?xml version='1.0' encoding='UTF-8' standalone='yes'?>"
             b'\n<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.o'
             b'rg/package/2006/metadata/core-properties" xmlns:dc="http://pur'
             b'l.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcm'
             b'itype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="h'
             b'ttp://www.w3.org/2001/XMLSchema-instance">\n'
-            b'  <cp:contentStatus>DRAFT</cp:contentStatus>\n'
-            b'  <dc:creator>python-docx</dc:creator>\n'
+            b"  <cp:contentStatus>DRAFT</cp:contentStatus>\n"
+            b"  <dc:creator>python-docx</dc:creator>\n"
             b'  <dcterms:created xsi:type="dcterms:W3CDTF">2012-11-17T11:07:'
-            b'40-05:30</dcterms:created>\n'
-            b'  <dc:description/>\n'
-            b'  <dc:identifier>GXS 10.2.1ab</dc:identifier>\n'
-            b'  <dc:language>US-EN</dc:language>\n'
-            b'  <cp:lastPrinted>2014-06-04T04:28:00Z</cp:lastPrinted>\n'
-            b'  <cp:keywords>foo bar baz</cp:keywords>\n'
-            b'  <cp:lastModifiedBy>Steve Canny</cp:lastModifiedBy>\n'
-            b'  <cp:revision>4</cp:revision>\n'
-            b'  <dc:subject>Spam</dc:subject>\n'
-            b'  <dc:title>Word Document</dc:title>\n'
-            b'  <cp:version>1.2.88</cp:version>\n'
-            b'</cp:coreProperties>\n'
+            b"40-05:30</dcterms:created>\n"
+            b"  <dc:description/>\n"
+            b"  <dc:identifier>GXS 10.2.1ab</dc:identifier>\n"
+            b"  <dc:language>US-EN</dc:language>\n"
+            b"  <cp:lastPrinted>2014-06-04T04:28:00Z</cp:lastPrinted>\n"
+            b"  <cp:keywords>foo bar baz</cp:keywords>\n"
+            b"  <cp:lastModifiedBy>Steve Canny</cp:lastModifiedBy>\n"
+            b"  <cp:revision>4</cp:revision>\n"
+            b"  <dc:subject>Spam</dc:subject>\n"
+            b"  <dc:title>Word Document</dc:title>\n"
+            b"  <cp:version>1.2.88</cp:version>\n"
+            b"</cp:coreProperties>\n"
         )
         return CoreProperties(element)
diff --git a/tests/opc/test_oxml.py b/tests/opc/test_oxml.py
index 79e77c880..c269bde35 100644
--- a/tests/opc/test_oxml.py
+++ b/tests/opc/test_oxml.py
@@ -6,55 +6,60 @@
 
 from docx.opc.constants import RELATIONSHIP_TARGET_MODE as RTM
 from docx.opc.oxml import (
-    CT_Default, CT_Override, CT_Relationship, CT_Relationships, CT_Types
+    CT_Default,
+    CT_Override,
+    CT_Relationship,
+    CT_Relationships,
+    CT_Types,
 )
 from docx.oxml.xmlchemy import serialize_for_reading
 
 from .unitdata.rels import (
-    a_Default, an_Override, a_Relationship, a_Relationships, a_Types
+    a_Default,
+    an_Override,
+    a_Relationship,
+    a_Relationships,
+    a_Types,
 )
 
 
 class DescribeCT_Default(object):
-
     def it_provides_read_access_to_xml_values(self):
         default = a_Default().element
-        assert default.extension == 'xml'
-        assert default.content_type == 'application/xml'
+        assert default.extension == "xml"
+        assert default.content_type == "application/xml"
 
     def it_can_construct_a_new_default_element(self):
-        default = CT_Default.new('xml', 'application/xml')
+        default = CT_Default.new("xml", "application/xml")
         expected_xml = a_Default().xml
         assert default.xml == expected_xml
 
 
 class DescribeCT_Override(object):
-
     def it_provides_read_access_to_xml_values(self):
         override = an_Override().element
-        assert override.partname == '/part/name.xml'
-        assert override.content_type == 'app/vnd.type'
+        assert override.partname == "/part/name.xml"
+        assert override.content_type == "app/vnd.type"
 
     def it_can_construct_a_new_override_element(self):
-        override = CT_Override.new('/part/name.xml', 'app/vnd.type')
+        override = CT_Override.new("/part/name.xml", "app/vnd.type")
         expected_xml = an_Override().xml
         assert override.xml == expected_xml
 
 
 class DescribeCT_Relationship(object):
-
     def it_provides_read_access_to_xml_values(self):
         rel = a_Relationship().element
-        assert rel.rId == 'rId9'
-        assert rel.reltype == 'ReLtYpE'
-        assert rel.target_ref == 'docProps/core.xml'
+        assert rel.rId == "rId9"
+        assert rel.reltype == "ReLtYpE"
+        assert rel.target_ref == "docProps/core.xml"
         assert rel.target_mode == RTM.INTERNAL
 
     def it_can_construct_from_attribute_values(self):
         cases = (
-            ('rId9', 'ReLtYpE', 'foo/bar.xml',      None),
-            ('rId9', 'ReLtYpE', 'bar/foo.xml',      RTM.INTERNAL),
-            ('rId9', 'ReLtYpE', 'http://some/link', RTM.EXTERNAL),
+            ("rId9", "ReLtYpE", "foo/bar.xml", None),
+            ("rId9", "ReLtYpE", "bar/foo.xml", RTM.INTERNAL),
+            ("rId9", "ReLtYpE", "http://some/link", RTM.EXTERNAL),
         )
         for rId, reltype, target, target_mode in cases:
             if target_mode is None:
@@ -69,7 +74,6 @@ def it_can_construct_from_attribute_values(self):
 
 
 class DescribeCT_Relationships(object):
-
     def it_can_construct_a_new_relationships_element(self):
         rels = CT_Relationships.new()
         expected_xml = (
@@ -82,24 +86,23 @@ def it_can_build_rels_element_incrementally(self):
         # setup ------------------------
         rels = CT_Relationships.new()
         # exercise ---------------------
-        rels.add_rel('rId1', 'http://reltype1', 'docProps/core.xml')
-        rels.add_rel('rId2', 'http://linktype', 'http://some/link', True)
-        rels.add_rel('rId3', 'http://reltype2', '../slides/slide1.xml')
+        rels.add_rel("rId1", "http://reltype1", "docProps/core.xml")
+        rels.add_rel("rId2", "http://linktype", "http://some/link", True)
+        rels.add_rel("rId3", "http://reltype2", "../slides/slide1.xml")
         # verify -----------------------
         expected_rels_xml = a_Relationships().xml
         assert serialize_for_reading(rels) == expected_rels_xml
 
     def it_can_generate_rels_file_xml(self):
         expected_xml = (
-            '<?xml version=\'1.0\' encoding=\'UTF-8\' standalone=\'yes\'?>\n'
+            "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n"
             '<Relationships xmlns="http://schemas.openxmlformats.org/package'
-            '/2006/relationships"/>'.encode('utf-8')
+            '/2006/relationships"/>'.encode("utf-8")
         )
         assert CT_Relationships.new().xml == expected_xml
 
 
 class DescribeCT_Types(object):
-
     def it_provides_access_to_default_child_elements(self):
         types = a_Types().element
         assert len(types.defaults) == 2
@@ -124,10 +127,10 @@ def it_can_construct_a_new_types_element(self):
 
     def it_can_build_types_element_incrementally(self):
         types = CT_Types.new()
-        types.add_default('xml', 'application/xml')
-        types.add_default('jpeg', 'image/jpeg')
-        types.add_override('/docProps/core.xml', 'app/vnd.type1')
-        types.add_override('/ppt/presentation.xml', 'app/vnd.type2')
-        types.add_override('/docProps/thumbnail.jpeg', 'image/jpeg')
+        types.add_default("xml", "application/xml")
+        types.add_default("jpeg", "image/jpeg")
+        types.add_override("/docProps/core.xml", "app/vnd.type1")
+        types.add_override("/ppt/presentation.xml", "app/vnd.type2")
+        types.add_override("/docProps/thumbnail.jpeg", "image/jpeg")
         expected_types_xml = a_Types().xml
         assert types.xml == expected_types_xml
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index 8b2de5728..e2edb3ae6 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -29,22 +29,18 @@
 
 
 class DescribeOpcPackage(object):
-
-    def it_can_open_a_pkg_file(self, PackageReader_, PartFactory_,
-                               Unmarshaller_):
+    def it_can_open_a_pkg_file(self, PackageReader_, PartFactory_, Unmarshaller_):
         # mockery ----------------------
-        pkg_file = Mock(name='pkg_file')
+        pkg_file = Mock(name="pkg_file")
         pkg_reader = PackageReader_.from_file.return_value
         # exercise ---------------------
         pkg = OpcPackage.open(pkg_file)
         # verify -----------------------
         PackageReader_.from_file.assert_called_once_with(pkg_file)
-        Unmarshaller_.unmarshal.assert_called_once_with(pkg_reader, pkg,
-                                                        PartFactory_)
+        Unmarshaller_.unmarshal.assert_called_once_with(pkg_reader, pkg, PartFactory_)
         assert isinstance(pkg, OpcPackage)
 
-    def it_initializes_its_rels_collection_on_first_reference(
-            self, Relationships_):
+    def it_initializes_its_rels_collection_on_first_reference(self, Relationships_):
         pkg = OpcPackage()
         rels = pkg.rels
         Relationships_.assert_called_once_with(PACKAGE_URI.baseURI)
@@ -56,12 +52,9 @@ def it_can_add_a_relationship_to_a_part(self, pkg_with_rels_, rel_attrs_):
         # exercise ---------------------
         pkg.load_rel(reltype, target, rId)
         # verify -----------------------
-        pkg._rels.add_relationship.assert_called_once_with(
-            reltype, target, rId, False
-        )
+        pkg._rels.add_relationship.assert_called_once_with(reltype, target, rId, False)
 
-    def it_can_establish_a_relationship_to_another_part(
-            self, relate_to_part_fixture_):
+    def it_can_establish_a_relationship_to_another_part(self, relate_to_part_fixture_):
         pkg, part_, reltype, rId = relate_to_part_fixture_
         _rId = pkg.relate_to(part_, reltype)
         pkg.rels.get_or_add.assert_called_once_with(reltype, part_)
@@ -69,10 +62,10 @@ def it_can_establish_a_relationship_to_another_part(
 
     def it_can_provide_a_list_of_the_parts_it_contains(self):
         # mockery ----------------------
-        parts = [Mock(name='part1'), Mock(name='part2')]
+        parts = [Mock(name="part1"), Mock(name="part2")]
         pkg = OpcPackage()
         # verify -----------------------
-        with patch.object(OpcPackage, 'iter_parts', return_value=parts):
+        with patch.object(OpcPackage, "iter_parts", return_value=parts):
             assert pkg.parts == [parts[0], parts[1]]
 
     def it_can_iterate_over_parts_by_walking_rels_graph(self):
@@ -84,17 +77,13 @@ def it_can_iterate_over_parts_by_walking_rels_graph(self):
         #   external         +--------+
         #                    | part_2 |
         #                    +--------+
-        part1, part2 = (Mock(name='part1'), Mock(name='part2'))
-        part1.rels = {
-            1: Mock(name='rel1', is_external=False, target_part=part2)
-        }
-        part2.rels = {
-            1: Mock(name='rel2', is_external=False, target_part=part1)
-        }
+        part1, part2 = (Mock(name="part1"), Mock(name="part2"))
+        part1.rels = {1: Mock(name="rel1", is_external=False, target_part=part2)}
+        part2.rels = {1: Mock(name="rel2", is_external=False, target_part=part1)}
         pkg = OpcPackage()
         pkg._rels = {
-            1: Mock(name='rel3', is_external=False, target_part=part1),
-            2: Mock(name='rel4', is_external=True),
+            1: Mock(name="rel3", is_external=False, target_part=part1),
+            2: Mock(name="rel4", is_external=True),
         }
         # verify -----------------------
         assert part1 in pkg.iter_parts()
@@ -121,15 +110,12 @@ def it_can_find_a_part_related_by_reltype(self, related_part_fixture_):
         pkg.rels.part_with_reltype.assert_called_once_with(reltype)
         assert related_part is related_part_
 
-    def it_can_save_to_a_pkg_file(
-            self, pkg_file_, PackageWriter_, parts, parts_):
+    def it_can_save_to_a_pkg_file(self, pkg_file_, PackageWriter_, parts, parts_):
         pkg = OpcPackage()
         pkg.save(pkg_file_)
         for part in parts_:
             part.before_marshal.assert_called_once_with()
-        PackageWriter_.write.assert_called_once_with(
-            pkg_file_, pkg._rels, parts_
-        )
+        PackageWriter_.write.assert_called_once_with(pkg_file_, pkg._rels, parts_)
 
     def it_provides_access_to_the_core_properties(self, core_props_fixture):
         opc_package, core_properties_ = core_props_fixture
@@ -137,7 +123,8 @@ def it_provides_access_to_the_core_properties(self, core_props_fixture):
         assert core_properties is core_properties_
 
     def it_provides_access_to_the_core_properties_part_to_help(
-            self, core_props_part_fixture):
+        self, core_props_part_fixture
+    ):
         opc_package, core_properties_part_ = core_props_part_fixture
         core_properties_part = opc_package._core_properties_part
         assert core_properties_part is core_properties_part_
@@ -161,23 +148,20 @@ def it_creates_a_default_core_props_part_if_none_present(
 
     @pytest.fixture
     def core_props_fixture(
-            self, _core_properties_part_prop_, core_properties_part_,
-            core_properties_):
+        self, _core_properties_part_prop_, core_properties_part_, core_properties_
+    ):
         opc_package = OpcPackage()
         _core_properties_part_prop_.return_value = core_properties_part_
         core_properties_part_.core_properties = core_properties_
         return opc_package, core_properties_
 
     @pytest.fixture
-    def core_props_part_fixture(
-            self, part_related_by_, core_properties_part_):
+    def core_props_part_fixture(self, part_related_by_, core_properties_part_):
         opc_package = OpcPackage()
         part_related_by_.return_value = core_properties_part_
         return opc_package, core_properties_part_
 
-    @pytest.fixture(
-        params=[((), 1), ((1,), 2), ((1, 2), 3), ((2, 3), 1), ((1, 3), 2)]
-    )
+    @pytest.fixture(params=[((), 1), ((1,), 2), ((1, 2), 3), ((2, 3), 1), ((1, 3), 2)])
     def next_partname_fixture(self, request, iter_parts_):
         existing_partname_ns, next_partname_n = request.param
         parts_ = [
@@ -191,16 +175,16 @@ def next_partname_fixture(self, request, iter_parts_):
 
     @pytest.fixture
     def relate_to_part_fixture_(self, request, pkg, rels_, reltype):
-        rId = 'rId99'
-        rel_ = instance_mock(request, _Relationship, name='rel_', rId=rId)
+        rId = "rId99"
+        rel_ = instance_mock(request, _Relationship, name="rel_", rId=rId)
         rels_.get_or_add.return_value = rel_
         pkg._rels = rels_
-        part_ = instance_mock(request, Part, name='part_')
+        part_ = instance_mock(request, Part, name="part_")
         return pkg, part_, reltype, rId
 
     @pytest.fixture
     def related_part_fixture_(self, request, rels_, reltype):
-        related_part_ = instance_mock(request, Part, name='related_part_')
+        related_part_ = instance_mock(request, Part, name="related_part_")
         rels_.part_with_reltype.return_value = related_part_
         pkg = OpcPackage()
         pkg._rels = rels_
@@ -210,7 +194,7 @@ def related_part_fixture_(self, request, rels_, reltype):
 
     @pytest.fixture
     def CorePropertiesPart_(self, request):
-        return class_mock(request, 'docx.opc.package.CorePropertiesPart')
+        return class_mock(request, "docx.opc.package.CorePropertiesPart")
 
     @pytest.fixture
     def core_properties_(self, request):
@@ -222,7 +206,7 @@ def core_properties_part_(self, request):
 
     @pytest.fixture
     def _core_properties_part_prop_(self, request):
-        return property_mock(request, OpcPackage, '_core_properties_part')
+        return property_mock(request, OpcPackage, "_core_properties_part")
 
     @pytest.fixture
     def iter_parts_(self, request):
@@ -230,7 +214,7 @@ def iter_parts_(self, request):
 
     @pytest.fixture
     def PackageReader_(self, request):
-        return class_mock(request, 'docx.opc.package.PackageReader')
+        return class_mock(request, "docx.opc.package.PackageReader")
 
     @pytest.fixture
     def PackURI_(self, request):
@@ -242,15 +226,15 @@ def packuri_(self, request):
 
     @pytest.fixture
     def PackageWriter_(self, request):
-        return class_mock(request, 'docx.opc.package.PackageWriter')
+        return class_mock(request, "docx.opc.package.PackageWriter")
 
     @pytest.fixture
     def PartFactory_(self, request):
-        return class_mock(request, 'docx.opc.package.PartFactory')
+        return class_mock(request, "docx.opc.package.PartFactory")
 
     @pytest.fixture
     def part_related_by_(self, request):
-        return method_mock(request, OpcPackage, 'part_related_by')
+        return method_mock(request, OpcPackage, "part_related_by")
 
     @pytest.fixture
     def parts(self, request, parts_):
@@ -259,16 +243,15 @@ def parts(self, request, parts_):
         patch after each use.
         """
         _patch = patch.object(
-            OpcPackage, 'parts', new_callable=PropertyMock,
-            return_value=parts_
+            OpcPackage, "parts", new_callable=PropertyMock, return_value=parts_
         )
         request.addfinalizer(_patch.stop)
         return _patch.start()
 
     @pytest.fixture
     def parts_(self, request):
-        part_ = instance_mock(request, Part, name='part_')
-        part_2_ = instance_mock(request, Part, name='part_2_')
+        part_ = instance_mock(request, Part, name="part_")
+        part_2_ = instance_mock(request, Part, name="part_2_")
         return [part_, part_2_]
 
     @pytest.fixture
@@ -287,18 +270,18 @@ def pkg_with_rels_(self, request, rels_):
 
     @pytest.fixture
     def Relationships_(self, request):
-        return class_mock(request, 'docx.opc.package.Relationships')
+        return class_mock(request, "docx.opc.package.Relationships")
 
     @pytest.fixture
     def rel_attrs_(self, request):
-        reltype = 'http://rel/type'
-        target_ = instance_mock(request, Part, name='target_')
-        rId = 'rId99'
+        reltype = "http://rel/type"
+        target_ = instance_mock(request, Part, name="target_")
+        rId = "rId99"
         return reltype, target_, rId
 
     @pytest.fixture
     def relate_to_(self, request):
-        return method_mock(request, OpcPackage, 'relate_to')
+        return method_mock(request, OpcPackage, "relate_to")
 
     @pytest.fixture
     def rels_(self, request):
@@ -306,15 +289,14 @@ def rels_(self, request):
 
     @pytest.fixture
     def reltype(self, request):
-        return 'http://rel/type'
+        return "http://rel/type"
 
     @pytest.fixture
     def Unmarshaller_(self, request):
-        return class_mock(request, 'docx.opc.package.Unmarshaller')
+        return class_mock(request, "docx.opc.package.Unmarshaller")
 
 
 class DescribeUnmarshaller(object):
-
     def it_can_unmarshal_from_a_pkg_reader(
         self,
         pkg_reader_,
@@ -336,56 +318,92 @@ def it_can_unmarshal_from_a_pkg_reader(
         pkg_.after_unmarshal.assert_called_once_with()
 
     def it_can_unmarshal_parts(
-            self, pkg_reader_, pkg_, part_factory_, parts_dict_, partnames_,
-            content_types_, reltypes_, blobs_):
+        self,
+        pkg_reader_,
+        pkg_,
+        part_factory_,
+        parts_dict_,
+        partnames_,
+        content_types_,
+        reltypes_,
+        blobs_,
+    ):
         # fixture ----------------------
         partname_, partname_2_ = partnames_
         content_type_, content_type_2_ = content_types_
         reltype_, reltype_2_ = reltypes_
         blob_, blob_2_ = blobs_
         # exercise ---------------------
-        parts = Unmarshaller._unmarshal_parts(
-            pkg_reader_, pkg_, part_factory_
-        )
+        parts = Unmarshaller._unmarshal_parts(pkg_reader_, pkg_, part_factory_)
         # verify -----------------------
-        assert (
-            part_factory_.call_args_list == [
-                call(partname_, content_type_, reltype_, blob_, pkg_),
-                call(partname_2_, content_type_2_, reltype_2_, blob_2_, pkg_)
-            ]
-        )
+        assert part_factory_.call_args_list == [
+            call(partname_, content_type_, reltype_, blob_, pkg_),
+            call(partname_2_, content_type_2_, reltype_2_, blob_2_, pkg_),
+        ]
         assert parts == parts_dict_
 
     def it_can_unmarshal_relationships(self):
         # test data --------------------
-        reltype = 'http://reltype'
+        reltype = "http://reltype"
         # mockery ----------------------
-        pkg_reader = Mock(name='pkg_reader')
+        pkg_reader = Mock(name="pkg_reader")
         pkg_reader.iter_srels.return_value = (
-            ('/',         Mock(name='srel1', rId='rId1', reltype=reltype,
-             target_partname='partname1', is_external=False)),
-            ('/',         Mock(name='srel2', rId='rId2', reltype=reltype,
-             target_ref='target_ref_1',   is_external=True)),
-            ('partname1', Mock(name='srel3', rId='rId3', reltype=reltype,
-             target_partname='partname2', is_external=False)),
-            ('partname2', Mock(name='srel4', rId='rId4', reltype=reltype,
-             target_ref='target_ref_2',   is_external=True)),
+            (
+                "/",
+                Mock(
+                    name="srel1",
+                    rId="rId1",
+                    reltype=reltype,
+                    target_partname="partname1",
+                    is_external=False,
+                ),
+            ),
+            (
+                "/",
+                Mock(
+                    name="srel2",
+                    rId="rId2",
+                    reltype=reltype,
+                    target_ref="target_ref_1",
+                    is_external=True,
+                ),
+            ),
+            (
+                "partname1",
+                Mock(
+                    name="srel3",
+                    rId="rId3",
+                    reltype=reltype,
+                    target_partname="partname2",
+                    is_external=False,
+                ),
+            ),
+            (
+                "partname2",
+                Mock(
+                    name="srel4",
+                    rId="rId4",
+                    reltype=reltype,
+                    target_ref="target_ref_2",
+                    is_external=True,
+                ),
+            ),
         )
-        pkg = Mock(name='pkg')
+        pkg = Mock(name="pkg")
         parts = {}
         for num in range(1, 3):
-            name = 'part%d' % num
+            name = "part%d" % num
             part = Mock(name=name)
-            parts['partname%d' % num] = part
+            parts["partname%d" % num] = part
             pkg.attach_mock(part, name)
         # exercise ---------------------
         Unmarshaller._unmarshal_relationships(pkg_reader, pkg, parts)
         # verify -----------------------
         expected_pkg_calls = [
-            call.load_rel(reltype, parts['partname1'], 'rId1', False),
-            call.load_rel(reltype, 'target_ref_1', 'rId2', True),
-            call.part1.load_rel(reltype, parts['partname2'], 'rId3', False),
-            call.part2.load_rel(reltype, 'target_ref_2', 'rId4', True),
+            call.load_rel(reltype, parts["partname1"], "rId1", False),
+            call.load_rel(reltype, "target_ref_1", "rId2", True),
+            call.part1.load_rel(reltype, parts["partname2"], "rId3", False),
+            call.part2.load_rel(reltype, "target_ref_2", "rId4", True),
         ]
         assert pkg.mock_calls == expected_pkg_calls
 
@@ -393,14 +411,14 @@ def it_can_unmarshal_relationships(self):
 
     @pytest.fixture
     def blobs_(self, request):
-        blob_ = loose_mock(request, spec=str, name='blob_')
-        blob_2_ = loose_mock(request, spec=str, name='blob_2_')
+        blob_ = loose_mock(request, spec=str, name="blob_")
+        blob_2_ = loose_mock(request, spec=str, name="blob_2_")
         return blob_, blob_2_
 
     @pytest.fixture
     def content_types_(self, request):
-        content_type_ = loose_mock(request, spec=str, name='content_type_')
-        content_type_2_ = loose_mock(request, spec=str, name='content_type_2_')
+        content_type_ = loose_mock(request, spec=str, name="content_type_")
+        content_type_2_ = loose_mock(request, spec=str, name="content_type_2_")
         return content_type_, content_type_2_
 
     @pytest.fixture
@@ -411,14 +429,14 @@ def part_factory_(self, request, parts_):
 
     @pytest.fixture
     def partnames_(self, request):
-        partname_ = loose_mock(request, spec=str, name='partname_')
-        partname_2_ = loose_mock(request, spec=str, name='partname_2_')
+        partname_ = loose_mock(request, spec=str, name="partname_")
+        partname_2_ = loose_mock(request, spec=str, name="partname_2_")
         return partname_, partname_2_
 
     @pytest.fixture
     def parts_(self, request):
-        part_ = instance_mock(request, Part, name='part_')
-        part_2_ = instance_mock(request, Part, name='part_2')
+        part_ = instance_mock(request, Part, name="part_")
+        part_2_ = instance_mock(request, Part, name="part_2")
         return part_, part_2_
 
     @pytest.fixture
@@ -432,8 +450,7 @@ def pkg_(self, request):
         return instance_mock(request, OpcPackage)
 
     @pytest.fixture
-    def pkg_reader_(
-            self, request, partnames_, content_types_, reltypes_, blobs_):
+    def pkg_reader_(self, request, partnames_, content_types_, reltypes_, blobs_):
         partname_, partname_2_ = partnames_
         content_type_, content_type_2_ = content_types_
         reltype_, reltype_2_ = reltypes_
@@ -448,16 +465,16 @@ def pkg_reader_(
 
     @pytest.fixture
     def reltypes_(self, request):
-        reltype_ = instance_mock(request, str, name='reltype_')
-        reltype_2_ = instance_mock(request, str, name='reltype_2')
+        reltype_ = instance_mock(request, str, name="reltype_")
+        reltype_2_ = instance_mock(request, str, name="reltype_2")
         return reltype_, reltype_2_
 
     @pytest.fixture
     def _unmarshal_parts_(self, request):
-        return method_mock(request, Unmarshaller, '_unmarshal_parts', autospec=False)
+        return method_mock(request, Unmarshaller, "_unmarshal_parts", autospec=False)
 
     @pytest.fixture
     def _unmarshal_relationships_(self, request):
         return method_mock(
-            request, Unmarshaller, '_unmarshal_relationships', autospec=False
+            request, Unmarshaller, "_unmarshal_relationships", autospec=False
         )
diff --git a/tests/opc/test_packuri.py b/tests/opc/test_packuri.py
index f2527eba3..a56badcda 100644
--- a/tests/opc/test_packuri.py
+++ b/tests/opc/test_packuri.py
@@ -10,16 +10,15 @@
 
 
 class DescribePackURI(object):
-
     def cases(self, expected_values):
         """
         Return list of tuples zipped from uri_str cases and
         *expected_values*. Raise if lengths don't match.
         """
         uri_str_cases = [
-            '/',
-            '/ppt/presentation.xml',
-            '/ppt/slides/slide1.xml',
+            "/",
+            "/ppt/presentation.xml",
+            "/ppt/slides/slide1.xml",
         ]
         if len(expected_values) != len(uri_str_cases):
             msg = "len(expected_values) differs from len(uri_str_cases)"
@@ -28,27 +27,27 @@ def cases(self, expected_values):
         return zip(pack_uris, expected_values)
 
     def it_can_construct_from_relative_ref(self):
-        baseURI = '/ppt/slides'
-        relative_ref = '../slideLayouts/slideLayout1.xml'
+        baseURI = "/ppt/slides"
+        relative_ref = "../slideLayouts/slideLayout1.xml"
         pack_uri = PackURI.from_rel_ref(baseURI, relative_ref)
-        assert pack_uri == '/ppt/slideLayouts/slideLayout1.xml'
+        assert pack_uri == "/ppt/slideLayouts/slideLayout1.xml"
 
     def it_should_raise_on_construct_with_bad_pack_uri_str(self):
         with pytest.raises(ValueError):
-            PackURI('foobar')
+            PackURI("foobar")
 
     def it_can_calculate_baseURI(self):
-        expected_values = ('/', '/ppt', '/ppt/slides')
+        expected_values = ("/", "/ppt", "/ppt/slides")
         for pack_uri, expected_baseURI in self.cases(expected_values):
             assert pack_uri.baseURI == expected_baseURI
 
     def it_can_calculate_extension(self):
-        expected_values = ('', 'xml', 'xml')
+        expected_values = ("", "xml", "xml")
         for pack_uri, expected_ext in self.cases(expected_values):
             assert pack_uri.ext == expected_ext
 
     def it_can_calculate_filename(self):
-        expected_values = ('', 'presentation.xml', 'slide1.xml')
+        expected_values = ("", "presentation.xml", "slide1.xml")
         for pack_uri, expected_filename in self.cases(expected_values):
             assert pack_uri.filename == expected_filename
 
@@ -59,20 +58,26 @@ def it_knows_the_filename_index(self):
 
     def it_can_calculate_membername(self):
         expected_values = (
-            '',
-            'ppt/presentation.xml',
-            'ppt/slides/slide1.xml',
+            "",
+            "ppt/presentation.xml",
+            "ppt/slides/slide1.xml",
         )
         for pack_uri, expected_membername in self.cases(expected_values):
             assert pack_uri.membername == expected_membername
 
     def it_can_calculate_relative_ref_value(self):
         cases = (
-            ('/', '/ppt/presentation.xml', 'ppt/presentation.xml'),
-            ('/ppt', '/ppt/slideMasters/slideMaster1.xml',
-             'slideMasters/slideMaster1.xml'),
-            ('/ppt/slides', '/ppt/slideLayouts/slideLayout1.xml',
-             '../slideLayouts/slideLayout1.xml'),
+            ("/", "/ppt/presentation.xml", "ppt/presentation.xml"),
+            (
+                "/ppt",
+                "/ppt/slideMasters/slideMaster1.xml",
+                "slideMasters/slideMaster1.xml",
+            ),
+            (
+                "/ppt/slides",
+                "/ppt/slideLayouts/slideLayout1.xml",
+                "../slideLayouts/slideLayout1.xml",
+            ),
         )
         for baseURI, uri_str, expected_relative_ref in cases:
             pack_uri = PackURI(uri_str)
@@ -80,9 +85,9 @@ def it_can_calculate_relative_ref_value(self):
 
     def it_can_calculate_rels_uri(self):
         expected_values = (
-            '/_rels/.rels',
-            '/ppt/_rels/presentation.xml.rels',
-            '/ppt/slides/_rels/slide1.xml.rels',
+            "/_rels/.rels",
+            "/ppt/_rels/presentation.xml.rels",
+            "/ppt/slides/_rels/slide1.xml.rels",
         )
         for pack_uri, expected_rels_uri in self.cases(expected_values):
             assert pack_uri.rels_uri == expected_rels_uri
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index cc60beaae..b32bf7f4f 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -26,7 +26,6 @@
 
 
 class DescribePart(object):
-
     def it_can_be_constructed_by_PartFactory(
         self, partname_, content_type_, blob_, package_, __init_
     ):
@@ -71,7 +70,7 @@ def blob_fixture(self, blob_):
 
     @pytest.fixture
     def content_type_fixture(self):
-        content_type = 'content/type'
+        content_type = "content/type"
         part = Part(None, content_type, None, None)
         return part, content_type
 
@@ -87,14 +86,14 @@ def part(self):
 
     @pytest.fixture
     def partname_get_fixture(self):
-        partname = PackURI('/part/name')
+        partname = PackURI("/part/name")
         part = Part(partname, None, None, None)
         return part, partname
 
     @pytest.fixture
     def partname_set_fixture(self):
-        old_partname = PackURI('/old/part/name')
-        new_partname = PackURI('/new/part/name')
+        old_partname = PackURI("/old/part/name")
+        new_partname = PackURI("/new/part/name")
         part = Part(old_partname, None, None, None)
         return part, new_partname
 
@@ -122,7 +121,6 @@ def partname_(self, request):
 
 
 class DescribePartRelationshipManagementInterface(object):
-
     def it_provides_access_to_its_relationships(self, rels_fixture):
         part, Relationships_, partname_, rels_ = rels_fixture
         rels = part.rels
@@ -132,19 +130,15 @@ def it_provides_access_to_its_relationships(self, rels_fixture):
     def it_can_load_a_relationship(self, load_rel_fixture):
         part, rels_, reltype_, target_, rId_ = load_rel_fixture
         part.load_rel(reltype_, target_, rId_)
-        rels_.add_relationship.assert_called_once_with(
-            reltype_, target_, rId_, False
-        )
+        rels_.add_relationship.assert_called_once_with(reltype_, target_, rId_, False)
 
-    def it_can_establish_a_relationship_to_another_part(
-            self, relate_to_part_fixture):
+    def it_can_establish_a_relationship_to_another_part(self, relate_to_part_fixture):
         part, target_, reltype_, rId_ = relate_to_part_fixture
         rId = part.relate_to(target_, reltype_)
         part.rels.get_or_add.assert_called_once_with(reltype_, target_)
         assert rId is rId_
 
-    def it_can_establish_an_external_relationship(
-            self, relate_to_url_fixture):
+    def it_can_establish_an_external_relationship(self, relate_to_url_fixture):
         part, url_, reltype_, rId_ = relate_to_url_fixture
         rId = part.relate_to(url_, reltype_, is_external=True)
         part.rels.get_or_add_ext_rel.assert_called_once_with(reltype_, url_)
@@ -168,22 +162,23 @@ def it_can_find_a_related_part_by_rId(self, related_parts_fixture):
         part, related_parts_ = related_parts_fixture
         assert part.related_parts is related_parts_
 
-    def it_can_find_the_uri_of_an_external_relationship(
-            self, target_ref_fixture):
+    def it_can_find_the_uri_of_an_external_relationship(self, target_ref_fixture):
         part, rId_, url_ = target_ref_fixture
         url = part.target_ref(rId_)
         assert url == url_
 
     # fixtures ---------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:p', True),
-        ('w:p/r:a{r:id=rId42}', True),
-        ('w:p/r:a{r:id=rId42}/r:b{r:id=rId42}', False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", True),
+            ("w:p/r:a{r:id=rId42}", True),
+            ("w:p/r:a{r:id=rId42}/r:b{r:id=rId42}", False),
+        ]
+    )
     def drop_rel_fixture(self, request, part):
         part_cxml, rel_should_be_dropped = request.param
-        rId = 'rId42'
+        rId = "rId42"
         part._element = element(part_cxml)
         part._rels = {rId: None}
         return part, rId, rel_should_be_dropped
@@ -194,15 +189,13 @@ def load_rel_fixture(self, part, rels_, reltype_, part_, rId_):
         return part, rels_, reltype_, part_, rId_
 
     @pytest.fixture
-    def relate_to_part_fixture(
-            self, request, part, reltype_, part_, rels_, rId_):
+    def relate_to_part_fixture(self, request, part, reltype_, part_, rels_, rId_):
         part._rels = rels_
         target_ = part_
         return part, target_, reltype_, rId_
 
     @pytest.fixture
-    def relate_to_url_fixture(
-            self, request, part, rels_, url_, reltype_, rId_):
+    def relate_to_url_fixture(self, request, part, rels_, url_, reltype_, rId_):
         part._rels = rels_
         return part, url_, reltype_, rId_
 
@@ -242,15 +235,11 @@ def partname_(self, request):
 
     @pytest.fixture
     def Relationships_(self, request, rels_):
-        return class_mock(
-            request, 'docx.opc.part.Relationships', return_value=rels_
-        )
+        return class_mock(request, "docx.opc.part.Relationships", return_value=rels_)
 
     @pytest.fixture
     def rel_(self, request, rId_, url_):
-        return instance_mock(
-            request, _Relationship, rId=rId_, target_ref=url_
-        )
+        return instance_mock(request, _Relationship, rId=rId_, target_ref=url_)
 
     @pytest.fixture
     def rels_(self, request, part_, rel_, rId_, related_parts_):
@@ -279,12 +268,14 @@ def url_(self, request):
 
 
 class DescribePartFactory(object):
-
-    def it_constructs_part_from_selector_if_defined(
-            self, cls_selector_fixture):
+    def it_constructs_part_from_selector_if_defined(self, cls_selector_fixture):
         # fixture ----------------------
-        (cls_selector_fn_, part_load_params, CustomPartClass_,
-         part_of_custom_type_) = cls_selector_fixture
+        (
+            cls_selector_fn_,
+            part_load_params,
+            CustomPartClass_,
+            part_of_custom_type_,
+        ) = cls_selector_fixture
         partname, content_type, reltype, blob, package = part_load_params
         # exercise ---------------------
         PartFactory.part_class_selector = cls_selector_fn_
@@ -297,7 +288,8 @@ def it_constructs_part_from_selector_if_defined(
         assert part is part_of_custom_type_
 
     def it_constructs_custom_part_type_for_registered_content_types(
-            self, part_args_, CustomPartClass_, part_of_custom_type_):
+        self, part_args_, CustomPartClass_, part_of_custom_type_
+    ):
         # fixture ----------------------
         partname, content_type, reltype, package, blob = part_args_
         # exercise ---------------------
@@ -310,7 +302,8 @@ def it_constructs_custom_part_type_for_registered_content_types(
         assert part is part_of_custom_type_
 
     def it_constructs_part_using_default_class_when_no_custom_registered(
-            self, part_args_2_, DefaultPartClass_, part_of_default_type_):
+        self, part_args_2_, DefaultPartClass_, part_of_default_type_
+    ):
         partname, content_type, reltype, blob, package = part_args_2_
         part = PartFactory(partname, content_type, reltype, blob, package)
         DefaultPartClass_.load.assert_called_once_with(
@@ -331,21 +324,29 @@ def blob_2_(self, request):
     @pytest.fixture
     def cls_method_fn_(self, request, cls_selector_fn_):
         return function_mock(
-            request, 'docx.opc.part.cls_method_fn',
-            return_value=cls_selector_fn_
+            request, "docx.opc.part.cls_method_fn", return_value=cls_selector_fn_
         )
 
     @pytest.fixture
     def cls_selector_fixture(
-            self, request, cls_selector_fn_, cls_method_fn_, part_load_params,
-            CustomPartClass_, part_of_custom_type_):
+        self,
+        request,
+        cls_selector_fn_,
+        cls_method_fn_,
+        part_load_params,
+        CustomPartClass_,
+        part_of_custom_type_,
+    ):
         def reset_part_class_selector():
             PartFactory.part_class_selector = original_part_class_selector
+
         original_part_class_selector = PartFactory.part_class_selector
         request.addfinalizer(reset_part_class_selector)
         return (
-            cls_selector_fn_, part_load_params, CustomPartClass_,
-            part_of_custom_type_
+            cls_selector_fn_,
+            part_load_params,
+            CustomPartClass_,
+            part_of_custom_type_,
         )
 
     @pytest.fixture
@@ -355,7 +356,7 @@ def cls_selector_fn_(self, request, CustomPartClass_):
         cls_selector_fn_.return_value = CustomPartClass_
         # Python 2 version
         cls_selector_fn_.__func__ = loose_mock(
-            request, name='__func__', return_value=cls_selector_fn_
+            request, name="__func__", return_value=cls_selector_fn_
         )
         return cls_selector_fn_
 
@@ -369,15 +370,13 @@ def content_type_2_(self, request):
 
     @pytest.fixture
     def CustomPartClass_(self, request, part_of_custom_type_):
-        CustomPartClass_ = Mock(name='CustomPartClass', spec=Part)
+        CustomPartClass_ = Mock(name="CustomPartClass", spec=Part)
         CustomPartClass_.load.return_value = part_of_custom_type_
         return CustomPartClass_
 
     @pytest.fixture
     def DefaultPartClass_(self, request, part_of_default_type_):
-        DefaultPartClass_ = cls_attr_mock(
-            request, PartFactory, 'default_part_type'
-        )
+        DefaultPartClass_ = cls_attr_mock(request, PartFactory, "default_part_type")
         DefaultPartClass_.load.return_value = part_of_default_type_
         return DefaultPartClass_
 
@@ -390,8 +389,7 @@ def package_2_(self, request):
         return instance_mock(request, OpcPackage)
 
     @pytest.fixture
-    def part_load_params(
-            self, partname_, content_type_, reltype_, blob_, package_):
+    def part_load_params(self, partname_, content_type_, reltype_, blob_, package_):
         return partname_, content_type_, reltype_, blob_, package_
 
     @pytest.fixture
@@ -411,15 +409,13 @@ def partname_2_(self, request):
         return instance_mock(request, PackURI)
 
     @pytest.fixture
-    def part_args_(
-            self, request, partname_, content_type_, reltype_, package_,
-            blob_):
+    def part_args_(self, request, partname_, content_type_, reltype_, package_, blob_):
         return partname_, content_type_, reltype_, blob_, package_
 
     @pytest.fixture
     def part_args_2_(
-            self, request, partname_2_, content_type_2_, reltype_2_,
-            package_2_, blob_2_):
+        self, request, partname_2_, content_type_2_, reltype_2_, package_2_, blob_2_
+    ):
         return partname_2_, content_type_2_, reltype_2_, blob_2_, package_2_
 
     @pytest.fixture
@@ -432,7 +428,6 @@ def reltype_2_(self, request):
 
 
 class DescribeXmlPart(object):
-
     def it_can_be_constructed_by_PartFactory(
         self, partname_, content_type_, blob_, package_, element_, parse_xml_, __init_
     ):
@@ -489,9 +484,7 @@ def package_(self, request):
 
     @pytest.fixture
     def parse_xml_(self, request, element_):
-        return function_mock(
-            request, 'docx.opc.part.parse_xml', return_value=element_
-        )
+        return function_mock(request, "docx.opc.part.parse_xml", return_value=element_)
 
     @pytest.fixture
     def partname_(self, request):
@@ -499,6 +492,4 @@ def partname_(self, request):
 
     @pytest.fixture
     def serialize_part_xml_(self, request):
-        return function_mock(
-            request, 'docx.opc.part.serialize_part_xml'
-        )
+        return function_mock(request, "docx.opc.part.serialize_part_xml")
diff --git a/tests/opc/test_phys_pkg.py b/tests/opc/test_phys_pkg.py
index 7e62cfd8e..5fa1e9e75 100644
--- a/tests/opc/test_phys_pkg.py
+++ b/tests/opc/test_phys_pkg.py
@@ -19,45 +19,47 @@
 from docx.opc.exceptions import PackageNotFoundError
 from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.phys_pkg import (
-    _DirPkgReader, PhysPkgReader, PhysPkgWriter, _ZipPkgReader, _ZipPkgWriter
+    _DirPkgReader,
+    PhysPkgReader,
+    PhysPkgWriter,
+    _ZipPkgReader,
+    _ZipPkgWriter,
 )
 
 from ..unitutil.file import absjoin, test_file_dir
 from ..unitutil.mock import class_mock, loose_mock, Mock
 
 
-test_docx_path = absjoin(test_file_dir, 'test.docx')
-dir_pkg_path = absjoin(test_file_dir, 'expanded_docx')
+test_docx_path = absjoin(test_file_dir, "test.docx")
+dir_pkg_path = absjoin(test_file_dir, "expanded_docx")
 zip_pkg_path = test_docx_path
 
 
 class DescribeDirPkgReader(object):
-
     def it_is_used_by_PhysPkgReader_when_pkg_is_a_dir(self):
         phys_reader = PhysPkgReader(dir_pkg_path)
         assert isinstance(phys_reader, _DirPkgReader)
 
-    def it_doesnt_mind_being_closed_even_though_it_doesnt_need_it(
-            self, dir_reader):
+    def it_doesnt_mind_being_closed_even_though_it_doesnt_need_it(self, dir_reader):
         dir_reader.close()
 
     def it_can_retrieve_the_blob_for_a_pack_uri(self, dir_reader):
-        pack_uri = PackURI('/word/document.xml')
+        pack_uri = PackURI("/word/document.xml")
         blob = dir_reader.blob_for(pack_uri)
         sha1 = hashlib.sha1(blob).hexdigest()
-        assert sha1 == '0e62d87ea74ea2b8088fd11ee97b42da9b4c77b0'
+        assert sha1 == "0e62d87ea74ea2b8088fd11ee97b42da9b4c77b0"
 
     def it_can_get_the_content_types_xml(self, dir_reader):
         sha1 = hashlib.sha1(dir_reader.content_types_xml).hexdigest()
-        assert sha1 == '89aadbb12882dd3d7340cd47382dc2c73d75dd81'
+        assert sha1 == "89aadbb12882dd3d7340cd47382dc2c73d75dd81"
 
     def it_can_retrieve_the_rels_xml_for_a_source_uri(self, dir_reader):
         rels_xml = dir_reader.rels_xml_for(PACKAGE_URI)
         sha1 = hashlib.sha1(rels_xml).hexdigest()
-        assert sha1 == 'ebacdddb3e7843fdd54c2f00bc831551b26ac823'
+        assert sha1 == "ebacdddb3e7843fdd54c2f00bc831551b26ac823"
 
     def it_returns_none_when_part_has_no_rels_xml(self, dir_reader):
-        partname = PackURI('/ppt/viewProps.xml')
+        partname = PackURI("/ppt/viewProps.xml")
         rels_xml = dir_reader.rels_xml_for(partname)
         assert rels_xml is None
 
@@ -67,32 +69,30 @@ def it_returns_none_when_part_has_no_rels_xml(self, dir_reader):
     def pkg_file_(self, request):
         return loose_mock(request)
 
-    @pytest.fixture(scope='class')
+    @pytest.fixture(scope="class")
     def dir_reader(self):
         return _DirPkgReader(dir_pkg_path)
 
 
 class DescribePhysPkgReader(object):
-
     def it_raises_when_pkg_path_is_not_a_package(self):
         with pytest.raises(PackageNotFoundError):
-            PhysPkgReader('foobar')
+            PhysPkgReader("foobar")
 
 
 class DescribeZipPkgReader(object):
-
     def it_is_used_by_PhysPkgReader_when_pkg_is_a_zip(self):
         phys_reader = PhysPkgReader(zip_pkg_path)
         assert isinstance(phys_reader, _ZipPkgReader)
 
     def it_is_used_by_PhysPkgReader_when_pkg_is_a_stream(self):
-        with open(zip_pkg_path, 'rb') as stream:
+        with open(zip_pkg_path, "rb") as stream:
             phys_reader = PhysPkgReader(stream)
         assert isinstance(phys_reader, _ZipPkgReader)
 
     def it_opens_pkg_file_zip_on_construction(self, ZipFile_, pkg_file_):
         _ZipPkgReader(pkg_file_)
-        ZipFile_.assert_called_once_with(pkg_file_, 'r')
+        ZipFile_.assert_called_once_with(pkg_file_, "r")
 
     def it_can_be_closed(self, ZipFile_):
         # mockery ----------------------
@@ -104,28 +104,28 @@ def it_can_be_closed(self, ZipFile_):
         zipf.close.assert_called_once_with()
 
     def it_can_retrieve_the_blob_for_a_pack_uri(self, phys_reader):
-        pack_uri = PackURI('/word/document.xml')
+        pack_uri = PackURI("/word/document.xml")
         blob = phys_reader.blob_for(pack_uri)
         sha1 = hashlib.sha1(blob).hexdigest()
-        assert sha1 == 'b9b4a98bcac7c5a162825b60c3db7df11e02ac5f'
+        assert sha1 == "b9b4a98bcac7c5a162825b60c3db7df11e02ac5f"
 
     def it_has_the_content_types_xml(self, phys_reader):
         sha1 = hashlib.sha1(phys_reader.content_types_xml).hexdigest()
-        assert sha1 == 'cd687f67fd6b5f526eedac77cf1deb21968d7245'
+        assert sha1 == "cd687f67fd6b5f526eedac77cf1deb21968d7245"
 
     def it_can_retrieve_rels_xml_for_source_uri(self, phys_reader):
         rels_xml = phys_reader.rels_xml_for(PACKAGE_URI)
         sha1 = hashlib.sha1(rels_xml).hexdigest()
-        assert sha1 == '90965123ed2c79af07a6963e7cfb50a6e2638565'
+        assert sha1 == "90965123ed2c79af07a6963e7cfb50a6e2638565"
 
     def it_returns_none_when_part_has_no_rels_xml(self, phys_reader):
-        partname = PackURI('/ppt/viewProps.xml')
+        partname = PackURI("/ppt/viewProps.xml")
         rels_xml = phys_reader.rels_xml_for(partname)
         assert rels_xml is None
 
     # fixtures ---------------------------------------------
 
-    @pytest.fixture(scope='class')
+    @pytest.fixture(scope="class")
     def phys_reader(self, request):
         phys_reader = _ZipPkgReader(zip_pkg_path)
         request.addfinalizer(phys_reader.close)
@@ -137,17 +137,14 @@ def pkg_file_(self, request):
 
 
 class DescribeZipPkgWriter(object):
-
     def it_is_used_by_PhysPkgWriter_unconditionally(self, tmp_docx_path):
         phys_writer = PhysPkgWriter(tmp_docx_path)
         assert isinstance(phys_writer, _ZipPkgWriter)
 
     def it_opens_pkg_file_zip_on_construction(self, ZipFile_):
-        pkg_file = Mock(name='pkg_file')
+        pkg_file = Mock(name="pkg_file")
         _ZipPkgWriter(pkg_file)
-        ZipFile_.assert_called_once_with(
-            pkg_file, 'w', compression=ZIP_DEFLATED
-        )
+        ZipFile_.assert_called_once_with(pkg_file, "w", compression=ZIP_DEFLATED)
 
     def it_can_be_closed(self, ZipFile_):
         # mockery ----------------------
@@ -160,15 +157,15 @@ def it_can_be_closed(self, ZipFile_):
 
     def it_can_write_a_blob(self, pkg_file):
         # setup ------------------------
-        pack_uri = PackURI('/part/name.xml')
-        blob = '<BlobbityFooBlob/>'.encode('utf-8')
+        pack_uri = PackURI("/part/name.xml")
+        blob = "<BlobbityFooBlob/>".encode("utf-8")
         # exercise ---------------------
         pkg_writer = PhysPkgWriter(pkg_file)
         pkg_writer.write(pack_uri, blob)
         pkg_writer.close()
         # verify -----------------------
         written_blob_sha1 = hashlib.sha1(blob).hexdigest()
-        zipf = ZipFile(pkg_file, 'r')
+        zipf = ZipFile(pkg_file, "r")
         retrieved_blob = zipf.read(pack_uri.membername)
         zipf.close()
         retrieved_blob_sha1 = hashlib.sha1(retrieved_blob).hexdigest()
@@ -185,11 +182,12 @@ def pkg_file(self, request):
 
 # fixtures -------------------------------------------------
 
+
 @pytest.fixture
 def tmp_docx_path(tmpdir):
-    return str(tmpdir.join('test_python-docx.docx'))
+    return str(tmpdir.join("test_python-docx.docx"))
 
 
 @pytest.fixture
 def ZipFile_(request):
-    return class_mock(request, 'docx.opc.phys_pkg.ZipFile')
+    return class_mock(request, "docx.opc.phys_pkg.ZipFile")
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index 96885efcb..ac75e8365 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -33,7 +33,6 @@
 
 
 class DescribePackageReader(object):
-
     def it_can_construct_from_pkg_file(
         self, _init_, PhysPkgReader_, from_xml, _srels_for, _load_serialized_parts
     ):
@@ -41,13 +40,13 @@ def it_can_construct_from_pkg_file(
         content_types = from_xml.return_value
         pkg_srels = _srels_for.return_value
         sparts = _load_serialized_parts.return_value
-        pkg_file = Mock(name='pkg_file')
+        pkg_file = Mock(name="pkg_file")
 
         pkg_reader = PackageReader.from_file(pkg_file)
 
         PhysPkgReader_.assert_called_once_with(pkg_file)
         from_xml.assert_called_once_with(phys_reader.content_types_xml)
-        _srels_for.assert_called_once_with(phys_reader, '/')
+        _srels_for.assert_called_once_with(phys_reader, "/")
         _load_serialized_parts.assert_called_once_with(
             phys_reader, pkg_srels, content_types
         )
@@ -62,41 +61,40 @@ def it_can_iterate_over_the_serialized_parts(self, iter_sparts_fixture):
 
     def it_can_iterate_over_all_the_srels(self):
         # mockery ----------------------
-        pkg_srels = ['srel1', 'srel2']
+        pkg_srels = ["srel1", "srel2"]
         sparts = [
-            Mock(name='spart1', partname='pn1', srels=['srel3', 'srel4']),
-            Mock(name='spart2', partname='pn2', srels=['srel5', 'srel6']),
+            Mock(name="spart1", partname="pn1", srels=["srel3", "srel4"]),
+            Mock(name="spart2", partname="pn2", srels=["srel5", "srel6"]),
         ]
         pkg_reader = PackageReader(None, pkg_srels, sparts)
         # exercise ---------------------
         generated_tuples = [t for t in pkg_reader.iter_srels()]
         # verify -----------------------
         expected_tuples = [
-            ('/',   'srel1'),
-            ('/',   'srel2'),
-            ('pn1', 'srel3'),
-            ('pn1', 'srel4'),
-            ('pn2', 'srel5'),
-            ('pn2', 'srel6'),
+            ("/", "srel1"),
+            ("/", "srel2"),
+            ("pn1", "srel3"),
+            ("pn1", "srel4"),
+            ("pn2", "srel5"),
+            ("pn2", "srel6"),
         ]
         assert generated_tuples == expected_tuples
 
     def it_can_load_serialized_parts(self, _SerializedPart_, _walk_phys_parts):
         # test data --------------------
         test_data = (
-            ('/part/name1.xml', 'app/vnd.type_1', 'reltype1', '<Part_1/>',
-             'srels_1'),
-            ('/part/name2.xml', 'app/vnd.type_2', 'reltype2', '<Part_2/>',
-             'srels_2'),
+            ("/part/name1.xml", "app/vnd.type_1", "reltype1", "<Part_1/>", "srels_1"),
+            ("/part/name2.xml", "app/vnd.type_2", "reltype2", "<Part_2/>", "srels_2"),
         )
         iter_vals = [(t[0], t[2], t[3], t[4]) for t in test_data]
         content_types = dict((t[0], t[1]) for t in test_data)
         # mockery ----------------------
-        phys_reader = Mock(name='phys_reader')
-        pkg_srels = Mock(name='pkg_srels')
+        phys_reader = Mock(name="phys_reader")
+        pkg_srels = Mock(name="pkg_srels")
         _walk_phys_parts.return_value = iter_vals
         _SerializedPart_.side_effect = expected_sparts = (
-            Mock(name='spart_1'), Mock(name='spart_2')
+            Mock(name="spart_1"),
+            Mock(name="spart_2"),
         )
         # exercise ---------------------
         retval = PackageReader._load_serialized_parts(
@@ -104,10 +102,12 @@ def it_can_load_serialized_parts(self, _SerializedPart_, _walk_phys_parts):
         )
         # verify -----------------------
         expected_calls = [
-            call('/part/name1.xml', 'app/vnd.type_1', '<Part_1/>',
-                 'reltype1', 'srels_1'),
-            call('/part/name2.xml', 'app/vnd.type_2', '<Part_2/>',
-                 'reltype2', 'srels_2'),
+            call(
+                "/part/name1.xml", "app/vnd.type_1", "<Part_1/>", "reltype1", "srels_1"
+            ),
+            call(
+                "/part/name2.xml", "app/vnd.type_2", "<Part_2/>", "reltype2", "srels_2"
+            ),
         ]
         assert _SerializedPart_.call_args_list == expected_calls
         assert retval == expected_sparts
@@ -123,37 +123,49 @@ def it_can_walk_phys_pkg_parts(self, _srels_for):
         #                    | part_2 |---> | part_3 |
         #                    +--------+     +--------+
         partname_1, partname_2, partname_3 = (
-            '/part/name1.xml', '/part/name2.xml', '/part/name3.xml'
-        )
-        part_1_blob, part_2_blob, part_3_blob = (
-            '<Part_1/>', '<Part_2/>', '<Part_3/>'
+            "/part/name1.xml",
+            "/part/name2.xml",
+            "/part/name3.xml",
         )
-        reltype1, reltype2, reltype3 = ('reltype1', 'reltype2', 'reltype3')
+        part_1_blob, part_2_blob, part_3_blob = ("<Part_1/>", "<Part_2/>", "<Part_3/>")
+        reltype1, reltype2, reltype3 = ("reltype1", "reltype2", "reltype3")
         srels = [
-            Mock(name='rId1', is_external=True),
-            Mock(name='rId2', is_external=False, reltype=reltype1,
-                 target_partname=partname_1),
-            Mock(name='rId3', is_external=False, reltype=reltype2,
-                 target_partname=partname_2),
-            Mock(name='rId4', is_external=False, reltype=reltype1,
-                 target_partname=partname_1),
-            Mock(name='rId5', is_external=False, reltype=reltype3,
-                 target_partname=partname_3),
+            Mock(name="rId1", is_external=True),
+            Mock(
+                name="rId2",
+                is_external=False,
+                reltype=reltype1,
+                target_partname=partname_1,
+            ),
+            Mock(
+                name="rId3",
+                is_external=False,
+                reltype=reltype2,
+                target_partname=partname_2,
+            ),
+            Mock(
+                name="rId4",
+                is_external=False,
+                reltype=reltype1,
+                target_partname=partname_1,
+            ),
+            Mock(
+                name="rId5",
+                is_external=False,
+                reltype=reltype3,
+                target_partname=partname_3,
+            ),
         ]
         pkg_srels = srels[:2]
         part_1_srels = srels[2:3]
         part_2_srels = srels[3:5]
         part_3_srels = []
         # mockery ----------------------
-        phys_reader = Mock(name='phys_reader')
+        phys_reader = Mock(name="phys_reader")
         _srels_for.side_effect = [part_1_srels, part_2_srels, part_3_srels]
-        phys_reader.blob_for.side_effect = [
-            part_1_blob, part_2_blob, part_3_blob
-        ]
+        phys_reader.blob_for.side_effect = [part_1_blob, part_2_blob, part_3_blob]
         # exercise ---------------------
-        generated_tuples = list(
-            PackageReader._walk_phys_parts(phys_reader, pkg_srels)
-        )
+        generated_tuples = list(PackageReader._walk_phys_parts(phys_reader, pkg_srels))
         # verify -----------------------
         expected_tuples = [
             (partname_1, part_1_blob, reltype1, part_1_srels),
@@ -162,11 +174,10 @@ def it_can_walk_phys_pkg_parts(self, _srels_for):
         ]
         assert generated_tuples == expected_tuples
 
-    def it_can_retrieve_srels_for_a_source_uri(
-            self, _SerializedRelationships_):
+    def it_can_retrieve_srels_for_a_source_uri(self, _SerializedRelationships_):
         # mockery ----------------------
-        phys_reader = Mock(name='phys_reader')
-        source_uri = Mock(name='source_uri')
+        phys_reader = Mock(name="phys_reader")
+        source_uri = Mock(name="source_uri")
         rels_xml = phys_reader.rels_xml_for.return_value
         load_from_xml = _SerializedRelationships_.load_from_xml
         srels = load_from_xml.return_value
@@ -181,19 +192,19 @@ def it_can_retrieve_srels_for_a_source_uri(
 
     @pytest.fixture
     def blobs_(self, request):
-        blob_ = loose_mock(request, spec=str, name='blob_')
-        blob_2_ = loose_mock(request, spec=str, name='blob_2_')
+        blob_ = loose_mock(request, spec=str, name="blob_")
+        blob_2_ = loose_mock(request, spec=str, name="blob_2_")
         return blob_, blob_2_
 
     @pytest.fixture
     def content_types_(self, request):
-        content_type_ = loose_mock(request, spec=str, name='content_type_')
-        content_type_2_ = loose_mock(request, spec=str, name='content_type_2_')
+        content_type_ = loose_mock(request, spec=str, name="content_type_")
+        content_type_2_ = loose_mock(request, spec=str, name="content_type_2_")
         return content_type_, content_type_2_
 
     @pytest.fixture
     def from_xml(self, request):
-        return method_mock(request, _ContentTypeMap, 'from_xml', autospec=False)
+        return method_mock(request, _ContentTypeMap, "from_xml", autospec=False)
 
     @pytest.fixture
     def _init_(self, request):
@@ -201,7 +212,8 @@ def _init_(self, request):
 
     @pytest.fixture
     def iter_sparts_fixture(
-            self, sparts_, partnames_, content_types_, reltypes_, blobs_):
+        self, sparts_, partnames_, content_types_, reltypes_, blobs_
+    ):
         pkg_reader = PackageReader(None, None, sparts_)
         expected_iter_spart_items = [
             (partnames_[0], content_types_[0], reltypes_[0], blobs_[0]),
@@ -212,138 +224,140 @@ def iter_sparts_fixture(
     @pytest.fixture
     def _load_serialized_parts(self, request):
         return method_mock(
-            request, PackageReader, '_load_serialized_parts', autospec=False
+            request, PackageReader, "_load_serialized_parts", autospec=False
         )
 
     @pytest.fixture
     def partnames_(self, request):
-        partname_ = loose_mock(request, spec=str, name='partname_')
-        partname_2_ = loose_mock(request, spec=str, name='partname_2_')
+        partname_ = loose_mock(request, spec=str, name="partname_")
+        partname_2_ = loose_mock(request, spec=str, name="partname_2_")
         return partname_, partname_2_
 
     @pytest.fixture
     def PhysPkgReader_(self, request):
-        _patch = patch(
-            'docx.opc.pkgreader.PhysPkgReader', spec_set=_ZipPkgReader
-        )
+        _patch = patch("docx.opc.pkgreader.PhysPkgReader", spec_set=_ZipPkgReader)
         request.addfinalizer(_patch.stop)
         return _patch.start()
 
     @pytest.fixture
     def reltypes_(self, request):
-        reltype_ = instance_mock(request, str, name='reltype_')
-        reltype_2_ = instance_mock(request, str, name='reltype_2')
+        reltype_ = instance_mock(request, str, name="reltype_")
+        reltype_2_ = instance_mock(request, str, name="reltype_2")
         return reltype_, reltype_2_
 
     @pytest.fixture
     def _SerializedPart_(self, request):
-        return class_mock(request, 'docx.opc.pkgreader._SerializedPart')
+        return class_mock(request, "docx.opc.pkgreader._SerializedPart")
 
     @pytest.fixture
     def _SerializedRelationships_(self, request):
-        return class_mock(
-            request, 'docx.opc.pkgreader._SerializedRelationships'
-        )
+        return class_mock(request, "docx.opc.pkgreader._SerializedRelationships")
 
     @pytest.fixture
-    def sparts_(
-            self, request, partnames_, content_types_, reltypes_, blobs_):
+    def sparts_(self, request, partnames_, content_types_, reltypes_, blobs_):
         sparts_ = []
         for idx in range(2):
-            name = 'spart_%s' % (('%d_' % (idx+1)) if idx else '')
+            name = "spart_%s" % (("%d_" % (idx + 1)) if idx else "")
             spart_ = instance_mock(
-                request, _SerializedPart, name=name,
-                partname=partnames_[idx], content_type=content_types_[idx],
-                reltype=reltypes_[idx], blob=blobs_[idx]
+                request,
+                _SerializedPart,
+                name=name,
+                partname=partnames_[idx],
+                content_type=content_types_[idx],
+                reltype=reltypes_[idx],
+                blob=blobs_[idx],
             )
             sparts_.append(spart_)
         return sparts_
 
     @pytest.fixture
     def _srels_for(self, request):
-        return method_mock(request, PackageReader, '_srels_for', autospec=False)
+        return method_mock(request, PackageReader, "_srels_for", autospec=False)
 
     @pytest.fixture
     def _walk_phys_parts(self, request):
-        return method_mock(request, PackageReader, '_walk_phys_parts', autospec=False)
+        return method_mock(request, PackageReader, "_walk_phys_parts", autospec=False)
 
 
 class Describe_ContentTypeMap(object):
-
     def it_can_construct_from_ct_item_xml(self, from_xml_fixture):
-        content_types_xml, expected_defaults, expected_overrides = (
-            from_xml_fixture
-        )
+        content_types_xml, expected_defaults, expected_overrides = from_xml_fixture
         ct_map = _ContentTypeMap.from_xml(content_types_xml)
         assert ct_map._defaults == expected_defaults
         assert ct_map._overrides == expected_overrides
 
     def it_matches_an_override_on_case_insensitive_partname(
-            self, match_override_fixture):
+        self, match_override_fixture
+    ):
         ct_map, partname, content_type = match_override_fixture
         assert ct_map[partname] == content_type
 
     def it_falls_back_to_case_insensitive_extension_default_match(
-            self, match_default_fixture):
+        self, match_default_fixture
+    ):
         ct_map, partname, content_type = match_default_fixture
         assert ct_map[partname] == content_type
 
     def it_should_raise_on_partname_not_found(self):
         ct_map = _ContentTypeMap()
         with pytest.raises(KeyError):
-            ct_map[PackURI('/!blat/rhumba.1x&')]
+            ct_map[PackURI("/!blat/rhumba.1x&")]
 
     def it_should_raise_on_key_not_instance_of_PackURI(self):
         ct_map = _ContentTypeMap()
-        ct_map._overrides = {PackURI('/part/name1.xml'): 'app/vnd.type1'}
+        ct_map._overrides = {PackURI("/part/name1.xml"): "app/vnd.type1"}
         with pytest.raises(KeyError):
-            ct_map['/part/name1.xml']
+            ct_map["/part/name1.xml"]
 
     # fixtures ---------------------------------------------
 
     @pytest.fixture
     def from_xml_fixture(self):
         entries = (
-            ('Default', 'xml', CT.XML),
-            ('Default', 'PNG', CT.PNG),
-            ('Override', '/ppt/presentation.xml', CT.PML_PRESENTATION_MAIN),
+            ("Default", "xml", CT.XML),
+            ("Default", "PNG", CT.PNG),
+            ("Override", "/ppt/presentation.xml", CT.PML_PRESENTATION_MAIN),
         )
         content_types_xml = self._xml_from(entries)
         expected_defaults = {}
         expected_overrides = {}
         for entry in entries:
-            if entry[0] == 'Default':
+            if entry[0] == "Default":
                 ext = entry[1].lower()
                 content_type = entry[2]
                 expected_defaults[ext] = content_type
-            elif entry[0] == 'Override':
+            elif entry[0] == "Override":
                 partname, content_type = entry[1:]
                 expected_overrides[partname] = content_type
         return content_types_xml, expected_defaults, expected_overrides
 
-    @pytest.fixture(params=[
-        ('/foo/bar.xml', 'xml', 'application/xml'),
-        ('/foo/bar.PNG', 'png', 'image/png'),
-        ('/foo/bar.jpg', 'JPG', 'image/jpeg'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("/foo/bar.xml", "xml", "application/xml"),
+            ("/foo/bar.PNG", "png", "image/png"),
+            ("/foo/bar.jpg", "JPG", "image/jpeg"),
+        ]
+    )
     def match_default_fixture(self, request):
         partname_str, ext, content_type = request.param
         partname = PackURI(partname_str)
         ct_map = _ContentTypeMap()
-        ct_map._add_override(PackURI('/bar/foo.xyz'), 'application/xyz')
+        ct_map._add_override(PackURI("/bar/foo.xyz"), "application/xyz")
         ct_map._add_default(ext, content_type)
         return ct_map, partname, content_type
 
-    @pytest.fixture(params=[
-        ('/foo/bar.xml', '/foo/bar.xml'),
-        ('/foo/bar.xml', '/FOO/Bar.XML'),
-        ('/FoO/bAr.XmL', '/foo/bar.xml'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("/foo/bar.xml", "/foo/bar.xml"),
+            ("/foo/bar.xml", "/FOO/Bar.XML"),
+            ("/FoO/bAr.XmL", "/foo/bar.xml"),
+        ]
+    )
     def match_override_fixture(self, request):
         partname_str, should_match_partname_str = request.param
         partname = PackURI(partname_str)
         should_match_partname = PackURI(should_match_partname_str)
-        content_type = 'appl/vnd-foobar'
+        content_type = "appl/vnd-foobar"
         ct_map = _ContentTypeMap()
         ct_map._add_override(partname, content_type)
         return ct_map, should_match_partname, content_type
@@ -354,13 +368,13 @@ def _xml_from(self, entries):
         """
         types_bldr = a_Types().with_nsdecls()
         for entry in entries:
-            if entry[0] == 'Default':
+            if entry[0] == "Default":
                 ext, content_type = entry[1:]
                 default_bldr = a_Default()
                 default_bldr.with_Extension(ext)
                 default_bldr.with_ContentType(content_type)
                 types_bldr.with_child(default_bldr)
-            elif entry[0] == 'Override':
+            elif entry[0] == "Override":
                 partname, content_type = entry[1:]
                 override_bldr = an_Override()
                 override_bldr.with_PartName(partname)
@@ -370,14 +384,13 @@ def _xml_from(self, entries):
 
 
 class Describe_SerializedPart(object):
-
     def it_remembers_construction_values(self):
         # test data --------------------
-        partname = '/part/name.xml'
-        content_type = 'app/vnd.type'
-        reltype = 'http://rel/type'
-        blob = '<Part/>'
-        srels = 'srels proxy'
+        partname = "/part/name.xml"
+        content_type = "app/vnd.type"
+        reltype = "http://rel/type"
+        blob = "<Part/>"
+        srels = "srels proxy"
         # exercise ---------------------
         spart = _SerializedPart(partname, content_type, reltype, blob, srels)
         # verify -----------------------
@@ -389,42 +402,57 @@ def it_remembers_construction_values(self):
 
 
 class Describe_SerializedRelationship(object):
-
     def it_remembers_construction_values(self):
         # test data --------------------
         rel_elm = Mock(
-            name='rel_elm', rId='rId9', reltype='ReLtYpE',
-            target_ref='docProps/core.xml', target_mode=RTM.INTERNAL
+            name="rel_elm",
+            rId="rId9",
+            reltype="ReLtYpE",
+            target_ref="docProps/core.xml",
+            target_mode=RTM.INTERNAL,
         )
         # exercise ---------------------
-        srel = _SerializedRelationship('/', rel_elm)
+        srel = _SerializedRelationship("/", rel_elm)
         # verify -----------------------
-        assert srel.rId == 'rId9'
-        assert srel.reltype == 'ReLtYpE'
-        assert srel.target_ref == 'docProps/core.xml'
+        assert srel.rId == "rId9"
+        assert srel.reltype == "ReLtYpE"
+        assert srel.target_ref == "docProps/core.xml"
         assert srel.target_mode == RTM.INTERNAL
 
     def it_knows_when_it_is_external(self):
-        cases = (RTM.INTERNAL, RTM.EXTERNAL, 'FOOBAR')
+        cases = (RTM.INTERNAL, RTM.EXTERNAL, "FOOBAR")
         expected_values = (False, True, False)
         for target_mode, expected_value in zip(cases, expected_values):
-            rel_elm = Mock(name='rel_elm', rId=None, reltype=None,
-                           target_ref=None, target_mode=target_mode)
+            rel_elm = Mock(
+                name="rel_elm",
+                rId=None,
+                reltype=None,
+                target_ref=None,
+                target_mode=target_mode,
+            )
             srel = _SerializedRelationship(None, rel_elm)
             assert srel.is_external is expected_value
 
     def it_can_calculate_its_target_partname(self):
         # test data --------------------
         cases = (
-            ('/', 'docProps/core.xml', '/docProps/core.xml'),
-            ('/ppt', 'viewProps.xml', '/ppt/viewProps.xml'),
-            ('/ppt/slides', '../slideLayouts/slideLayout1.xml',
-             '/ppt/slideLayouts/slideLayout1.xml'),
+            ("/", "docProps/core.xml", "/docProps/core.xml"),
+            ("/ppt", "viewProps.xml", "/ppt/viewProps.xml"),
+            (
+                "/ppt/slides",
+                "../slideLayouts/slideLayout1.xml",
+                "/ppt/slideLayouts/slideLayout1.xml",
+            ),
         )
         for baseURI, target_ref, expected_partname in cases:
             # setup --------------------
-            rel_elm = Mock(name='rel_elm', rId=None, reltype=None,
-                           target_ref=target_ref, target_mode=RTM.INTERNAL)
+            rel_elm = Mock(
+                name="rel_elm",
+                rId=None,
+                reltype=None,
+                target_ref=target_ref,
+                target_mode=RTM.INTERNAL,
+            )
             # exercise -----------------
             srel = _SerializedRelationship(baseURI, rel_elm)
             # verify -------------------
@@ -432,29 +460,30 @@ def it_can_calculate_its_target_partname(self):
 
     def it_raises_on_target_partname_when_external(self):
         rel_elm = Mock(
-            name='rel_elm', rId='rId9', reltype='ReLtYpE',
-            target_ref='docProps/core.xml', target_mode=RTM.EXTERNAL
+            name="rel_elm",
+            rId="rId9",
+            reltype="ReLtYpE",
+            target_ref="docProps/core.xml",
+            target_mode=RTM.EXTERNAL,
         )
-        srel = _SerializedRelationship('/', rel_elm)
+        srel = _SerializedRelationship("/", rel_elm)
         with pytest.raises(ValueError):
             srel.target_partname
 
 
 class Describe_SerializedRelationships(object):
-
     def it_can_load_from_xml(self, parse_xml_, _SerializedRelationship_):
         # mockery ----------------------
         baseURI, rels_item_xml, rel_elm_1, rel_elm_2 = (
-            Mock(name='baseURI'), Mock(name='rels_item_xml'),
-            Mock(name='rel_elm_1'), Mock(name='rel_elm_2'),
-        )
-        rels_elm = Mock(
-            name='rels_elm', Relationship_lst=[rel_elm_1, rel_elm_2]
+            Mock(name="baseURI"),
+            Mock(name="rels_item_xml"),
+            Mock(name="rel_elm_1"),
+            Mock(name="rel_elm_2"),
         )
+        rels_elm = Mock(name="rels_elm", Relationship_lst=[rel_elm_1, rel_elm_2])
         parse_xml_.return_value = rels_elm
         # exercise ---------------------
-        srels = _SerializedRelationships.load_from_xml(
-            baseURI, rels_item_xml)
+        srels = _SerializedRelationships.load_from_xml(baseURI, rels_item_xml)
         # verify -----------------------
         expected_calls = [
             call(baseURI, rel_elm_1),
@@ -477,10 +506,8 @@ def it_should_be_iterable(self):
 
     @pytest.fixture
     def parse_xml_(self, request):
-        return function_mock(request, 'docx.opc.pkgreader.parse_xml')
+        return function_mock(request, "docx.opc.pkgreader.parse_xml")
 
     @pytest.fixture
     def _SerializedRelationship_(self, request):
-        return class_mock(
-            request, 'docx.opc.pkgreader._SerializedRelationship'
-        )
+        return class_mock(request, "docx.opc.pkgreader._SerializedRelationship")
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
index d119748dd..25bcadb42 100644
--- a/tests/opc/test_pkgwriter.py
+++ b/tests/opc/test_pkgwriter.py
@@ -14,17 +14,22 @@
 
 from .unitdata.types import a_Default, a_Types, an_Override
 from ..unitutil.mock import (
-    call, class_mock, instance_mock, MagicMock, method_mock, Mock, patch
+    call,
+    class_mock,
+    instance_mock,
+    MagicMock,
+    method_mock,
+    Mock,
+    patch,
 )
 
 
 class DescribePackageWriter(object):
-
     def it_can_write_a_package(self, PhysPkgWriter_, _write_methods):
         # mockery ----------------------
-        pkg_file = Mock(name='pkg_file')
-        pkg_rels = Mock(name='pkg_rels')
-        parts = Mock(name='parts')
+        pkg_file = Mock(name="pkg_file")
+        pkg_rels = Mock(name="pkg_rels")
+        parts = Mock(name="parts")
         phys_writer = PhysPkgWriter_.return_value
         # exercise ---------------------
         PackageWriter.write(pkg_file, pkg_rels, parts)
@@ -39,32 +44,27 @@ def it_can_write_a_package(self, PhysPkgWriter_, _write_methods):
         phys_writer.close.assert_called_once_with()
 
     def it_can_write_a_content_types_stream(self, write_cti_fixture):
-        _ContentTypesItem_, parts_, phys_pkg_writer_, blob_ = (
-            write_cti_fixture
-        )
+        _ContentTypesItem_, parts_, phys_pkg_writer_, blob_ = write_cti_fixture
         PackageWriter._write_content_types_stream(phys_pkg_writer_, parts_)
         _ContentTypesItem_.from_parts.assert_called_once_with(parts_)
-        phys_pkg_writer_.write.assert_called_once_with(
-            '/[Content_Types].xml', blob_
-        )
+        phys_pkg_writer_.write.assert_called_once_with("/[Content_Types].xml", blob_)
 
     def it_can_write_a_pkg_rels_item(self):
         # mockery ----------------------
-        phys_writer = Mock(name='phys_writer')
-        pkg_rels = Mock(name='pkg_rels')
+        phys_writer = Mock(name="phys_writer")
+        pkg_rels = Mock(name="pkg_rels")
         # exercise ---------------------
         PackageWriter._write_pkg_rels(phys_writer, pkg_rels)
         # verify -----------------------
-        phys_writer.write.assert_called_once_with('/_rels/.rels',
-                                                  pkg_rels.xml)
+        phys_writer.write.assert_called_once_with("/_rels/.rels", pkg_rels.xml)
 
     def it_can_write_a_list_of_parts(self):
         # mockery ----------------------
-        phys_writer = Mock(name='phys_writer')
-        rels = MagicMock(name='rels')
+        phys_writer = Mock(name="phys_writer")
+        rels = MagicMock(name="rels")
         rels.__len__.return_value = 1
-        part1 = Mock(name='part1', _rels=rels)
-        part2 = Mock(name='part2', _rels=[])
+        part1 = Mock(name="part1", _rels=rels)
+        part2 = Mock(name="part2", _rels=[])
         # exercise ---------------------
         PackageWriter._write_parts(phys_writer, [part1, part2])
         # verify -----------------------
@@ -87,9 +87,7 @@ def cti_(self, request, blob_):
 
     @pytest.fixture
     def _ContentTypesItem_(self, request, cti_):
-        _ContentTypesItem_ = class_mock(
-            request, 'docx.opc.pkgwriter._ContentTypesItem'
-        )
+        _ContentTypesItem_ = class_mock(request, "docx.opc.pkgwriter._ContentTypesItem")
         _ContentTypesItem_.from_parts.return_value = cti_
         return _ContentTypesItem_
 
@@ -99,7 +97,7 @@ def parts_(self, request):
 
     @pytest.fixture
     def PhysPkgWriter_(self, request):
-        _patch = patch('docx.opc.pkgwriter.PhysPkgWriter')
+        _patch = patch("docx.opc.pkgwriter.PhysPkgWriter")
         request.addfinalizer(_patch.stop)
         return _patch.start()
 
@@ -108,20 +106,19 @@ def phys_pkg_writer_(self, request):
         return instance_mock(request, _ZipPkgWriter)
 
     @pytest.fixture
-    def write_cti_fixture(
-            self, _ContentTypesItem_, parts_, phys_pkg_writer_, blob_):
+    def write_cti_fixture(self, _ContentTypesItem_, parts_, phys_pkg_writer_, blob_):
         return _ContentTypesItem_, parts_, phys_pkg_writer_, blob_
 
     @pytest.fixture
     def _write_methods(self, request):
         """Mock that patches all the _write_* methods of PackageWriter"""
-        root_mock = Mock(name='PackageWriter')
-        patch1 = patch.object(PackageWriter, '_write_content_types_stream')
-        patch2 = patch.object(PackageWriter, '_write_pkg_rels')
-        patch3 = patch.object(PackageWriter, '_write_parts')
-        root_mock.attach_mock(patch1.start(), '_write_content_types_stream')
-        root_mock.attach_mock(patch2.start(), '_write_pkg_rels')
-        root_mock.attach_mock(patch3.start(), '_write_parts')
+        root_mock = Mock(name="PackageWriter")
+        patch1 = patch.object(PackageWriter, "_write_content_types_stream")
+        patch2 = patch.object(PackageWriter, "_write_pkg_rels")
+        patch3 = patch.object(PackageWriter, "_write_parts")
+        root_mock.attach_mock(patch1.start(), "_write_content_types_stream")
+        root_mock.attach_mock(patch2.start(), "_write_pkg_rels")
+        root_mock.attach_mock(patch3.start(), "_write_parts")
 
         def fin():
             patch1.stop()
@@ -133,11 +130,10 @@ def fin():
 
     @pytest.fixture
     def xml_for_(self, request):
-        return method_mock(request, _ContentTypesItem, 'xml_for')
+        return method_mock(request, _ContentTypesItem, "xml_for")
 
 
 class Describe_ContentTypesItem(object):
-
     def it_can_compose_content_types_element(self, xml_for_fixture):
         cti, expected_xml = xml_for_fixture
         types_elm = cti._element
@@ -148,41 +144,41 @@ def it_can_compose_content_types_element(self, xml_for_fixture):
     def _mock_part(self, request, name, partname_str, content_type):
         partname = PackURI(partname_str)
         return instance_mock(
-            request, Part, name=name, partname=partname,
-            content_type=content_type
+            request, Part, name=name, partname=partname, content_type=content_type
         )
 
-    @pytest.fixture(params=[
-        ('Default',  '/ppt/MEDIA/image.PNG',   CT.PNG),
-        ('Default',  '/ppt/media/image.xml',   CT.XML),
-        ('Default',  '/ppt/media/image.rels',  CT.OPC_RELATIONSHIPS),
-        ('Default',  '/ppt/media/image.jpeg',  CT.JPEG),
-        ('Override', '/docProps/core.xml',     'app/vnd.core'),
-        ('Override', '/ppt/slides/slide1.xml', 'app/vnd.ct_sld'),
-        ('Override', '/zebra/foo.bar',         'app/vnd.foobar'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("Default", "/ppt/MEDIA/image.PNG", CT.PNG),
+            ("Default", "/ppt/media/image.xml", CT.XML),
+            ("Default", "/ppt/media/image.rels", CT.OPC_RELATIONSHIPS),
+            ("Default", "/ppt/media/image.jpeg", CT.JPEG),
+            ("Override", "/docProps/core.xml", "app/vnd.core"),
+            ("Override", "/ppt/slides/slide1.xml", "app/vnd.ct_sld"),
+            ("Override", "/zebra/foo.bar", "app/vnd.foobar"),
+        ]
+    )
     def xml_for_fixture(self, request):
         elm_type, partname_str, content_type = request.param
-        part_ = self._mock_part(request, 'part_', partname_str, content_type)
+        part_ = self._mock_part(request, "part_", partname_str, content_type)
         cti = _ContentTypesItem.from_parts([part_])
         # expected_xml -----------------
         types_bldr = a_Types().with_nsdecls()
-        ext = partname_str.split('.')[-1].lower()
-        if elm_type == 'Default' and ext not in ('rels', 'xml'):
+        ext = partname_str.split(".")[-1].lower()
+        if elm_type == "Default" and ext not in ("rels", "xml"):
             default_bldr = a_Default()
             default_bldr.with_Extension(ext)
             default_bldr.with_ContentType(content_type)
             types_bldr.with_child(default_bldr)
 
         types_bldr.with_child(
-            a_Default().with_Extension('rels')
-                       .with_ContentType(CT.OPC_RELATIONSHIPS)
+            a_Default().with_Extension("rels").with_ContentType(CT.OPC_RELATIONSHIPS)
         )
         types_bldr.with_child(
-            a_Default().with_Extension('xml').with_ContentType(CT.XML)
+            a_Default().with_Extension("xml").with_ContentType(CT.XML)
         )
 
-        if elm_type == 'Override':
+        if elm_type == "Override":
             override_bldr = an_Override()
             override_bldr.with_PartName(partname_str)
             override_bldr.with_ContentType(content_type)
diff --git a/tests/opc/test_rel.py b/tests/opc/test_rel.py
index db9b52b59..d94750027 100644
--- a/tests/opc/test_rel.py
+++ b/tests/opc/test_rel.py
@@ -4,9 +4,7 @@
 Unit test suite for the docx.opc.rel module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -15,18 +13,15 @@
 from docx.opc.part import Part
 from docx.opc.rel import _Relationship, Relationships
 
-from ..unitutil.mock import (
-    call, class_mock, instance_mock, Mock, patch, PropertyMock
-)
+from ..unitutil.mock import call, class_mock, instance_mock, Mock, patch, PropertyMock
 
 
 class Describe_Relationship(object):
-
     def it_remembers_construction_values(self):
         # test data --------------------
-        rId = 'rId9'
-        reltype = 'reltype'
-        target = Mock(name='target_part')
+        rId = "rId9"
+        reltype = "reltype"
+        target = Mock(name="target_part")
         external = False
         # exercise ---------------------
         rel = _Relationship(rId, reltype, target, None, external)
@@ -42,8 +37,8 @@ def it_should_raise_on_target_part_access_on_external_rel(self):
             rel.target_part
 
     def it_should_have_target_ref_for_external_rel(self):
-        rel = _Relationship(None, None, 'target', None, external=True)
-        assert rel.target_ref == 'target'
+        rel = _Relationship(None, None, "target", None, external=True)
+        assert rel.target_ref == "target"
 
     def it_should_have_relative_ref_for_internal_rel(self):
         """
@@ -51,23 +46,24 @@ def it_should_have_relative_ref_for_internal_rel(self):
         have a relative ref, e.g. '../slideLayouts/slideLayout1.xml', for
         the target_ref attribute.
         """
-        part = Mock(name='part', partname=PackURI('/ppt/media/image1.png'))
-        baseURI = '/ppt/slides'
+        part = Mock(name="part", partname=PackURI("/ppt/media/image1.png"))
+        baseURI = "/ppt/slides"
         rel = _Relationship(None, None, part, baseURI)  # external=False
-        assert rel.target_ref == '../media/image1.png'
+        assert rel.target_ref == "../media/image1.png"
 
 
 class DescribeRelationships(object):
-
     def it_can_add_a_relationship(self, _Relationship_):
         baseURI, rId, reltype, target, external = (
-            'baseURI', 'rId9', 'reltype', 'target', False
+            "baseURI",
+            "rId9",
+            "reltype",
+            "target",
+            False,
         )
         rels = Relationships(baseURI)
         rel = rels.add_relationship(reltype, target, rId, external)
-        _Relationship_.assert_called_once_with(
-            rId, reltype, target, baseURI, external
-        )
+        _Relationship_.assert_called_once_with(rId, reltype, target, baseURI, external)
         assert rels[rId] == rel
         assert rel == _Relationship_.return_value
 
@@ -80,14 +76,14 @@ def it_can_add_an_external_relationship(self, add_ext_rel_fixture_):
         assert rel.reltype == reltype
 
     def it_can_find_a_relationship_by_rId(self):
-        rel = Mock(name='rel', rId='foobar')
+        rel = Mock(name="rel", rId="foobar")
         rels = Relationships(None)
-        rels['foobar'] = rel
-        assert rels['foobar'] == rel
+        rels["foobar"] = rel
+        assert rels["foobar"] == rel
 
     def it_can_find_or_add_a_relationship(
-            self, rels_with_matching_rel_, rels_with_missing_rel_):
-
+        self, rels_with_matching_rel_, rels_with_missing_rel_
+    ):
         rels, reltype, part, matching_rel = rels_with_matching_rel_
         assert rels.get_or_add(reltype, part) == matching_rel
 
@@ -95,7 +91,8 @@ def it_can_find_or_add_a_relationship(
         assert rels.get_or_add(reltype, part) == new_rel
 
     def it_can_find_or_add_an_external_relationship(
-            self, add_matching_ext_rel_fixture_):
+        self, add_matching_ext_rel_fixture_
+    ):
         rels, reltype, url, rId = add_matching_ext_rel_fixture_
         _rId = rels.get_or_add_ext_rel(reltype, url)
         assert _rId == rId
@@ -108,10 +105,9 @@ def it_can_find_a_related_part_by_rId(self, rels_with_known_target_part):
 
     def it_raises_on_related_part_not_found(self, rels):
         with pytest.raises(KeyError):
-            rels.related_parts['rId666']
+            rels.related_parts["rId666"]
 
-    def it_can_find_a_related_part_by_reltype(
-            self, rels_with_target_known_by_reltype):
+    def it_can_find_a_related_part_by_reltype(self, rels_with_target_known_by_reltype):
         rels, reltype, known_target_part = rels_with_target_known_by_reltype
         part = rels.part_with_reltype(reltype)
         assert part is known_target_part
@@ -122,15 +118,11 @@ def it_can_compose_rels_xml(self, rels, rels_elm):
         # verify -----------------------
         rels_elm.assert_has_calls(
             [
-                call.add_rel(
-                    'rId1', 'http://rt-hyperlink', 'http://some/link', True
-                ),
-                call.add_rel(
-                    'rId2', 'http://rt-image', '../media/image1.png', False
-                ),
-                call.xml()
+                call.add_rel("rId1", "http://rt-hyperlink", "http://some/link", True),
+                call.add_rel("rId2", "http://rt-image", "../media/image1.png", False),
+                call.xml(),
             ],
-            any_order=True
+            any_order=True,
         )
 
     def it_knows_the_next_available_rId_to_help(self, rels_with_rId_gap):
@@ -147,7 +139,7 @@ def add_ext_rel_fixture_(self, reltype, url):
 
     @pytest.fixture
     def add_matching_ext_rel_fixture_(self, request, reltype, url):
-        rId = 'rId369'
+        rId = "rId369"
         rels = Relationships(None)
         rels.add_relationship(reltype, url, rId, is_external=True)
         return rels, reltype, url, rId
@@ -156,15 +148,14 @@ def add_matching_ext_rel_fixture_(self, request, reltype, url):
 
     @pytest.fixture
     def _baseURI(self):
-        return '/baseURI'
+        return "/baseURI"
 
     @pytest.fixture
     def _Relationship_(self, request):
-        return class_mock(request, 'docx.opc.rel._Relationship')
+        return class_mock(request, "docx.opc.rel._Relationship")
 
     @pytest.fixture
-    def _rel_with_target_known_by_reltype(
-            self, _rId, reltype, _target_part, _baseURI):
+    def _rel_with_target_known_by_reltype(self, _rId, reltype, _target_part, _baseURI):
         rel = _Relationship(_rId, reltype, _target_part, _baseURI)
         return rel, reltype, _target_part
 
@@ -174,15 +165,16 @@ def rels(self):
         Populated Relationships instance that will exercise the rels.xml
         property.
         """
-        rels = Relationships('/baseURI')
+        rels = Relationships("/baseURI")
         rels.add_relationship(
-            reltype='http://rt-hyperlink', target='http://some/link',
-            rId='rId1', is_external=True
+            reltype="http://rt-hyperlink",
+            target="http://some/link",
+            rId="rId1",
+            is_external=True,
         )
-        part = Mock(name='part')
-        part.partname.relative_ref.return_value = '../media/image1.png'
-        rels.add_relationship(reltype='http://rt-image', target=part,
-                              rId='rId2')
+        part = Mock(name="part")
+        part.partname.relative_ref.return_value = "../media/image1.png"
+        rels.add_relationship(reltype="http://rt-image", target=part, rId="rId2")
         return rels
 
     @pytest.fixture
@@ -192,20 +184,19 @@ def rels_elm(self, request):
         CT_Relationships.new()
         """
         # create rels_elm mock with a .xml property
-        rels_elm = Mock(name='rels_elm')
-        xml = PropertyMock(name='xml')
+        rels_elm = Mock(name="rels_elm")
+        xml = PropertyMock(name="xml")
         type(rels_elm).xml = xml
-        rels_elm.attach_mock(xml, 'xml')
+        rels_elm.attach_mock(xml, "xml")
         rels_elm.reset_mock()  # to clear attach_mock call
         # patch CT_Relationships to return that rels_elm
-        patch_ = patch.object(CT_Relationships, 'new', return_value=rels_elm)
+        patch_ = patch.object(CT_Relationships, "new", return_value=rels_elm)
         patch_.start()
         request.addfinalizer(patch_.stop)
         return rels_elm
 
     @pytest.fixture
-    def _rel_with_known_target_part(
-            self, _rId, reltype, _target_part, _baseURI):
+    def _rel_with_known_target_part(self, _rId, reltype, _target_part, _baseURI):
         rel = _Relationship(_rId, reltype, _target_part, _baseURI)
         return rel, _rId, _target_part
 
@@ -217,32 +208,30 @@ def rels_with_known_target_part(self, rels, _rel_with_known_target_part):
 
     @pytest.fixture
     def rels_with_matching_rel_(self, request, rels):
-        matching_reltype_ = instance_mock(
-            request, str, name='matching_reltype_'
-        )
-        matching_part_ = instance_mock(
-            request, Part, name='matching_part_'
-        )
+        matching_reltype_ = instance_mock(request, str, name="matching_reltype_")
+        matching_part_ = instance_mock(request, Part, name="matching_part_")
         matching_rel_ = instance_mock(
-            request, _Relationship, name='matching_rel_',
-            reltype=matching_reltype_, target_part=matching_part_,
-            is_external=False
+            request,
+            _Relationship,
+            name="matching_rel_",
+            reltype=matching_reltype_,
+            target_part=matching_part_,
+            is_external=False,
         )
         rels[1] = matching_rel_
         return rels, matching_reltype_, matching_part_, matching_rel_
 
     @pytest.fixture
     def rels_with_missing_rel_(self, request, rels, _Relationship_):
-        missing_reltype_ = instance_mock(
-            request, str, name='missing_reltype_'
-        )
-        missing_part_ = instance_mock(
-            request, Part, name='missing_part_'
-        )
+        missing_reltype_ = instance_mock(request, str, name="missing_reltype_")
+        missing_part_ = instance_mock(request, Part, name="missing_part_")
         new_rel_ = instance_mock(
-            request, _Relationship, name='new_rel_',
-            reltype=missing_reltype_, target_part=missing_part_,
-            is_external=False
+            request,
+            _Relationship,
+            name="new_rel_",
+            reltype=missing_reltype_,
+            target_part=missing_part_,
+            is_external=False,
         )
         _Relationship_.return_value = new_rel_
         return rels, missing_reltype_, missing_part_, new_rel_
@@ -251,29 +240,30 @@ def rels_with_missing_rel_(self, request, rels, _Relationship_):
     def rels_with_rId_gap(self, request):
         rels = Relationships(None)
         rel_with_rId1 = instance_mock(
-            request, _Relationship, name='rel_with_rId1', rId='rId1'
+            request, _Relationship, name="rel_with_rId1", rId="rId1"
         )
         rel_with_rId3 = instance_mock(
-            request, _Relationship, name='rel_with_rId3', rId='rId3'
+            request, _Relationship, name="rel_with_rId3", rId="rId3"
         )
-        rels['rId1'] = rel_with_rId1
-        rels['rId3'] = rel_with_rId3
-        return rels, 'rId2'
+        rels["rId1"] = rel_with_rId1
+        rels["rId3"] = rel_with_rId3
+        return rels, "rId2"
 
     @pytest.fixture
     def rels_with_target_known_by_reltype(
-            self, rels, _rel_with_target_known_by_reltype):
+        self, rels, _rel_with_target_known_by_reltype
+    ):
         rel, reltype, target_part = _rel_with_target_known_by_reltype
         rels[1] = rel
         return rels, reltype, target_part
 
     @pytest.fixture
     def reltype(self):
-        return 'http://rel/type'
+        return "http://rel/type"
 
     @pytest.fixture
     def _rId(self):
-        return 'rId6'
+        return "rId6"
 
     @pytest.fixture
     def _target_part(self, request):
@@ -281,4 +271,4 @@ def _target_part(self, request):
 
     @pytest.fixture
     def url(self):
-        return 'https://github.com/scanny/python-docx'
+        return "https://github.com/scanny/python-docx"
diff --git a/tests/opc/unitdata/rels.py b/tests/opc/unitdata/rels.py
index 94e45167e..73663d188 100644
--- a/tests/opc/unitdata/rels.py
+++ b/tests/opc/unitdata/rels.py
@@ -17,6 +17,7 @@ class BaseBuilder(object):
     """
     Provides common behavior for all data builders.
     """
+
     @property
     def element(self):
         """Return element based on XML generated by builder"""
@@ -30,9 +31,10 @@ def with_indent(self, indent):
 
 class RelationshipsBuilder(object):
     """Builder class for test Relationships"""
+
     partname_tmpls = {
-        RT.SLIDE_MASTER: '/ppt/slideMasters/slideMaster%d.xml',
-        RT.SLIDE:        '/ppt/slides/slide%d.xml',
+        RT.SLIDE_MASTER: "/ppt/slideMasters/slideMaster%d.xml",
+        RT.SLIDE: "/ppt/slides/slide%d.xml",
     }
 
     def __init__(self):
@@ -49,7 +51,7 @@ def _next_partnum(self, reltype):
 
     @property
     def next_rId(self):
-        rId = 'rId%d' % self.next_rel_num
+        rId = "rId%d" % self.next_rel_num
         self.next_rel_num += 1
         return rId
 
@@ -70,10 +72,11 @@ class CT_DefaultBuilder(BaseBuilder):
     Test data builder for CT_Default (Default) XML element that appears in
     `[Content_Types].xml`.
     """
+
     def __init__(self):
         """Establish instance variables with default values"""
-        self._content_type = 'application/xml'
-        self._extension = 'xml'
+        self._content_type = "application/xml"
+        self._extension = "xml"
         self._indent = 0
         self._namespace = ' xmlns="%s"' % NS.OPC_CONTENT_TYPES
 
@@ -89,16 +92,15 @@ def with_extension(self, extension):
 
     def without_namespace(self):
         """Don't include an 'xmlns=' attribute"""
-        self._namespace = ''
+        self._namespace = ""
         return self
 
     @property
     def xml(self):
         """Return Default element"""
         tmpl = '%s<Default%s Extension="%s" ContentType="%s"/>\n'
-        indent = ' ' * self._indent
-        return tmpl % (indent, self._namespace, self._extension,
-                       self._content_type)
+        indent = " " * self._indent
+        return tmpl % (indent, self._namespace, self._extension, self._content_type)
 
 
 class CT_OverrideBuilder(BaseBuilder):
@@ -106,12 +108,13 @@ class CT_OverrideBuilder(BaseBuilder):
     Test data builder for CT_Override (Override) XML element that appears in
     `[Content_Types].xml`.
     """
+
     def __init__(self):
         """Establish instance variables with default values"""
-        self._content_type = 'app/vnd.type'
+        self._content_type = "app/vnd.type"
         self._indent = 0
         self._namespace = ' xmlns="%s"' % NS.OPC_CONTENT_TYPES
-        self._partname = '/part/name.xml'
+        self._partname = "/part/name.xml"
 
     def with_content_type(self, content_type):
         """Set ContentType attribute to *content_type*"""
@@ -125,16 +128,15 @@ def with_partname(self, partname):
 
     def without_namespace(self):
         """Don't include an 'xmlns=' attribute"""
-        self._namespace = ''
+        self._namespace = ""
         return self
 
     @property
     def xml(self):
         """Return Override element"""
         tmpl = '%s<Override%s PartName="%s" ContentType="%s"/>\n'
-        indent = ' ' * self._indent
-        return tmpl % (indent, self._namespace, self._partname,
-                       self._content_type)
+        indent = " " * self._indent
+        return tmpl % (indent, self._namespace, self._partname, self._content_type)
 
 
 class CT_RelationshipBuilder(BaseBuilder):
@@ -142,11 +144,12 @@ class CT_RelationshipBuilder(BaseBuilder):
     Test data builder for CT_Relationship (Relationship) XML element that
     appears in .rels files
     """
+
     def __init__(self):
         """Establish instance variables with default values"""
-        self._rId = 'rId9'
-        self._reltype = 'ReLtYpE'
-        self._target = 'docProps/core.xml'
+        self._rId = "rId9"
+        self._reltype = "ReLtYpE"
+        self._target = "docProps/core.xml"
         self._target_mode = None
         self._indent = 0
         self._namespace = ' xmlns="%s"' % NS.OPC_RELATIONSHIPS
@@ -168,27 +171,33 @@ def with_target(self, target):
 
     def with_target_mode(self, target_mode):
         """Set TargetMode attribute to *target_mode*"""
-        self._target_mode = None if target_mode == 'Internal' else target_mode
+        self._target_mode = None if target_mode == "Internal" else target_mode
         return self
 
     def without_namespace(self):
         """Don't include an 'xmlns=' attribute"""
-        self._namespace = ''
+        self._namespace = ""
         return self
 
     @property
     def target_mode(self):
         if self._target_mode is None:
-            return ''
+            return ""
         return ' TargetMode="%s"' % self._target_mode
 
     @property
     def xml(self):
         """Return Relationship element"""
         tmpl = '%s<Relationship%s Id="%s" Type="%s" Target="%s"%s/>\n'
-        indent = ' ' * self._indent
-        return tmpl % (indent, self._namespace, self._rId, self._reltype,
-                       self._target, self.target_mode)
+        indent = " " * self._indent
+        return tmpl % (
+            indent,
+            self._namespace,
+            self._rId,
+            self._reltype,
+            self._target,
+            self.target_mode,
+        )
 
 
 class CT_RelationshipsBuilder(BaseBuilder):
@@ -196,12 +205,13 @@ class CT_RelationshipsBuilder(BaseBuilder):
     Test data builder for CT_Relationships (Relationships) XML element, the
     root element in .rels files.
     """
+
     def __init__(self):
         """Establish instance variables with default values"""
         self._rels = (
-            ('rId1', 'http://reltype1', 'docProps/core.xml',    'Internal'),
-            ('rId2', 'http://linktype', 'http://some/link',     'External'),
-            ('rId3', 'http://reltype2', '../slides/slide1.xml', 'Internal'),
+            ("rId1", "http://reltype1", "docProps/core.xml", "Internal"),
+            ("rId2", "http://linktype", "http://some/link", "External"),
+            ("rId3", "http://reltype2", "../slides/slide1.xml", "Internal"),
         )
 
     @property
@@ -211,14 +221,17 @@ def xml(self):
         """
         xml = '<Relationships xmlns="%s">\n' % NS.OPC_RELATIONSHIPS
         for rId, reltype, target, target_mode in self._rels:
-            xml += (a_Relationship().with_rId(rId)
-                                    .with_reltype(reltype)
-                                    .with_target(target)
-                                    .with_target_mode(target_mode)
-                                    .with_indent(2)
-                                    .without_namespace()
-                                    .xml)
-        xml += '</Relationships>\n'
+            xml += (
+                a_Relationship()
+                .with_rId(rId)
+                .with_reltype(reltype)
+                .with_target(target)
+                .with_target_mode(target_mode)
+                .with_indent(2)
+                .without_namespace()
+                .xml
+            )
+        xml += "</Relationships>\n"
         return xml
 
 
@@ -227,17 +240,18 @@ class CT_TypesBuilder(BaseBuilder):
     Test data builder for CT_Types (<Types>) XML element, the root element in
     [Content_Types].xml files
     """
+
     def __init__(self):
         """Establish instance variables with default values"""
         self._defaults = (
-            ('xml', 'application/xml'),
-            ('jpeg', 'image/jpeg'),
+            ("xml", "application/xml"),
+            ("jpeg", "image/jpeg"),
         )
         self._empty = False
         self._overrides = (
-            ('/docProps/core.xml', 'app/vnd.type1'),
-            ('/ppt/presentation.xml', 'app/vnd.type2'),
-            ('/docProps/thumbnail.jpeg', 'image/jpeg'),
+            ("/docProps/core.xml", "app/vnd.type1"),
+            ("/ppt/presentation.xml", "app/vnd.type2"),
+            ("/docProps/thumbnail.jpeg", "image/jpeg"),
         )
 
     def empty(self):
@@ -254,18 +268,24 @@ def xml(self):
 
         xml = '<Types xmlns="%s">\n' % NS.OPC_CONTENT_TYPES
         for extension, content_type in self._defaults:
-            xml += (a_Default().with_extension(extension)
-                               .with_content_type(content_type)
-                               .with_indent(2)
-                               .without_namespace()
-                               .xml)
+            xml += (
+                a_Default()
+                .with_extension(extension)
+                .with_content_type(content_type)
+                .with_indent(2)
+                .without_namespace()
+                .xml
+            )
         for partname, content_type in self._overrides:
-            xml += (an_Override().with_partname(partname)
-                                 .with_content_type(content_type)
-                                 .with_indent(2)
-                                 .without_namespace()
-                                 .xml)
-        xml += '</Types>\n'
+            xml += (
+                an_Override()
+                .with_partname(partname)
+                .with_content_type(content_type)
+                .with_indent(2)
+                .without_namespace()
+                .xml
+            )
+        xml += "</Types>\n"
         return xml
 
 
diff --git a/tests/opc/unitdata/types.py b/tests/opc/unitdata/types.py
index 82864a965..d5b742b10 100644
--- a/tests/opc/unitdata/types.py
+++ b/tests/opc/unitdata/types.py
@@ -12,24 +12,24 @@
 
 
 class CT_DefaultBuilder(BaseBuilder):
-    __tag__ = 'Default'
-    __nspfxs__ = ('ct',)
-    __attrs__ = ('Extension', 'ContentType')
+    __tag__ = "Default"
+    __nspfxs__ = ("ct",)
+    __attrs__ = ("Extension", "ContentType")
 
 
 class CT_OverrideBuilder(BaseBuilder):
-    __tag__ = 'Override'
-    __nspfxs__ = ('ct',)
-    __attrs__ = ('PartName', 'ContentType')
+    __tag__ = "Override"
+    __nspfxs__ = ("ct",)
+    __attrs__ = ("PartName", "ContentType")
 
 
 class CT_TypesBuilder(BaseBuilder):
-    __tag__ = 'Types'
-    __nspfxs__ = ('ct',)
+    __tag__ = "Types"
+    __nspfxs__ = ("ct",)
     __attrs__ = ()
 
     def with_nsdecls(self, *nspfxs):
-        self._nsdecls = ' xmlns="%s"' % nsmap['ct']
+        self._nsdecls = ' xmlns="%s"' % nsmap["ct"]
         return self
 
 
diff --git a/tests/oxml/parts/test_document.py b/tests/oxml/parts/test_document.py
index aa1bc5b05..707a0dd71 100644
--- a/tests/oxml/parts/test_document.py
+++ b/tests/oxml/parts/test_document.py
@@ -12,7 +12,6 @@
 
 
 class DescribeCT_Body(object):
-
     def it_can_clear_all_its_content(self, clear_fixture):
         body, expected_xml = clear_fixture
         body.clear_content()
@@ -26,13 +25,15 @@ def it_can_add_a_section_break(self, section_break_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:body',                 'w:body'),
-        ('w:body/w:p',             'w:body'),
-        ('w:body/w:tbl',           'w:body'),
-        ('w:body/w:sectPr',        'w:body/w:sectPr'),
-        ('w:body/(w:p, w:sectPr)', 'w:body/w:sectPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:body", "w:body"),
+            ("w:body/w:p", "w:body"),
+            ("w:body/w:tbl", "w:body"),
+            ("w:body/w:sectPr", "w:body/w:sectPr"),
+            ("w:body/(w:p, w:sectPr)", "w:body/w:sectPr"),
+        ]
+    )
     def clear_fixture(self, request):
         before_cxml, after_cxml = request.param
         body = element(before_cxml)
@@ -41,11 +42,11 @@ def clear_fixture(self, request):
 
     @pytest.fixture
     def section_break_fixture(self):
-        body = element('w:body/w:sectPr/w:type{w:val=foobar}')
+        body = element("w:body/w:sectPr/w:type{w:val=foobar}")
         expected_xml = xml(
-            'w:body/('
-            '  w:p/w:pPr/w:sectPr/w:type{w:val=foobar},'
-            '  w:sectPr/w:type{w:val=foobar}'
-            ')'
+            "w:body/("
+            "  w:p/w:pPr/w:sectPr/w:type{w:val=foobar},"
+            "  w:sectPr/w:type{w:val=foobar}"
+            ")"
         )
         return body, expected_xml
diff --git a/tests/oxml/parts/unitdata/document.py b/tests/oxml/parts/unitdata/document.py
index 27c6ed402..6dd8efe79 100644
--- a/tests/oxml/parts/unitdata/document.py
+++ b/tests/oxml/parts/unitdata/document.py
@@ -8,14 +8,14 @@
 
 
 class CT_BodyBuilder(BaseBuilder):
-    __tag__ = 'w:body'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:body"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_DocumentBuilder(BaseBuilder):
-    __tag__ = 'w:document'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:document"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
index 4a4aab6b6..85302d64c 100644
--- a/tests/oxml/test__init__.py
+++ b/tests/oxml/test__init__.py
@@ -10,80 +10,71 @@
 
 from lxml import etree
 
-from docx.oxml import (
-    OxmlElement, oxml_parser, parse_xml, register_element_cls
-)
+from docx.oxml import OxmlElement, oxml_parser, parse_xml, register_element_cls
 from docx.oxml.ns import qn
 from docx.oxml.shared import BaseOxmlElement
 
 
 class DescribeOxmlElement(object):
-
     def it_returns_an_lxml_element_with_matching_tag_name(self):
-        element = OxmlElement('a:foo')
+        element = OxmlElement("a:foo")
         assert isinstance(element, etree._Element)
         assert element.tag == (
-            '{http://schemas.openxmlformats.org/drawingml/2006/main}foo'
+            "{http://schemas.openxmlformats.org/drawingml/2006/main}foo"
         )
 
     def it_adds_supplied_attributes(self):
-        element = OxmlElement('a:foo', {'a': 'b', 'c': 'd'})
+        element = OxmlElement("a:foo", {"a": "b", "c": "d"})
         assert etree.tostring(element) == (
             '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/200'
             '6/main" a="b" c="d"/>'
-        ).encode('utf-8')
+        ).encode("utf-8")
 
     def it_adds_additional_namespace_declarations_when_supplied(self):
-        ns1 = 'http://schemas.openxmlformats.org/drawingml/2006/main'
-        ns2 = 'other'
-        element = OxmlElement('a:foo', nsdecls={'a': ns1, 'x': ns2})
+        ns1 = "http://schemas.openxmlformats.org/drawingml/2006/main"
+        ns2 = "other"
+        element = OxmlElement("a:foo", nsdecls={"a": ns1, "x": ns2})
         assert len(element.nsmap.items()) == 2
-        assert element.nsmap['a'] == ns1
-        assert element.nsmap['x'] == ns2
+        assert element.nsmap["a"] == ns1
+        assert element.nsmap["x"] == ns2
 
 
 class DescribeOxmlParser(object):
-
     def it_strips_whitespace_between_elements(self, whitespace_fixture):
         pretty_xml_text, stripped_xml_text = whitespace_fixture
         element = etree.fromstring(pretty_xml_text, oxml_parser)
-        xml_text = etree.tostring(element, encoding='unicode')
+        xml_text = etree.tostring(element, encoding="unicode")
         assert xml_text == stripped_xml_text
 
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
     def whitespace_fixture(self):
-        pretty_xml_text = (
-            '<foø>\n'
-            '  <bår>text</bår>\n'
-            '</foø>\n'
-        )
-        stripped_xml_text = '<foø><bår>text</bår></foø>'
+        pretty_xml_text = "<foø>\n" "  <bår>text</bår>\n" "</foø>\n"
+        stripped_xml_text = "<foø><bår>text</bår></foø>"
         return pretty_xml_text, stripped_xml_text
 
 
 class DescribeParseXml(object):
-
     def it_accepts_bytes_and_assumes_utf8_encoding(self, xml_bytes):
         parse_xml(xml_bytes)
 
     def it_accepts_unicode_providing_there_is_no_encoding_declaration(self):
         non_enc_decl = '<?xml version="1.0" standalone="yes"?>'
         enc_decl = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
-        xml_body = '<foo><bar>føøbår</bar></foo>'
+        xml_body = "<foo><bar>føøbår</bar></foo>"
         # unicode body by itself doesn't raise
         parse_xml(xml_body)
         # adding XML decl without encoding attr doesn't raise either
-        xml_text = '%s\n%s' % (non_enc_decl, xml_body)
+        xml_text = "%s\n%s" % (non_enc_decl, xml_body)
         parse_xml(xml_text)
         # but adding encoding in the declaration raises ValueError
-        xml_text = '%s\n%s' % (enc_decl, xml_body)
+        xml_text = "%s\n%s" % (enc_decl, xml_body)
         with pytest.raises(ValueError):
             parse_xml(xml_text)
 
     def it_uses_registered_element_classes(self, xml_bytes):
-        register_element_cls('a:foo', CustElmCls)
+        register_element_cls("a:foo", CustElmCls)
         element = parse_xml(xml_bytes)
         assert isinstance(element, CustElmCls)
 
@@ -94,19 +85,17 @@ def xml_bytes(self):
         return (
             '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/200'
             '6/main">\n'
-            '  <a:bar>foøbår</a:bar>\n'
-            '</a:foo>\n'
-        ).encode('utf-8')
+            "  <a:bar>foøbår</a:bar>\n"
+            "</a:foo>\n"
+        ).encode("utf-8")
 
 
 class DescribeRegisterElementCls(object):
-
-    def it_determines_class_used_for_elements_with_matching_tagname(
-            self, xml_text):
-        register_element_cls('a:foo', CustElmCls)
+    def it_determines_class_used_for_elements_with_matching_tagname(self, xml_text):
+        register_element_cls("a:foo", CustElmCls)
         foo = parse_xml(xml_text)
         assert type(foo) is CustElmCls
-        assert type(foo.find(qn('a:bar'))) is etree._Element
+        assert type(foo.find(qn("a:bar"))) is etree._Element
 
     # fixture components ---------------------------------------------
 
@@ -115,8 +104,8 @@ def xml_text(self):
         return (
             '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/200'
             '6/main">\n'
-            '  <a:bar>foøbår</a:bar>\n'
-            '</a:foo>\n'
+            "  <a:bar>foøbår</a:bar>\n"
+            "</a:foo>\n"
         )
 
 
@@ -124,5 +113,6 @@ def xml_text(self):
 # static fixture
 # ===========================================================================
 
+
 class CustElmCls(BaseOxmlElement):
     pass
diff --git a/tests/oxml/test_ns.py b/tests/oxml/test_ns.py
index d17d98340..413d10bde 100644
--- a/tests/oxml/test_ns.py
+++ b/tests/oxml/test_ns.py
@@ -12,10 +12,9 @@
 
 
 class DescribeNamespacePrefixedTag(object):
-
     def it_behaves_like_a_string_when_you_want_it_to(self, nsptag):
-        s = '- %s -' % nsptag
-        assert s == '- a:foobar -'
+        s = "- %s -" % nsptag
+        assert s == "- a:foobar -"
 
     def it_knows_its_clark_name(self, nsptag, clark_name):
         assert nsptag.clark_name == clark_name
@@ -27,13 +26,12 @@ def it_can_construct_from_a_clark_name(self, clark_name, nsptag):
     def it_knows_its_local_part(self, nsptag, local_part):
         assert nsptag.local_part == local_part
 
-    def it_can_compose_a_single_entry_nsmap_for_itself(
-            self, nsptag, namespace_uri_a):
-        expected_nsmap = {'a': namespace_uri_a}
+    def it_can_compose_a_single_entry_nsmap_for_itself(self, nsptag, namespace_uri_a):
+        expected_nsmap = {"a": namespace_uri_a}
         assert nsptag.nsmap == expected_nsmap
 
     def it_knows_its_namespace_prefix(self, nsptag):
-        assert nsptag.nspfx == 'a'
+        assert nsptag.nspfx == "a"
 
     def it_knows_its_namespace_uri(self, nsptag, namespace_uri_a):
         assert nsptag.nsuri == namespace_uri_a
@@ -42,15 +40,15 @@ def it_knows_its_namespace_uri(self, nsptag, namespace_uri_a):
 
     @pytest.fixture
     def clark_name(self, namespace_uri_a, local_part):
-        return '{%s}%s' % (namespace_uri_a, local_part)
+        return "{%s}%s" % (namespace_uri_a, local_part)
 
     @pytest.fixture
     def local_part(self):
-        return 'foobar'
+        return "foobar"
 
     @pytest.fixture
     def namespace_uri_a(self):
-        return 'http://schemas.openxmlformats.org/drawingml/2006/main'
+        return "http://schemas.openxmlformats.org/drawingml/2006/main"
 
     @pytest.fixture
     def nsptag(self, nsptag_str):
@@ -58,4 +56,4 @@ def nsptag(self, nsptag_str):
 
     @pytest.fixture
     def nsptag_str(self, local_part):
-        return 'a:%s' % local_part
+        return "a:%s" % local_part
diff --git a/tests/oxml/test_styles.py b/tests/oxml/test_styles.py
index a342323c7..0c34f6637 100644
--- a/tests/oxml/test_styles.py
+++ b/tests/oxml/test_styles.py
@@ -4,9 +4,7 @@
 Test suite for the docx.oxml.styles module.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -16,7 +14,6 @@
 
 
 class DescribeCT_Styles(object):
-
     def it_can_add_a_style_of_type(self, add_fixture):
         styles, name, style_type, builtin, expected_xml = add_fixture
         style = styles.add_style_of_type(name, style_type, builtin)
@@ -25,14 +22,26 @@ def it_can_add_a_style_of_type(self, add_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:styles', 'Foo Bar',   WD_STYLE_TYPE.LIST,      False,
-         'w:styles/w:style{w:type=numbering,w:customStyle=1,w:styleId=FooBar'
-         '}/w:name{w:val=Foo Bar}'),
-        ('w:styles', 'heading 1', WD_STYLE_TYPE.PARAGRAPH, True,
-         'w:styles/w:style{w:type=paragraph,w:styleId=Heading1}/w:name{w:val'
-         '=heading 1}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:styles",
+                "Foo Bar",
+                WD_STYLE_TYPE.LIST,
+                False,
+                "w:styles/w:style{w:type=numbering,w:customStyle=1,w:styleId=FooBar"
+                "}/w:name{w:val=Foo Bar}",
+            ),
+            (
+                "w:styles",
+                "heading 1",
+                WD_STYLE_TYPE.PARAGRAPH,
+                True,
+                "w:styles/w:style{w:type=paragraph,w:styleId=Heading1}/w:name{w:val"
+                "=heading 1}",
+            ),
+        ]
+    )
     def add_fixture(self, request):
         styles_cxml, name, style_type, builtin, expected_cxml = request.param
         styles = element(styles_cxml)
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 61d8ba1d8..bc40b5fba 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -16,7 +16,6 @@
 
 
 class DescribeCT_Row(object):
-
     def it_can_add_a_trPr(self, add_trPr_fixture):
         tr, expected_xml = add_trPr_fixture
         tr._add_trPr()
@@ -29,12 +28,14 @@ def it_raises_on_tc_at_grid_col(self, tc_raise_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:tr',                    'w:tr/w:trPr'),
-        ('w:tr/w:tblPrEx',          'w:tr/(w:tblPrEx,w:trPr)'),
-        ('w:tr/w:tc',               'w:tr/(w:trPr,w:tc)'),
-        ('w:tr/(w:sdt,w:del,w:tc)', 'w:tr/(w:trPr,w:sdt,w:del,w:tc)'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tr", "w:tr/w:trPr"),
+            ("w:tr/w:tblPrEx", "w:tr/(w:tblPrEx,w:trPr)"),
+            ("w:tr/w:tc", "w:tr/(w:trPr,w:tc)"),
+            ("w:tr/(w:sdt,w:del,w:tc)", "w:tr/(w:trPr,w:sdt,w:del,w:tc)"),
+        ]
+    )
     def add_trPr_fixture(self, request):
         tr_cxml, expected_cxml = request.param
         tr = element(tr_cxml)
@@ -44,18 +45,17 @@ def add_trPr_fixture(self, request):
     @pytest.fixture(params=[(0, 0, 3), (1, 0, 1)])
     def tc_raise_fixture(self, request):
         snippet_idx, row_idx, col_idx = request.param
-        tbl = parse_xml(snippet_seq('tbl-cells')[snippet_idx])
+        tbl = parse_xml(snippet_seq("tbl-cells")[snippet_idx])
         tr = tbl.tr_lst[row_idx]
         return tr, col_idx
 
 
 class DescribeCT_Tc(object):
-
     def it_can_merge_to_another_tc(
         self, tr_, _span_dimensions_, _tbl_, _grow_to_, top_tc_
     ):
         top_tr_ = tr_
-        tc, other_tc = element('w:tc'), element('w:tc')
+        tc, other_tc = element("w:tc"), element("w:tc")
         top, left, height, width = 0, 1, 2, 3
         _span_dimensions_.return_value = top, left, height, width
         _tbl_.return_value.tr_lst = [tr_]
@@ -92,14 +92,15 @@ def it_can_extend_its_horz_span_to_help_merge(
         self, top_tc_, grid_span_, _move_content_to_, _swallow_next_tc_
     ):
         grid_span_.side_effect = [1, 3, 4]
-        grid_width, vMerge = 4, 'continue'
-        tc = element('w:tc')
+        grid_width, vMerge = 4, "continue"
+        tc = element("w:tc")
 
         tc._span_to_width(grid_width, top_tc_, vMerge)
 
         _move_content_to_.assert_called_once_with(tc, top_tc_)
         assert _swallow_next_tc_.call_args_list == [
-            call(tc, grid_width, top_tc_), call(tc, grid_width, top_tc_)
+            call(tc, grid_width, top_tc_),
+            call(tc, grid_width, top_tc_),
         ]
         assert tc.vMerge == vMerge
 
@@ -131,25 +132,41 @@ def it_raises_on_tr_above(self, tr_above_raise_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        # both cells have a width
-        ('w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p),'
-         'w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))',      0, 2,
-         'w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=2880,w:type=dxa},'
-         'w:gridSpan{w:val=2}),w:p))'),
-        # neither have a width
-        ('w:tr/(w:tc/w:p,w:tc/w:p)',                           0, 2,
-         'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))'),
-        # only second one has a width
-        ('w:tr/(w:tc/w:p,'
-         'w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))',      0, 2,
-         'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))'),
-        # only first one has a width
-        ('w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p),'
-         'w:tc/w:p)',                                          0, 2,
-         'w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=1440,w:type=dxa},'
-         'w:gridSpan{w:val=2}),w:p))'),
-    ])
+    @pytest.fixture(
+        params=[
+            # both cells have a width
+            (
+                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p),"
+                "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=2880,w:type=dxa},"
+                "w:gridSpan{w:val=2}),w:p))",
+            ),
+            # neither have a width
+            (
+                "w:tr/(w:tc/w:p,w:tc/w:p)",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+            ),
+            # only second one has a width
+            (
+                "w:tr/(w:tc/w:p," "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+            ),
+            # only first one has a width
+            (
+                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p)," "w:tc/w:p)",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=1440,w:type=dxa},"
+                "w:gridSpan{w:val=2}),w:p))",
+            ),
+        ]
+    )
     def add_width_fixture(self, request):
         tr_cxml, tc_idx, grid_width, expected_tr_cxml = request.param
         tr = element(tr_cxml)
@@ -157,30 +174,42 @@ def add_width_fixture(self, request):
         expected_tr_xml = xml(expected_tr_cxml)
         return tc, grid_width, top_tc, tr, expected_tr_xml
 
-    @pytest.fixture(params=[
-        (0, 0, 0, 'top',    0), (2, 0, 1, 'top',    0),
-        (2, 1, 1, 'top',    0), (4, 2, 1, 'top',    1),
-        (0, 0, 0, 'left',   0), (1, 0, 1, 'left',   2),
-        (3, 1, 0, 'left',   0), (3, 1, 1, 'left',   2),
-        (0, 0, 0, 'bottom', 1), (1, 0, 0, 'bottom', 1),
-        (2, 0, 1, 'bottom', 2), (4, 1, 1, 'bottom', 3),
-        (0, 0, 0, 'right',  1), (1, 0, 0, 'right',  2),
-        (0, 0, 0, 'right',  1), (4, 2, 1, 'right',  3),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, 0, 0, "top", 0),
+            (2, 0, 1, "top", 0),
+            (2, 1, 1, "top", 0),
+            (4, 2, 1, "top", 1),
+            (0, 0, 0, "left", 0),
+            (1, 0, 1, "left", 2),
+            (3, 1, 0, "left", 0),
+            (3, 1, 1, "left", 2),
+            (0, 0, 0, "bottom", 1),
+            (1, 0, 0, "bottom", 1),
+            (2, 0, 1, "bottom", 2),
+            (4, 1, 1, "bottom", 3),
+            (0, 0, 0, "right", 1),
+            (1, 0, 0, "right", 2),
+            (0, 0, 0, "right", 1),
+            (4, 2, 1, "right", 3),
+        ]
+    )
     def extents_fixture(self, request):
         snippet_idx, row, col, attr_name, expected_value = request.param
         tbl = self._snippet_tbl(snippet_idx)
         tc = tbl.tr_lst[row].tc_lst[col]
         return tc, attr_name, expected_value
 
-    @pytest.fixture(params=[
-        (0, 0, 0, 2, 1),
-        (0, 0, 1, 1, 2),
-        (0, 1, 1, 2, 2),
-        (1, 0, 0, 2, 2),
-        (2, 0, 0, 2, 2),
-        (2, 1, 2, 1, 2),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, 0, 0, 2, 1),
+            (0, 0, 1, 1, 2),
+            (0, 1, 1, 2, 2),
+            (1, 0, 0, 2, 2),
+            (2, 0, 0, 2, 2),
+            (2, 1, 2, 1, 2),
+        ]
+    )
     def grow_to_fixture(self, request, _span_to_width_):
         snippet_idx, row, col, width, height = request.param
         tbl = self._snippet_tbl(snippet_idx)
@@ -189,45 +218,47 @@ def grow_to_fixture(self, request, _span_to_width_):
         end = start + height
         expected_calls = [
             call(width, tc, None),
-            call(width, tc, 'restart'),
-            call(width, tc, 'continue'),
-            call(width, tc, 'continue'),
+            call(width, tc, "restart"),
+            call(width, tc, "continue"),
+            call(width, tc, "continue"),
         ][start:end]
         return tc, width, height, None, expected_calls
 
-    @pytest.fixture(params=[
-        ('w:tc/w:p',             'w:tc/w:p',
-         'w:tc/w:p',             'w:tc/w:p'),
-        ('w:tc/w:p',             'w:tc/w:p/w:r',
-         'w:tc/w:p',             'w:tc/w:p/w:r'),
-        ('w:tc/w:p/w:r',         'w:tc/w:p',
-         'w:tc/w:p',             'w:tc/w:p/w:r'),
-        ('w:tc/(w:p/w:r,w:sdt)', 'w:tc/w:p',
-         'w:tc/w:p',             'w:tc/(w:p/w:r,w:sdt)'),
-        ('w:tc/(w:p/w:r,w:sdt)', 'w:tc/(w:tbl,w:p)',
-         'w:tc/w:p',             'w:tc/(w:tbl,w:p/w:r,w:sdt)'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc/w:p", "w:tc/w:p", "w:tc/w:p", "w:tc/w:p"),
+            ("w:tc/w:p", "w:tc/w:p/w:r", "w:tc/w:p", "w:tc/w:p/w:r"),
+            ("w:tc/w:p/w:r", "w:tc/w:p", "w:tc/w:p", "w:tc/w:p/w:r"),
+            ("w:tc/(w:p/w:r,w:sdt)", "w:tc/w:p", "w:tc/w:p", "w:tc/(w:p/w:r,w:sdt)"),
+            (
+                "w:tc/(w:p/w:r,w:sdt)",
+                "w:tc/(w:tbl,w:p)",
+                "w:tc/w:p",
+                "w:tc/(w:tbl,w:p/w:r,w:sdt)",
+            ),
+        ]
+    )
     def move_fixture(self, request):
-        tc_cxml, tc_2_cxml, expected_tc_cxml, expected_tc_2_cxml = (
-            request.param
-        )
+        tc_cxml, tc_2_cxml, expected_tc_cxml, expected_tc_2_cxml = request.param
         tc, tc_2 = element(tc_cxml), element(tc_2_cxml)
         expected_tc_xml = xml(expected_tc_cxml)
         expected_tc_2_xml = xml(expected_tc_2_cxml)
         return tc, tc_2, expected_tc_xml, expected_tc_2_xml
 
-    @pytest.fixture(params=[
-        (0, 0, 0, 0, 1, (0, 0, 1, 2)),
-        (0, 0, 1, 2, 1, (0, 1, 3, 1)),
-        (0, 2, 2, 1, 1, (1, 1, 2, 2)),
-        (0, 1, 2, 1, 0, (1, 0, 1, 3)),
-        (1, 0, 0, 1, 1, (0, 0, 2, 2)),
-        (1, 0, 1, 0, 0, (0, 0, 1, 3)),
-        (2, 0, 1, 2, 1, (0, 1, 3, 1)),
-        (2, 0, 1, 1, 0, (0, 0, 2, 2)),
-        (2, 1, 2, 0, 1, (0, 1, 2, 2)),
-        (4, 0, 1, 0, 0, (0, 0, 1, 3)),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, 0, 0, 0, 1, (0, 0, 1, 2)),
+            (0, 0, 1, 2, 1, (0, 1, 3, 1)),
+            (0, 2, 2, 1, 1, (1, 1, 2, 2)),
+            (0, 1, 2, 1, 0, (1, 0, 1, 3)),
+            (1, 0, 0, 1, 1, (0, 0, 2, 2)),
+            (1, 0, 1, 0, 0, (0, 0, 1, 3)),
+            (2, 0, 1, 2, 1, (0, 1, 3, 1)),
+            (2, 0, 1, 1, 0, (0, 0, 2, 2)),
+            (2, 1, 2, 0, 1, (0, 1, 2, 2)),
+            (4, 0, 1, 0, 0, (0, 0, 1, 3)),
+        ]
+    )
     def span_fixture(self, request):
         snippet_idx, row, col, row_2, col_2, expected_value = request.param
         tbl = self._snippet_tbl(snippet_idx)
@@ -235,15 +266,17 @@ def span_fixture(self, request):
         tc_2 = tbl.tr_lst[row_2].tc_lst[col_2]
         return tc, tc_2, expected_value
 
-    @pytest.fixture(params=[
-        (1, 0, 0, 1, 0),  # inverted-L horz
-        (1, 1, 0, 0, 0),  # same in opposite order
-        (2, 0, 2, 0, 1),  # inverted-L vert
-        (5, 0, 1, 1, 0),  # tee-shape horz bar
-        (5, 1, 0, 2, 1),  # same, opposite side
-        (6, 1, 0, 0, 1),  # tee-shape vert bar
-        (6, 0, 1, 1, 2),  # same, opposite side
-    ])
+    @pytest.fixture(
+        params=[
+            (1, 0, 0, 1, 0),  # inverted-L horz
+            (1, 1, 0, 0, 0),  # same in opposite order
+            (2, 0, 2, 0, 1),  # inverted-L vert
+            (5, 0, 1, 1, 0),  # tee-shape horz bar
+            (5, 1, 0, 2, 1),  # same, opposite side
+            (6, 1, 0, 0, 1),  # tee-shape vert bar
+            (6, 0, 1, 1, 2),  # same, opposite side
+        ]
+    )
     def span_raise_fixture(self, request):
         snippet_idx, row, col, row_2, col_2 = request.param
         tbl = self._snippet_tbl(snippet_idx)
@@ -251,19 +284,41 @@ def span_raise_fixture(self, request):
         tc_2 = tbl.tr_lst[row_2].tc_lst[col_2]
         return tc, tc_2
 
-    @pytest.fixture(params=[
-        ('w:tr/(w:tc/w:p,w:tc/w:p)',                              0, 2,
-         'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))'),
-        ('w:tr/(w:tc/w:p,w:tc/w:p,w:tc/w:p)',                     1, 2,
-         'w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))'),
-        ('w:tr/(w:tc/w:p/w:r/w:t"a",w:tc/w:p/w:r/w:t"b")',        0, 2,
-         'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p/w:r/w:t"a",'
-         'w:p/w:r/w:t"b"))'),
-        ('w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p),w:tc/w:p)', 0, 3,
-         'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=3},w:p))'),
-        ('w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))', 0, 3,
-         'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=3},w:p))'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:tr/(w:tc/w:p,w:tc/w:p)",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+            ),
+            (
+                "w:tr/(w:tc/w:p,w:tc/w:p,w:tc/w:p)",
+                1,
+                2,
+                "w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+            ),
+            (
+                'w:tr/(w:tc/w:p/w:r/w:t"a",w:tc/w:p/w:r/w:t"b")',
+                0,
+                2,
+                'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p/w:r/w:t"a",'
+                'w:p/w:r/w:t"b"))',
+            ),
+            (
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p),w:tc/w:p)",
+                0,
+                3,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=3},w:p))",
+            ),
+            (
+                "w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+                0,
+                3,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=3},w:p))",
+            ),
+        ]
+    )
     def swallow_fixture(self, request):
         tr_cxml, tc_idx, grid_width, expected_tr_cxml = request.param
         tr = element(tr_cxml)
@@ -271,10 +326,12 @@ def swallow_fixture(self, request):
         expected_tr_xml = xml(expected_tr_cxml)
         return tc, grid_width, top_tc, tr, expected_tr_xml
 
-    @pytest.fixture(params=[
-        ('w:tr/w:tc/w:p', 0, 2),
-        ('w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))', 0, 2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tr/w:tc/w:p", 0, 2),
+            ("w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))", 0, 2),
+        ]
+    )
     def swallow_raise_fixture(self, request):
         tr_cxml, tc_idx, grid_width = request.param
         tr = element(tr_cxml)
@@ -284,7 +341,7 @@ def swallow_raise_fixture(self, request):
     @pytest.fixture(params=[(0, 0, 0), (4, 0, 0)])
     def tr_above_raise_fixture(self, request):
         snippet_idx, row_idx, col_idx = request.param
-        tbl = parse_xml(snippet_seq('tbl-cells')[snippet_idx])
+        tbl = parse_xml(snippet_seq("tbl-cells")[snippet_idx])
         tc = tbl.tr_lst[row_idx].tc_lst[col_idx]
         return tc
 
@@ -292,38 +349,38 @@ def tr_above_raise_fixture(self, request):
 
     @pytest.fixture
     def grid_span_(self, request):
-        return property_mock(request, CT_Tc, 'grid_span')
+        return property_mock(request, CT_Tc, "grid_span")
 
     @pytest.fixture
     def _grow_to_(self, request):
-        return method_mock(request, CT_Tc, '_grow_to')
+        return method_mock(request, CT_Tc, "_grow_to")
 
     @pytest.fixture
     def _move_content_to_(self, request):
-        return method_mock(request, CT_Tc, '_move_content_to')
+        return method_mock(request, CT_Tc, "_move_content_to")
 
     @pytest.fixture
     def _span_dimensions_(self, request):
-        return method_mock(request, CT_Tc, '_span_dimensions')
+        return method_mock(request, CT_Tc, "_span_dimensions")
 
     @pytest.fixture
     def _span_to_width_(self, request):
-        return method_mock(request, CT_Tc, '_span_to_width', autospec=False)
+        return method_mock(request, CT_Tc, "_span_to_width", autospec=False)
 
     def _snippet_tbl(self, idx):
         """
         Return a <w:tbl> element for snippet at *idx* in 'tbl-cells' snippet
         file.
         """
-        return parse_xml(snippet_seq('tbl-cells')[idx])
+        return parse_xml(snippet_seq("tbl-cells")[idx])
 
     @pytest.fixture
     def _swallow_next_tc_(self, request):
-        return method_mock(request, CT_Tc, '_swallow_next_tc')
+        return method_mock(request, CT_Tc, "_swallow_next_tc")
 
     @pytest.fixture
     def _tbl_(self, request):
-        return property_mock(request, CT_Tc, '_tbl')
+        return property_mock(request, CT_Tc, "_tbl")
 
     @pytest.fixture
     def top_tc_(self, request):
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
index 407eaefc9..15f68face 100644
--- a/tests/oxml/test_xmlchemy.py
+++ b/tests/oxml/test_xmlchemy.py
@@ -14,9 +14,17 @@
 from docx.oxml.ns import qn
 from docx.oxml.simpletypes import BaseIntType
 from docx.oxml.xmlchemy import (
-    BaseOxmlElement, Choice, serialize_for_reading, OneOrMore, OneAndOnlyOne,
-    OptionalAttribute, RequiredAttribute, ZeroOrMore, ZeroOrOne,
-    ZeroOrOneChoice, XmlString
+    BaseOxmlElement,
+    Choice,
+    serialize_for_reading,
+    OneOrMore,
+    OneAndOnlyOne,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrMore,
+    ZeroOrOne,
+    ZeroOrOneChoice,
+    XmlString,
 )
 
 from ..unitdata import BaseBuilder
@@ -24,64 +32,71 @@
 
 
 class DescribeBaseOxmlElement(object):
-
-    def it_can_find_the_first_of_its_children_named_in_a_sequence(
-            self, first_fixture):
+    def it_can_find_the_first_of_its_children_named_in_a_sequence(self, first_fixture):
         element, tagnames, matching_child = first_fixture
         assert element.first_child_found_in(*tagnames) is matching_child
 
-    def it_can_insert_an_element_before_named_successors(
-            self, insert_fixture):
+    def it_can_insert_an_element_before_named_successors(self, insert_fixture):
         element, child, tagnames, expected_xml = insert_fixture
         element.insert_element_before(child, *tagnames)
         assert element.xml == expected_xml
 
-    def it_can_remove_all_children_with_name_in_sequence(
-            self, remove_fixture):
+    def it_can_remove_all_children_with_name_in_sequence(self, remove_fixture):
         element, tagnames, expected_xml = remove_fixture
         element.remove_all(*tagnames)
         assert element.xml == expected_xml
 
     # fixtures ---------------------------------------------
 
-    @pytest.fixture(params=[
-        ('biu', 'iu',  'i'),
-        ('bu',  'iu',  'u'),
-        ('bi',  'u',   None),
-        ('b',   'iu',  None),
-        ('iu',  'biu', 'i'),
-        ('',    'biu', None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("biu", "iu", "i"),
+            ("bu", "iu", "u"),
+            ("bi", "u", None),
+            ("b", "iu", None),
+            ("iu", "biu", "i"),
+            ("", "biu", None),
+        ]
+    )
     def first_fixture(self, request):
         present, matching, match = request.param
         element = self.rPr_bldr(present).element
         tagnames = self.nsptags(matching)
-        matching_child = element.find(qn('w:%s' % match)) if match else None
+        matching_child = element.find(qn("w:%s" % match)) if match else None
         return element, tagnames, matching_child
 
-    @pytest.fixture(params=[
-        ('iu', 'b', 'iu', 'biu'),
-        ('u',  'b', 'iu', 'bu'),
-        ('',   'b', 'iu', 'b'),
-        ('bu', 'i', 'u',  'biu'),
-        ('bi', 'u', '',   'biu'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("iu", "b", "iu", "biu"),
+            ("u", "b", "iu", "bu"),
+            ("", "b", "iu", "b"),
+            ("bu", "i", "u", "biu"),
+            ("bi", "u", "", "biu"),
+        ]
+    )
     def insert_fixture(self, request):
         present, new, successors, after = request.param
         element = self.rPr_bldr(present).element
-        child = {
-            'b': a_b(), 'i': an_i(), 'u': a_u()
-        }[new].with_nsdecls().element
-        tagnames = [('w:%s' % char) for char in successors]
+        child = {"b": a_b(), "i": an_i(), "u": a_u()}[new].with_nsdecls().element
+        tagnames = [("w:%s" % char) for char in successors]
         expected_xml = self.rPr_bldr(after).xml()
         return element, child, tagnames, expected_xml
 
-    @pytest.fixture(params=[
-        ('biu', 'b', 'iu'), ('biu', 'bi', 'u'), ('bbiiuu',  'i',   'bbuu'),
-        ('biu', 'i', 'bu'), ('biu', 'bu', 'i'), ('bbiiuu',   '', 'bbiiuu'),
-        ('biu', 'u', 'bi'), ('biu', 'ui', 'b'), ('bbiiuu', 'bi',     'uu'),
-        ('bu',  'i', 'bu'), ('',    'ui',  ''),
-    ])
+    @pytest.fixture(
+        params=[
+            ("biu", "b", "iu"),
+            ("biu", "bi", "u"),
+            ("bbiiuu", "i", "bbuu"),
+            ("biu", "i", "bu"),
+            ("biu", "bu", "i"),
+            ("bbiiuu", "", "bbiiuu"),
+            ("biu", "u", "bi"),
+            ("biu", "ui", "b"),
+            ("bbiiuu", "bi", "uu"),
+            ("bu", "i", "bu"),
+            ("", "ui", ""),
+        ]
+    )
     def remove_fixture(self, request):
         present, remove, after = request.param
         element = self.rPr_bldr(present).element
@@ -92,16 +107,16 @@ def remove_fixture(self, request):
     # fixture components ---------------------------------------------
 
     def nsptags(self, letters):
-        return [('w:%s' % letter) for letter in letters]
+        return [("w:%s" % letter) for letter in letters]
 
     def rPr_bldr(self, children):
         rPr_bldr = an_rPr().with_nsdecls()
         for char in children:
-            if char == 'b':
+            if char == "b":
                 rPr_bldr.with_child(a_b())
-            elif char == 'i':
+            elif char == "i":
                 rPr_bldr.with_child(an_i())
-            elif char == 'u':
+            elif char == "u":
                 rPr_bldr.with_child(a_u())
             else:
                 raise NotImplementedError("got '%s'" % char)
@@ -109,7 +124,6 @@ def rPr_bldr(self, children):
 
 
 class DescribeSerializeForReading(object):
-
     def it_pretty_prints_an_lxml_element(self, pretty_fixture):
         element, expected_xml_text = pretty_fixture
         xml_text = serialize_for_reading(element)
@@ -124,11 +138,7 @@ def it_returns_unicode_text(self, type_fixture):
 
     @pytest.fixture
     def pretty_fixture(self, element):
-        expected_xml_text = (
-            '<foø>\n'
-            '  <bår>text</bår>\n'
-            '</foø>\n'
-        )
+        expected_xml_text = "<foø>\n" "  <bår>text</bår>\n" "</foø>\n"
         return element, expected_xml_text
 
     @pytest.fixture
@@ -139,11 +149,10 @@ def type_fixture(self, element):
 
     @pytest.fixture
     def element(self):
-        return parse_xml('<foø><bår>text</bår></foø>')
+        return parse_xml("<foø><bår>text</bår></foø>")
 
 
 class DescribeXmlString(object):
-
     def it_parses_a_line_to_help_compare(self, parse_fixture):
         """
         This internal function is important to test separately because if it
@@ -167,54 +176,67 @@ def it_knows_if_two_xml_lines_are_equivalent(self, xml_line_case):
 
     # fixtures ---------------------------------------------
 
-    @pytest.fixture(params=[
-        ('<a>text</a>',  '<a',   '',       '>',  'text</a>'),
-        ('<a:f/>',       '<a:f', '',       '/>', None),
-        ('<a:f b="c"/>', '<a:f', ' b="c"', '/>', None),
-        ('<a:f>t</a:f>', '<a:f', '',       '>',  't</a:f>'),
-        ('<dcterms:created xsi:type="dcterms:W3CDTF">2013-12-23T23:15:00Z</d'
-         'cterms:created>', '<dcterms:created', ' xsi:type="dcterms:W3CDTF"',
-         '>', '2013-12-23T23:15:00Z</dcterms:created>'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("<a>text</a>", "<a", "", ">", "text</a>"),
+            ("<a:f/>", "<a:f", "", "/>", None),
+            ('<a:f b="c"/>', "<a:f", ' b="c"', "/>", None),
+            ("<a:f>t</a:f>", "<a:f", "", ">", "t</a:f>"),
+            (
+                '<dcterms:created xsi:type="dcterms:W3CDTF">2013-12-23T23:15:00Z</d'
+                "cterms:created>",
+                "<dcterms:created",
+                ' xsi:type="dcterms:W3CDTF"',
+                ">",
+                "2013-12-23T23:15:00Z</dcterms:created>",
+            ),
+        ]
+    )
     def parse_fixture(self, request):
         line, front, attrs, close, text = request.param
         return line, front, attrs, close, text
 
-    @pytest.fixture(params=[
-        'simple_elm', 'nsp_tagname', 'indent', 'attrs', 'nsdecl_order',
-        'closing_elm',
-    ])
+    @pytest.fixture(
+        params=[
+            "simple_elm",
+            "nsp_tagname",
+            "indent",
+            "attrs",
+            "nsdecl_order",
+            "closing_elm",
+        ]
+    )
     def xml_line_case(self, request):
         cases = {
-            'simple_elm': (
-                '<name/>',
-                '<name/>',
-                '<name>',
+            "simple_elm": (
+                "<name/>",
+                "<name/>",
+                "<name>",
             ),
-            'nsp_tagname': (
-                '<xyz:name/>',
-                '<xyz:name/>',
-                '<abc:name/>',
+            "nsp_tagname": (
+                "<xyz:name/>",
+                "<xyz:name/>",
+                "<abc:name/>",
             ),
-            'indent': (
-                '  <xyz:name/>',
-                '  <xyz:name/>',
-                '<xyz:name/>',
+            "indent": (
+                "  <xyz:name/>",
+                "  <xyz:name/>",
+                "<xyz:name/>",
             ),
-            'attrs': (
+            "attrs": (
                 '  <abc:Name foo="bar" bar="foo">',
                 '  <abc:Name bar="foo" foo="bar">',
                 '  <abc:Name far="boo" foo="bar">',
             ),
-            'nsdecl_order': (
+            "nsdecl_order": (
                 '    <name xmlns:a="http://ns/1" xmlns:b="http://ns/2"/>',
                 '    <name xmlns:b="http://ns/2" xmlns:a="http://ns/1"/>',
                 '    <name xmlns:b="http://ns/2" xmlns:a="http://ns/1">',
             ),
-            'closing_elm': (
-                '</xyz:name>',
-                '</xyz:name>',
-                '<xyz:name>',
+            "closing_elm": (
+                "</xyz:name>",
+                "</xyz:name>",
+                "<xyz:name>",
             ),
         }
         line, other, differs = cases[request.param]
@@ -222,9 +244,7 @@ def xml_line_case(self, request):
 
 
 class DescribeChoice(object):
-
-    def it_adds_a_getter_property_for_the_choice_element(
-            self, getter_fixture):
+    def it_adds_a_getter_property_for_the_choice_element(self, getter_fixture):
         parent, expected_choice = getter_fixture
         assert parent.choice is expected_choice
 
@@ -238,7 +258,7 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent._insert_choice(choice)
         assert parent.xml == expected_xml
         assert parent._insert_choice.__doc__.startswith(
-            'Return the passed ``<w:choice>`` '
+            "Return the passed ``<w:choice>`` "
         )
 
     def it_adds_an_add_method_for_the_child_element(self, add_fixture):
@@ -247,11 +267,12 @@ def it_adds_an_add_method_for_the_child_element(self, add_fixture):
         assert parent.xml == expected_xml
         assert isinstance(choice, CT_Choice)
         assert parent._add_choice.__doc__.startswith(
-            'Add a new ``<w:choice>`` child element '
+            "Add a new ``<w:choice>`` child element "
         )
 
     def it_adds_a_get_or_change_to_method_for_the_child_element(
-            self, get_or_change_to_fixture):
+        self, get_or_change_to_fixture
+    ):
         parent, expected_xml = get_or_change_to_fixture
         choice = parent.get_or_change_to_choice()
         assert isinstance(choice, CT_Choice)
@@ -262,40 +283,44 @@ def it_adds_a_get_or_change_to_method_for_the_child_element(
     @pytest.fixture
     def add_fixture(self):
         parent = self.parent_bldr().element
-        expected_xml = self.parent_bldr('choice').xml()
+        expected_xml = self.parent_bldr("choice").xml()
         return parent, expected_xml
 
-    @pytest.fixture(params=[
-        ('choice2', 'choice'),
-        (None,      'choice'),
-        ('choice',  'choice'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("choice2", "choice"),
+            (None, "choice"),
+            ("choice", "choice"),
+        ]
+    )
     def get_or_change_to_fixture(self, request):
         before_member_tag, after_member_tag = request.param
         parent = self.parent_bldr(before_member_tag).element
         expected_xml = self.parent_bldr(after_member_tag).xml()
         return parent, expected_xml
 
-    @pytest.fixture(params=['choice', None])
+    @pytest.fixture(params=["choice", None])
     def getter_fixture(self, request):
         choice_tag = request.param
         parent = self.parent_bldr(choice_tag).element
-        expected_choice = parent.find(qn('w:choice'))  # None if not found
+        expected_choice = parent.find(qn("w:choice"))  # None if not found
         return parent, expected_choice
 
     @pytest.fixture
     def insert_fixture(self):
         parent = (
-            a_parent().with_nsdecls().with_child(
-                an_oomChild()).with_child(
-                an_oooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
         ).element
         choice = a_choice().with_nsdecls().element
         expected_xml = (
-            a_parent().with_nsdecls().with_child(
-                a_choice()).with_child(
-                an_oomChild()).with_child(
-                an_oooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(a_choice())
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
         ).xml()
         return parent, choice, expected_xml
 
@@ -309,15 +334,14 @@ def new_fixture(self):
 
     def parent_bldr(self, choice_tag=None):
         parent_bldr = a_parent().with_nsdecls()
-        if choice_tag == 'choice':
+        if choice_tag == "choice":
             parent_bldr.with_child(a_choice())
-        if choice_tag == 'choice2':
+        if choice_tag == "choice2":
             parent_bldr.with_child(a_choice2())
         return parent_bldr
 
 
 class DescribeOneAndOnlyOne(object):
-
     def it_adds_a_getter_property_for_the_child_element(self, getter_fixture):
         parent, oooChild = getter_fixture
         assert parent.oooChild is oooChild
@@ -327,14 +351,12 @@ def it_adds_a_getter_property_for_the_child_element(self, getter_fixture):
     @pytest.fixture
     def getter_fixture(self):
         parent = a_parent().with_nsdecls().with_child(an_oooChild()).element
-        oooChild = parent.find(qn('w:oooChild'))
+        oooChild = parent.find(qn("w:oooChild"))
         return parent, oooChild
 
 
 class DescribeOneOrMore(object):
-
-    def it_adds_a_getter_property_for_the_child_element_list(
-            self, getter_fixture):
+    def it_adds_a_getter_property_for_the_child_element_list(self, getter_fixture):
         parent, oomChild = getter_fixture
         assert parent.oomChild_lst[0] is oomChild
 
@@ -348,7 +370,7 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent._insert_oomChild(oomChild)
         assert parent.xml == expected_xml
         assert parent._insert_oomChild.__doc__.startswith(
-            'Return the passed ``<w:oomChild>`` '
+            "Return the passed ``<w:oomChild>`` "
         )
 
     def it_adds_a_private_add_method_for_the_child_element(self, add_fixture):
@@ -357,7 +379,7 @@ def it_adds_a_private_add_method_for_the_child_element(self, add_fixture):
         assert parent.xml == expected_xml
         assert isinstance(oomChild, CT_OomChild)
         assert parent._add_oomChild.__doc__.startswith(
-            'Add a new ``<w:oomChild>`` child element '
+            "Add a new ``<w:oomChild>`` child element "
         )
 
     def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
@@ -366,7 +388,7 @@ def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
         assert parent.xml == expected_xml
         assert isinstance(oomChild, CT_OomChild)
         assert parent._add_oomChild.__doc__.startswith(
-            'Add a new ``<w:oomChild>`` child element '
+            "Add a new ``<w:oomChild>`` child element "
         )
 
     # fixtures -------------------------------------------------------
@@ -380,24 +402,26 @@ def add_fixture(self):
     @pytest.fixture
     def getter_fixture(self):
         parent = self.parent_bldr(True).element
-        oomChild = parent.find(qn('w:oomChild'))
+        oomChild = parent.find(qn("w:oomChild"))
         return parent, oomChild
 
     @pytest.fixture
     def insert_fixture(self):
         parent = (
-            a_parent().with_nsdecls().with_child(
-                an_oooChild()).with_child(
-                a_zomChild()).with_child(
-                a_zooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oooChild())
+            .with_child(a_zomChild())
+            .with_child(a_zooChild())
         ).element
         oomChild = an_oomChild().with_nsdecls().element
         expected_xml = (
-            a_parent().with_nsdecls().with_child(
-                an_oomChild()).with_child(
-                an_oooChild()).with_child(
-                a_zomChild()).with_child(
-                a_zooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
+            .with_child(a_zomChild())
+            .with_child(a_zooChild())
         ).xml()
         return parent, oomChild, expected_xml
 
@@ -417,7 +441,6 @@ def parent_bldr(self, oomChild_is_present):
 
 
 class DescribeOptionalAttribute(object):
-
     def it_adds_a_getter_property_for_the_attr_value(self, getter_fixture):
         parent, optAttr_python_value = getter_fixture
         assert parent.optAttr == optAttr_python_value
@@ -436,13 +459,13 @@ def it_adds_a_docstring_for_the_property(self):
 
     @pytest.fixture
     def getter_fixture(self):
-        parent = a_parent().with_nsdecls().with_optAttr('24').element
+        parent = a_parent().with_nsdecls().with_optAttr("24").element
         return parent, 24
 
     @pytest.fixture(params=[36, None])
     def setter_fixture(self, request):
         value = request.param
-        parent = a_parent().with_nsdecls().with_optAttr('42').element
+        parent = a_parent().with_nsdecls().with_optAttr("42").element
         if value is None:
             expected_xml = a_parent().with_nsdecls().xml()
         else:
@@ -451,7 +474,6 @@ def setter_fixture(self, request):
 
 
 class DescribeRequiredAttribute(object):
-
     def it_adds_a_getter_property_for_the_attr_value(self, getter_fixture):
         parent, reqAttr_python_value = getter_fixture
         assert parent.reqAttr == reqAttr_python_value
@@ -480,14 +502,16 @@ def it_raises_on_assign_invalid_value(self, invalid_assign_fixture):
 
     @pytest.fixture
     def getter_fixture(self):
-        parent = a_parent().with_nsdecls().with_reqAttr('42').element
+        parent = a_parent().with_nsdecls().with_reqAttr("42").element
         return parent, 42
 
-    @pytest.fixture(params=[
-        (None, TypeError),
-        (-4,   ValueError),
-        ('2',  TypeError),
-    ])
+    @pytest.fixture(
+        params=[
+            (None, TypeError),
+            (-4, ValueError),
+            ("2", TypeError),
+        ]
+    )
     def invalid_assign_fixture(self, request):
         invalid_value, expected_exception = request.param
         parent = a_parent().with_nsdecls().with_reqAttr(1).element
@@ -495,16 +519,14 @@ def invalid_assign_fixture(self, request):
 
     @pytest.fixture
     def setter_fixture(self):
-        parent = a_parent().with_nsdecls().with_reqAttr('42').element
+        parent = a_parent().with_nsdecls().with_reqAttr("42").element
         value = 24
         expected_xml = a_parent().with_nsdecls().with_reqAttr(value).xml()
         return parent, value, expected_xml
 
 
 class DescribeZeroOrMore(object):
-
-    def it_adds_a_getter_property_for_the_child_element_list(
-            self, getter_fixture):
+    def it_adds_a_getter_property_for_the_child_element_list(self, getter_fixture):
         parent, zomChild = getter_fixture
         assert parent.zomChild_lst[0] is zomChild
 
@@ -518,7 +540,7 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent._insert_zomChild(zomChild)
         assert parent.xml == expected_xml
         assert parent._insert_zomChild.__doc__.startswith(
-            'Return the passed ``<w:zomChild>`` '
+            "Return the passed ``<w:zomChild>`` "
         )
 
     def it_adds_an_add_method_for_the_child_element(self, add_fixture):
@@ -527,7 +549,7 @@ def it_adds_an_add_method_for_the_child_element(self, add_fixture):
         assert parent.xml == expected_xml
         assert isinstance(zomChild, CT_ZomChild)
         assert parent._add_zomChild.__doc__.startswith(
-            'Add a new ``<w:zomChild>`` child element '
+            "Add a new ``<w:zomChild>`` child element "
         )
 
     def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
@@ -536,11 +558,11 @@ def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
         assert parent.xml == expected_xml
         assert isinstance(zomChild, CT_ZomChild)
         assert parent._add_zomChild.__doc__.startswith(
-            'Add a new ``<w:zomChild>`` child element '
+            "Add a new ``<w:zomChild>`` child element "
         )
 
     def it_removes_the_property_root_name_used_for_declaration(self):
-        assert not hasattr(CT_Parent, 'zomChild')
+        assert not hasattr(CT_Parent, "zomChild")
 
     # fixtures -------------------------------------------------------
 
@@ -553,24 +575,26 @@ def add_fixture(self):
     @pytest.fixture
     def getter_fixture(self):
         parent = self.parent_bldr(True).element
-        zomChild = parent.find(qn('w:zomChild'))
+        zomChild = parent.find(qn("w:zomChild"))
         return parent, zomChild
 
     @pytest.fixture
     def insert_fixture(self):
         parent = (
-            a_parent().with_nsdecls().with_child(
-                an_oomChild()).with_child(
-                an_oooChild()).with_child(
-                a_zooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
+            .with_child(a_zooChild())
         ).element
         zomChild = a_zomChild().with_nsdecls().element
         expected_xml = (
-            a_parent().with_nsdecls().with_child(
-                an_oomChild()).with_child(
-                an_oooChild()).with_child(
-                a_zomChild()).with_child(
-                a_zooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
+            .with_child(a_zomChild())
+            .with_child(a_zooChild())
         ).xml()
         return parent, zomChild, expected_xml
 
@@ -588,7 +612,6 @@ def parent_bldr(self, zomChild_is_present):
 
 
 class DescribeZeroOrOne(object):
-
     def it_adds_a_getter_property_for_the_child_element(self, getter_fixture):
         parent, zooChild = getter_fixture
         assert parent.zooChild is zooChild
@@ -599,7 +622,7 @@ def it_adds_an_add_method_for_the_child_element(self, add_fixture):
         assert parent.xml == expected_xml
         assert isinstance(zooChild, CT_ZooChild)
         assert parent._add_zooChild.__doc__.startswith(
-            'Add a new ``<w:zooChild>`` child element '
+            "Add a new ``<w:zooChild>`` child element "
         )
 
     def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
@@ -607,11 +630,10 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent._insert_zooChild(zooChild)
         assert parent.xml == expected_xml
         assert parent._insert_zooChild.__doc__.startswith(
-            'Return the passed ``<w:zooChild>`` '
+            "Return the passed ``<w:zooChild>`` "
         )
 
-    def it_adds_a_get_or_add_method_for_the_child_element(
-            self, get_or_add_fixture):
+    def it_adds_a_get_or_add_method_for_the_child_element(self, get_or_add_fixture):
         parent, expected_xml = get_or_add_fixture
         zooChild = parent.get_or_add_zooChild()
         assert isinstance(zooChild, CT_ZooChild)
@@ -634,7 +656,7 @@ def add_fixture(self):
     def getter_fixture(self, request):
         zooChild_is_present = request.param
         parent = self.parent_bldr(zooChild_is_present).element
-        zooChild = parent.find(qn('w:zooChild'))  # None if not found
+        zooChild = parent.find(qn("w:zooChild"))  # None if not found
         return parent, zooChild
 
     @pytest.fixture(params=[True, False])
@@ -647,18 +669,20 @@ def get_or_add_fixture(self, request):
     @pytest.fixture
     def insert_fixture(self):
         parent = (
-            a_parent().with_nsdecls().with_child(
-                an_oomChild()).with_child(
-                an_oooChild()).with_child(
-                a_zomChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
+            .with_child(a_zomChild())
         ).element
         zooChild = a_zooChild().with_nsdecls().element
         expected_xml = (
-            a_parent().with_nsdecls().with_child(
-                an_oomChild()).with_child(
-                an_oooChild()).with_child(
-                a_zomChild()).with_child(
-                a_zooChild())
+            a_parent()
+            .with_nsdecls()
+            .with_child(an_oomChild())
+            .with_child(an_oooChild())
+            .with_child(a_zomChild())
+            .with_child(a_zooChild())
         ).xml()
         return parent, zooChild, expected_xml
 
@@ -679,18 +703,17 @@ def parent_bldr(self, zooChild_is_present):
 
 
 class DescribeZeroOrOneChoice(object):
-
     def it_adds_a_getter_for_the_current_choice(self, getter_fixture):
         parent, expected_choice = getter_fixture
         assert parent.eg_zooChoice is expected_choice
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[None, 'choice', 'choice2'])
+    @pytest.fixture(params=[None, "choice", "choice2"])
     def getter_fixture(self, request):
         choice_tag = request.param
         parent = self.parent_bldr(choice_tag).element
-        tagname = 'w:%s' % choice_tag
+        tagname = "w:%s" % choice_tag
         expected_choice = parent.find(qn(tagname))  # None if not found
         return parent, expected_choice
 
@@ -698,9 +721,9 @@ def getter_fixture(self, request):
 
     def parent_bldr(self, choice_tag=None):
         parent_bldr = a_parent().with_nsdecls()
-        if choice_tag == 'choice':
+        if choice_tag == "choice":
             parent_bldr.with_child(a_choice())
-        if choice_tag == 'choice2':
+        if choice_tag == "choice2":
             parent_bldr.with_child(a_choice2())
         return parent_bldr
 
@@ -709,33 +732,32 @@ def parent_bldr(self, choice_tag=None):
 # static shared fixture
 # --------------------------------------------------------------------
 
-class ST_IntegerType(BaseIntType):
 
+class ST_IntegerType(BaseIntType):
     @classmethod
     def validate(cls, value):
         cls.validate_int(value)
         if value < 1 or value > 42:
-            raise ValueError(
-                "value must be in range 1 to 42 inclusive"
-            )
+            raise ValueError("value must be in range 1 to 42 inclusive")
 
 
 class CT_Parent(BaseOxmlElement):
     """
     ``<w:parent>`` element, an invented element for use in testing.
     """
+
     eg_zooChoice = ZeroOrOneChoice(
-        (Choice('w:choice'), Choice('w:choice2')),
-        successors=('w:oomChild', 'w:oooChild')
+        (Choice("w:choice"), Choice("w:choice2")),
+        successors=("w:oomChild", "w:oooChild"),
+    )
+    oomChild = OneOrMore(
+        "w:oomChild", successors=("w:oooChild", "w:zomChild", "w:zooChild")
     )
-    oomChild = OneOrMore('w:oomChild', successors=(
-        'w:oooChild', 'w:zomChild', 'w:zooChild'
-    ))
-    oooChild = OneAndOnlyOne('w:oooChild')
-    zomChild = ZeroOrMore('w:zomChild', successors=('w:zooChild',))
-    zooChild = ZeroOrOne('w:zooChild', successors=())
-    optAttr = OptionalAttribute('w:optAttr', ST_IntegerType)
-    reqAttr = RequiredAttribute('reqAttr', ST_IntegerType)
+    oooChild = OneAndOnlyOne("w:oooChild")
+    zomChild = ZeroOrMore("w:zomChild", successors=("w:zooChild",))
+    zooChild = ZeroOrOne("w:zooChild", successors=())
+    optAttr = OptionalAttribute("w:optAttr", ST_IntegerType)
+    reqAttr = RequiredAttribute("reqAttr", ST_IntegerType)
 
 
 class CT_Choice(BaseOxmlElement):
@@ -766,52 +788,52 @@ class CT_ZooChild(BaseOxmlElement):
     """
 
 
-register_element_cls('w:parent',   CT_Parent)
-register_element_cls('w:choice',   CT_Choice)
-register_element_cls('w:oomChild', CT_OomChild)
-register_element_cls('w:zomChild', CT_ZomChild)
-register_element_cls('w:zooChild', CT_ZooChild)
+register_element_cls("w:parent", CT_Parent)
+register_element_cls("w:choice", CT_Choice)
+register_element_cls("w:oomChild", CT_OomChild)
+register_element_cls("w:zomChild", CT_ZomChild)
+register_element_cls("w:zooChild", CT_ZooChild)
 
 
 class CT_ChoiceBuilder(BaseBuilder):
-    __tag__ = 'w:choice'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:choice"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_Choice2Builder(BaseBuilder):
-    __tag__ = 'w:choice2'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:choice2"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_ParentBuilder(BaseBuilder):
-    __tag__ = 'w:parent'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:optAttr', 'reqAttr')
+    __tag__ = "w:parent"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:optAttr", "reqAttr")
 
 
 class CT_OomChildBuilder(BaseBuilder):
-    __tag__ = 'w:oomChild'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:oomChild"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_OooChildBuilder(BaseBuilder):
-    __tag__ = 'w:oooChild'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:oooChild"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_ZomChildBuilder(BaseBuilder):
-    __tag__ = 'w:zomChild'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:zomChild"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_ZooChildBuilder(BaseBuilder):
-    __tag__ = 'w:zooChild'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:zooChild"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
diff --git a/tests/oxml/text/test_run.py b/tests/oxml/text/test_run.py
index 57b8580fe..0dc091b26 100644
--- a/tests/oxml/text/test_run.py
+++ b/tests/oxml/text/test_run.py
@@ -4,9 +4,7 @@
 Test suite for the docx.oxml.text.run module.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -14,7 +12,6 @@
 
 
 class DescribeCT_R(object):
-
     def it_can_add_a_t_preserving_edge_whitespace(self, add_t_fixture):
         r, text, expected_xml = add_t_fixture
         r.add_t(text)
@@ -22,12 +19,17 @@ def it_can_add_a_t_preserving_edge_whitespace(self, add_t_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:r', 'foobar',  'w:r/w:t"foobar"'),
-        ('w:r', 'foobar ', 'w:r/w:t{xml:space=preserve}"foobar "'),
-        ('w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr)', 'foobar',
-         'w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr, w:t"foobar")'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", "foobar", 'w:r/w:t"foobar"'),
+            ("w:r", "foobar ", 'w:r/w:t{xml:space=preserve}"foobar "'),
+            (
+                "w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr)",
+                "foobar",
+                'w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr, w:t"foobar")',
+            ),
+        ]
+    )
     def add_t_fixture(self, request):
         initial_cxml, text, expected_cxml = request.param
         r = element(initial_cxml)
diff --git a/tests/oxml/unitdata/dml.py b/tests/oxml/unitdata/dml.py
index 84518f8b7..d2ba72ed7 100644
--- a/tests/oxml/unitdata/dml.py
+++ b/tests/oxml/unitdata/dml.py
@@ -8,50 +8,50 @@
 
 
 class CT_BlipBuilder(BaseBuilder):
-    __tag__ = 'a:blip'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('r:embed', 'r:link', 'cstate')
+    __tag__ = "a:blip"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("r:embed", "r:link", "cstate")
 
 
 class CT_BlipFillPropertiesBuilder(BaseBuilder):
-    __tag__ = 'pic:blipFill'
-    __nspfxs__ = ('pic',)
+    __tag__ = "pic:blipFill"
+    __nspfxs__ = ("pic",)
     __attrs__ = ()
 
 
 class CT_DrawingBuilder(BaseBuilder):
-    __tag__ = 'w:drawing'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:drawing"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_GraphicalObjectBuilder(BaseBuilder):
-    __tag__ = 'a:graphic'
-    __nspfxs__ = ('a',)
+    __tag__ = "a:graphic"
+    __nspfxs__ = ("a",)
     __attrs__ = ()
 
 
 class CT_GraphicalObjectDataBuilder(BaseBuilder):
-    __tag__ = 'a:graphicData'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('uri',)
+    __tag__ = "a:graphicData"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("uri",)
 
 
 class CT_GraphicalObjectFrameLockingBuilder(BaseBuilder):
-    __tag__ = 'a:graphicFrameLocks'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('noChangeAspect',)
+    __tag__ = "a:graphicFrameLocks"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("noChangeAspect",)
 
 
 class CT_InlineBuilder(BaseBuilder):
-    __tag__ = 'wp:inline'
-    __nspfxs__ = ('wp',)
-    __attrs__ = ('distT', 'distB', 'distL', 'distR')
+    __tag__ = "wp:inline"
+    __nspfxs__ = ("wp",)
+    __attrs__ = ("distT", "distB", "distL", "distR")
 
 
 class CT_NonVisualDrawingPropsBuilder(BaseBuilder):
-    __nspfxs__ = ('wp',)
-    __attrs__ = ('id', 'name', 'descr', 'hidden', 'title')
+    __nspfxs__ = ("wp",)
+    __attrs__ = ("id", "name", "descr", "hidden", "title")
 
     def __init__(self, tag):
         self.__tag__ = tag
@@ -59,38 +59,38 @@ def __init__(self, tag):
 
 
 class CT_NonVisualGraphicFramePropertiesBuilder(BaseBuilder):
-    __tag__ = 'wp:cNvGraphicFramePr'
-    __nspfxs__ = ('wp',)
+    __tag__ = "wp:cNvGraphicFramePr"
+    __nspfxs__ = ("wp",)
     __attrs__ = ()
 
 
 class CT_NonVisualPicturePropertiesBuilder(BaseBuilder):
-    __tag__ = 'pic:cNvPicPr'
-    __nspfxs__ = ('pic',)
-    __attrs__ = ('preferRelativeResize')
+    __tag__ = "pic:cNvPicPr"
+    __nspfxs__ = ("pic",)
+    __attrs__ = "preferRelativeResize"
 
 
 class CT_PictureBuilder(BaseBuilder):
-    __tag__ = 'pic:pic'
-    __nspfxs__ = ('pic',)
+    __tag__ = "pic:pic"
+    __nspfxs__ = ("pic",)
     __attrs__ = ()
 
 
 class CT_PictureNonVisualBuilder(BaseBuilder):
-    __tag__ = 'pic:nvPicPr'
-    __nspfxs__ = ('pic',)
+    __tag__ = "pic:nvPicPr"
+    __nspfxs__ = ("pic",)
     __attrs__ = ()
 
 
 class CT_Point2DBuilder(BaseBuilder):
-    __tag__ = 'a:off'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('x', 'y')
+    __tag__ = "a:off"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("x", "y")
 
 
 class CT_PositiveSize2DBuilder(BaseBuilder):
     __nspfxs__ = ()
-    __attrs__ = ('cx', 'cy')
+    __attrs__ = ("cx", "cy")
 
     def __init__(self, tag):
         self.__tag__ = tag
@@ -98,33 +98,33 @@ def __init__(self, tag):
 
 
 class CT_PresetGeometry2DBuilder(BaseBuilder):
-    __tag__ = 'a:prstGeom'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('prst',)
+    __tag__ = "a:prstGeom"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("prst",)
 
 
 class CT_RelativeRectBuilder(BaseBuilder):
-    __tag__ = 'a:fillRect'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('l', 't', 'r', 'b')
+    __tag__ = "a:fillRect"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("l", "t", "r", "b")
 
 
 class CT_ShapePropertiesBuilder(BaseBuilder):
-    __tag__ = 'pic:spPr'
-    __nspfxs__ = ('pic', 'a')
-    __attrs__ = ('bwMode',)
+    __tag__ = "pic:spPr"
+    __nspfxs__ = ("pic", "a")
+    __attrs__ = ("bwMode",)
 
 
 class CT_StretchInfoPropertiesBuilder(BaseBuilder):
-    __tag__ = 'a:stretch'
-    __nspfxs__ = ('a',)
+    __tag__ = "a:stretch"
+    __nspfxs__ = ("a",)
     __attrs__ = ()
 
 
 class CT_Transform2DBuilder(BaseBuilder):
-    __tag__ = 'a:xfrm'
-    __nspfxs__ = ('a',)
-    __attrs__ = ('rot', 'flipH', 'flipV')
+    __tag__ = "a:xfrm"
+    __nspfxs__ = ("a",)
+    __attrs__ = ("rot", "flipH", "flipV")
 
 
 def a_blip():
@@ -144,11 +144,11 @@ def a_cNvPicPr():
 
 
 def a_cNvPr():
-    return CT_NonVisualDrawingPropsBuilder('pic:cNvPr')
+    return CT_NonVisualDrawingPropsBuilder("pic:cNvPr")
 
 
 def a_docPr():
-    return CT_NonVisualDrawingPropsBuilder('wp:docPr')
+    return CT_NonVisualDrawingPropsBuilder("wp:docPr")
 
 
 def a_drawing():
@@ -184,11 +184,11 @@ def a_stretch():
 
 
 def an_ext():
-    return CT_PositiveSize2DBuilder('a:ext')
+    return CT_PositiveSize2DBuilder("a:ext")
 
 
 def an_extent():
-    return CT_PositiveSize2DBuilder('wp:extent')
+    return CT_PositiveSize2DBuilder("wp:extent")
 
 
 def an_inline():
diff --git a/tests/oxml/unitdata/numbering.py b/tests/oxml/unitdata/numbering.py
index 984667b32..92f943fdb 100644
--- a/tests/oxml/unitdata/numbering.py
+++ b/tests/oxml/unitdata/numbering.py
@@ -8,14 +8,14 @@
 
 
 class CT_NumBuilder(BaseBuilder):
-    __tag__ = 'w:num'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:numId')
+    __tag__ = "w:num"
+    __nspfxs__ = ("w",)
+    __attrs__ = "w:numId"
 
 
 class CT_NumberingBuilder(BaseBuilder):
-    __tag__ = 'w:numbering'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:numbering"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
diff --git a/tests/oxml/unitdata/section.py b/tests/oxml/unitdata/section.py
index 2f5f41151..13194f4c2 100644
--- a/tests/oxml/unitdata/section.py
+++ b/tests/oxml/unitdata/section.py
@@ -8,30 +8,35 @@
 
 
 class CT_PageMarBuilder(BaseBuilder):
-    __tag__ = 'w:pgMar'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:pgMar"
+    __nspfxs__ = ("w",)
     __attrs__ = (
-        'w:top', 'w:right', 'w:bottom', 'w:left', 'w:header', 'w:footer',
-        'w:gutter'
+        "w:top",
+        "w:right",
+        "w:bottom",
+        "w:left",
+        "w:header",
+        "w:footer",
+        "w:gutter",
     )
 
 
 class CT_PageSzBuilder(BaseBuilder):
-    __tag__ = 'w:pgSz'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:w', 'w:h', 'w:orient', 'w:code')
+    __tag__ = "w:pgSz"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:w", "w:h", "w:orient", "w:code")
 
 
 class CT_SectPrBuilder(BaseBuilder):
-    __tag__ = 'w:sectPr'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:sectPr"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_SectTypeBuilder(BaseBuilder):
-    __tag__ = 'w:type'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:val',)
+    __tag__ = "w:type"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:val",)
 
 
 def a_pgMar():
diff --git a/tests/oxml/unitdata/shared.py b/tests/oxml/unitdata/shared.py
index 4bee3ae0f..a7007862e 100644
--- a/tests/oxml/unitdata/shared.py
+++ b/tests/oxml/unitdata/shared.py
@@ -8,20 +8,20 @@
 
 
 class CT_OnOffBuilder(BaseBuilder):
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:val')
+    __nspfxs__ = ("w",)
+    __attrs__ = "w:val"
 
     def __init__(self, tag):
         self.__tag__ = tag
         super(CT_OnOffBuilder, self).__init__()
 
     def with_val(self, value):
-        self._set_xmlattr('w:val', str(value))
+        self._set_xmlattr("w:val", str(value))
         return self
 
 
 class CT_StringBuilder(BaseBuilder):
-    __nspfxs__ = ('w',)
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
     def __init__(self, tag):
@@ -29,5 +29,5 @@ def __init__(self, tag):
         super(CT_StringBuilder, self).__init__()
 
     def with_val(self, value):
-        self._set_xmlattr('w:val', str(value))
+        self._set_xmlattr("w:val", str(value))
         return self
diff --git a/tests/oxml/unitdata/styles.py b/tests/oxml/unitdata/styles.py
index cf7dd4fa6..0411c93e6 100644
--- a/tests/oxml/unitdata/styles.py
+++ b/tests/oxml/unitdata/styles.py
@@ -8,14 +8,14 @@
 
 
 class CT_StyleBuilder(BaseBuilder):
-    __tag__ = 'w:style'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:type', 'w:styleId', 'w:default', 'w:customStyle')
+    __tag__ = "w:style"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:type", "w:styleId", "w:default", "w:customStyle")
 
 
 class CT_StylesBuilder(BaseBuilder):
-    __tag__ = 'w:styles'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:styles"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
diff --git a/tests/oxml/unitdata/table.py b/tests/oxml/unitdata/table.py
index 5f0cb2722..45536d49a 100644
--- a/tests/oxml/unitdata/table.py
+++ b/tests/oxml/unitdata/table.py
@@ -9,50 +9,50 @@
 
 
 class CT_RowBuilder(BaseBuilder):
-    __tag__ = 'w:tr'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:w',)
+    __tag__ = "w:tr"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:w",)
 
 
 class CT_TblBuilder(BaseBuilder):
-    __tag__ = 'w:tbl'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:tbl"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_TblGridBuilder(BaseBuilder):
-    __tag__ = 'w:tblGrid'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:w',)
+    __tag__ = "w:tblGrid"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:w",)
 
 
 class CT_TblGridColBuilder(BaseBuilder):
-    __tag__ = 'w:gridCol'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:w',)
+    __tag__ = "w:gridCol"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:w",)
 
 
 class CT_TblPrBuilder(BaseBuilder):
-    __tag__ = 'w:tblPr'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:tblPr"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_TblWidthBuilder(BaseBuilder):
-    __tag__ = 'w:tblW'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:w', 'w:type')
+    __tag__ = "w:tblW"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:w", "w:type")
 
 
 class CT_TcBuilder(BaseBuilder):
-    __tag__ = 'w:tc'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:id',)
+    __tag__ = "w:tc"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:id",)
 
 
 class CT_TcPrBuilder(BaseBuilder):
-    __tag__ = 'w:tcPr'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:tcPr"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
@@ -73,7 +73,7 @@ def a_tblPr():
 
 
 def a_tblStyle():
-    return CT_StringBuilder('w:tblStyle')
+    return CT_StringBuilder("w:tblStyle")
 
 
 def a_tblW():
diff --git a/tests/oxml/unitdata/text.py b/tests/oxml/unitdata/text.py
index 361296147..de1d984d3 100644
--- a/tests/oxml/unitdata/text.py
+++ b/tests/oxml/unitdata/text.py
@@ -9,13 +9,13 @@
 
 
 class CT_BrBuilder(BaseBuilder):
-    __tag__ = 'w:br'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:type', 'w:clear')
+    __tag__ = "w:br"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:type", "w:clear")
 
 
 class CT_EmptyBuilder(BaseBuilder):
-    __nspfxs__ = ('w',)
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
     def __init__(self, tag):
@@ -24,65 +24,63 @@ def __init__(self, tag):
 
 
 class CT_JcBuilder(BaseBuilder):
-    __tag__ = 'w:jc'
-    __nspfxs__ = ('w',)
-    __attrs__ = ('w:val',)
+    __tag__ = "w:jc"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:val",)
 
 
 class CT_PBuilder(BaseBuilder):
-    __tag__ = 'w:p'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:p"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_PPrBuilder(BaseBuilder):
-    __tag__ = 'w:pPr'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:pPr"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_RBuilder(BaseBuilder):
-    __tag__ = 'w:r'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:r"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_RPrBuilder(BaseBuilder):
-    __tag__ = 'w:rPr'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:rPr"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_SectPrBuilder(BaseBuilder):
-    __tag__ = 'w:sectPr'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:sectPr"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
 
 class CT_TextBuilder(BaseBuilder):
-    __tag__ = 'w:t'
-    __nspfxs__ = ('w',)
+    __tag__ = "w:t"
+    __nspfxs__ = ("w",)
     __attrs__ = ()
 
     def with_space(self, value):
-        self._set_xmlattr('xml:space', str(value))
+        self._set_xmlattr("xml:space", str(value))
         return self
 
 
 class CT_UnderlineBuilder(BaseBuilder):
-    __tag__ = 'w:u'
-    __nspfxs__ = ('w',)
-    __attrs__ = (
-        'w:val', 'w:color', 'w:themeColor', 'w:themeTint', 'w:themeShade'
-    )
+    __tag__ = "w:u"
+    __nspfxs__ = ("w",)
+    __attrs__ = ("w:val", "w:color", "w:themeColor", "w:themeTint", "w:themeShade")
 
 
 def a_b():
-    return CT_OnOffBuilder('w:b')
+    return CT_OnOffBuilder("w:b")
 
 
 def a_bCs():
-    return CT_OnOffBuilder('w:bCs')
+    return CT_OnOffBuilder("w:bCs")
 
 
 def a_br():
@@ -90,19 +88,19 @@ def a_br():
 
 
 def a_caps():
-    return CT_OnOffBuilder('w:caps')
+    return CT_OnOffBuilder("w:caps")
 
 
 def a_cr():
-    return CT_EmptyBuilder('w:cr')
+    return CT_EmptyBuilder("w:cr")
 
 
 def a_cs():
-    return CT_OnOffBuilder('w:cs')
+    return CT_OnOffBuilder("w:cs")
 
 
 def a_dstrike():
-    return CT_OnOffBuilder('w:dstrike')
+    return CT_OnOffBuilder("w:dstrike")
 
 
 def a_jc():
@@ -110,39 +108,39 @@ def a_jc():
 
 
 def a_noProof():
-    return CT_OnOffBuilder('w:noProof')
+    return CT_OnOffBuilder("w:noProof")
 
 
 def a_shadow():
-    return CT_OnOffBuilder('w:shadow')
+    return CT_OnOffBuilder("w:shadow")
 
 
 def a_smallCaps():
-    return CT_OnOffBuilder('w:smallCaps')
+    return CT_OnOffBuilder("w:smallCaps")
 
 
 def a_snapToGrid():
-    return CT_OnOffBuilder('w:snapToGrid')
+    return CT_OnOffBuilder("w:snapToGrid")
 
 
 def a_specVanish():
-    return CT_OnOffBuilder('w:specVanish')
+    return CT_OnOffBuilder("w:specVanish")
 
 
 def a_strike():
-    return CT_OnOffBuilder('w:strike')
+    return CT_OnOffBuilder("w:strike")
 
 
 def a_tab():
-    return CT_EmptyBuilder('w:tab')
+    return CT_EmptyBuilder("w:tab")
 
 
 def a_vanish():
-    return CT_OnOffBuilder('w:vanish')
+    return CT_OnOffBuilder("w:vanish")
 
 
 def a_webHidden():
-    return CT_OnOffBuilder('w:webHidden')
+    return CT_OnOffBuilder("w:webHidden")
 
 
 def a_p():
@@ -154,7 +152,7 @@ def a_pPr():
 
 
 def a_pStyle():
-    return CT_StringBuilder('w:pStyle')
+    return CT_StringBuilder("w:pStyle")
 
 
 def a_sectPr():
@@ -170,27 +168,27 @@ def a_u():
 
 
 def an_emboss():
-    return CT_OnOffBuilder('w:emboss')
+    return CT_OnOffBuilder("w:emboss")
 
 
 def an_i():
-    return CT_OnOffBuilder('w:i')
+    return CT_OnOffBuilder("w:i")
 
 
 def an_iCs():
-    return CT_OnOffBuilder('w:iCs')
+    return CT_OnOffBuilder("w:iCs")
 
 
 def an_imprint():
-    return CT_OnOffBuilder('w:imprint')
+    return CT_OnOffBuilder("w:imprint")
 
 
 def an_oMath():
-    return CT_OnOffBuilder('w:oMath')
+    return CT_OnOffBuilder("w:oMath")
 
 
 def an_outline():
-    return CT_OnOffBuilder('w:outline')
+    return CT_OnOffBuilder("w:outline")
 
 
 def an_r():
@@ -202,8 +200,8 @@ def an_rPr():
 
 
 def an_rStyle():
-    return CT_StringBuilder('w:rStyle')
+    return CT_StringBuilder("w:rStyle")
 
 
 def an_rtl():
-    return CT_OnOffBuilder('w:rtl')
+    return CT_OnOffBuilder("w:rtl")
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index d6f0e7731..36616590b 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -24,7 +24,6 @@
 
 
 class DescribeDocumentPart(object):
-
     def it_can_add_a_footer_part(self, package_, FooterPart_, footer_part_, relate_to_):
         FooterPart_.new.return_value = footer_part_
         relate_to_.return_value = "rId12"
@@ -101,7 +100,8 @@ def it_provides_access_to_its_core_properties(self, core_props_fixture):
         assert core_properties is core_properties_
 
     def it_provides_access_to_the_inline_shapes_in_the_document(
-            self, inline_shapes_fixture):
+        self, inline_shapes_fixture
+    ):
         document, InlineShapes_, body_elm = inline_shapes_fixture
         inline_shapes = document.inline_shapes
         InlineShapes_.assert_called_once_with(body_elm, document)
@@ -209,10 +209,7 @@ def core_props_fixture(self, package_, core_properties_):
 
     @pytest.fixture
     def inline_shapes_fixture(self, request, InlineShapes_):
-        document_elm = (
-            a_document().with_nsdecls().with_child(
-                a_body())
-        ).element
+        document_elm = (a_document().with_nsdecls().with_child(a_body())).element
         body_elm = document_elm[0]
         document = DocumentPart(None, None, document_elm, None)
         return document, InlineShapes_, body_elm
@@ -220,12 +217,11 @@ def inline_shapes_fixture(self, request, InlineShapes_):
     @pytest.fixture
     def save_fixture(self, package_):
         document_part = DocumentPart(None, None, None, package_)
-        file_ = 'foobar.docx'
+        file_ = "foobar.docx"
         return document_part, file_
 
     @pytest.fixture
-    def settings_fixture(self, _settings_part_prop_, settings_part_,
-                         settings_):
+    def settings_fixture(self, _settings_part_prop_, settings_part_, settings_):
         document_part = DocumentPart(None, None, None, None)
         _settings_part_prop_.return_value = settings_part_
         settings_part_.settings = settings_
@@ -250,7 +246,7 @@ def drop_rel_(self, request):
 
     @pytest.fixture
     def FooterPart_(self, request):
-        return class_mock(request, 'docx.parts.document.FooterPart')
+        return class_mock(request, "docx.parts.document.FooterPart")
 
     @pytest.fixture
     def footer_part_(self, request):
@@ -258,7 +254,7 @@ def footer_part_(self, request):
 
     @pytest.fixture
     def HeaderPart_(self, request):
-        return class_mock(request, 'docx.parts.document.HeaderPart')
+        return class_mock(request, "docx.parts.document.HeaderPart")
 
     @pytest.fixture
     def header_part_(self, request):
@@ -266,11 +262,11 @@ def header_part_(self, request):
 
     @pytest.fixture
     def InlineShapes_(self, request):
-        return class_mock(request, 'docx.parts.document.InlineShapes')
+        return class_mock(request, "docx.parts.document.InlineShapes")
 
     @pytest.fixture
     def NumberingPart_(self, request):
-        return class_mock(request, 'docx.parts.document.NumberingPart')
+        return class_mock(request, "docx.parts.document.NumberingPart")
 
     @pytest.fixture
     def numbering_part_(self, request):
@@ -282,11 +278,11 @@ def package_(self, request):
 
     @pytest.fixture
     def part_related_by_(self, request):
-        return method_mock(request, DocumentPart, 'part_related_by')
+        return method_mock(request, DocumentPart, "part_related_by")
 
     @pytest.fixture
     def relate_to_(self, request):
-        return method_mock(request, DocumentPart, 'relate_to')
+        return method_mock(request, DocumentPart, "relate_to")
 
     @pytest.fixture
     def related_parts_(self, request):
@@ -294,11 +290,11 @@ def related_parts_(self, request):
 
     @pytest.fixture
     def related_parts_prop_(self, request):
-        return property_mock(request, DocumentPart, 'related_parts')
+        return property_mock(request, DocumentPart, "related_parts")
 
     @pytest.fixture
     def SettingsPart_(self, request):
-        return class_mock(request, 'docx.parts.document.SettingsPart')
+        return class_mock(request, "docx.parts.document.SettingsPart")
 
     @pytest.fixture
     def settings_(self, request):
@@ -310,7 +306,7 @@ def settings_part_(self, request):
 
     @pytest.fixture
     def _settings_part_prop_(self, request):
-        return property_mock(request, DocumentPart, '_settings_part')
+        return property_mock(request, DocumentPart, "_settings_part")
 
     @pytest.fixture
     def style_(self, request):
@@ -322,7 +318,7 @@ def styles_(self, request):
 
     @pytest.fixture
     def StylesPart_(self, request):
-        return class_mock(request, 'docx.parts.document.StylesPart')
+        return class_mock(request, "docx.parts.document.StylesPart")
 
     @pytest.fixture
     def styles_part_(self, request):
@@ -330,8 +326,8 @@ def styles_part_(self, request):
 
     @pytest.fixture
     def styles_prop_(self, request):
-        return property_mock(request, DocumentPart, 'styles')
+        return property_mock(request, DocumentPart, "styles")
 
     @pytest.fixture
     def _styles_part_prop_(self, request):
-        return property_mock(request, DocumentPart, '_styles_part')
+        return property_mock(request, DocumentPart, "_styles_part")
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index 205738036..815b207cc 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -16,7 +16,6 @@
 
 
 class DescribeFooterPart(object):
-
     def it_is_used_by_loader_to_construct_footer_part(
         self, package_, FooterPart_load_, footer_part_
     ):
@@ -85,7 +84,6 @@ def parse_xml_(self, request):
 
 
 class DescribeHeaderPart(object):
-
     def it_is_used_by_loader_to_construct_header_part(
         self, package_, HeaderPart_load_, header_part_
     ):
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
index 1ab2490be..90a59c2fb 100644
--- a/tests/parts/test_image.py
+++ b/tests/parts/test_image.py
@@ -18,7 +18,6 @@
 
 
 class DescribeImagePart(object):
-
     def it_is_used_by_PartFactory_to_construct_image_part(
         self, image_part_load_, partname_, blob_, package_, image_part_
     ):
@@ -51,9 +50,9 @@ def it_knows_its_filename(self, filename_fixture):
         assert image_part.filename == expected_filename
 
     def it_knows_the_sha1_of_its_image(self):
-        blob = b'fO0Bar'
+        blob = b"fO0Bar"
         image_part = ImagePart(None, None, blob)
-        assert image_part.sha1 == '4921e7002ddfba690a937d54bda226a7b8bdeb68'
+        assert image_part.sha1 == "4921e7002ddfba690a937d54bda226a7b8bdeb68"
 
     # fixtures -------------------------------------------------------
 
@@ -61,33 +60,31 @@ def it_knows_the_sha1_of_its_image(self):
     def blob_(self, request):
         return instance_mock(request, str)
 
-    @pytest.fixture(params=['loaded', 'new'])
+    @pytest.fixture(params=["loaded", "new"])
     def dimensions_fixture(self, request):
-        image_file_path = test_file('monty-truth.png')
+        image_file_path = test_file("monty-truth.png")
         image = Image.from_file(image_file_path)
         expected_cx, expected_cy = 1905000, 2717800
 
         # case 1: image part is loaded by PartFactory w/no Image inst
-        if request.param == 'loaded':
-            partname = PackURI('/word/media/image1.png')
+        if request.param == "loaded":
+            partname = PackURI("/word/media/image1.png")
             content_type = CT.PNG
-            image_part = ImagePart.load(
-                partname, content_type, image.blob, None
-            )
+            image_part = ImagePart.load(partname, content_type, image.blob, None)
         # case 2: image part is newly created from image file
-        elif request.param == 'new':
+        elif request.param == "new":
             image_part = ImagePart.from_image(image, None)
 
         return image_part, expected_cx, expected_cy
 
-    @pytest.fixture(params=['loaded', 'new'])
+    @pytest.fixture(params=["loaded", "new"])
     def filename_fixture(self, request, image_):
-        partname = PackURI('/word/media/image666.png')
-        if request.param == 'loaded':
+        partname = PackURI("/word/media/image666.png")
+        if request.param == "loaded":
             image_part = ImagePart(partname, None, None, None)
-            expected_filename = 'image.png'
-        elif request.param == 'new':
-            image_.filename = 'foobar.PXG'
+            expected_filename = "image.png"
+        elif request.param == "new":
+            image_.filename = "foobar.PXG"
             image_part = ImagePart(partname, None, None, image_)
             expected_filename = image_.filename
         return image_part, expected_filename
@@ -106,7 +103,7 @@ def image_part_(self, request):
 
     @pytest.fixture
     def image_part_load_(self, request):
-        return method_mock(request, ImagePart, 'load', autospec=False)
+        return method_mock(request, ImagePart, "load", autospec=False)
 
     @pytest.fixture
     def package_(self, request):
diff --git a/tests/parts/test_numbering.py b/tests/parts/test_numbering.py
index e5292a67c..44dedde78 100644
--- a/tests/parts/test_numbering.py
+++ b/tests/parts/test_numbering.py
@@ -16,11 +16,13 @@
 
 
 class DescribeNumberingPart(object):
-
-    def it_provides_access_to_the_numbering_definitions(
-            self, num_defs_fixture):
-        (numbering_part, _NumberingDefinitions_, numbering_elm_,
-         numbering_definitions_) = num_defs_fixture
+    def it_provides_access_to_the_numbering_definitions(self, num_defs_fixture):
+        (
+            numbering_part,
+            _NumberingDefinitions_,
+            numbering_elm_,
+            numbering_definitions_,
+        ) = num_defs_fixture
         numbering_definitions = numbering_part.numbering_definitions
         _NumberingDefinitions_.assert_called_once_with(numbering_elm_)
         assert numbering_definitions is numbering_definitions_
@@ -29,12 +31,14 @@ def it_provides_access_to_the_numbering_definitions(
 
     @pytest.fixture
     def num_defs_fixture(
-            self, _NumberingDefinitions_, numbering_elm_,
-            numbering_definitions_):
+        self, _NumberingDefinitions_, numbering_elm_, numbering_definitions_
+    ):
         numbering_part = NumberingPart(None, None, numbering_elm_, None)
         return (
-            numbering_part, _NumberingDefinitions_, numbering_elm_,
-            numbering_definitions_
+            numbering_part,
+            _NumberingDefinitions_,
+            numbering_elm_,
+            numbering_definitions_,
         )
 
     # fixture components ---------------------------------------------
@@ -42,8 +46,9 @@ def num_defs_fixture(
     @pytest.fixture
     def _NumberingDefinitions_(self, request, numbering_definitions_):
         return class_mock(
-            request, 'docx.parts.numbering._NumberingDefinitions',
-            return_value=numbering_definitions_
+            request,
+            "docx.parts.numbering._NumberingDefinitions",
+            return_value=numbering_definitions_,
         )
 
     @pytest.fixture
@@ -56,9 +61,7 @@ def numbering_elm_(self, request):
 
 
 class Describe_NumberingDefinitions(object):
-
-    def it_knows_how_many_numbering_definitions_it_contains(
-            self, len_fixture):
+    def it_knows_how_many_numbering_definitions_it_contains(self, len_fixture):
         numbering_definitions, numbering_definition_count = len_fixture
         assert len(numbering_definitions) == numbering_definition_count
 
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index 12c6b1d27..21ba2ec42 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -18,11 +18,10 @@
 
 
 class DescribeSettingsPart(object):
-
     def it_is_used_by_loader_to_construct_settings_part(
         self, load_, package_, settings_part_
     ):
-        partname, blob = 'partname', 'blob'
+        partname, blob = "partname", "blob"
         content_type = CT.WML_SETTINGS
         load_.return_value = settings_part_
 
@@ -41,7 +40,7 @@ def it_constructs_a_default_settings_part_to_help(self):
         package = OpcPackage()
         settings_part = SettingsPart.default(package)
         assert isinstance(settings_part, SettingsPart)
-        assert settings_part.partname == '/word/settings.xml'
+        assert settings_part.partname == "/word/settings.xml"
         assert settings_part.content_type == CT.WML_SETTINGS
         assert settings_part.package is package
         assert len(settings_part.element) == 6
@@ -50,7 +49,7 @@ def it_constructs_a_default_settings_part_to_help(self):
 
     @pytest.fixture
     def settings_fixture(self, Settings_, settings_):
-        settings_elm = element('w:settings')
+        settings_elm = element("w:settings")
         settings_part = SettingsPart(None, None, settings_elm, None)
         return settings_part, Settings_, settings_
 
@@ -58,7 +57,7 @@ def settings_fixture(self, Settings_, settings_):
 
     @pytest.fixture
     def load_(self, request):
-        return method_mock(request, SettingsPart, 'load', autospec=False)
+        return method_mock(request, SettingsPart, "load", autospec=False)
 
     @pytest.fixture
     def package_(self, request):
@@ -67,7 +66,7 @@ def package_(self, request):
     @pytest.fixture
     def Settings_(self, request, settings_):
         return class_mock(
-            request, 'docx.parts.settings.Settings', return_value=settings_
+            request, "docx.parts.settings.Settings", return_value=settings_
         )
 
     @pytest.fixture
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index e42fc49ae..671547582 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -21,7 +21,6 @@
 
 
 class DescribeBaseStoryPart(object):
-
     def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
         package_.get_or_add_image_part.return_value = image_part_
         relate_to_.return_value = "rId42"
diff --git a/tests/parts/test_styles.py b/tests/parts/test_styles.py
index 8ff600359..0f2a7b11d 100644
--- a/tests/parts/test_styles.py
+++ b/tests/parts/test_styles.py
@@ -18,7 +18,6 @@
 
 
 class DescribeStylesPart(object):
-
     def it_provides_access_to_its_styles(self, styles_fixture):
         styles_part, Styles_, styles_ = styles_fixture
         styles = styles_part.styles
@@ -29,7 +28,7 @@ def it_can_construct_a_default_styles_part_to_help(self):
         package = OpcPackage()
         styles_part = StylesPart.default(package)
         assert isinstance(styles_part, StylesPart)
-        assert styles_part.partname == '/word/styles.xml'
+        assert styles_part.partname == "/word/styles.xml"
         assert styles_part.content_type == CT.WML_STYLES
         assert styles_part.package is package
         assert len(styles_part.element) == 6
@@ -45,9 +44,7 @@ def styles_fixture(self, Styles_, styles_elm_, styles_):
 
     @pytest.fixture
     def Styles_(self, request, styles_):
-        return class_mock(
-            request, 'docx.parts.styles.Styles', return_value=styles_
-        )
+        return class_mock(request, "docx.parts.styles.Styles", return_value=styles_)
 
     @pytest.fixture
     def styles_(self, request):
diff --git a/tests/styles/test_latent.py b/tests/styles/test_latent.py
index f42214cf6..ee4bead87 100644
--- a/tests/styles/test_latent.py
+++ b/tests/styles/test_latent.py
@@ -4,9 +4,7 @@
 Unit test suite for the docx.styles.latent module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -16,7 +14,6 @@
 
 
 class DescribeLatentStyle(object):
-
     def it_can_delete_itself(self, delete_fixture):
         latent_style, latent_styles, expected_xml = delete_fixture
         latent_style.delete()
@@ -50,77 +47,87 @@ def it_can_change_its_on_off_properties(self, on_off_set_fixture):
 
     @pytest.fixture
     def delete_fixture(self):
-        latent_styles = element('w:latentStyles/w:lsdException{w:name=Foo}')
+        latent_styles = element("w:latentStyles/w:lsdException{w:name=Foo}")
         latent_style = _LatentStyle(latent_styles[0])
-        expected_xml = xml('w:latentStyles')
+        expected_xml = xml("w:latentStyles")
         return latent_style, latent_styles, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:lsdException{w:name=heading 1}', 'Heading 1'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:lsdException{w:name=heading 1}", "Heading 1"),
+        ]
+    )
     def name_get_fixture(self, request):
         lsdException_cxml, expected_value = request.param
         latent_style = _LatentStyle(element(lsdException_cxml))
         return latent_style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:lsdException',                     'hidden',           None),
-        ('w:lsdException',                     'locked',           None),
-        ('w:lsdException',                     'quick_style',      None),
-        ('w:lsdException',                     'unhide_when_used', None),
-        ('w:lsdException{w:semiHidden=1}',     'hidden',           True),
-        ('w:lsdException{w:locked=1}',         'locked',           True),
-        ('w:lsdException{w:qFormat=1}',        'quick_style',      True),
-        ('w:lsdException{w:unhideWhenUsed=1}', 'unhide_when_used', True),
-        ('w:lsdException{w:semiHidden=0}',     'hidden',           False),
-        ('w:lsdException{w:locked=0}',         'locked',           False),
-        ('w:lsdException{w:qFormat=0}',        'quick_style',      False),
-        ('w:lsdException{w:unhideWhenUsed=0}', 'unhide_when_used', False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:lsdException", "hidden", None),
+            ("w:lsdException", "locked", None),
+            ("w:lsdException", "quick_style", None),
+            ("w:lsdException", "unhide_when_used", None),
+            ("w:lsdException{w:semiHidden=1}", "hidden", True),
+            ("w:lsdException{w:locked=1}", "locked", True),
+            ("w:lsdException{w:qFormat=1}", "quick_style", True),
+            ("w:lsdException{w:unhideWhenUsed=1}", "unhide_when_used", True),
+            ("w:lsdException{w:semiHidden=0}", "hidden", False),
+            ("w:lsdException{w:locked=0}", "locked", False),
+            ("w:lsdException{w:qFormat=0}", "quick_style", False),
+            ("w:lsdException{w:unhideWhenUsed=0}", "unhide_when_used", False),
+        ]
+    )
     def on_off_get_fixture(self, request):
         lsdException_cxml, prop_name, expected_value = request.param
         latent_style = _LatentStyle(element(lsdException_cxml))
         return latent_style, prop_name, expected_value
 
-    @pytest.fixture(params=[
-        ('w:lsdException',                 'hidden',           True,
-         'w:lsdException{w:semiHidden=1}'),
-        ('w:lsdException{w:semiHidden=1}', 'hidden',           False,
-         'w:lsdException{w:semiHidden=0}'),
-        ('w:lsdException{w:semiHidden=0}', 'hidden',           None,
-         'w:lsdException'),
-        ('w:lsdException',                 'locked',           True,
-         'w:lsdException{w:locked=1}'),
-        ('w:lsdException',                 'quick_style',      False,
-         'w:lsdException{w:qFormat=0}'),
-        ('w:lsdException',                 'unhide_when_used', True,
-         'w:lsdException{w:unhideWhenUsed=1}'),
-        ('w:lsdException{w:locked=1}',     'locked',           None,
-         'w:lsdException'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:lsdException", "hidden", True, "w:lsdException{w:semiHidden=1}"),
+            (
+                "w:lsdException{w:semiHidden=1}",
+                "hidden",
+                False,
+                "w:lsdException{w:semiHidden=0}",
+            ),
+            ("w:lsdException{w:semiHidden=0}", "hidden", None, "w:lsdException"),
+            ("w:lsdException", "locked", True, "w:lsdException{w:locked=1}"),
+            ("w:lsdException", "quick_style", False, "w:lsdException{w:qFormat=0}"),
+            (
+                "w:lsdException",
+                "unhide_when_used",
+                True,
+                "w:lsdException{w:unhideWhenUsed=1}",
+            ),
+            ("w:lsdException{w:locked=1}", "locked", None, "w:lsdException"),
+        ]
+    )
     def on_off_set_fixture(self, request):
         lsdException_cxml, prop_name, value, expected_cxml = request.param
         latent_styles = _LatentStyle(element(lsdException_cxml))
         expected_xml = xml(expected_cxml)
         return latent_styles, prop_name, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:lsdException',                  None),
-        ('w:lsdException{w:uiPriority=42}', 42),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:lsdException", None),
+            ("w:lsdException{w:uiPriority=42}", 42),
+        ]
+    )
     def priority_get_fixture(self, request):
         lsdException_cxml, expected_value = request.param
         latent_style = _LatentStyle(element(lsdException_cxml))
         return latent_style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:lsdException',                  42,
-         'w:lsdException{w:uiPriority=42}'),
-        ('w:lsdException{w:uiPriority=42}', 24,
-         'w:lsdException{w:uiPriority=24}'),
-        ('w:lsdException{w:uiPriority=24}', None,
-         'w:lsdException'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:lsdException", 42, "w:lsdException{w:uiPriority=42}"),
+            ("w:lsdException{w:uiPriority=42}", 24, "w:lsdException{w:uiPriority=24}"),
+            ("w:lsdException{w:uiPriority=24}", None, "w:lsdException"),
+        ]
+    )
     def priority_set_fixture(self, request):
         lsdException_cxml, new_value, expected_cxml = request.param
         latent_style = _LatentStyle(element(lsdException_cxml))
@@ -129,7 +136,6 @@ def priority_set_fixture(self, request):
 
 
 class DescribeLatentStyles(object):
-
     def it_can_add_a_latent_style(self, add_fixture):
         latent_styles, name, expected_xml = add_fixture
 
@@ -193,79 +199,113 @@ def it_can_change_its_boolean_properties(self, bool_prop_set_fixture):
 
     @pytest.fixture
     def add_fixture(self):
-        latent_styles = LatentStyles(element('w:latentStyles'))
-        name = 'Heading 1'
-        expected_xml = xml('w:latentStyles/w:lsdException{w:name=heading 1}')
+        latent_styles = LatentStyles(element("w:latentStyles"))
+        name = "Heading 1"
+        expected_xml = xml("w:latentStyles/w:lsdException{w:name=heading 1}")
         return latent_styles, name, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:latentStyles', 'default_to_hidden',           False),
-        ('w:latentStyles', 'default_to_locked',           False),
-        ('w:latentStyles', 'default_to_quick_style',      False),
-        ('w:latentStyles', 'default_to_unhide_when_used', False),
-        ('w:latentStyles{w:defSemiHidden=1}',
-         'default_to_hidden',           True),
-        ('w:latentStyles{w:defLockedState=0}',
-         'default_to_locked',           False),
-        ('w:latentStyles{w:defQFormat=on}',
-         'default_to_quick_style',      True),
-        ('w:latentStyles{w:defUnhideWhenUsed=false}',
-         'default_to_unhide_when_used', False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", "default_to_hidden", False),
+            ("w:latentStyles", "default_to_locked", False),
+            ("w:latentStyles", "default_to_quick_style", False),
+            ("w:latentStyles", "default_to_unhide_when_used", False),
+            ("w:latentStyles{w:defSemiHidden=1}", "default_to_hidden", True),
+            ("w:latentStyles{w:defLockedState=0}", "default_to_locked", False),
+            ("w:latentStyles{w:defQFormat=on}", "default_to_quick_style", True),
+            (
+                "w:latentStyles{w:defUnhideWhenUsed=false}",
+                "default_to_unhide_when_used",
+                False,
+            ),
+        ]
+    )
     def bool_prop_get_fixture(self, request):
         latentStyles_cxml, prop_name, expected_value = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         return latent_styles, prop_name, expected_value
 
-    @pytest.fixture(params=[
-        ('w:latentStyles', 'default_to_hidden',           True,
-         'w:latentStyles{w:defSemiHidden=1}'),
-        ('w:latentStyles', 'default_to_locked',           False,
-         'w:latentStyles{w:defLockedState=0}'),
-        ('w:latentStyles', 'default_to_quick_style',      True,
-         'w:latentStyles{w:defQFormat=1}'),
-        ('w:latentStyles', 'default_to_unhide_when_used', False,
-         'w:latentStyles{w:defUnhideWhenUsed=0}'),
-        ('w:latentStyles{w:defSemiHidden=0}',  'default_to_hidden', 'Foo',
-         'w:latentStyles{w:defSemiHidden=1}'),
-        ('w:latentStyles{w:defLockedState=1}', 'default_to_locked', None,
-         'w:latentStyles{w:defLockedState=0}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:latentStyles",
+                "default_to_hidden",
+                True,
+                "w:latentStyles{w:defSemiHidden=1}",
+            ),
+            (
+                "w:latentStyles",
+                "default_to_locked",
+                False,
+                "w:latentStyles{w:defLockedState=0}",
+            ),
+            (
+                "w:latentStyles",
+                "default_to_quick_style",
+                True,
+                "w:latentStyles{w:defQFormat=1}",
+            ),
+            (
+                "w:latentStyles",
+                "default_to_unhide_when_used",
+                False,
+                "w:latentStyles{w:defUnhideWhenUsed=0}",
+            ),
+            (
+                "w:latentStyles{w:defSemiHidden=0}",
+                "default_to_hidden",
+                "Foo",
+                "w:latentStyles{w:defSemiHidden=1}",
+            ),
+            (
+                "w:latentStyles{w:defLockedState=1}",
+                "default_to_locked",
+                None,
+                "w:latentStyles{w:defLockedState=0}",
+            ),
+        ]
+    )
     def bool_prop_set_fixture(self, request):
         latentStyles_cxml, prop_name, value, expected_cxml = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         expected_xml = xml(expected_cxml)
         return latent_styles, prop_name, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:latentStyles',             None),
-        ('w:latentStyles{w:count=42}', 42),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", None),
+            ("w:latentStyles{w:count=42}", 42),
+        ]
+    )
     def count_get_fixture(self, request):
         latentStyles_cxml, expected_value = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         return latent_styles, expected_value
 
-    @pytest.fixture(params=[
-        ('w:latentStyles',             42,   'w:latentStyles{w:count=42}'),
-        ('w:latentStyles{w:count=24}', 42,   'w:latentStyles{w:count=42}'),
-        ('w:latentStyles{w:count=24}', None, 'w:latentStyles'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", 42, "w:latentStyles{w:count=42}"),
+            ("w:latentStyles{w:count=24}", 42, "w:latentStyles{w:count=42}"),
+            ("w:latentStyles{w:count=24}", None, "w:latentStyles"),
+        ]
+    )
     def count_set_fixture(self, request):
         latentStyles_cxml, value, expected_cxml = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         expected_xml = xml(expected_cxml)
         return latent_styles, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:lsdException{w:name=Ab},w:lsdException,w:lsdException', 'Ab', 0),
-        ('w:lsdException,w:lsdException{w:name=Cd},w:lsdException', 'Cd', 1),
-        ('w:lsdException,w:lsdException,w:lsdException{w:name=Ef}', 'Ef', 2),
-        ('w:lsdException{w:name=heading 1}', 'Heading 1', 0),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:lsdException{w:name=Ab},w:lsdException,w:lsdException", "Ab", 0),
+            ("w:lsdException,w:lsdException{w:name=Cd},w:lsdException", "Cd", 1),
+            ("w:lsdException,w:lsdException,w:lsdException{w:name=Ef}", "Ef", 2),
+            ("w:lsdException{w:name=heading 1}", "Heading 1", 0),
+        ]
+    )
     def getitem_fixture(self, request):
         cxml, name, idx = request.param
-        latentStyles_cxml = 'w:latentStyles/(%s)' % cxml
+        latentStyles_cxml = "w:latentStyles/(%s)" % cxml
         latentStyles = element(latentStyles_cxml)
         lsdException = latentStyles[idx]
         latent_styles = LatentStyles(latentStyles)
@@ -273,46 +313,55 @@ def getitem_fixture(self, request):
 
     @pytest.fixture
     def getitem_raises_fixture(self):
-        latent_styles = LatentStyles(element('w:latentStyles'))
-        return latent_styles, 'Foobar'
-
-    @pytest.fixture(params=[
-        ('w:latentStyles',                                  0),
-        ('w:latentStyles/w:lsdException',                   1),
-        ('w:latentStyles/(w:lsdException,w:lsdException)',  2),
-    ])
+        latent_styles = LatentStyles(element("w:latentStyles"))
+        return latent_styles, "Foobar"
+
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", 0),
+            ("w:latentStyles/w:lsdException", 1),
+            ("w:latentStyles/(w:lsdException,w:lsdException)", 2),
+        ]
+    )
     def iter_fixture(self, request):
         latentStyles_cxml, count = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         return latent_styles, count
 
-    @pytest.fixture(params=[
-        ('w:latentStyles',                                  0),
-        ('w:latentStyles/w:lsdException',                   1),
-        ('w:latentStyles/(w:lsdException,w:lsdException)',  2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", 0),
+            ("w:latentStyles/w:lsdException", 1),
+            ("w:latentStyles/(w:lsdException,w:lsdException)", 2),
+        ]
+    )
     def len_fixture(self, request):
         latentStyles_cxml, count = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         return latent_styles, count
 
-    @pytest.fixture(params=[
-        ('w:latentStyles',                     None),
-        ('w:latentStyles{w:defUIPriority=42}', 42),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", None),
+            ("w:latentStyles{w:defUIPriority=42}", 42),
+        ]
+    )
     def priority_get_fixture(self, request):
         latentStyles_cxml, expected_value = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
         return latent_styles, expected_value
 
-    @pytest.fixture(params=[
-        ('w:latentStyles',                     42,
-         'w:latentStyles{w:defUIPriority=42}'),
-        ('w:latentStyles{w:defUIPriority=24}', 42,
-         'w:latentStyles{w:defUIPriority=42}'),
-        ('w:latentStyles{w:defUIPriority=24}', None,
-         'w:latentStyles'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:latentStyles", 42, "w:latentStyles{w:defUIPriority=42}"),
+            (
+                "w:latentStyles{w:defUIPriority=24}",
+                42,
+                "w:latentStyles{w:defUIPriority=42}",
+            ),
+            ("w:latentStyles{w:defUIPriority=24}", None, "w:latentStyles"),
+        ]
+    )
     def priority_set_fixture(self, request):
         latentStyles_cxml, value, expected_cxml = request.param
         latent_styles = LatentStyles(element(latentStyles_cxml))
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index 437e390e1..caa281db8 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -4,16 +4,18 @@
 Test suite for the docx.styles.style module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.styles.style import (
-    BaseStyle, _CharacterStyle, _ParagraphStyle, _NumberingStyle,
-    StyleFactory, _TableStyle
+    BaseStyle,
+    _CharacterStyle,
+    _ParagraphStyle,
+    _NumberingStyle,
+    StyleFactory,
+    _TableStyle,
 )
 from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
@@ -23,7 +25,6 @@
 
 
 class DescribeStyleFactory(object):
-
     def it_constructs_the_right_type_of_style(self, factory_fixture):
         style_elm, StyleCls_, style_ = factory_fixture
         style = StyleFactory(style_elm)
@@ -32,19 +33,27 @@ def it_constructs_the_right_type_of_style(self, factory_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=['paragraph', 'character', 'table', 'numbering'])
+    @pytest.fixture(params=["paragraph", "character", "table", "numbering"])
     def factory_fixture(
-            self, request, paragraph_style_, _ParagraphStyle_,
-            character_style_, _CharacterStyle_, table_style_, _TableStyle_,
-            numbering_style_, _NumberingStyle_):
+        self,
+        request,
+        paragraph_style_,
+        _ParagraphStyle_,
+        character_style_,
+        _CharacterStyle_,
+        table_style_,
+        _TableStyle_,
+        numbering_style_,
+        _NumberingStyle_,
+    ):
         type_attr_val = request.param
         StyleCls_, style_mock = {
-            'paragraph': (_ParagraphStyle_, paragraph_style_),
-            'character': (_CharacterStyle_, character_style_),
-            'table':     (_TableStyle_,     table_style_),
-            'numbering': (_NumberingStyle_, numbering_style_),
+            "paragraph": (_ParagraphStyle_, paragraph_style_),
+            "character": (_CharacterStyle_, character_style_),
+            "table": (_TableStyle_, table_style_),
+            "numbering": (_NumberingStyle_, numbering_style_),
         }[request.param]
-        style_cxml = 'w:style{w:type=%s}' % type_attr_val
+        style_cxml = "w:style{w:type=%s}" % type_attr_val
         style_elm = element(style_cxml)
         return style_elm, StyleCls_, style_mock
 
@@ -53,8 +62,7 @@ def factory_fixture(
     @pytest.fixture
     def _ParagraphStyle_(self, request, paragraph_style_):
         return class_mock(
-            request, 'docx.styles.style._ParagraphStyle',
-            return_value=paragraph_style_
+            request, "docx.styles.style._ParagraphStyle", return_value=paragraph_style_
         )
 
     @pytest.fixture
@@ -64,8 +72,7 @@ def paragraph_style_(self, request):
     @pytest.fixture
     def _CharacterStyle_(self, request, character_style_):
         return class_mock(
-            request, 'docx.styles.style._CharacterStyle',
-            return_value=character_style_
+            request, "docx.styles.style._CharacterStyle", return_value=character_style_
         )
 
     @pytest.fixture
@@ -75,8 +82,7 @@ def character_style_(self, request):
     @pytest.fixture
     def _TableStyle_(self, request, table_style_):
         return class_mock(
-            request, 'docx.styles.style._TableStyle',
-            return_value=table_style_
+            request, "docx.styles.style._TableStyle", return_value=table_style_
         )
 
     @pytest.fixture
@@ -86,8 +92,7 @@ def table_style_(self, request):
     @pytest.fixture
     def _NumberingStyle_(self, request, numbering_style_):
         return class_mock(
-            request, 'docx.styles.style._NumberingStyle',
-            return_value=numbering_style_
+            request, "docx.styles.style._NumberingStyle", return_value=numbering_style_
         )
 
     @pytest.fixture
@@ -96,7 +101,6 @@ def numbering_style_(self, request):
 
 
 class DescribeBaseStyle(object):
-
     def it_knows_its_style_id(self, id_get_fixture):
         style, expected_value = id_get_fixture
         assert style.style_id == expected_value
@@ -176,11 +180,13 @@ def it_can_delete_itself_from_the_document(self, delete_fixture):
 
     # fixture --------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:style',                  True),
-        ('w:style{w:customStyle=0}', True),
-        ('w:style{w:customStyle=1}', False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", True),
+            ("w:style{w:customStyle=0}", True),
+            ("w:style{w:customStyle=1}", False),
+        ]
+    )
     def builtin_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
@@ -188,186 +194,207 @@ def builtin_get_fixture(self, request):
 
     @pytest.fixture
     def delete_fixture(self):
-        styles = element('w:styles/w:style')
+        styles = element("w:styles/w:style")
         style = BaseStyle(styles[0])
-        expected_xml = xml('w:styles')
+        expected_xml = xml("w:styles")
         return style, styles, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style',                       False),
-        ('w:style/w:semiHidden',          True),
-        ('w:style/w:semiHidden{w:val=0}', False),
-        ('w:style/w:semiHidden{w:val=1}', True),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", False),
+            ("w:style/w:semiHidden", True),
+            ("w:style/w:semiHidden{w:val=0}", False),
+            ("w:style/w:semiHidden{w:val=1}", True),
+        ]
+    )
     def hidden_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                       True,  'w:style/w:semiHidden'),
-        ('w:style/w:semiHidden{w:val=0}', True,  'w:style/w:semiHidden'),
-        ('w:style/w:semiHidden{w:val=1}', True,  'w:style/w:semiHidden'),
-        ('w:style',                       False, 'w:style'),
-        ('w:style/w:semiHidden',          False, 'w:style'),
-        ('w:style/w:semiHidden{w:val=1}', False, 'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", True, "w:style/w:semiHidden"),
+            ("w:style/w:semiHidden{w:val=0}", True, "w:style/w:semiHidden"),
+            ("w:style/w:semiHidden{w:val=1}", True, "w:style/w:semiHidden"),
+            ("w:style", False, "w:style"),
+            ("w:style/w:semiHidden", False, "w:style"),
+            ("w:style/w:semiHidden{w:val=1}", False, "w:style"),
+        ]
+    )
     def hidden_set_fixture(self, request):
         style_cxml, value, expected_cxml = request.param
         style = BaseStyle(element(style_cxml))
         expected_xml = xml(expected_cxml)
         return style, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style',                   None),
-        ('w:style{w:styleId=Foobar}', 'Foobar'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", None),
+            ("w:style{w:styleId=Foobar}", "Foobar"),
+        ]
+    )
     def id_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                'Foo', 'w:style{w:styleId=Foo}'),
-        ('w:style{w:styleId=Foo}', 'Bar', 'w:style{w:styleId=Bar}'),
-        ('w:style{w:styleId=Bar}', None,  'w:style'),
-        ('w:style',                None,  'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", "Foo", "w:style{w:styleId=Foo}"),
+            ("w:style{w:styleId=Foo}", "Bar", "w:style{w:styleId=Bar}"),
+            ("w:style{w:styleId=Bar}", None, "w:style"),
+            ("w:style", None, "w:style"),
+        ]
+    )
     def id_set_fixture(self, request):
         style_cxml, new_value, expected_style_cxml = request.param
         style = BaseStyle(element(style_cxml))
         expected_xml = xml(expected_style_cxml)
         return style, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style',                   False),
-        ('w:style/w:locked',          True),
-        ('w:style/w:locked{w:val=0}', False),
-        ('w:style/w:locked{w:val=1}', True),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", False),
+            ("w:style/w:locked", True),
+            ("w:style/w:locked{w:val=0}", False),
+            ("w:style/w:locked{w:val=1}", True),
+        ]
+    )
     def locked_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                   True,  'w:style/w:locked'),
-        ('w:style/w:locked{w:val=0}', True,  'w:style/w:locked'),
-        ('w:style/w:locked{w:val=1}', True,  'w:style/w:locked'),
-        ('w:style',                   False, 'w:style'),
-        ('w:style/w:locked',          False, 'w:style'),
-        ('w:style/w:locked{w:val=1}', False, 'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", True, "w:style/w:locked"),
+            ("w:style/w:locked{w:val=0}", True, "w:style/w:locked"),
+            ("w:style/w:locked{w:val=1}", True, "w:style/w:locked"),
+            ("w:style", False, "w:style"),
+            ("w:style/w:locked", False, "w:style"),
+            ("w:style/w:locked{w:val=1}", False, "w:style"),
+        ]
+    )
     def locked_set_fixture(self, request):
         style_cxml, value, expected_cxml = request.param
         style = BaseStyle(element(style_cxml))
         expected_xml = xml(expected_cxml)
         return style, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style{w:type=table}',                         None),
-        ('w:style{w:type=table}/w:name{w:val=Boofar}',    'Boofar'),
-        ('w:style{w:type=table}/w:name{w:val=heading 1}', 'Heading 1'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style{w:type=table}", None),
+            ("w:style{w:type=table}/w:name{w:val=Boofar}", "Boofar"),
+            ("w:style{w:type=table}/w:name{w:val=heading 1}", "Heading 1"),
+        ]
+    )
     def name_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                   'Foo', 'w:style/w:name{w:val=Foo}'),
-        ('w:style/w:name{w:val=Foo}', 'Bar', 'w:style/w:name{w:val=Bar}'),
-        ('w:style/w:name{w:val=Bar}', None,  'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", "Foo", "w:style/w:name{w:val=Foo}"),
+            ("w:style/w:name{w:val=Foo}", "Bar", "w:style/w:name{w:val=Bar}"),
+            ("w:style/w:name{w:val=Bar}", None, "w:style"),
+        ]
+    )
     def name_set_fixture(self, request):
         style_cxml, new_value, expected_style_cxml = request.param
         style = BaseStyle(element(style_cxml))
         expected_xml = xml(expected_style_cxml)
         return style, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style',                        None),
-        ('w:style/w:uiPriority{w:val=42}', 42),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", None),
+            ("w:style/w:uiPriority{w:val=42}", 42),
+        ]
+    )
     def priority_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                        42,
-         'w:style/w:uiPriority{w:val=42}'),
-        ('w:style/w:uiPriority{w:val=42}', 24,
-         'w:style/w:uiPriority{w:val=24}'),
-        ('w:style/w:uiPriority{w:val=24}', None,
-         'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", 42, "w:style/w:uiPriority{w:val=42}"),
+            ("w:style/w:uiPriority{w:val=42}", 24, "w:style/w:uiPriority{w:val=24}"),
+            ("w:style/w:uiPriority{w:val=24}", None, "w:style"),
+        ]
+    )
     def priority_set_fixture(self, request):
         style_cxml, value, expected_cxml = request.param
         style = BaseStyle(element(style_cxml))
         expected_xml = xml(expected_cxml)
         return style, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style',                     False),
-        ('w:style/w:qFormat',           True),
-        ('w:style/w:qFormat{w:val=0}',  False),
-        ('w:style/w:qFormat{w:val=on}', True),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", False),
+            ("w:style/w:qFormat", True),
+            ("w:style/w:qFormat{w:val=0}", False),
+            ("w:style/w:qFormat{w:val=on}", True),
+        ]
+    )
     def quick_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                     True,  'w:style/w:qFormat'),
-        ('w:style/w:qFormat',           False, 'w:style'),
-        ('w:style/w:qFormat',           True,  'w:style/w:qFormat'),
-        ('w:style/w:qFormat{w:val=0}',  False, 'w:style'),
-        ('w:style/w:qFormat{w:val=on}', True,  'w:style/w:qFormat'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", True, "w:style/w:qFormat"),
+            ("w:style/w:qFormat", False, "w:style"),
+            ("w:style/w:qFormat", True, "w:style/w:qFormat"),
+            ("w:style/w:qFormat{w:val=0}", False, "w:style"),
+            ("w:style/w:qFormat{w:val=on}", True, "w:style/w:qFormat"),
+        ]
+    )
     def quick_set_fixture(self, request):
         style_cxml, new_value, expected_style_cxml = request.param
         style = BaseStyle(element(style_cxml))
         expected_xml = xml(expected_style_cxml)
         return style, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:style',                   WD_STYLE_TYPE.PARAGRAPH),
-        ('w:style{w:type=paragraph}', WD_STYLE_TYPE.PARAGRAPH),
-        ('w:style{w:type=character}', WD_STYLE_TYPE.CHARACTER),
-        ('w:style{w:type=numbering}', WD_STYLE_TYPE.LIST),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", WD_STYLE_TYPE.PARAGRAPH),
+            ("w:style{w:type=paragraph}", WD_STYLE_TYPE.PARAGRAPH),
+            ("w:style{w:type=character}", WD_STYLE_TYPE.CHARACTER),
+            ("w:style{w:type=numbering}", WD_STYLE_TYPE.LIST),
+        ]
+    )
     def type_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                           False),
-        ('w:style/w:unhideWhenUsed',          True),
-        ('w:style/w:unhideWhenUsed{w:val=0}', False),
-        ('w:style/w:unhideWhenUsed{w:val=1}', True),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", False),
+            ("w:style/w:unhideWhenUsed", True),
+            ("w:style/w:unhideWhenUsed{w:val=0}", False),
+            ("w:style/w:unhideWhenUsed{w:val=1}", True),
+        ]
+    )
     def unhide_get_fixture(self, request):
         style_cxml, expected_value = request.param
         style = BaseStyle(element(style_cxml))
         return style, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                           True,
-         'w:style/w:unhideWhenUsed'),
-        ('w:style/w:unhideWhenUsed',          False,
-         'w:style'),
-        ('w:style/w:unhideWhenUsed{w:val=0}', True,
-         'w:style/w:unhideWhenUsed'),
-        ('w:style/w:unhideWhenUsed{w:val=1}', True,
-         'w:style/w:unhideWhenUsed'),
-        ('w:style/w:unhideWhenUsed{w:val=1}', False,
-         'w:style'),
-        ('w:style',                           False,
-         'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", True, "w:style/w:unhideWhenUsed"),
+            ("w:style/w:unhideWhenUsed", False, "w:style"),
+            ("w:style/w:unhideWhenUsed{w:val=0}", True, "w:style/w:unhideWhenUsed"),
+            ("w:style/w:unhideWhenUsed{w:val=1}", True, "w:style/w:unhideWhenUsed"),
+            ("w:style/w:unhideWhenUsed{w:val=1}", False, "w:style"),
+            ("w:style", False, "w:style"),
+        ]
+    )
     def unhide_set_fixture(self, request):
         style_cxml, value, expected_cxml = request.param
         style = BaseStyle(element(style_cxml))
@@ -376,11 +403,8 @@ def unhide_set_fixture(self, request):
 
 
 class Describe_CharacterStyle(object):
-
     def it_knows_which_style_it_is_based_on(self, base_get_fixture):
-        style, StyleFactory_, StyleFactory_calls, base_style_ = (
-            base_get_fixture
-        )
+        style, StyleFactory_, StyleFactory_calls, base_style_ = base_get_fixture
         base_style = style.base_style
 
         assert StyleFactory_.call_args_list == StyleFactory_calls
@@ -399,14 +423,13 @@ def it_provides_access_to_its_font(self, font_fixture):
 
     # fixture --------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:styles/(w:style{w:styleId=Foo},w:style/w:basedOn{w:val=Foo})',
-         1, 0),
-        ('w:styles/(w:style{w:styleId=Foo},w:style/w:basedOn{w:val=Bar})',
-         1, -1),
-        ('w:styles/w:style',
-         0, -1),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles/(w:style{w:styleId=Foo},w:style/w:basedOn{w:val=Foo})", 1, 0),
+            ("w:styles/(w:style{w:styleId=Foo},w:style/w:basedOn{w:val=Bar})", 1, -1),
+            ("w:styles/w:style", 0, -1),
+        ]
+    )
     def base_get_fixture(self, request, StyleFactory_):
         styles_cxml, style_idx, base_style_idx = request.param
         styles = element(styles_cxml)
@@ -420,14 +443,13 @@ def base_get_fixture(self, request, StyleFactory_):
             expected_value = None
         return style, StyleFactory_, StyleFactory_calls, expected_value
 
-    @pytest.fixture(params=[
-        ('w:style',                       'Foo',
-         'w:style/w:basedOn{w:val=Foo}'),
-        ('w:style/w:basedOn{w:val=Foo}',  'Bar',
-         'w:style/w:basedOn{w:val=Bar}'),
-        ('w:style/w:basedOn{w:val=Bar}',  None,
-         'w:style'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:style", "Foo", "w:style/w:basedOn{w:val=Foo}"),
+            ("w:style/w:basedOn{w:val=Foo}", "Bar", "w:style/w:basedOn{w:val=Bar}"),
+            ("w:style/w:basedOn{w:val=Bar}", None, "w:style"),
+        ]
+    )
     def base_set_fixture(self, request, style_):
         style_cxml, base_style_id, expected_style_cxml = request.param
         style = _CharacterStyle(element(style_cxml))
@@ -438,16 +460,14 @@ def base_set_fixture(self, request, style_):
 
     @pytest.fixture
     def font_fixture(self, Font_, font_):
-        style = _CharacterStyle(element('w:style'))
+        style = _CharacterStyle(element("w:style"))
         return style, Font_, font_
 
     # fixture components ---------------------------------------------
 
     @pytest.fixture
     def Font_(self, request, font_):
-        return class_mock(
-            request, 'docx.styles.style.Font', return_value=font_
-        )
+        return class_mock(request, "docx.styles.style.Font", return_value=font_)
 
     @pytest.fixture
     def font_(self, request):
@@ -459,11 +479,10 @@ def style_(self, request):
 
     @pytest.fixture
     def StyleFactory_(self, request):
-        return function_mock(request, 'docx.styles.style.StyleFactory')
+        return function_mock(request, "docx.styles.style.StyleFactory")
 
 
 class Describe_ParagraphStyle(object):
-
     def it_knows_its_next_paragraph_style(self, next_get_fixture):
         style, expected_value = next_get_fixture
         assert style.next_paragraph_style == expected_value
@@ -481,56 +500,61 @@ def it_provides_access_to_its_paragraph_format(self, parfmt_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('H1',   'Body'),
-        ('H2',   'H2'),
-        ('Body', 'Body'),
-        ('Foo',  'Foo'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("H1", "Body"),
+            ("H2", "H2"),
+            ("Body", "Body"),
+            ("Foo", "Foo"),
+        ]
+    )
     def next_get_fixture(self, request):
         style_name, next_style_name = request.param
         styles = element(
-            'w:styles/('
-            'w:style{w:type=paragraph,w:styleId=H1}/w:next{w:val=Body},'
-            'w:style{w:type=paragraph,w:styleId=H2}/w:next{w:val=Char},'
-            'w:style{w:type=paragraph,w:styleId=Body},'
-            'w:style{w:type=paragraph,w:styleId=Foo}/w:next{w:val=Bar},'
-            'w:style{w:type=character,w:styleId=Char})'
+            "w:styles/("
+            "w:style{w:type=paragraph,w:styleId=H1}/w:next{w:val=Body},"
+            "w:style{w:type=paragraph,w:styleId=H2}/w:next{w:val=Char},"
+            "w:style{w:type=paragraph,w:styleId=Body},"
+            "w:style{w:type=paragraph,w:styleId=Foo}/w:next{w:val=Bar},"
+            "w:style{w:type=character,w:styleId=Char})"
         )
-        style_names = ['H1', 'H2', 'Body', 'Foo', 'Char']
+        style_names = ["H1", "H2", "Body", "Foo", "Char"]
         style_elm = styles[style_names.index(style_name)]
         next_style_elm = styles[style_names.index(next_style_name)]
         style = _ParagraphStyle(style_elm)
-        if style_name == 'H1':
+        if style_name == "H1":
             next_style = _ParagraphStyle(next_style_elm)
         else:
             next_style = style
         return style, next_style
 
-    @pytest.fixture(params=[
-        ('H', 'B',  'w:style{w:type=paragraph,w:styleId=H}/w:next{w:val=B}'),
-        ('H', None, 'w:style{w:type=paragraph,w:styleId=H}'),
-        ('H', 'H',  'w:style{w:type=paragraph,w:styleId=H}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("H", "B", "w:style{w:type=paragraph,w:styleId=H}/w:next{w:val=B}"),
+            ("H", None, "w:style{w:type=paragraph,w:styleId=H}"),
+            ("H", "H", "w:style{w:type=paragraph,w:styleId=H}"),
+        ]
+    )
     def next_set_fixture(self, request):
         style_name, next_style_name, style_cxml = request.param
         styles = element(
-            'w:styles/('
-            'w:style{w:type=paragraph,w:styleId=H},'
-            'w:style{w:type=paragraph,w:styleId=B})'
+            "w:styles/("
+            "w:style{w:type=paragraph,w:styleId=H},"
+            "w:style{w:type=paragraph,w:styleId=B})"
         )
-        style_elms = {'H': styles[0], 'B': styles[1]}
+        style_elms = {"H": styles[0], "B": styles[1]}
         style = _ParagraphStyle(style_elms[style_name])
         next_style = (
-            None if next_style_name is None else
-            _ParagraphStyle(style_elms[next_style_name])
+            None
+            if next_style_name is None
+            else _ParagraphStyle(style_elms[next_style_name])
         )
         expected_xml = xml(style_cxml)
         return style, next_style, expected_xml
 
     @pytest.fixture
     def parfmt_fixture(self, ParagraphFormat_, paragraph_format_):
-        style = _ParagraphStyle(element('w:style'))
+        style = _ParagraphStyle(element("w:style"))
         return style, ParagraphFormat_, paragraph_format_
 
     # fixture components ---------------------------------------------
@@ -538,8 +562,7 @@ def parfmt_fixture(self, ParagraphFormat_, paragraph_format_):
     @pytest.fixture
     def ParagraphFormat_(self, request, paragraph_format_):
         return class_mock(
-            request, 'docx.styles.style.ParagraphFormat',
-            return_value=paragraph_format_
+            request, "docx.styles.style.ParagraphFormat", return_value=paragraph_format_
         )
 
     @pytest.fixture
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index 650acf342..c01d2138a 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -13,13 +13,10 @@
 from docx.styles.styles import Styles
 
 from ..unitutil.cxml import element
-from ..unitutil.mock import (
-    call, class_mock, function_mock, instance_mock, method_mock
-)
+from ..unitutil.mock import call, class_mock, function_mock, instance_mock, method_mock
 
 
 class DescribeStyles(object):
-
     def it_supports_the_in_operator_on_style_name(self, in_fixture):
         styles, name, expected_value = in_fixture
         assert (name in styles) is expected_value
@@ -29,9 +26,7 @@ def it_knows_its_length(self, len_fixture):
         assert len(styles) == expected_value
 
     def it_can_iterate_over_its_styles(self, iter_fixture):
-        styles, expected_count, style_, StyleFactory_, expected_calls = (
-            iter_fixture
-        )
+        styles, expected_count, style_, StyleFactory_, expected_calls = iter_fixture
         count = 0
         for style in styles:
             assert style is style_
@@ -39,7 +34,7 @@ def it_can_iterate_over_its_styles(self, iter_fixture):
         assert count == expected_count
         assert StyleFactory_.call_args_list == expected_calls
 
-    @pytest.mark.filterwarnings('ignore::UserWarning')
+    @pytest.mark.filterwarnings("ignore::UserWarning")
     def it_can_get_a_style_by_id(self, getitem_id_fixture):
         styles, key, expected_element = getitem_id_fixture
         style = styles[key]
@@ -144,7 +139,7 @@ def it_gets_a_style_by_id_to_help(self, _get_by_id_fixture):
     def it_gets_a_style_id_from_a_name_to_help(
         self, _getitem_, _get_style_id_from_style_, style_
     ):
-        style_name, style_type, style_id_ = 'Foo Bar', 1, 'FooBar'
+        style_name, style_type, style_id_ = "Foo Bar", 1, "FooBar"
         _getitem_.return_value = style_
         _get_style_id_from_style_.return_value = style_id_
         styles = Styles(None)
@@ -176,37 +171,53 @@ def it_provides_access_to_the_latent_styles(self, latent_styles_fixture):
 
     # fixture --------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('Foo Bar',   'Foo Bar',   WD_STYLE_TYPE.CHARACTER, False),
-        ('Heading 1', 'heading 1', WD_STYLE_TYPE.PARAGRAPH, True),
-    ])
-    def add_fixture(self, request, styles_elm_, _getitem_, style_elm_,
-                    StyleFactory_, style_):
+    @pytest.fixture(
+        params=[
+            ("Foo Bar", "Foo Bar", WD_STYLE_TYPE.CHARACTER, False),
+            ("Heading 1", "heading 1", WD_STYLE_TYPE.PARAGRAPH, True),
+        ]
+    )
+    def add_fixture(
+        self, request, styles_elm_, _getitem_, style_elm_, StyleFactory_, style_
+    ):
         name, name_, style_type, builtin = request.param
         styles = Styles(styles_elm_)
         _getitem_.return_value = None
         styles_elm_.add_style_of_type.return_value = style_elm_
         StyleFactory_.return_value = style_
         return (
-            styles, name, style_type, builtin, name_, StyleFactory_,
-            style_elm_, style_
+            styles,
+            name,
+            style_type,
+            builtin,
+            name_,
+            StyleFactory_,
+            style_elm_,
+            style_,
         )
 
     @pytest.fixture
     def add_raises_fixture(self, _getitem_):
-        styles = Styles(element('w:styles/w:style/w:name{w:val=heading 1}'))
-        name = 'Heading 1'
+        styles = Styles(element("w:styles/w:style/w:name{w:val=heading 1}"))
+        name = "Heading 1"
         return styles, name
 
-    @pytest.fixture(params=[
-        ('w:styles',
-         False, WD_STYLE_TYPE.CHARACTER),
-        ('w:styles/w:style{w:type=paragraph,w:default=1}',
-         True, WD_STYLE_TYPE.PARAGRAPH),
-        ('w:styles/(w:style{w:type=table,w:default=1},w:style{w:type=table,w'
-         ':default=1})',
-         True, WD_STYLE_TYPE.TABLE),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles", False, WD_STYLE_TYPE.CHARACTER),
+            (
+                "w:styles/w:style{w:type=paragraph,w:default=1}",
+                True,
+                WD_STYLE_TYPE.PARAGRAPH,
+            ),
+            (
+                "w:styles/(w:style{w:type=table,w:default=1},w:style{w:type=table,w"
+                ":default=1})",
+                True,
+                WD_STYLE_TYPE.TABLE,
+            ),
+        ]
+    )
     def default_fixture(self, request, StyleFactory_, style_):
         styles_cxml, is_defined, style_type = request.param
         styles_elm = element(styles_cxml)
@@ -214,70 +225,89 @@ def default_fixture(self, request, StyleFactory_, style_):
         StyleFactory_calls = [call(styles_elm[-1])] if is_defined else []
         StyleFactory_.return_value = style_
         expected_value = style_ if is_defined else None
-        return (
-            styles, style_type, StyleFactory_, StyleFactory_calls,
-            expected_value
-        )
-
-    @pytest.fixture(params=[
-        ('w:styles/w:style{w:type=paragraph,w:styleId=Foo}', 'Foo',
-         WD_STYLE_TYPE.PARAGRAPH),
-        ('w:styles/w:style{w:type=paragraph,w:styleId=Foo}', 'Bar',
-         WD_STYLE_TYPE.PARAGRAPH),
-        ('w:styles/w:style{w:type=table,w:styleId=Bar}',     'Bar',
-         WD_STYLE_TYPE.PARAGRAPH),
-    ])
+        return (styles, style_type, StyleFactory_, StyleFactory_calls, expected_value)
+
+    @pytest.fixture(
+        params=[
+            (
+                "w:styles/w:style{w:type=paragraph,w:styleId=Foo}",
+                "Foo",
+                WD_STYLE_TYPE.PARAGRAPH,
+            ),
+            (
+                "w:styles/w:style{w:type=paragraph,w:styleId=Foo}",
+                "Bar",
+                WD_STYLE_TYPE.PARAGRAPH,
+            ),
+            (
+                "w:styles/w:style{w:type=table,w:styleId=Bar}",
+                "Bar",
+                WD_STYLE_TYPE.PARAGRAPH,
+            ),
+        ]
+    )
     def _get_by_id_fixture(self, request, default_, StyleFactory_, style_):
         styles_cxml, style_id, style_type = request.param
         styles_elm = element(styles_cxml)
         style_elm = styles_elm[0]
         styles = Styles(styles_elm)
-        default_calls = [] if style_id == 'Foo' else [call(styles, style_type)]
-        StyleFactory_calls = [call(style_elm)] if style_id == 'Foo' else []
+        default_calls = [] if style_id == "Foo" else [call(styles, style_type)]
+        StyleFactory_calls = [call(style_elm)] if style_id == "Foo" else []
         default_.return_value = StyleFactory_.return_value = style_
         return (
-            styles, style_id, style_type, default_calls, StyleFactory_,
-            StyleFactory_calls, style_
+            styles,
+            style_id,
+            style_type,
+            default_calls,
+            StyleFactory_,
+            StyleFactory_calls,
+            style_,
         )
 
-    @pytest.fixture(params=[
-        ('w:styles/(w:style{%s,w:styleId=Foobar},w:style,w:style)', 0),
-        ('w:styles/(w:style,w:style{%s,w:styleId=Foobar},w:style)', 1),
-        ('w:styles/(w:style,w:style,w:style{%s,w:styleId=Foobar})', 2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles/(w:style{%s,w:styleId=Foobar},w:style,w:style)", 0),
+            ("w:styles/(w:style,w:style{%s,w:styleId=Foobar},w:style)", 1),
+            ("w:styles/(w:style,w:style,w:style{%s,w:styleId=Foobar})", 2),
+        ]
+    )
     def getitem_id_fixture(self, request):
         styles_cxml_tmpl, style_idx = request.param
-        styles_cxml = styles_cxml_tmpl % 'w:type=paragraph'
+        styles_cxml = styles_cxml_tmpl % "w:type=paragraph"
         styles = Styles(element(styles_cxml))
         expected_element = styles._element[style_idx]
-        return styles, 'Foobar', expected_element
-
-    @pytest.fixture(params=[
-        ('w:styles/(w:style%s/w:name{w:val=foo},w:style)', 'foo',       0),
-        ('w:styles/(w:style,w:style%s/w:name{w:val=foo})', 'foo',       1),
-        ('w:styles/w:style%s/w:name{w:val=heading 1}',     'Heading 1', 0),
-    ])
+        return styles, "Foobar", expected_element
+
+    @pytest.fixture(
+        params=[
+            ("w:styles/(w:style%s/w:name{w:val=foo},w:style)", "foo", 0),
+            ("w:styles/(w:style,w:style%s/w:name{w:val=foo})", "foo", 1),
+            ("w:styles/w:style%s/w:name{w:val=heading 1}", "Heading 1", 0),
+        ]
+    )
     def getitem_name_fixture(self, request):
         styles_cxml_tmpl, key, style_idx = request.param
-        styles_cxml = styles_cxml_tmpl % '{w:type=character}'
+        styles_cxml = styles_cxml_tmpl % "{w:type=character}"
         styles = Styles(element(styles_cxml))
         expected_element = styles._element[style_idx]
         return styles, key, expected_element
 
-    @pytest.fixture(params=[
-        ('w:styles/(w:style,w:style/w:name{w:val=foo},w:style)'),
-        ('w:styles/(w:style{w:styleId=foo},w:style,w:style)'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles/(w:style,w:style/w:name{w:val=foo},w:style)"),
+            ("w:styles/(w:style{w:styleId=foo},w:style,w:style)"),
+        ]
+    )
     def get_raises_fixture(self, request):
         styles_cxml = request.param
         styles = Styles(element(styles_cxml))
-        return styles, 'bar'
+        return styles, "bar"
 
     @pytest.fixture(params=[True, False])
     def id_style_fixture(self, request, default_, style_):
         style_is_default = request.param
         styles = Styles(None)
-        style_id, style_type = 'FooBar', 1
+        style_id, style_type = "FooBar", 1
         default_.return_value = style_ if style_is_default else None
         style_.style_id, style_.type = style_id, style_type
         expected_value = None if style_is_default else style_id
@@ -290,23 +320,27 @@ def id_style_raises_fixture(self, style_):
         style_type = 2
         return styles, style_, style_type
 
-    @pytest.fixture(params=[
-        ('w:styles/w:style/w:name{w:val=heading 1}', 'Heading 1', True),
-        ('w:styles/w:style/w:name{w:val=Foo Bar}',   'Foo Bar',   True),
-        ('w:styles/w:style/w:name{w:val=heading 1}', 'Foobar',    False),
-        ('w:styles',                                 'Foobar',    False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles/w:style/w:name{w:val=heading 1}", "Heading 1", True),
+            ("w:styles/w:style/w:name{w:val=Foo Bar}", "Foo Bar", True),
+            ("w:styles/w:style/w:name{w:val=heading 1}", "Foobar", False),
+            ("w:styles", "Foobar", False),
+        ]
+    )
     def in_fixture(self, request):
         styles_cxml, name, expected_value = request.param
         styles = Styles(element(styles_cxml))
         return styles, name, expected_value
 
-    @pytest.fixture(params=[
-        ('w:styles',                           0),
-        ('w:styles/w:style',                   1),
-        ('w:styles/(w:style,w:style)',         2),
-        ('w:styles/(w:style,w:style,w:style)', 3),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles", 0),
+            ("w:styles/w:style", 1),
+            ("w:styles/(w:style,w:style)", 2),
+            ("w:styles/(w:style,w:style,w:style)", 3),
+        ]
+    )
     def iter_fixture(self, request, StyleFactory_, style_):
         styles_cxml, expected_count = request.param
         styles_elm = element(styles_cxml)
@@ -317,15 +351,17 @@ def iter_fixture(self, request, StyleFactory_, style_):
 
     @pytest.fixture
     def latent_styles_fixture(self, LatentStyles_, latent_styles_):
-        styles = Styles(element('w:styles/w:latentStyles'))
+        styles = Styles(element("w:styles/w:latentStyles"))
         return styles, LatentStyles_, latent_styles_
 
-    @pytest.fixture(params=[
-        ('w:styles',                           0),
-        ('w:styles/w:style',                   1),
-        ('w:styles/(w:style,w:style)',         2),
-        ('w:styles/(w:style,w:style,w:style)', 3),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:styles", 0),
+            ("w:styles/w:style", 1),
+            ("w:styles/(w:style,w:style)", 2),
+            ("w:styles/(w:style,w:style,w:style)", 3),
+        ]
+    )
     def len_fixture(self, request):
         styles_cxml, expected_value = request.param
         styles = Styles(element(styles_cxml))
@@ -335,29 +371,28 @@ def len_fixture(self, request):
 
     @pytest.fixture
     def default_(self, request):
-        return method_mock(request, Styles, 'default')
+        return method_mock(request, Styles, "default")
 
     @pytest.fixture
     def _get_by_id_(self, request):
-        return method_mock(request, Styles, '_get_by_id')
+        return method_mock(request, Styles, "_get_by_id")
 
     @pytest.fixture
     def _getitem_(self, request):
-        return method_mock(request, Styles, '__getitem__')
+        return method_mock(request, Styles, "__getitem__")
 
     @pytest.fixture
     def _get_style_id_from_name_(self, request):
-        return method_mock(request, Styles, '_get_style_id_from_name')
+        return method_mock(request, Styles, "_get_style_id_from_name")
 
     @pytest.fixture
     def _get_style_id_from_style_(self, request):
-        return method_mock(request, Styles, '_get_style_id_from_style')
+        return method_mock(request, Styles, "_get_style_id_from_style")
 
     @pytest.fixture
     def LatentStyles_(self, request, latent_styles_):
         return class_mock(
-            request, 'docx.styles.styles.LatentStyles',
-            return_value=latent_styles_
+            request, "docx.styles.styles.LatentStyles", return_value=latent_styles_
         )
 
     @pytest.fixture
@@ -370,7 +405,7 @@ def style_(self, request):
 
     @pytest.fixture
     def StyleFactory_(self, request):
-        return function_mock(request, 'docx.styles.styles.StyleFactory')
+        return function_mock(request, "docx.styles.styles.StyleFactory")
 
     @pytest.fixture
     def style_elm_(self, request):
diff --git a/tests/test_api.py b/tests/test_api.py
index cc3553ccf..23251cf34 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -4,9 +4,7 @@
 Test suite for the docx.api module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
@@ -19,7 +17,6 @@
 
 
 class DescribeDocument(object):
-
     def it_opens_a_docx_file(self, open_fixture):
         docx, Package_, document_ = open_fixture
         document = Document(docx)
@@ -41,7 +38,7 @@ def it_raises_on_not_a_Word_file(self, raise_fixture):
 
     @pytest.fixture
     def default_fixture(self, _default_docx_path_, Package_, document_):
-        docx = 'barfoo.docx'
+        docx = "barfoo.docx"
         _default_docx_path_.return_value = docx
         document_part = Package_.open.return_value.main_document_part
         document_part.document = document_
@@ -50,7 +47,7 @@ def default_fixture(self, _default_docx_path_, Package_, document_):
 
     @pytest.fixture
     def open_fixture(self, Package_, document_):
-        docx = 'foobar.docx'
+        docx = "foobar.docx"
         document_part = Package_.open.return_value.main_document_part
         document_part.document = document_
         document_part.content_type = CT.WML_DOCUMENT_MAIN
@@ -58,15 +55,15 @@ def open_fixture(self, Package_, document_):
 
     @pytest.fixture
     def raise_fixture(self, Package_):
-        not_a_docx = 'foobar.xlsx'
-        Package_.open.return_value.main_document_part.content_type = 'BOGUS'
+        not_a_docx = "foobar.xlsx"
+        Package_.open.return_value.main_document_part.content_type = "BOGUS"
         return not_a_docx
 
     # fixture components ---------------------------------------------
 
     @pytest.fixture
     def _default_docx_path_(self, request):
-        return function_mock(request, 'docx.api._default_docx_path')
+        return function_mock(request, "docx.api._default_docx_path")
 
     @pytest.fixture
     def document_(self, request):
@@ -74,4 +71,4 @@ def document_(self, request):
 
     @pytest.fixture
     def Package_(self, request):
-        return class_mock(request, 'docx.api.Package')
+        return class_mock(request, "docx.api.Package")
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 5bc9bab3f..3fe2d0ff5 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -17,7 +17,6 @@
 
 
 class DescribeBlockItemContainer(object):
-
     def it_can_add_a_paragraph(self, add_paragraph_fixture, _add_paragraph_):
         text, style, paragraph_, add_run_calls = add_paragraph_fixture
         _add_paragraph_.return_value = paragraph_
@@ -37,8 +36,7 @@ def it_can_add_a_table(self, add_table_fixture):
         assert table._element.xml == expected_xml
         assert table._parent is blkcntnr
 
-    def it_provides_access_to_the_paragraphs_it_contains(
-            self, paragraphs_fixture):
+    def it_provides_access_to_the_paragraphs_it_contains(self, paragraphs_fixture):
         # test len(), iterable, and indexed access
         blkcntnr, expected_count = paragraphs_fixture
         paragraphs = blkcntnr.paragraphs
@@ -71,12 +69,14 @@ def it_adds_a_paragraph_to_help(self, _add_paragraph_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('',    None),
-        ('Foo', None),
-        ('',    'Bar'),
-        ('Foo', 'Bar'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("", None),
+            ("Foo", None),
+            ("", "Bar"),
+            ("Foo", "Bar"),
+        ]
+    )
     def add_paragraph_fixture(self, request, paragraph_):
         text, style = request.param
         paragraph_.style = None
@@ -85,37 +85,41 @@ def add_paragraph_fixture(self, request, paragraph_):
 
     @pytest.fixture
     def _add_paragraph_fixture(self, request):
-        blkcntnr_cxml, after_cxml = 'w:body', 'w:body/w:p'
+        blkcntnr_cxml, after_cxml = "w:body", "w:body/w:p"
         blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
         expected_xml = xml(after_cxml)
         return blkcntnr, expected_xml
 
     @pytest.fixture
     def add_table_fixture(self):
-        blkcntnr = BlockItemContainer(element('w:body'), None)
+        blkcntnr = BlockItemContainer(element("w:body"), None)
         rows, cols, width = 2, 2, Inches(2)
-        expected_xml = snippet_seq('new-tbl')[0]
+        expected_xml = snippet_seq("new-tbl")[0]
         return blkcntnr, rows, cols, width, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:body',                 0),
-        ('w:body/w:p',             1),
-        ('w:body/(w:p,w:p)',       2),
-        ('w:body/(w:p,w:tbl)',     1),
-        ('w:body/(w:p,w:tbl,w:p)', 2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:body", 0),
+            ("w:body/w:p", 1),
+            ("w:body/(w:p,w:p)", 2),
+            ("w:body/(w:p,w:tbl)", 1),
+            ("w:body/(w:p,w:tbl,w:p)", 2),
+        ]
+    )
     def paragraphs_fixture(self, request):
         blkcntnr_cxml, expected_count = request.param
         blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
         return blkcntnr, expected_count
 
-    @pytest.fixture(params=[
-        ('w:body',                   0),
-        ('w:body/w:tbl',             1),
-        ('w:body/(w:tbl,w:tbl)',     2),
-        ('w:body/(w:p,w:tbl)',       1),
-        ('w:body/(w:tbl,w:tbl,w:p)', 2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:body", 0),
+            ("w:body/w:tbl", 1),
+            ("w:body/(w:tbl,w:tbl)", 2),
+            ("w:body/(w:p,w:tbl)", 1),
+            ("w:body/(w:tbl,w:tbl,w:p)", 2),
+        ]
+    )
     def tables_fixture(self, request):
         blkcntnr_cxml, expected_count = request.param
         blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
@@ -125,7 +129,7 @@ def tables_fixture(self, request):
 
     @pytest.fixture
     def _add_paragraph_(self, request):
-        return method_mock(request, BlockItemContainer, '_add_paragraph')
+        return method_mock(request, BlockItemContainer, "_add_paragraph")
 
     @pytest.fixture
     def paragraph_(self, request):
diff --git a/tests/test_document.py b/tests/test_document.py
index 0de469c38..27f17f978 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -25,7 +25,6 @@
 
 
 class DescribeDocument(object):
-
     def it_can_add_a_heading(self, add_heading_fixture, add_paragraph_, paragraph_):
         level, style = add_heading_fixture
         add_paragraph_.return_value = paragraph_
@@ -77,7 +76,7 @@ def it_can_add_a_section(
         section = document.add_section(start_type)
 
         assert document.element.xml == expected_xml
-        sectPr = document.element.xpath('w:body/w:sectPr')[0]
+        sectPr = document.element.xpath("w:body/w:sectPr")[0]
         Section_.assert_called_once_with(sectPr, document_part_)
         assert section is section_
 
@@ -108,7 +107,7 @@ def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
         assert paragraphs is paragraphs_
 
     def it_provides_access_to_its_sections(self, document_part_, Sections_, sections_):
-        document_elm = element('w:document')
+        document_elm = element("w:document")
         Sections_.return_value = sections_
         document = Document(document_elm, document_part_)
 
@@ -148,21 +147,25 @@ def it_determines_block_width_to_help(self, block_width_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (0, 'Title'),
-        (1, 'Heading 1'),
-        (2, 'Heading 2'),
-        (9, 'Heading 9'),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, "Title"),
+            (1, "Heading 1"),
+            (2, "Heading 2"),
+            (9, "Heading 9"),
+        ]
+    )
     def add_heading_fixture(self, request):
         level, style = request.param
         return level, style
 
-    @pytest.fixture(params=[
-        ('',         None),
-        ('',         'Heading 1'),
-        ('foo\rbar', 'Body Text'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("", None),
+            ("", "Heading 1"),
+            ("foo\rbar", "Body Text"),
+        ]
+    )
     def add_paragraph_fixture(self, request, body_prop_, paragraph_):
         text, style = request.param
         document = Document(None, None)
@@ -172,32 +175,34 @@ def add_paragraph_fixture(self, request, body_prop_, paragraph_):
     @pytest.fixture
     def add_picture_fixture(self, request, add_paragraph_, run_, picture_):
         document = Document(None, None)
-        path, width, height = 'foobar.png', 100, 200
+        path, width, height = "foobar.png", 100, 200
         add_paragraph_.return_value.add_run.return_value = run_
         run_.add_picture.return_value = picture_
         return document, path, width, height, run_, picture_
 
-    @pytest.fixture(params=[
-        ('w:sectPr',                        WD_SECTION.EVEN_PAGE,
-         'w:sectPr/w:type{w:val=evenPage}'),
-        ('w:sectPr/w:type{w:val=evenPage}', WD_SECTION.ODD_PAGE,
-         'w:sectPr/w:type{w:val=oddPage}'),
-        ('w:sectPr/w:type{w:val=oddPage}',  WD_SECTION.NEW_PAGE,
-         'w:sectPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", WD_SECTION.EVEN_PAGE, "w:sectPr/w:type{w:val=evenPage}"),
+            (
+                "w:sectPr/w:type{w:val=evenPage}",
+                WD_SECTION.ODD_PAGE,
+                "w:sectPr/w:type{w:val=oddPage}",
+            ),
+            ("w:sectPr/w:type{w:val=oddPage}", WD_SECTION.NEW_PAGE, "w:sectPr"),
+        ]
+    )
     def add_section_fixture(self, request):
         sentinel, start_type, new_sentinel = request.param
-        document_elm = element('w:document/w:body/(w:p,%s)' % sentinel)
+        document_elm = element("w:document/w:body/(w:p,%s)" % sentinel)
         expected_xml = xml(
-            'w:document/w:body/(w:p,w:p/w:pPr/%s,%s)' %
-            (sentinel, new_sentinel)
+            "w:document/w:body/(w:p,w:p/w:pPr/%s,%s)" % (sentinel, new_sentinel)
         )
         return document_elm, start_type, expected_xml
 
     @pytest.fixture
     def add_table_fixture(self, _block_width_prop_, body_prop_, table_):
         document = Document(None, None)
-        rows, cols, style = 4, 2, 'Light Shading Accent 1'
+        rows, cols, style = 4, 2, "Light Shading Accent 1"
         body_prop_.return_value.add_table.return_value = table_
         _block_width_prop_.return_value = width = 42
         return document, rows, cols, style, width, table_
@@ -214,7 +219,7 @@ def block_width_fixture(self, sections_prop_, section_):
 
     @pytest.fixture
     def body_fixture(self, _Body_, body_):
-        document_elm = element('w:document/w:body')
+        document_elm = element("w:document/w:body")
         body_elm = document_elm[0]
         document = Document(document_elm, None)
         return document, body_elm, _Body_, body_
@@ -245,7 +250,7 @@ def part_fixture(self, document_part_):
     @pytest.fixture
     def save_fixture(self, document_part_):
         document = Document(None, document_part_)
-        file_ = 'foobar.docx'
+        file_ = "foobar.docx"
         return document, file_
 
     @pytest.fixture
@@ -270,11 +275,11 @@ def tables_fixture(self, body_prop_, tables_):
 
     @pytest.fixture
     def add_paragraph_(self, request):
-        return method_mock(request, Document, 'add_paragraph')
+        return method_mock(request, Document, "add_paragraph")
 
     @pytest.fixture
     def _Body_(self, request, body_):
-        return class_mock(request, 'docx.document._Body', return_value=body_)
+        return class_mock(request, "docx.document._Body", return_value=body_)
 
     @pytest.fixture
     def body_(self, request):
@@ -282,11 +287,11 @@ def body_(self, request):
 
     @pytest.fixture
     def _block_width_prop_(self, request):
-        return property_mock(request, Document, '_block_width')
+        return property_mock(request, Document, "_block_width")
 
     @pytest.fixture
     def body_prop_(self, request, body_):
-        return property_mock(request, Document, '_body', return_value=body_)
+        return property_mock(request, Document, "_body", return_value=body_)
 
     @pytest.fixture
     def core_properties_(self, request):
@@ -318,7 +323,7 @@ def run_(self, request):
 
     @pytest.fixture
     def Section_(self, request):
-        return class_mock(request, 'docx.document.Section')
+        return class_mock(request, "docx.document.Section")
 
     @pytest.fixture
     def section_(self, request):
@@ -326,7 +331,7 @@ def section_(self, request):
 
     @pytest.fixture
     def Sections_(self, request):
-        return class_mock(request, 'docx.document.Sections')
+        return class_mock(request, "docx.document.Sections")
 
     @pytest.fixture
     def sections_(self, request):
@@ -334,7 +339,7 @@ def sections_(self, request):
 
     @pytest.fixture
     def sections_prop_(self, request):
-        return property_mock(request, Document, 'sections')
+        return property_mock(request, Document, "sections")
 
     @pytest.fixture
     def settings_(self, request):
@@ -346,7 +351,7 @@ def styles_(self, request):
 
     @pytest.fixture
     def table_(self, request):
-        return instance_mock(request, Table, style='UNASSIGNED')
+        return instance_mock(request, Table, style="UNASSIGNED")
 
     @pytest.fixture
     def tables_(self, request):
@@ -354,7 +359,6 @@ def tables_(self, request):
 
 
 class Describe_Body(object):
-
     def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
         body, expected_xml = clear_fixture
         _body = body.clear_content()
@@ -363,12 +367,14 @@ def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:body',                 'w:body'),
-        ('w:body/w:p',             'w:body'),
-        ('w:body/w:sectPr',        'w:body/w:sectPr'),
-        ('w:body/(w:p, w:sectPr)', 'w:body/w:sectPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:body", "w:body"),
+            ("w:body/w:p", "w:body"),
+            ("w:body/w:sectPr", "w:body/w:sectPr"),
+            ("w:body/(w:p, w:sectPr)", "w:body/w:sectPr"),
+        ]
+    )
     def clear_fixture(self, request):
         before_cxml, after_cxml = request.param
         body = _Body(element(before_cxml), None)
diff --git a/tests/test_enum.py b/tests/test_enum.py
index edfe595dc..a07795ed5 100644
--- a/tests/test_enum.py
+++ b/tests/test_enum.py
@@ -12,55 +12,58 @@
 import pytest
 
 from docx.enum.base import (
-    alias, Enumeration, EnumMember, ReturnValueOnlyEnumMember,
-    XmlEnumeration, XmlMappedEnumMember
+    alias,
+    Enumeration,
+    EnumMember,
+    ReturnValueOnlyEnumMember,
+    XmlEnumeration,
+    XmlMappedEnumMember,
 )
 
 
-@alias('BARFOO')
+@alias("BARFOO")
 class FOOBAR(Enumeration):
     """
     Enumeration docstring
     """
 
-    __ms_name__ = 'MsoFoobar'
+    __ms_name__ = "MsoFoobar"
 
-    __url__ = 'http://msdn.microsoft.com/foobar.aspx'
+    __url__ = "http://msdn.microsoft.com/foobar.aspx"
 
     __members__ = (
-        EnumMember(None, None, 'No setting/remove setting'),
-        EnumMember('READ_WRITE', 1, 'Readable and settable'),
-        ReturnValueOnlyEnumMember('READ_ONLY', -2, 'Return value only'),
+        EnumMember(None, None, "No setting/remove setting"),
+        EnumMember("READ_WRITE", 1, "Readable and settable"),
+        ReturnValueOnlyEnumMember("READ_ONLY", -2, "Return value only"),
     )
 
 
-@alias('XML-FU')
+@alias("XML-FU")
 class XMLFOO(XmlEnumeration):
     """
     XmlEnumeration docstring
     """
 
-    __ms_name__ = 'MsoXmlFoobar'
+    __ms_name__ = "MsoXmlFoobar"
 
-    __url__ = 'http://msdn.microsoft.com/msoxmlfoobar.aspx'
+    __url__ = "http://msdn.microsoft.com/msoxmlfoobar.aspx"
 
     __members__ = (
-        XmlMappedEnumMember(None, None, None, 'No setting'),
-        XmlMappedEnumMember('XML_RW', 42, 'attrVal', 'Read/write setting'),
-        ReturnValueOnlyEnumMember('RO', -2, 'Return value only;'),
+        XmlMappedEnumMember(None, None, None, "No setting"),
+        XmlMappedEnumMember("XML_RW", 42, "attrVal", "Read/write setting"),
+        ReturnValueOnlyEnumMember("RO", -2, "Return value only;"),
     )
 
 
 class DescribeEnumeration(object):
-
     def it_has_the_right_metaclass(self):
-        assert type(FOOBAR).__name__ == 'MetaEnumeration'
+        assert type(FOOBAR).__name__ == "MetaEnumeration"
 
     def it_provides_an_EnumValue_instance_for_each_named_member(self):
         with pytest.raises(AttributeError):
-            getattr(FOOBAR, 'None')
+            getattr(FOOBAR, "None")
         for obj in (FOOBAR.READ_WRITE, FOOBAR.READ_ONLY):
-            assert type(obj).__name__ == 'EnumValue'
+            assert type(obj).__name__ == "EnumValue"
 
     def it_provides_the_enumeration_value_for_each_named_member(self):
         assert FOOBAR.READ_WRITE == 1
@@ -70,7 +73,7 @@ def it_knows_if_a_setting_is_valid(self):
         FOOBAR.validate(None)
         FOOBAR.validate(FOOBAR.READ_WRITE)
         with pytest.raises(ValueError):
-            FOOBAR.validate('foobar')
+            FOOBAR.validate("foobar")
         with pytest.raises(ValueError):
             FOOBAR.validate(FOOBAR.READ_ONLY)
 
@@ -79,23 +82,21 @@ def it_can_be_referred_to_by_a_convenience_alias_if_defined(self):
 
 
 class DescribeEnumValue(object):
-
     def it_provides_its_symbolic_name_as_its_string_value(self):
-        assert ('%s' % FOOBAR.READ_WRITE) == 'READ_WRITE (1)'
+        assert ("%s" % FOOBAR.READ_WRITE) == "READ_WRITE (1)"
 
     def it_provides_its_description_as_its_docstring(self):
-        assert FOOBAR.READ_ONLY.__doc__ == 'Return value only'
+        assert FOOBAR.READ_ONLY.__doc__ == "Return value only"
 
 
 class DescribeXmlEnumeration(object):
-
     def it_knows_the_XML_value_for_each_of_its_xml_members(self):
-        assert XMLFOO.to_xml(XMLFOO.XML_RW) == 'attrVal'
-        assert XMLFOO.to_xml(42) == 'attrVal'
+        assert XMLFOO.to_xml(XMLFOO.XML_RW) == "attrVal"
+        assert XMLFOO.to_xml(42) == "attrVal"
         with pytest.raises(ValueError):
             XMLFOO.to_xml(XMLFOO.RO)
 
     def it_can_map_each_of_its_xml_members_from_the_XML_value(self):
         assert XMLFOO.from_xml(None) is None
-        assert XMLFOO.from_xml('attrVal') == XMLFOO.XML_RW
-        assert str(XMLFOO.from_xml('attrVal')) == 'XML_RW (42)'
+        assert XMLFOO.from_xml("attrVal") == XMLFOO.XML_RW
+        assert str(XMLFOO.from_xml("attrVal")) == "XML_RW (42)"
diff --git a/tests/test_package.py b/tests/test_package.py
index c4df206ad..e94e5f318 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -16,7 +16,6 @@
 
 
 class DescribePackage(object):
-
     def it_can_get_or_add_an_image_part_containing_a_specified_image(
         self, image_parts_prop_, image_parts_, image_part_
     ):
@@ -30,7 +29,7 @@ def it_can_get_or_add_an_image_part_containing_a_specified_image(
         assert image_part is image_part_
 
     def it_gathers_package_image_parts_after_unmarshalling(self):
-        package = Package.open(docx_path('having-images'))
+        package = Package.open(docx_path("having-images"))
         image_parts = package.image_parts
         assert len(image_parts) == 3
         for image_part in image_parts:
@@ -52,7 +51,6 @@ def image_parts_prop_(self, request):
 
 
 class DescribeImageParts(object):
-
     def it_can_get_a_matching_image_part(
         self, Image_, image_, _get_by_sha1_, image_part_
     ):
@@ -104,20 +102,19 @@ def it_can_really_add_a_new_image_part(
 
     @pytest.fixture(params=[((2, 3), 1), ((1, 3), 2), ((1, 2), 3)])
     def next_partname_fixture(self, request):
-
         def image_part_with_partname_(n):
             partname = image_partname(n)
             return instance_mock(request, ImagePart, partname=partname)
 
         def image_partname(n):
-            return PackURI('/word/media/image%d.png' % n)
+            return PackURI("/word/media/image%d.png" % n)
 
         existing_partname_numbers, expected_partname_number = request.param
         image_parts = ImageParts()
         for n in existing_partname_numbers:
             image_part_ = image_part_with_partname_(n)
             image_parts.append(image_part_)
-        ext = 'png'
+        ext = "png"
         expected_image_partname = image_partname(expected_partname_number)
         return image_parts, ext, expected_image_partname
 
@@ -125,15 +122,15 @@ def image_partname(n):
 
     @pytest.fixture
     def _add_image_part_(self, request):
-        return method_mock(request, ImageParts, '_add_image_part')
+        return method_mock(request, ImageParts, "_add_image_part")
 
     @pytest.fixture
     def _get_by_sha1_(self, request):
-        return method_mock(request, ImageParts, '_get_by_sha1')
+        return method_mock(request, ImageParts, "_get_by_sha1")
 
     @pytest.fixture
     def Image_(self, request):
-        return class_mock(request, 'docx.package.Image')
+        return class_mock(request, "docx.package.Image")
 
     @pytest.fixture
     def image_(self, request):
@@ -141,7 +138,7 @@ def image_(self, request):
 
     @pytest.fixture
     def ImagePart_(self, request):
-        return class_mock(request, 'docx.package.ImagePart')
+        return class_mock(request, "docx.package.ImagePart")
 
     @pytest.fixture
     def image_part_(self, request):
@@ -149,7 +146,7 @@ def image_part_(self, request):
 
     @pytest.fixture
     def _next_image_partname_(self, request):
-        return method_mock(request, ImageParts, '_next_image_partname')
+        return method_mock(request, ImageParts, "_next_image_partname")
 
     @pytest.fixture
     def partname_(self, request):
diff --git a/tests/test_section.py b/tests/test_section.py
index 7ac29a0f5..ae887a960 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -17,7 +17,6 @@
 
 
 class DescribeSections(object):
-
     def it_knows_how_many_sections_it_contains(self):
         sections = Sections(
             element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)"), None
@@ -35,7 +34,8 @@ def it_can_iterate_over_its_Section_instances(
         section_lst = [s for s in sections]
 
         assert Section_.call_args_list == [
-            call(sectPrs[0], document_part_), call(sectPrs[1], document_part_)
+            call(sectPrs[0], document_part_),
+            call(sectPrs[1], document_part_),
         ]
         assert section_lst == [section_, section_]
 
@@ -71,7 +71,8 @@ def it_can_access_its_Section_instances_by_slice(
         section_lst = sections[1:9]
 
         assert Section_.call_args_list == [
-            call(sectPrs[1], document_part_), call(sectPrs[2], document_part_)
+            call(sectPrs[1], document_part_),
+            call(sectPrs[2], document_part_),
         ]
         assert section_lst == [section_, section_]
 
@@ -91,7 +92,6 @@ def section_(self, request):
 
 
 class DescribeSection(object):
-
     def it_knows_when_it_displays_a_distinct_first_page_header(
         self, diff_first_header_get_fixture
     ):
@@ -115,7 +115,7 @@ def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
     def it_provides_access_to_its_even_page_footer(
         self, document_part_, _Footer_, footer_
     ):
-        sectPr = element('w:sectPr')
+        sectPr = element("w:sectPr")
         _Footer_.return_value = footer_
         section = Section(sectPr, document_part_)
 
@@ -171,7 +171,7 @@ def it_provides_access_to_its_first_page_header(
     def it_provides_access_to_its_default_footer(
         self, document_part_, _Footer_, footer_
     ):
-        sectPr = element('w:sectPr')
+        sectPr = element("w:sectPr")
         _Footer_.return_value = footer_
         section = Section(sectPr, document_part_)
 
@@ -185,7 +185,7 @@ def it_provides_access_to_its_default_footer(
     def it_provides_access_to_its_default_header(
         self, document_part_, _Header_, header_
     ):
-        sectPr = element('w:sectPr')
+        sectPr = element("w:sectPr")
         _Header_.return_value = header_
         section = Section(sectPr, document_part_)
 
@@ -306,137 +306,171 @@ def diff_first_header_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return sectPr, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:sectPr/w:pgMar{w:left=120}',   'left_margin',      76200),
-        ('w:sectPr/w:pgMar{w:right=240}',  'right_margin',    152400),
-        ('w:sectPr/w:pgMar{w:top=-360}',   'top_margin',     -228600),
-        ('w:sectPr/w:pgMar{w:bottom=480}', 'bottom_margin',   304800),
-        ('w:sectPr/w:pgMar{w:gutter=600}', 'gutter',          381000),
-        ('w:sectPr/w:pgMar{w:header=720}', 'header_distance', 457200),
-        ('w:sectPr/w:pgMar{w:footer=840}', 'footer_distance', 533400),
-        ('w:sectPr/w:pgMar',               'left_margin',       None),
-        ('w:sectPr',                       'top_margin',        None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr/w:pgMar{w:left=120}", "left_margin", 76200),
+            ("w:sectPr/w:pgMar{w:right=240}", "right_margin", 152400),
+            ("w:sectPr/w:pgMar{w:top=-360}", "top_margin", -228600),
+            ("w:sectPr/w:pgMar{w:bottom=480}", "bottom_margin", 304800),
+            ("w:sectPr/w:pgMar{w:gutter=600}", "gutter", 381000),
+            ("w:sectPr/w:pgMar{w:header=720}", "header_distance", 457200),
+            ("w:sectPr/w:pgMar{w:footer=840}", "footer_distance", 533400),
+            ("w:sectPr/w:pgMar", "left_margin", None),
+            ("w:sectPr", "top_margin", None),
+        ]
+    )
     def margins_get_fixture(self, request):
         sectPr_cxml, margin_prop_name, expected_value = request.param
         sectPr = element(sectPr_cxml)
         return sectPr, margin_prop_name, expected_value
 
-    @pytest.fixture(params=[
-        ('w:sectPr', 'left_margin',     Inches(1),
-         'w:sectPr/w:pgMar{w:left=1440}'),
-        ('w:sectPr', 'right_margin',    Inches(0.5),
-         'w:sectPr/w:pgMar{w:right=720}'),
-        ('w:sectPr', 'top_margin',      Inches(-0.25),
-         'w:sectPr/w:pgMar{w:top=-360}'),
-        ('w:sectPr', 'bottom_margin',   Inches(0.75),
-         'w:sectPr/w:pgMar{w:bottom=1080}'),
-        ('w:sectPr', 'gutter',          Inches(0.25),
-         'w:sectPr/w:pgMar{w:gutter=360}'),
-        ('w:sectPr', 'header_distance', Inches(1.25),
-         'w:sectPr/w:pgMar{w:header=1800}'),
-        ('w:sectPr', 'footer_distance', Inches(1.35),
-         'w:sectPr/w:pgMar{w:footer=1944}'),
-        ('w:sectPr', 'left_margin', None, 'w:sectPr/w:pgMar'),
-        ('w:sectPr/w:pgMar{w:top=-360}', 'top_margin', Inches(0.6),
-         'w:sectPr/w:pgMar{w:top=864}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", "left_margin", Inches(1), "w:sectPr/w:pgMar{w:left=1440}"),
+            ("w:sectPr", "right_margin", Inches(0.5), "w:sectPr/w:pgMar{w:right=720}"),
+            ("w:sectPr", "top_margin", Inches(-0.25), "w:sectPr/w:pgMar{w:top=-360}"),
+            (
+                "w:sectPr",
+                "bottom_margin",
+                Inches(0.75),
+                "w:sectPr/w:pgMar{w:bottom=1080}",
+            ),
+            ("w:sectPr", "gutter", Inches(0.25), "w:sectPr/w:pgMar{w:gutter=360}"),
+            (
+                "w:sectPr",
+                "header_distance",
+                Inches(1.25),
+                "w:sectPr/w:pgMar{w:header=1800}",
+            ),
+            (
+                "w:sectPr",
+                "footer_distance",
+                Inches(1.35),
+                "w:sectPr/w:pgMar{w:footer=1944}",
+            ),
+            ("w:sectPr", "left_margin", None, "w:sectPr/w:pgMar"),
+            (
+                "w:sectPr/w:pgMar{w:top=-360}",
+                "top_margin",
+                Inches(0.6),
+                "w:sectPr/w:pgMar{w:top=864}",
+            ),
+        ]
+    )
     def margins_set_fixture(self, request):
         sectPr_cxml, property_name, new_value, expected_cxml = request.param
         sectPr = element(sectPr_cxml)
         expected_xml = xml(expected_cxml)
         return sectPr, property_name, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:sectPr/w:pgSz{w:orient=landscape}', WD_ORIENT.LANDSCAPE),
-        ('w:sectPr/w:pgSz{w:orient=portrait}',  WD_ORIENT.PORTRAIT),
-        ('w:sectPr/w:pgSz',                     WD_ORIENT.PORTRAIT),
-        ('w:sectPr',                            WD_ORIENT.PORTRAIT),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr/w:pgSz{w:orient=landscape}", WD_ORIENT.LANDSCAPE),
+            ("w:sectPr/w:pgSz{w:orient=portrait}", WD_ORIENT.PORTRAIT),
+            ("w:sectPr/w:pgSz", WD_ORIENT.PORTRAIT),
+            ("w:sectPr", WD_ORIENT.PORTRAIT),
+        ]
+    )
     def orientation_get_fixture(self, request):
         sectPr_cxml, expected_orientation = request.param
         sectPr = element(sectPr_cxml)
         return sectPr, expected_orientation
 
-    @pytest.fixture(params=[
-        (WD_ORIENT.LANDSCAPE, 'w:sectPr/w:pgSz{w:orient=landscape}'),
-        (WD_ORIENT.PORTRAIT,  'w:sectPr/w:pgSz'),
-        (None,                'w:sectPr/w:pgSz'),
-    ])
+    @pytest.fixture(
+        params=[
+            (WD_ORIENT.LANDSCAPE, "w:sectPr/w:pgSz{w:orient=landscape}"),
+            (WD_ORIENT.PORTRAIT, "w:sectPr/w:pgSz"),
+            (None, "w:sectPr/w:pgSz"),
+        ]
+    )
     def orientation_set_fixture(self, request):
         new_orientation, expected_cxml = request.param
-        sectPr = element('w:sectPr')
+        sectPr = element("w:sectPr")
         expected_xml = xml(expected_cxml)
         return sectPr, new_orientation, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:sectPr/w:pgSz{w:h=2880}', Inches(2)),
-        ('w:sectPr/w:pgSz',           None),
-        ('w:sectPr',                  None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr/w:pgSz{w:h=2880}", Inches(2)),
+            ("w:sectPr/w:pgSz", None),
+            ("w:sectPr", None),
+        ]
+    )
     def page_height_get_fixture(self, request):
         sectPr_cxml, expected_page_height = request.param
         sectPr = element(sectPr_cxml)
         return sectPr, expected_page_height
 
-    @pytest.fixture(params=[
-        (None,      'w:sectPr/w:pgSz'),
-        (Inches(2), 'w:sectPr/w:pgSz{w:h=2880}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (None, "w:sectPr/w:pgSz"),
+            (Inches(2), "w:sectPr/w:pgSz{w:h=2880}"),
+        ]
+    )
     def page_height_set_fixture(self, request):
         new_page_height, expected_cxml = request.param
-        sectPr = element('w:sectPr')
+        sectPr = element("w:sectPr")
         expected_xml = xml(expected_cxml)
         return sectPr, new_page_height, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:sectPr/w:pgSz{w:w=1440}', Inches(1)),
-        ('w:sectPr/w:pgSz',           None),
-        ('w:sectPr',                  None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr/w:pgSz{w:w=1440}", Inches(1)),
+            ("w:sectPr/w:pgSz", None),
+            ("w:sectPr", None),
+        ]
+    )
     def page_width_get_fixture(self, request):
         sectPr_cxml, expected_page_width = request.param
         sectPr = element(sectPr_cxml)
         return sectPr, expected_page_width
 
-    @pytest.fixture(params=[
-        (None,      'w:sectPr/w:pgSz'),
-        (Inches(4), 'w:sectPr/w:pgSz{w:w=5760}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (None, "w:sectPr/w:pgSz"),
+            (Inches(4), "w:sectPr/w:pgSz{w:w=5760}"),
+        ]
+    )
     def page_width_set_fixture(self, request):
         new_page_width, expected_cxml = request.param
-        sectPr = element('w:sectPr')
+        sectPr = element("w:sectPr")
         expected_xml = xml(expected_cxml)
         return sectPr, new_page_width, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:sectPr',                          WD_SECTION.NEW_PAGE),
-        ('w:sectPr/w:type',                   WD_SECTION.NEW_PAGE),
-        ('w:sectPr/w:type{w:val=continuous}', WD_SECTION.CONTINUOUS),
-        ('w:sectPr/w:type{w:val=nextPage}',   WD_SECTION.NEW_PAGE),
-        ('w:sectPr/w:type{w:val=oddPage}',    WD_SECTION.ODD_PAGE),
-        ('w:sectPr/w:type{w:val=evenPage}',   WD_SECTION.EVEN_PAGE),
-        ('w:sectPr/w:type{w:val=nextColumn}', WD_SECTION.NEW_COLUMN),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:sectPr", WD_SECTION.NEW_PAGE),
+            ("w:sectPr/w:type", WD_SECTION.NEW_PAGE),
+            ("w:sectPr/w:type{w:val=continuous}", WD_SECTION.CONTINUOUS),
+            ("w:sectPr/w:type{w:val=nextPage}", WD_SECTION.NEW_PAGE),
+            ("w:sectPr/w:type{w:val=oddPage}", WD_SECTION.ODD_PAGE),
+            ("w:sectPr/w:type{w:val=evenPage}", WD_SECTION.EVEN_PAGE),
+            ("w:sectPr/w:type{w:val=nextColumn}", WD_SECTION.NEW_COLUMN),
+        ]
+    )
     def start_type_get_fixture(self, request):
         sectPr_cxml, expected_start_type = request.param
         sectPr = element(sectPr_cxml)
         return sectPr, expected_start_type
 
-    @pytest.fixture(params=[
-        ('w:sectPr/w:type{w:val=oddPage}',    WD_SECTION.EVEN_PAGE,
-         'w:sectPr/w:type{w:val=evenPage}'),
-        ('w:sectPr/w:type{w:val=nextPage}',   None,
-         'w:sectPr'),
-        ('w:sectPr',                          None,
-         'w:sectPr'),
-        ('w:sectPr/w:type{w:val=continuous}', WD_SECTION.NEW_PAGE,
-         'w:sectPr'),
-        ('w:sectPr/w:type',                   WD_SECTION.NEW_PAGE,
-         'w:sectPr'),
-        ('w:sectPr/w:type',                   WD_SECTION.NEW_COLUMN,
-         'w:sectPr/w:type{w:val=nextColumn}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:sectPr/w:type{w:val=oddPage}",
+                WD_SECTION.EVEN_PAGE,
+                "w:sectPr/w:type{w:val=evenPage}",
+            ),
+            ("w:sectPr/w:type{w:val=nextPage}", None, "w:sectPr"),
+            ("w:sectPr", None, "w:sectPr"),
+            ("w:sectPr/w:type{w:val=continuous}", WD_SECTION.NEW_PAGE, "w:sectPr"),
+            ("w:sectPr/w:type", WD_SECTION.NEW_PAGE, "w:sectPr"),
+            (
+                "w:sectPr/w:type",
+                WD_SECTION.NEW_COLUMN,
+                "w:sectPr/w:type{w:val=nextColumn}",
+            ),
+        ]
+    )
     def start_type_set_fixture(self, request):
         initial_cxml, new_start_type, expected_cxml = request.param
         sectPr = element(initial_cxml)
@@ -467,7 +501,6 @@ def header_(self, request):
 
 
 class Describe_BaseHeaderFooter(object):
-
     def it_knows_when_its_linked_to_the_previous_header_or_footer(
         self, is_linked_get_fixture, _has_definition_prop_
     ):
@@ -553,7 +586,7 @@ def and_it_adds_a_definition_when_it_is_linked_and_the_first_section(
         _has_definition_prop_,
         _prior_headerfooter_prop_,
         _add_definition_,
-        header_part_
+        header_part_,
     ):
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = None
@@ -620,7 +653,6 @@ def _prior_headerfooter_prop_(self, request):
 
 
 class Describe_Footer(object):
-
     def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_footer_part.return_value = footer_part_, "rId3"
@@ -692,7 +724,8 @@ def but_it_returns_None_when_its_the_first_footer(self):
 
     @pytest.fixture(
         params=[
-            ("w:sectPr", False), ("w:sectPr/w:footerReference{w:type=default}", True)
+            ("w:sectPr", False),
+            ("w:sectPr/w:footerReference{w:type=default}", True),
         ]
     )
     def has_definition_fixture(self, request):
@@ -716,7 +749,6 @@ def footer_part_(self, request):
 
 
 class Describe_Header(object):
-
     def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_header_part.return_value = header_part_, "rId3"
@@ -787,9 +819,7 @@ def but_it_returns_None_when_its_the_first_header(self):
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(
-        params=[
-            ("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=first}", True)
-        ]
+        params=[("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=first}", True)]
     )
     def has_definition_fixture(self, request):
         sectPr_cxml, expected_value = request.param
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 5873ffa1d..5c07a6652 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -12,7 +12,6 @@
 
 
 class DescribeSettings(object):
-
     def it_knows_when_the_document_has_distinct_odd_and_even_headers(
         self, odd_and_even_get_fixture
     ):
@@ -56,7 +55,7 @@ def odd_and_even_get_fixture(self, request):
             (
                 "w:settings/w:evenAndOddHeaders{w:val=1}",
                 True,
-                "w:settings/w:evenAndOddHeaders"
+                "w:settings/w:evenAndOddHeaders",
             ),
             ("w:settings/w:evenAndOddHeaders{w:val=off}", False, "w:settings"),
         ]
diff --git a/tests/test_shape.py b/tests/test_shape.py
index 105d2fa40..5e08e9743 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -14,21 +14,23 @@
 from docx.shared import Length
 
 from .oxml.unitdata.dml import (
-    a_blip, a_blipFill, a_graphic, a_graphicData, a_pic, an_inline,
+    a_blip,
+    a_blipFill,
+    a_graphic,
+    a_graphicData,
+    a_pic,
+    an_inline,
 )
 from .unitutil.cxml import element, xml
 from .unitutil.mock import loose_mock
 
 
 class DescribeInlineShapes(object):
-
-    def it_knows_how_many_inline_shapes_it_contains(
-            self, inline_shapes_fixture):
+    def it_knows_how_many_inline_shapes_it_contains(self, inline_shapes_fixture):
         inline_shapes, expected_count = inline_shapes_fixture
         assert len(inline_shapes) == expected_count
 
-    def it_can_iterate_over_its_InlineShape_instances(
-            self, inline_shapes_fixture):
+    def it_can_iterate_over_its_InlineShape_instances(self, inline_shapes_fixture):
         inline_shapes, inline_shape_count = inline_shapes_fixture
         actual_count = 0
         for inline_shape in inline_shapes:
@@ -36,15 +38,13 @@ def it_can_iterate_over_its_InlineShape_instances(
             actual_count += 1
         assert actual_count == inline_shape_count
 
-    def it_provides_indexed_access_to_inline_shapes(
-            self, inline_shapes_fixture):
+    def it_provides_indexed_access_to_inline_shapes(self, inline_shapes_fixture):
         inline_shapes, inline_shape_count = inline_shapes_fixture
         for idx in range(-inline_shape_count, inline_shape_count):
             inline_shape = inline_shapes[idx]
             assert isinstance(inline_shape, InlineShape)
 
-    def it_raises_on_indexed_access_out_of_range(
-            self, inline_shapes_fixture):
+    def it_raises_on_indexed_access_out_of_range(self, inline_shapes_fixture):
         inline_shapes, inline_shape_count = inline_shapes_fixture
         with pytest.raises(IndexError):
             too_low = -1 - inline_shape_count
@@ -62,9 +62,7 @@ def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
 
     @pytest.fixture
     def inline_shapes_fixture(self):
-        body = element(
-            'w:body/w:p/(w:r/w:drawing/wp:inline, w:r/w:drawing/wp:inline)'
-        )
+        body = element("w:body/w:p/(w:r/w:drawing/wp:inline, w:r/w:drawing/wp:inline)")
         inline_shapes = InlineShapes(body, None)
         expected_count = 2
         return inline_shapes, expected_count
@@ -73,13 +71,12 @@ def inline_shapes_fixture(self):
 
     @pytest.fixture
     def inline_shapes_with_parent_(self, request):
-        parent_ = loose_mock(request, name='parent_')
+        parent_ = loose_mock(request, name="parent_")
         inline_shapes = InlineShapes(None, parent_)
         return inline_shapes, parent_
 
 
 class DescribeInlineShape(object):
-
     def it_knows_what_type_of_shape_it_is(self, shape_type_fixture):
         inline_shape, inline_shape_type = shape_type_fixture
         assert inline_shape.type == inline_shape_type
@@ -104,7 +101,9 @@ def it_can_change_its_display_dimensions(self, dimensions_set_fixture):
     @pytest.fixture
     def dimensions_get_fixture(self):
         inline_cxml, expected_cx, expected_cy = (
-            'wp:inline/wp:extent{cx=333, cy=666}', 333, 666
+            "wp:inline/wp:extent{cx=333, cy=666}",
+            333,
+            666,
         )
         inline_shape = InlineShape(element(inline_cxml))
         return inline_shape, expected_cx, expected_cy
@@ -112,43 +111,50 @@ def dimensions_get_fixture(self):
     @pytest.fixture
     def dimensions_set_fixture(self):
         inline_cxml, new_cx, new_cy, expected_cxml = (
-            'wp:inline/(wp:extent{cx=333,cy=666},a:graphic/a:graphicData/'
-            'pic:pic/pic:spPr/a:xfrm/a:ext{cx=333,cy=666})',
-            444, 888,
-            'wp:inline/(wp:extent{cx=444,cy=888},a:graphic/a:graphicData/'
-            'pic:pic/pic:spPr/a:xfrm/a:ext{cx=444,cy=888})'
+            "wp:inline/(wp:extent{cx=333,cy=666},a:graphic/a:graphicData/"
+            "pic:pic/pic:spPr/a:xfrm/a:ext{cx=333,cy=666})",
+            444,
+            888,
+            "wp:inline/(wp:extent{cx=444,cy=888},a:graphic/a:graphicData/"
+            "pic:pic/pic:spPr/a:xfrm/a:ext{cx=444,cy=888})",
         )
         inline_shape = InlineShape(element(inline_cxml))
         expected_xml = xml(expected_cxml)
         return inline_shape, new_cx, new_cy, expected_xml
 
-    @pytest.fixture(params=[
-        'embed pic', 'link pic', 'link+embed pic', 'chart', 'smart art',
-        'not implemented'
-    ])
+    @pytest.fixture(
+        params=[
+            "embed pic",
+            "link pic",
+            "link+embed pic",
+            "chart",
+            "smart art",
+            "not implemented",
+        ]
+    )
     def shape_type_fixture(self, request):
-        if request.param == 'embed pic':
+        if request.param == "embed pic":
             inline = self._inline_with_picture(embed=True)
             shape_type = WD_INLINE_SHAPE.PICTURE
 
-        elif request.param == 'link pic':
+        elif request.param == "link pic":
             inline = self._inline_with_picture(link=True)
             shape_type = WD_INLINE_SHAPE.LINKED_PICTURE
 
-        elif request.param == 'link+embed pic':
+        elif request.param == "link+embed pic":
             inline = self._inline_with_picture(embed=True, link=True)
             shape_type = WD_INLINE_SHAPE.LINKED_PICTURE
 
-        elif request.param == 'chart':
-            inline = self._inline_with_uri(nsmap['c'])
+        elif request.param == "chart":
+            inline = self._inline_with_uri(nsmap["c"])
             shape_type = WD_INLINE_SHAPE.CHART
 
-        elif request.param == 'smart art':
-            inline = self._inline_with_uri(nsmap['dgm'])
+        elif request.param == "smart art":
+            inline = self._inline_with_uri(nsmap["dgm"])
             shape_type = WD_INLINE_SHAPE.SMART_ART
 
-        elif request.param == 'not implemented':
-            inline = self._inline_with_uri('foobar')
+        elif request.param == "not implemented":
+            inline = self._inline_with_uri("foobar")
             shape_type = WD_INLINE_SHAPE.NOT_IMPLEMENTED
 
         return InlineShape(inline), shape_type
@@ -156,28 +162,39 @@ def shape_type_fixture(self, request):
     # fixture components ---------------------------------------------
 
     def _inline_with_picture(self, embed=False, link=False):
-        picture_ns = nsmap['pic']
+        picture_ns = nsmap["pic"]
 
         blip_bldr = a_blip()
         if embed:
-            blip_bldr.with_embed('rId1')
+            blip_bldr.with_embed("rId1")
         if link:
-            blip_bldr.with_link('rId2')
+            blip_bldr.with_link("rId2")
 
         inline = (
-            an_inline().with_nsdecls('wp', 'r').with_child(
-                a_graphic().with_nsdecls().with_child(
-                    a_graphicData().with_uri(picture_ns).with_child(
-                        a_pic().with_nsdecls().with_child(
-                            a_blipFill().with_child(
-                                blip_bldr)))))
+            an_inline()
+            .with_nsdecls("wp", "r")
+            .with_child(
+                a_graphic()
+                .with_nsdecls()
+                .with_child(
+                    a_graphicData()
+                    .with_uri(picture_ns)
+                    .with_child(
+                        a_pic()
+                        .with_nsdecls()
+                        .with_child(a_blipFill().with_child(blip_bldr))
+                    )
+                )
+            )
         ).element
         return inline
 
     def _inline_with_uri(self, uri):
         inline = (
-            an_inline().with_nsdecls('wp').with_child(
-                a_graphic().with_nsdecls().with_child(
-                    a_graphicData().with_uri(uri)))
+            an_inline()
+            .with_nsdecls("wp")
+            .with_child(
+                a_graphic().with_nsdecls().with_child(a_graphicData().with_uri(uri))
+            )
         ).element
         return inline
diff --git a/tests/test_shared.py b/tests/test_shared.py
index 102a661ea..7641c158d 100644
--- a/tests/test_shared.py
+++ b/tests/test_shared.py
@@ -4,23 +4,18 @@
 Test suite for the docx.shared module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 import pytest
 
 from docx.opc.part import XmlPart
-from docx.shared import (
-    ElementProxy, Length, Cm, Emu, Inches, Mm, Pt, RGBColor, Twips
-)
+from docx.shared import ElementProxy, Length, Cm, Emu, Inches, Mm, Pt, RGBColor, Twips
 
 from .unitutil.cxml import element
 from .unitutil.mock import instance_mock
 
 
 class DescribeElementProxy(object):
-
     def it_knows_when_its_equal_to_another_proxy_object(self, eq_fixture):
         proxy, proxy_2, proxy_3, not_a_proxy = eq_fixture
 
@@ -44,17 +39,17 @@ def it_knows_its_part(self, part_fixture):
 
     @pytest.fixture
     def element_fixture(self):
-        p = element('w:p')
+        p = element("w:p")
         proxy = ElementProxy(p)
         return proxy, p
 
     @pytest.fixture
     def eq_fixture(self):
-        p, q = element('w:p'), element('w:p')
+        p, q = element("w:p"), element("w:p")
         proxy = ElementProxy(p)
         proxy_2 = ElementProxy(p)
         proxy_3 = ElementProxy(q)
-        not_a_proxy = 'Foobar'
+        not_a_proxy = "Foobar"
         return proxy, proxy_2, proxy_3, not_a_proxy
 
     @pytest.fixture
@@ -75,7 +70,6 @@ def part_(self, request):
 
 
 class DescribeLength(object):
-
     def it_can_construct_from_convenient_units(self, construct_fixture):
         UnitCls, units_val, emu = construct_fixture
         length = UnitCls(units_val)
@@ -91,50 +85,53 @@ def it_can_self_convert_to_convenient_units(self, units_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (Length,      914400,  914400),
-        (Inches,      1.1,    1005840),
-        (Cm,          2.53,    910799),
-        (Emu,         9144.9,    9144),
-        (Mm,          13.8,    496800),
-        (Pt,          24.5,    311150),
-        (Twips,       360,     228600),
-    ])
+    @pytest.fixture(
+        params=[
+            (Length, 914400, 914400),
+            (Inches, 1.1, 1005840),
+            (Cm, 2.53, 910799),
+            (Emu, 9144.9, 9144),
+            (Mm, 13.8, 496800),
+            (Pt, 24.5, 311150),
+            (Twips, 360, 228600),
+        ]
+    )
     def construct_fixture(self, request):
         UnitCls, units_val, emu = request.param
         return UnitCls, units_val, emu
 
-    @pytest.fixture(params=[
-        (914400, 'inches', 1.0,    float),
-        (914400, 'cm',     2.54,   float),
-        (914400, 'emu',    914400, int),
-        (914400, 'mm',     25.4,   float),
-        (914400, 'pt',     72.0,   float),
-        (914400, 'twips',  1440,   int),
-    ])
+    @pytest.fixture(
+        params=[
+            (914400, "inches", 1.0, float),
+            (914400, "cm", 2.54, float),
+            (914400, "emu", 914400, int),
+            (914400, "mm", 25.4, float),
+            (914400, "pt", 72.0, float),
+            (914400, "twips", 1440, int),
+        ]
+    )
     def units_fixture(self, request):
         emu, units_prop_name, expected_length_in_units, type_ = request.param
         return emu, units_prop_name, expected_length_in_units, type_
 
 
 class DescribeRGBColor(object):
-
     def it_is_natively_constructed_using_three_ints_0_to_255(self):
         RGBColor(0x12, 0x34, 0x56)
         with pytest.raises(ValueError):
-            RGBColor('12', '34', '56')
+            RGBColor("12", "34", "56")
         with pytest.raises(ValueError):
             RGBColor(-1, 34, 56)
         with pytest.raises(ValueError):
             RGBColor(12, 256, 56)
 
     def it_can_construct_from_a_hex_string_rgb_value(self):
-        rgb = RGBColor.from_string('123456')
+        rgb = RGBColor.from_string("123456")
         assert rgb == RGBColor(0x12, 0x34, 0x56)
 
     def it_can_provide_a_hex_string_rgb_value(self):
-        assert str(RGBColor(0x12, 0x34, 0x56)) == '123456'
+        assert str(RGBColor(0x12, 0x34, 0x56)) == "123456"
 
     def it_has_a_custom_repr(self):
         rgb_color = RGBColor(0x42, 0xF0, 0xBA)
-        assert repr(rgb_color) == 'RGBColor(0x42, 0xf0, 0xba)'
+        assert repr(rgb_color) == "RGBColor(0x42, 0xf0, 0xba)"
diff --git a/tests/test_table.py b/tests/test_table.py
index 1d2183fd6..b314b801e 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -8,7 +8,10 @@
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.table import (
-    WD_ALIGN_VERTICAL, WD_ROW_HEIGHT, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+    WD_ALIGN_VERTICAL,
+    WD_ROW_HEIGHT,
+    WD_TABLE_ALIGNMENT,
+    WD_TABLE_DIRECTION,
 )
 from docx.oxml import parse_xml
 from docx.oxml.table import CT_Tc
@@ -25,7 +28,6 @@
 
 
 class DescribeTable(object):
-
     def it_can_add_a_row(self, add_row_fixture):
         table, expected_xml = add_row_fixture
         row = table.add_row()
@@ -103,17 +105,13 @@ def it_can_change_its_direction(self, direction_set_fixture):
     def it_knows_its_table_style(self, style_get_fixture):
         table, style_id_, style_ = style_get_fixture
         style = table.style
-        table.part.get_style.assert_called_once_with(
-            style_id_, WD_STYLE_TYPE.TABLE
-        )
+        table.part.get_style.assert_called_once_with(style_id_, WD_STYLE_TYPE.TABLE)
         assert style is style_
 
     def it_can_change_its_table_style(self, style_set_fixture):
         table, value, expected_xml = style_set_fixture
         table.style = value
-        table.part.get_style_id.assert_called_once_with(
-            value, WD_STYLE_TYPE.TABLE
-        )
+        table.part.get_style_id.assert_called_once_with(value, WD_STYLE_TYPE.TABLE)
         assert table._tbl.xml == expected_xml
 
     def it_provides_access_to_its_cells_to_help(self, cells_fixture):
@@ -135,7 +133,7 @@ def it_knows_its_column_count_to_help(self, column_count_fixture):
 
     @pytest.fixture
     def add_column_fixture(self):
-        snippets = snippet_seq('add-row-col')
+        snippets = snippet_seq("add-row-col")
         tbl = parse_xml(snippets[0])
         table = Table(tbl, None)
         width = Inches(1.5)
@@ -144,76 +142,94 @@ def add_column_fixture(self):
 
     @pytest.fixture
     def add_row_fixture(self):
-        snippets = snippet_seq('add-row-col')
+        snippets = snippet_seq("add-row-col")
         tbl = parse_xml(snippets[0])
         table = Table(tbl, None)
         expected_xml = snippets[1]
         return table, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr',                    None),
-        ('w:tbl/w:tblPr/w:jc{w:val=center}', WD_TABLE_ALIGNMENT.CENTER),
-        ('w:tbl/w:tblPr/w:jc{w:val=right}',  WD_TABLE_ALIGNMENT.RIGHT),
-        ('w:tbl/w:tblPr/w:jc{w:val=left}',   WD_TABLE_ALIGNMENT.LEFT),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tbl/w:tblPr", None),
+            ("w:tbl/w:tblPr/w:jc{w:val=center}", WD_TABLE_ALIGNMENT.CENTER),
+            ("w:tbl/w:tblPr/w:jc{w:val=right}", WD_TABLE_ALIGNMENT.RIGHT),
+            ("w:tbl/w:tblPr/w:jc{w:val=left}", WD_TABLE_ALIGNMENT.LEFT),
+        ]
+    )
     def alignment_get_fixture(self, request):
         tbl_cxml, expected_value = request.param
         table = Table(element(tbl_cxml), None)
         return table, expected_value
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr', WD_TABLE_ALIGNMENT.LEFT,
-         'w:tbl/w:tblPr/w:jc{w:val=left}'),
-        ('w:tbl/w:tblPr/w:jc{w:val=left}', WD_TABLE_ALIGNMENT.RIGHT,
-         'w:tbl/w:tblPr/w:jc{w:val=right}'),
-        ('w:tbl/w:tblPr/w:jc{w:val=right}', None,
-         'w:tbl/w:tblPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:tbl/w:tblPr",
+                WD_TABLE_ALIGNMENT.LEFT,
+                "w:tbl/w:tblPr/w:jc{w:val=left}",
+            ),
+            (
+                "w:tbl/w:tblPr/w:jc{w:val=left}",
+                WD_TABLE_ALIGNMENT.RIGHT,
+                "w:tbl/w:tblPr/w:jc{w:val=right}",
+            ),
+            ("w:tbl/w:tblPr/w:jc{w:val=right}", None, "w:tbl/w:tblPr"),
+        ]
+    )
     def alignment_set_fixture(self, request):
         tbl_cxml, new_value, expected_tbl_cxml = request.param
         table = Table(element(tbl_cxml), None)
         expected_xml = xml(expected_tbl_cxml)
         return table, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr',                             True),
-        ('w:tbl/w:tblPr/w:tblLayout',                 True),
-        ('w:tbl/w:tblPr/w:tblLayout{w:type=autofit}', True),
-        ('w:tbl/w:tblPr/w:tblLayout{w:type=fixed}',   False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tbl/w:tblPr", True),
+            ("w:tbl/w:tblPr/w:tblLayout", True),
+            ("w:tbl/w:tblPr/w:tblLayout{w:type=autofit}", True),
+            ("w:tbl/w:tblPr/w:tblLayout{w:type=fixed}", False),
+        ]
+    )
     def autofit_get_fixture(self, request):
         tbl_cxml, expected_autofit = request.param
         table = Table(element(tbl_cxml), None)
         return table, expected_autofit
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr', True,
-         'w:tbl/w:tblPr/w:tblLayout{w:type=autofit}'),
-        ('w:tbl/w:tblPr', False,
-         'w:tbl/w:tblPr/w:tblLayout{w:type=fixed}'),
-        ('w:tbl/w:tblPr', None,
-         'w:tbl/w:tblPr/w:tblLayout{w:type=fixed}'),
-        ('w:tbl/w:tblPr/w:tblLayout{w:type=fixed}', True,
-         'w:tbl/w:tblPr/w:tblLayout{w:type=autofit}'),
-        ('w:tbl/w:tblPr/w:tblLayout{w:type=autofit}', False,
-         'w:tbl/w:tblPr/w:tblLayout{w:type=fixed}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tbl/w:tblPr", True, "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}"),
+            ("w:tbl/w:tblPr", False, "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}"),
+            ("w:tbl/w:tblPr", None, "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}"),
+            (
+                "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}",
+                True,
+                "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}",
+            ),
+            (
+                "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}",
+                False,
+                "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}",
+            ),
+        ]
+    )
     def autofit_set_fixture(self, request):
         tbl_cxml, new_value, expected_tbl_cxml = request.param
         table = Table(element(tbl_cxml), None)
         expected_xml = xml(expected_tbl_cxml)
         return table, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        (0, 9, 9, ()),
-        (1, 9, 8, ((0, 1),)),
-        (2, 9, 8, ((1, 4),)),
-        (3, 9, 6, ((0, 1, 3, 4),)),
-        (4, 9, 4, ((0, 1), (3, 6), (4, 5, 7, 8))),
-    ])
+    @pytest.fixture(
+        params=[
+            (0, 9, 9, ()),
+            (1, 9, 8, ((0, 1),)),
+            (2, 9, 8, ((1, 4),)),
+            (3, 9, 6, ((0, 1, 3, 4),)),
+            (4, 9, 4, ((0, 1), (3, 6), (4, 5, 7, 8))),
+        ]
+    )
     def cells_fixture(self, request):
         snippet_idx, cell_count, unique_count, matches = request.param
-        tbl_xml = snippet_seq('tbl-cells')[snippet_idx]
+        tbl_xml = snippet_seq("tbl-cells")[snippet_idx]
         table = Table(parse_xml(tbl_xml), None)
         return table, cell_count, unique_count, matches
 
@@ -228,32 +244,40 @@ def col_cells_fixture(self, _cells_, _column_count_):
 
     @pytest.fixture
     def column_count_fixture(self):
-        tbl_cxml = 'w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)'
+        tbl_cxml = "w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)"
         expected_value = 3
         table = Table(element(tbl_cxml), None)
         return table, expected_value
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr',                        None),
-        ('w:tbl/w:tblPr/w:bidiVisual',           WD_TABLE_DIRECTION.RTL),
-        ('w:tbl/w:tblPr/w:bidiVisual{w:val=0}',  WD_TABLE_DIRECTION.LTR),
-        ('w:tbl/w:tblPr/w:bidiVisual{w:val=on}', WD_TABLE_DIRECTION.RTL),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tbl/w:tblPr", None),
+            ("w:tbl/w:tblPr/w:bidiVisual", WD_TABLE_DIRECTION.RTL),
+            ("w:tbl/w:tblPr/w:bidiVisual{w:val=0}", WD_TABLE_DIRECTION.LTR),
+            ("w:tbl/w:tblPr/w:bidiVisual{w:val=on}", WD_TABLE_DIRECTION.RTL),
+        ]
+    )
     def direction_get_fixture(self, request):
         tbl_cxml, expected_value = request.param
         table = Table(element(tbl_cxml), None)
         return table, expected_value
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr',                       WD_TABLE_DIRECTION.RTL,
-         'w:tbl/w:tblPr/w:bidiVisual'),
-        ('w:tbl/w:tblPr/w:bidiVisual',          WD_TABLE_DIRECTION.LTR,
-         'w:tbl/w:tblPr/w:bidiVisual{w:val=0}'),
-        ('w:tbl/w:tblPr/w:bidiVisual{w:val=0}', WD_TABLE_DIRECTION.RTL,
-         'w:tbl/w:tblPr/w:bidiVisual'),
-        ('w:tbl/w:tblPr/w:bidiVisual{w:val=1}', None,
-         'w:tbl/w:tblPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tbl/w:tblPr", WD_TABLE_DIRECTION.RTL, "w:tbl/w:tblPr/w:bidiVisual"),
+            (
+                "w:tbl/w:tblPr/w:bidiVisual",
+                WD_TABLE_DIRECTION.LTR,
+                "w:tbl/w:tblPr/w:bidiVisual{w:val=0}",
+            ),
+            (
+                "w:tbl/w:tblPr/w:bidiVisual{w:val=0}",
+                WD_TABLE_DIRECTION.RTL,
+                "w:tbl/w:tblPr/w:bidiVisual",
+            ),
+            ("w:tbl/w:tblPr/w:bidiVisual{w:val=1}", None, "w:tbl/w:tblPr"),
+        ]
+    )
     def direction_set_fixture(self, request):
         tbl_cxml, new_value, expected_cxml = request.param
         table = Table(element(tbl_cxml), None)
@@ -271,20 +295,24 @@ def row_cells_fixture(self, _cells_, _column_count_):
 
     @pytest.fixture
     def style_get_fixture(self, part_prop_):
-        style_id = 'Barbaz'
-        tbl_cxml = 'w:tbl/w:tblPr/w:tblStyle{w:val=%s}' % style_id
+        style_id = "Barbaz"
+        tbl_cxml = "w:tbl/w:tblPr/w:tblStyle{w:val=%s}" % style_id
         table = Table(element(tbl_cxml), None)
         style_ = part_prop_.return_value.get_style.return_value
         return table, style_id, style_
 
-    @pytest.fixture(params=[
-        ('w:tbl/w:tblPr',                         'Tbl A', 'TblA',
-         'w:tbl/w:tblPr/w:tblStyle{w:val=TblA}'),
-        ('w:tbl/w:tblPr/w:tblStyle{w:val=TblA}',  'Tbl B', 'TblB',
-         'w:tbl/w:tblPr/w:tblStyle{w:val=TblB}'),
-        ('w:tbl/w:tblPr/w:tblStyle{w:val=TblB}',  None,    None,
-         'w:tbl/w:tblPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tbl/w:tblPr", "Tbl A", "TblA", "w:tbl/w:tblPr/w:tblStyle{w:val=TblA}"),
+            (
+                "w:tbl/w:tblPr/w:tblStyle{w:val=TblA}",
+                "Tbl B",
+                "TblB",
+                "w:tbl/w:tblPr/w:tblStyle{w:val=TblB}",
+            ),
+            ("w:tbl/w:tblPr/w:tblStyle{w:val=TblB}", None, None, "w:tbl/w:tblPr"),
+        ]
+    )
     def style_set_fixture(self, request, part_prop_):
         tbl_cxml, value, style_id, expected_cxml = request.param
         table = Table(element(tbl_cxml), None)
@@ -301,11 +329,11 @@ def table_fixture(self):
 
     @pytest.fixture
     def _cells_(self, request):
-        return property_mock(request, Table, '_cells')
+        return property_mock(request, Table, "_cells")
 
     @pytest.fixture
     def _column_count_(self, request):
-        return property_mock(request, Table, '_column_count')
+        return property_mock(request, Table, "_column_count")
 
     @pytest.fixture
     def document_part_(self, request):
@@ -313,9 +341,7 @@ def document_part_(self, request):
 
     @pytest.fixture
     def part_prop_(self, request, document_part_):
-        return property_mock(
-            request, Table, 'part', return_value=document_part_
-        )
+        return property_mock(request, Table, "part", return_value=document_part_)
 
     @pytest.fixture
     def table(self):
@@ -325,14 +351,12 @@ def table(self):
 
 
 class Describe_Cell(object):
-
     def it_knows_what_text_it_contains(self, text_get_fixture):
         cell, expected_text = text_get_fixture
         text = cell.text
         assert text == expected_text
 
-    def it_can_replace_its_content_with_a_string_of_text(
-            self, text_set_fixture):
+    def it_can_replace_its_content_with_a_string_of_text(self, text_set_fixture):
         cell, text, expected_xml = text_set_fixture
         cell.text = text
         assert cell._tc.xml == expected_xml
@@ -357,8 +381,7 @@ def it_can_change_its_width(self, width_set_fixture):
         assert cell.width == value
         assert cell._tc.xml == expected_xml
 
-    def it_provides_access_to_the_paragraphs_it_contains(
-            self, paragraphs_fixture):
+    def it_provides_access_to_the_paragraphs_it_contains(self, paragraphs_fixture):
         cell = paragraphs_fixture
         paragraphs = cell.paragraphs
         assert len(paragraphs) == 2
@@ -403,11 +426,13 @@ def it_can_merge_itself_with_other_cells(self, merge_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:tc',       'w:tc/w:p'),
-        ('w:tc/w:p',   'w:tc/(w:p, w:p)'),
-        ('w:tc/w:tbl', 'w:tc/(w:tbl, w:p)'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc", "w:tc/w:p"),
+            ("w:tc/w:p", "w:tc/(w:p, w:p)"),
+            ("w:tc/w:tbl", "w:tc/(w:tbl, w:p)"),
+        ]
+    )
     def add_paragraph_fixture(self, request):
         tc_cxml, after_tc_cxml = request.param
         cell = _Cell(element(tc_cxml), None)
@@ -416,35 +441,41 @@ def add_paragraph_fixture(self, request):
 
     @pytest.fixture
     def add_table_fixture(self, request):
-        cell = _Cell(element('w:tc/w:p'), None)
-        expected_xml = snippet_seq('new-tbl')[1]
+        cell = _Cell(element("w:tc/w:p"), None)
+        expected_xml = snippet_seq("new-tbl")[1]
         return cell, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tc', None),
-        ('w:tc/w:tcPr', None),
-        ('w:tc/w:tcPr/w:vAlign{w:val=bottom}', WD_ALIGN_VERTICAL.BOTTOM),
-        ('w:tc/w:tcPr/w:vAlign{w:val=top}', WD_ALIGN_VERTICAL.TOP),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc", None),
+            ("w:tc/w:tcPr", None),
+            ("w:tc/w:tcPr/w:vAlign{w:val=bottom}", WD_ALIGN_VERTICAL.BOTTOM),
+            ("w:tc/w:tcPr/w:vAlign{w:val=top}", WD_ALIGN_VERTICAL.TOP),
+        ]
+    )
     def alignment_get_fixture(self, request):
         tc_cxml, expected_value = request.param
         cell = _Cell(element(tc_cxml), None)
         return cell, expected_value
 
-    @pytest.fixture(params=[
-        ('w:tc', WD_ALIGN_VERTICAL.TOP,
-         'w:tc/w:tcPr/w:vAlign{w:val=top}'),
-        ('w:tc/w:tcPr', WD_ALIGN_VERTICAL.CENTER,
-         'w:tc/w:tcPr/w:vAlign{w:val=center}'),
-        ('w:tc/w:tcPr/w:vAlign{w:val=center}', WD_ALIGN_VERTICAL.BOTTOM,
-         'w:tc/w:tcPr/w:vAlign{w:val=bottom}'),
-        ('w:tc/w:tcPr/w:vAlign{w:val=center}', None,
-         'w:tc/w:tcPr'),
-        ('w:tc', None,
-         'w:tc/w:tcPr'),
-        ('w:tc/w:tcPr', None,
-         'w:tc/w:tcPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc", WD_ALIGN_VERTICAL.TOP, "w:tc/w:tcPr/w:vAlign{w:val=top}"),
+            (
+                "w:tc/w:tcPr",
+                WD_ALIGN_VERTICAL.CENTER,
+                "w:tc/w:tcPr/w:vAlign{w:val=center}",
+            ),
+            (
+                "w:tc/w:tcPr/w:vAlign{w:val=center}",
+                WD_ALIGN_VERTICAL.BOTTOM,
+                "w:tc/w:tcPr/w:vAlign{w:val=bottom}",
+            ),
+            ("w:tc/w:tcPr/w:vAlign{w:val=center}", None, "w:tc/w:tcPr"),
+            ("w:tc", None, "w:tc/w:tcPr"),
+            ("w:tc/w:tcPr", None, "w:tc/w:tcPr"),
+        ]
+    )
     def alignment_set_fixture(self, request):
         cxml, new_value, expected_cxml = request.param
         cell = _Cell(element(cxml), None)
@@ -459,64 +490,80 @@ def merge_fixture(self, tc_, tc_2_, parent_, merged_tc_):
 
     @pytest.fixture
     def paragraphs_fixture(self):
-        return _Cell(element('w:tc/(w:p, w:p)'), None)
-
-    @pytest.fixture(params=[
-        ('w:tc',                   0),
-        ('w:tc/w:tbl',             1),
-        ('w:tc/(w:tbl,w:tbl)',     2),
-        ('w:tc/(w:p,w:tbl)',       1),
-        ('w:tc/(w:tbl,w:tbl,w:p)', 2),
-    ])
+        return _Cell(element("w:tc/(w:p, w:p)"), None)
+
+    @pytest.fixture(
+        params=[
+            ("w:tc", 0),
+            ("w:tc/w:tbl", 1),
+            ("w:tc/(w:tbl,w:tbl)", 2),
+            ("w:tc/(w:p,w:tbl)", 1),
+            ("w:tc/(w:tbl,w:tbl,w:p)", 2),
+        ]
+    )
     def tables_fixture(self, request):
         cell_cxml, expected_count = request.param
         cell = _Cell(element(cell_cxml), None)
         return cell, expected_count
 
-    @pytest.fixture(params=[
-        ('w:tc',                                     ''),
-        ('w:tc/w:p/w:r/w:t"foobar"',                 'foobar'),
-        ('w:tc/(w:p/w:r/w:t"foo",w:p/w:r/w:t"bar")', 'foo\nbar'),
-        ('w:tc/(w:tcPr,w:p/w:r/w:t"foobar")',        'foobar'),
-        ('w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)',
-         'fo\tob\nar\n'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc", ""),
+            ('w:tc/w:p/w:r/w:t"foobar"', "foobar"),
+            ('w:tc/(w:p/w:r/w:t"foo",w:p/w:r/w:t"bar")', "foo\nbar"),
+            ('w:tc/(w:tcPr,w:p/w:r/w:t"foobar")', "foobar"),
+            ('w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)', "fo\tob\nar\n"),
+        ]
+    )
     def text_get_fixture(self, request):
         tc_cxml, expected_text = request.param
         cell = _Cell(element(tc_cxml), None)
         return cell, expected_text
 
-    @pytest.fixture(params=[
-        ('w:tc/w:p', 'foobar',
-         'w:tc/w:p/w:r/w:t"foobar"'),
-        ('w:tc/w:p', 'fo\tob\rar\n',
-         'w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)'),
-        ('w:tc/(w:tcPr, w:p, w:tbl, w:p)', 'foobar',
-         'w:tc/(w:tcPr, w:p/w:r/w:t"foobar")'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc/w:p", "foobar", 'w:tc/w:p/w:r/w:t"foobar"'),
+            (
+                "w:tc/w:p",
+                "fo\tob\rar\n",
+                'w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)',
+            ),
+            (
+                "w:tc/(w:tcPr, w:p, w:tbl, w:p)",
+                "foobar",
+                'w:tc/(w:tcPr, w:p/w:r/w:t"foobar")',
+            ),
+        ]
+    )
     def text_set_fixture(self, request):
         tc_cxml, new_text, expected_cxml = request.param
         cell = _Cell(element(tc_cxml), None)
         expected_xml = xml(expected_cxml)
         return cell, new_text, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tc',                                   None),
-        ('w:tc/w:tcPr',                            None),
-        ('w:tc/w:tcPr/w:tcW{w:w=25%,w:type=pct}',  None),
-        ('w:tc/w:tcPr/w:tcW{w:w=1440,w:type=dxa}', 914400),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc", None),
+            ("w:tc/w:tcPr", None),
+            ("w:tc/w:tcPr/w:tcW{w:w=25%,w:type=pct}", None),
+            ("w:tc/w:tcPr/w:tcW{w:w=1440,w:type=dxa}", 914400),
+        ]
+    )
     def width_get_fixture(self, request):
         tc_cxml, expected_width = request.param
         cell = _Cell(element(tc_cxml), None)
         return cell, expected_width
 
-    @pytest.fixture(params=[
-        ('w:tc', Inches(1),
-         'w:tc/w:tcPr/w:tcW{w:w=1440,w:type=dxa}'),
-        ('w:tc/w:tcPr/w:tcW{w:w=25%,w:type=pct}', Inches(2),
-         'w:tc/w:tcPr/w:tcW{w:w=2880,w:type=dxa}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tc", Inches(1), "w:tc/w:tcPr/w:tcW{w:w=1440,w:type=dxa}"),
+            (
+                "w:tc/w:tcPr/w:tcW{w:w=25%,w:type=pct}",
+                Inches(2),
+                "w:tc/w:tcPr/w:tcW{w:w=2880,w:type=dxa}",
+            ),
+        ]
+    )
     def width_set_fixture(self, request):
         tc_cxml, new_value, expected_cxml = request.param
         cell = _Cell(element(tc_cxml), None)
@@ -543,7 +590,6 @@ def tc_2_(self, request):
 
 
 class Describe_Column(object):
-
     def it_provides_access_to_its_cells(self, cells_fixture):
         column, column_idx, expected_cells = cells_fixture
         cells = column.cells
@@ -580,7 +626,7 @@ def cells_fixture(self, _index_, table_prop_, table_):
 
     @pytest.fixture
     def index_fixture(self):
-        tbl = element('w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)')
+        tbl = element("w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)")
         gridCol, expected_idx = tbl.tblGrid[1], 1
         column = _Column(gridCol, None)
         return column, expected_idx
@@ -591,25 +637,29 @@ def table_fixture(self, parent_, table_):
         parent_.table = table_
         return column, table_
 
-    @pytest.fixture(params=[
-        ('w:gridCol{w:w=4242}',   2693670),
-        ('w:gridCol{w:w=1440}',    914400),
-        ('w:gridCol{w:w=2.54cm}',  914400),
-        ('w:gridCol{w:w=54mm}',   1944000),
-        ('w:gridCol{w:w=12.5pt}',  158750),
-        ('w:gridCol',                None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:gridCol{w:w=4242}", 2693670),
+            ("w:gridCol{w:w=1440}", 914400),
+            ("w:gridCol{w:w=2.54cm}", 914400),
+            ("w:gridCol{w:w=54mm}", 1944000),
+            ("w:gridCol{w:w=12.5pt}", 158750),
+            ("w:gridCol", None),
+        ]
+    )
     def width_get_fixture(self, request):
         gridCol_cxml, expected_width = request.param
         column = _Column(element(gridCol_cxml), None)
         return column, expected_width
 
-    @pytest.fixture(params=[
-        ('w:gridCol',           914400, 'w:gridCol{w:w=1440}'),
-        ('w:gridCol{w:w=4242}', 457200, 'w:gridCol{w:w=720}'),
-        ('w:gridCol{w:w=4242}',   None, 'w:gridCol'),
-        ('w:gridCol',             None, 'w:gridCol'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:gridCol", 914400, "w:gridCol{w:w=1440}"),
+            ("w:gridCol{w:w=4242}", 457200, "w:gridCol{w:w=720}"),
+            ("w:gridCol{w:w=4242}", None, "w:gridCol"),
+            ("w:gridCol", None, "w:gridCol"),
+        ]
+    )
     def width_set_fixture(self, request):
         gridCol_cxml, new_value, expected_cxml = request.param
         column = _Column(element(gridCol_cxml), None)
@@ -620,7 +670,7 @@ def width_set_fixture(self, request):
 
     @pytest.fixture
     def _index_(self, request):
-        return property_mock(request, _Column, '_index')
+        return property_mock(request, _Column, "_index")
 
     @pytest.fixture
     def parent_(self, request):
@@ -632,11 +682,10 @@ def table_(self, request):
 
     @pytest.fixture
     def table_prop_(self, request, table_):
-        return property_mock(request, _Column, 'table', return_value=table_)
+        return property_mock(request, _Column, "table", return_value=table_)
 
 
 class Describe_Columns(object):
-
     def it_knows_how_many_columns_it_contains(self, columns_fixture):
         columns, column_count = columns_fixture
         assert len(columns) == column_count
@@ -691,7 +740,6 @@ def table_(self, request):
 
 
 class Describe_Row(object):
-
     def it_knows_its_height(self, height_get_fixture):
         row, expected_height = height_get_fixture
         assert row.height == expected_height
@@ -734,74 +782,90 @@ def cells_fixture(self, _index_, table_prop_, table_):
         table_.row_cells.return_value = list(expected_cells)
         return row, row_idx, expected_cells
 
-    @pytest.fixture(params=[
-        ('w:tr',                               None),
-        ('w:tr/w:trPr',                        None),
-        ('w:tr/w:trPr/w:trHeight',             None),
-        ('w:tr/w:trPr/w:trHeight{w:val=0}',    0),
-        ('w:tr/w:trPr/w:trHeight{w:val=1440}', 914400),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tr", None),
+            ("w:tr/w:trPr", None),
+            ("w:tr/w:trPr/w:trHeight", None),
+            ("w:tr/w:trPr/w:trHeight{w:val=0}", 0),
+            ("w:tr/w:trPr/w:trHeight{w:val=1440}", 914400),
+        ]
+    )
     def height_get_fixture(self, request):
         tr_cxml, expected_height = request.param
         row = _Row(element(tr_cxml), None)
         return row, expected_height
 
-    @pytest.fixture(params=[
-        ('w:tr',                               Inches(1),
-         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
-        ('w:tr/w:trPr',                        Inches(1),
-         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
-        ('w:tr/w:trPr/w:trHeight',             Inches(1),
-         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
-        ('w:tr/w:trPr/w:trHeight{w:val=1440}', Inches(2),
-         'w:tr/w:trPr/w:trHeight{w:val=2880}'),
-        ('w:tr/w:trPr/w:trHeight{w:val=2880}', None,
-         'w:tr/w:trPr/w:trHeight'),
-        ('w:tr',                   None, 'w:tr/w:trPr'),
-        ('w:tr/w:trPr',            None, 'w:tr/w:trPr'),
-        ('w:tr/w:trPr/w:trHeight', None, 'w:tr/w:trPr/w:trHeight'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tr", Inches(1), "w:tr/w:trPr/w:trHeight{w:val=1440}"),
+            ("w:tr/w:trPr", Inches(1), "w:tr/w:trPr/w:trHeight{w:val=1440}"),
+            ("w:tr/w:trPr/w:trHeight", Inches(1), "w:tr/w:trPr/w:trHeight{w:val=1440}"),
+            (
+                "w:tr/w:trPr/w:trHeight{w:val=1440}",
+                Inches(2),
+                "w:tr/w:trPr/w:trHeight{w:val=2880}",
+            ),
+            ("w:tr/w:trPr/w:trHeight{w:val=2880}", None, "w:tr/w:trPr/w:trHeight"),
+            ("w:tr", None, "w:tr/w:trPr"),
+            ("w:tr/w:trPr", None, "w:tr/w:trPr"),
+            ("w:tr/w:trPr/w:trHeight", None, "w:tr/w:trPr/w:trHeight"),
+        ]
+    )
     def height_set_fixture(self, request):
         tr_cxml, new_value, expected_cxml = request.param
         row = _Row(element(tr_cxml), None)
         expected_xml = xml(expected_cxml)
         return row, new_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tr',        None),
-        ('w:tr/w:trPr', None),
-        ('w:tr/w:trPr/w:trHeight{w:val=0, w:hRule=auto}',
-         WD_ROW_HEIGHT.AUTO),
-        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=atLeast}',
-         WD_ROW_HEIGHT.AT_LEAST),
-        ('w:tr/w:trPr/w:trHeight{w:val=2880, w:hRule=exact}',
-         WD_ROW_HEIGHT.EXACTLY),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tr", None),
+            ("w:tr/w:trPr", None),
+            ("w:tr/w:trPr/w:trHeight{w:val=0, w:hRule=auto}", WD_ROW_HEIGHT.AUTO),
+            (
+                "w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=atLeast}",
+                WD_ROW_HEIGHT.AT_LEAST,
+            ),
+            (
+                "w:tr/w:trPr/w:trHeight{w:val=2880, w:hRule=exact}",
+                WD_ROW_HEIGHT.EXACTLY,
+            ),
+        ]
+    )
     def height_rule_get_fixture(self, request):
         tr_cxml, expected_rule = request.param
         row = _Row(element(tr_cxml), None)
         return row, expected_rule
 
-    @pytest.fixture(params=[
-        ('w:tr',
-         WD_ROW_HEIGHT.AUTO,
-         'w:tr/w:trPr/w:trHeight{w:hRule=auto}'),
-        ('w:tr/w:trPr',
-         WD_ROW_HEIGHT.AT_LEAST,
-         'w:tr/w:trPr/w:trHeight{w:hRule=atLeast}'),
-        ('w:tr/w:trPr/w:trHeight',
-         WD_ROW_HEIGHT.EXACTLY,
-         'w:tr/w:trPr/w:trHeight{w:hRule=exact}'),
-        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=exact}',
-         WD_ROW_HEIGHT.AUTO,
-         'w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}'),
-        ('w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}',
-         None,
-         'w:tr/w:trPr/w:trHeight{w:val=1440}'),
-        ('w:tr',                   None, 'w:tr/w:trPr'),
-        ('w:tr/w:trPr',            None, 'w:tr/w:trPr'),
-        ('w:tr/w:trPr/w:trHeight', None, 'w:tr/w:trPr/w:trHeight'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tr", WD_ROW_HEIGHT.AUTO, "w:tr/w:trPr/w:trHeight{w:hRule=auto}"),
+            (
+                "w:tr/w:trPr",
+                WD_ROW_HEIGHT.AT_LEAST,
+                "w:tr/w:trPr/w:trHeight{w:hRule=atLeast}",
+            ),
+            (
+                "w:tr/w:trPr/w:trHeight",
+                WD_ROW_HEIGHT.EXACTLY,
+                "w:tr/w:trPr/w:trHeight{w:hRule=exact}",
+            ),
+            (
+                "w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=exact}",
+                WD_ROW_HEIGHT.AUTO,
+                "w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}",
+            ),
+            (
+                "w:tr/w:trPr/w:trHeight{w:val=1440, w:hRule=auto}",
+                None,
+                "w:tr/w:trPr/w:trHeight{w:val=1440}",
+            ),
+            ("w:tr", None, "w:tr/w:trPr"),
+            ("w:tr/w:trPr", None, "w:tr/w:trPr"),
+            ("w:tr/w:trPr/w:trHeight", None, "w:tr/w:trPr/w:trHeight"),
+        ]
+    )
     def height_rule_set_fixture(self, request):
         tr_cxml, new_rule, expected_cxml = request.param
         row = _Row(element(tr_cxml), None)
@@ -810,7 +874,7 @@ def height_rule_set_fixture(self, request):
 
     @pytest.fixture
     def idx_fixture(self):
-        tbl = element('w:tbl/(w:tr,w:tr,w:tr)')
+        tbl = element("w:tbl/(w:tr,w:tr,w:tr)")
         tr, expected_idx = tbl[1], 1
         row = _Row(tr, None)
         return row, expected_idx
@@ -825,7 +889,7 @@ def table_fixture(self, parent_, table_):
 
     @pytest.fixture
     def _index_(self, request):
-        return property_mock(request, _Row, '_index')
+        return property_mock(request, _Row, "_index")
 
     @pytest.fixture
     def parent_(self, request):
@@ -837,11 +901,10 @@ def table_(self, request):
 
     @pytest.fixture
     def table_prop_(self, request, table_):
-        return property_mock(request, _Row, 'table', return_value=table_)
+        return property_mock(request, _Row, "table", return_value=table_)
 
 
 class Describe_Rows(object):
-
     def it_knows_how_many_rows_it_contains(self, rows_fixture):
         rows, row_count = rows_fixture
         assert len(rows) == row_count
@@ -891,10 +954,12 @@ def rows_fixture(self):
         rows = _Rows(tbl, None)
         return rows, row_count
 
-    @pytest.fixture(params=[
-        (3, 1,  3, 2),
-        (3, 0, -1, 2),
-    ])
+    @pytest.fixture(
+        params=[
+            (3, 1, 3, 2),
+            (3, 0, -1, 2),
+        ]
+    )
     def slice_fixture(self, request):
         row_count, start, end, expected_count = request.param
         tbl = _tbl_bldr(rows=row_count, cols=2).element
@@ -916,6 +981,7 @@ def table_(self, request):
 
 # fixtures -----------------------------------------------------------
 
+
 def _tbl_bldr(rows, cols):
     tblGrid_bldr = a_tblGrid()
     for i in range(cols):
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index 52564b12b..5b4b15eb4 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -4,9 +4,7 @@
 Test suite for the docx.text.run module
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.dml.color import ColorFormat
 from docx.enum.text import WD_COLOR, WD_UNDERLINE
@@ -20,7 +18,6 @@
 
 
 class DescribeFont(object):
-
     def it_provides_access_to_its_color_object(self, color_fixture):
         font, color_, ColorFormat_ = color_fixture
         color = font.color
@@ -92,86 +89,99 @@ def it_can_change_its_highlight_color(self, highlight_set_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:r/w:rPr',                          'all_caps',       None),
-        ('w:r/w:rPr/w:caps',                   'all_caps',       True),
-        ('w:r/w:rPr/w:caps{w:val=on}',         'all_caps',       True),
-        ('w:r/w:rPr/w:caps{w:val=off}',        'all_caps',       False),
-        ('w:r/w:rPr/w:b{w:val=1}',             'bold',           True),
-        ('w:r/w:rPr/w:i{w:val=0}',             'italic',         False),
-        ('w:r/w:rPr/w:cs{w:val=true}',         'complex_script', True),
-        ('w:r/w:rPr/w:bCs{w:val=false}',       'cs_bold',        False),
-        ('w:r/w:rPr/w:iCs{w:val=on}',          'cs_italic',      True),
-        ('w:r/w:rPr/w:dstrike{w:val=off}',     'double_strike',  False),
-        ('w:r/w:rPr/w:emboss{w:val=1}',        'emboss',         True),
-        ('w:r/w:rPr/w:vanish{w:val=0}',        'hidden',         False),
-        ('w:r/w:rPr/w:i{w:val=true}',          'italic',         True),
-        ('w:r/w:rPr/w:imprint{w:val=false}',   'imprint',        False),
-        ('w:r/w:rPr/w:oMath{w:val=on}',        'math',           True),
-        ('w:r/w:rPr/w:noProof{w:val=off}',     'no_proof',       False),
-        ('w:r/w:rPr/w:outline{w:val=1}',       'outline',        True),
-        ('w:r/w:rPr/w:rtl{w:val=0}',           'rtl',            False),
-        ('w:r/w:rPr/w:shadow{w:val=true}',     'shadow',         True),
-        ('w:r/w:rPr/w:smallCaps{w:val=false}', 'small_caps',     False),
-        ('w:r/w:rPr/w:snapToGrid{w:val=on}',   'snap_to_grid',   True),
-        ('w:r/w:rPr/w:specVanish{w:val=off}',  'spec_vanish',    False),
-        ('w:r/w:rPr/w:strike{w:val=1}',        'strike',         True),
-        ('w:r/w:rPr/w:webHidden{w:val=0}',     'web_hidden',     False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r/w:rPr", "all_caps", None),
+            ("w:r/w:rPr/w:caps", "all_caps", True),
+            ("w:r/w:rPr/w:caps{w:val=on}", "all_caps", True),
+            ("w:r/w:rPr/w:caps{w:val=off}", "all_caps", False),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", True),
+            ("w:r/w:rPr/w:i{w:val=0}", "italic", False),
+            ("w:r/w:rPr/w:cs{w:val=true}", "complex_script", True),
+            ("w:r/w:rPr/w:bCs{w:val=false}", "cs_bold", False),
+            ("w:r/w:rPr/w:iCs{w:val=on}", "cs_italic", True),
+            ("w:r/w:rPr/w:dstrike{w:val=off}", "double_strike", False),
+            ("w:r/w:rPr/w:emboss{w:val=1}", "emboss", True),
+            ("w:r/w:rPr/w:vanish{w:val=0}", "hidden", False),
+            ("w:r/w:rPr/w:i{w:val=true}", "italic", True),
+            ("w:r/w:rPr/w:imprint{w:val=false}", "imprint", False),
+            ("w:r/w:rPr/w:oMath{w:val=on}", "math", True),
+            ("w:r/w:rPr/w:noProof{w:val=off}", "no_proof", False),
+            ("w:r/w:rPr/w:outline{w:val=1}", "outline", True),
+            ("w:r/w:rPr/w:rtl{w:val=0}", "rtl", False),
+            ("w:r/w:rPr/w:shadow{w:val=true}", "shadow", True),
+            ("w:r/w:rPr/w:smallCaps{w:val=false}", "small_caps", False),
+            ("w:r/w:rPr/w:snapToGrid{w:val=on}", "snap_to_grid", True),
+            ("w:r/w:rPr/w:specVanish{w:val=off}", "spec_vanish", False),
+            ("w:r/w:rPr/w:strike{w:val=1}", "strike", True),
+            ("w:r/w:rPr/w:webHidden{w:val=0}", "web_hidden", False),
+        ]
+    )
     def bool_prop_get_fixture(self, request):
         r_cxml, bool_prop_name, expected_value = request.param
         font = Font(element(r_cxml))
         return font, bool_prop_name, expected_value
 
-    @pytest.fixture(params=[
-        # nothing to True, False, and None ---------------------------
-        ('w:r',                             'all_caps',       True,
-         'w:r/w:rPr/w:caps'),
-        ('w:r',                             'bold',           False,
-         'w:r/w:rPr/w:b{w:val=0}'),
-        ('w:r',                             'italic',         None,
-         'w:r/w:rPr'),
-        # default to True, False, and None ---------------------------
-        ('w:r/w:rPr/w:cs',                  'complex_script', True,
-         'w:r/w:rPr/w:cs'),
-        ('w:r/w:rPr/w:bCs',                 'cs_bold',        False,
-         'w:r/w:rPr/w:bCs{w:val=0}'),
-        ('w:r/w:rPr/w:iCs',                 'cs_italic',      None,
-         'w:r/w:rPr'),
-        # True to True, False, and None ------------------------------
-        ('w:r/w:rPr/w:dstrike{w:val=1}',    'double_strike',  True,
-         'w:r/w:rPr/w:dstrike'),
-        ('w:r/w:rPr/w:emboss{w:val=on}',    'emboss',         False,
-         'w:r/w:rPr/w:emboss{w:val=0}'),
-        ('w:r/w:rPr/w:vanish{w:val=1}',     'hidden',         None,
-         'w:r/w:rPr'),
-        # False to True, False, and None -----------------------------
-        ('w:r/w:rPr/w:i{w:val=false}',      'italic',         True,
-         'w:r/w:rPr/w:i'),
-        ('w:r/w:rPr/w:imprint{w:val=0}',    'imprint',        False,
-         'w:r/w:rPr/w:imprint{w:val=0}'),
-        ('w:r/w:rPr/w:oMath{w:val=off}',    'math',           None,
-         'w:r/w:rPr'),
-        # random mix -------------------------------------------------
-        ('w:r/w:rPr/w:noProof{w:val=1}',    'no_proof',       False,
-         'w:r/w:rPr/w:noProof{w:val=0}'),
-        ('w:r/w:rPr',                       'outline',        True,
-         'w:r/w:rPr/w:outline'),
-        ('w:r/w:rPr/w:rtl{w:val=true}',     'rtl',            False,
-         'w:r/w:rPr/w:rtl{w:val=0}'),
-        ('w:r/w:rPr/w:shadow{w:val=on}',    'shadow',         True,
-         'w:r/w:rPr/w:shadow'),
-        ('w:r/w:rPr/w:smallCaps',           'small_caps',     False,
-         'w:r/w:rPr/w:smallCaps{w:val=0}'),
-        ('w:r/w:rPr/w:snapToGrid',          'snap_to_grid',   True,
-         'w:r/w:rPr/w:snapToGrid'),
-        ('w:r/w:rPr/w:specVanish',          'spec_vanish',    None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:strike{w:val=foo}',   'strike',         True,
-         'w:r/w:rPr/w:strike'),
-        ('w:r/w:rPr/w:webHidden',           'web_hidden',     False,
-         'w:r/w:rPr/w:webHidden{w:val=0}'),
-    ])
+    @pytest.fixture(
+        params=[
+            # nothing to True, False, and None ---------------------------
+            ("w:r", "all_caps", True, "w:r/w:rPr/w:caps"),
+            ("w:r", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r", "italic", None, "w:r/w:rPr"),
+            # default to True, False, and None ---------------------------
+            ("w:r/w:rPr/w:cs", "complex_script", True, "w:r/w:rPr/w:cs"),
+            ("w:r/w:rPr/w:bCs", "cs_bold", False, "w:r/w:rPr/w:bCs{w:val=0}"),
+            ("w:r/w:rPr/w:iCs", "cs_italic", None, "w:r/w:rPr"),
+            # True to True, False, and None ------------------------------
+            (
+                "w:r/w:rPr/w:dstrike{w:val=1}",
+                "double_strike",
+                True,
+                "w:r/w:rPr/w:dstrike",
+            ),
+            (
+                "w:r/w:rPr/w:emboss{w:val=on}",
+                "emboss",
+                False,
+                "w:r/w:rPr/w:emboss{w:val=0}",
+            ),
+            ("w:r/w:rPr/w:vanish{w:val=1}", "hidden", None, "w:r/w:rPr"),
+            # False to True, False, and None -----------------------------
+            ("w:r/w:rPr/w:i{w:val=false}", "italic", True, "w:r/w:rPr/w:i"),
+            (
+                "w:r/w:rPr/w:imprint{w:val=0}",
+                "imprint",
+                False,
+                "w:r/w:rPr/w:imprint{w:val=0}",
+            ),
+            ("w:r/w:rPr/w:oMath{w:val=off}", "math", None, "w:r/w:rPr"),
+            # random mix -------------------------------------------------
+            (
+                "w:r/w:rPr/w:noProof{w:val=1}",
+                "no_proof",
+                False,
+                "w:r/w:rPr/w:noProof{w:val=0}",
+            ),
+            ("w:r/w:rPr", "outline", True, "w:r/w:rPr/w:outline"),
+            ("w:r/w:rPr/w:rtl{w:val=true}", "rtl", False, "w:r/w:rPr/w:rtl{w:val=0}"),
+            ("w:r/w:rPr/w:shadow{w:val=on}", "shadow", True, "w:r/w:rPr/w:shadow"),
+            (
+                "w:r/w:rPr/w:smallCaps",
+                "small_caps",
+                False,
+                "w:r/w:rPr/w:smallCaps{w:val=0}",
+            ),
+            ("w:r/w:rPr/w:snapToGrid", "snap_to_grid", True, "w:r/w:rPr/w:snapToGrid"),
+            ("w:r/w:rPr/w:specVanish", "spec_vanish", None, "w:r/w:rPr"),
+            ("w:r/w:rPr/w:strike{w:val=foo}", "strike", True, "w:r/w:rPr/w:strike"),
+            (
+                "w:r/w:rPr/w:webHidden",
+                "web_hidden",
+                False,
+                "w:r/w:rPr/w:webHidden{w:val=0}",
+            ),
+        ]
+    )
     def bool_prop_set_fixture(self, request):
         r_cxml, prop_name, value, expected_cxml = request.param
         font = Font(element(r_cxml))
@@ -180,199 +190,240 @@ def bool_prop_set_fixture(self, request):
 
     @pytest.fixture
     def color_fixture(self, ColorFormat_, color_):
-        font = Font(element('w:r'))
+        font = Font(element("w:r"))
         return font, color_, ColorFormat_
 
-    @pytest.fixture(params=[
-        ('w:r',                                  None),
-        ('w:r/w:rPr',                            None),
-        ('w:r/w:rPr/w:highlight{w:val=default}', WD_COLOR.AUTO),
-        ('w:r/w:rPr/w:highlight{w:val=blue}',    WD_COLOR.BLUE),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:highlight{w:val=default}", WD_COLOR.AUTO),
+            ("w:r/w:rPr/w:highlight{w:val=blue}", WD_COLOR.BLUE),
+        ]
+    )
     def highlight_get_fixture(self, request):
         r_cxml, expected_value = request.param
         font = Font(element(r_cxml), None)
         return font, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r',                                 WD_COLOR.AUTO,
-         'w:r/w:rPr/w:highlight{w:val=default}'),
-        ('w:r/w:rPr',                           WD_COLOR.BRIGHT_GREEN,
-         'w:r/w:rPr/w:highlight{w:val=green}'),
-        ('w:r/w:rPr/w:highlight{w:val=green}',  WD_COLOR.YELLOW,
-         'w:r/w:rPr/w:highlight{w:val=yellow}'),
-        ('w:r/w:rPr/w:highlight{w:val=yellow}', None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr',                           None,
-         'w:r/w:rPr'),
-        ('w:r',                                 None,
-         'w:r/w:rPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", WD_COLOR.AUTO, "w:r/w:rPr/w:highlight{w:val=default}"),
+            ("w:r/w:rPr", WD_COLOR.BRIGHT_GREEN, "w:r/w:rPr/w:highlight{w:val=green}"),
+            (
+                "w:r/w:rPr/w:highlight{w:val=green}",
+                WD_COLOR.YELLOW,
+                "w:r/w:rPr/w:highlight{w:val=yellow}",
+            ),
+            ("w:r/w:rPr/w:highlight{w:val=yellow}", None, "w:r/w:rPr"),
+            ("w:r/w:rPr", None, "w:r/w:rPr"),
+            ("w:r", None, "w:r/w:rPr"),
+        ]
+    )
     def highlight_set_fixture(self, request):
         r_cxml, value, expected_cxml = request.param
         font = Font(element(r_cxml), None)
         expected_xml = xml(expected_cxml)
         return font, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                               None),
-        ('w:r/w:rPr',                         None),
-        ('w:r/w:rPr/w:rFonts',                None),
-        ('w:r/w:rPr/w:rFonts{w:ascii=Arial}', 'Arial'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:rFonts", None),
+            ("w:r/w:rPr/w:rFonts{w:ascii=Arial}", "Arial"),
+        ]
+    )
     def name_get_fixture(self, request):
         r_cxml, expected_value = request.param
         font = Font(element(r_cxml))
         return font, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r',                                          'Foo',
-         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
-        ('w:r/w:rPr',                                    'Foo',
-         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
-        ('w:r/w:rPr/w:rFonts{w:hAnsi=Foo}',              'Bar',
-         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
-        ('w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}',  'Bar',
-         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", "Foo", "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}"),
+            ("w:r/w:rPr", "Foo", "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}"),
+            (
+                "w:r/w:rPr/w:rFonts{w:hAnsi=Foo}",
+                "Bar",
+                "w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}",
+            ),
+            (
+                "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}",
+                "Bar",
+                "w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}",
+            ),
+        ]
+    )
     def name_set_fixture(self, request):
         r_cxml, value, expected_r_cxml = request.param
         font = Font(element(r_cxml))
         expected_xml = xml(expected_r_cxml)
         return font, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                      None),
-        ('w:r/w:rPr',                None),
-        ('w:r/w:rPr/w:sz{w:val=28}', Pt(14)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:sz{w:val=28}", Pt(14)),
+        ]
+    )
     def size_get_fixture(self, request):
         r_cxml, expected_value = request.param
         font = Font(element(r_cxml))
         return font, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r',                      Pt(12), 'w:r/w:rPr/w:sz{w:val=24}'),
-        ('w:r/w:rPr',                Pt(12), 'w:r/w:rPr/w:sz{w:val=24}'),
-        ('w:r/w:rPr/w:sz{w:val=24}', Pt(18), 'w:r/w:rPr/w:sz{w:val=36}'),
-        ('w:r/w:rPr/w:sz{w:val=36}', None,   'w:r/w:rPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", Pt(12), "w:r/w:rPr/w:sz{w:val=24}"),
+            ("w:r/w:rPr", Pt(12), "w:r/w:rPr/w:sz{w:val=24}"),
+            ("w:r/w:rPr/w:sz{w:val=24}", Pt(18), "w:r/w:rPr/w:sz{w:val=36}"),
+            ("w:r/w:rPr/w:sz{w:val=36}", None, "w:r/w:rPr"),
+        ]
+    )
     def size_set_fixture(self, request):
         r_cxml, value, expected_r_cxml = request.param
         font = Font(element(r_cxml))
         expected_xml = xml(expected_r_cxml)
         return font, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                                      None),
-        ('w:r/w:rPr',                                None),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    False),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   True),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:vertAlign{w:val=baseline}", False),
+            ("w:r/w:rPr/w:vertAlign{w:val=subscript}", True),
+            ("w:r/w:rPr/w:vertAlign{w:val=superscript}", False),
+        ]
+    )
     def subscript_get_fixture(self, request):
         r_cxml, expected_value = request.param
         font = Font(element(r_cxml))
         return font, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r',                                      True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r',                                      False,
-         'w:r/w:rPr'),
-        ('w:r',                                      None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   False,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', False,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    True,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", True, "w:r/w:rPr/w:vertAlign{w:val=subscript}"),
+            ("w:r", False, "w:r/w:rPr"),
+            ("w:r", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+                True,
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+            ),
+            ("w:r/w:rPr/w:vertAlign{w:val=subscript}", False, "w:r/w:rPr"),
+            ("w:r/w:rPr/w:vertAlign{w:val=subscript}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+                True,
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+            ),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+                False,
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+            ),
+            ("w:r/w:rPr/w:vertAlign{w:val=superscript}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=baseline}",
+                True,
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+            ),
+        ]
+    )
     def subscript_set_fixture(self, request):
         r_cxml, value, expected_r_cxml = request.param
         font = Font(element(r_cxml))
         expected_xml = xml(expected_r_cxml)
         return font, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                                      None),
-        ('w:r/w:rPr',                                None),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',    False),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',   False),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}', True),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:vertAlign{w:val=baseline}", False),
+            ("w:r/w:rPr/w:vertAlign{w:val=subscript}", False),
+            ("w:r/w:rPr/w:vertAlign{w:val=superscript}", True),
+        ]
+    )
     def superscript_get_fixture(self, request):
         r_cxml, expected_value = request.param
         font = Font(element(r_cxml))
         return font, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r',                                       True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r',                                       False,
-         'w:r/w:rPr'),
-        ('w:r',                                       None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  False,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=superscript}',  None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    False,
-         'w:r/w:rPr/w:vertAlign{w:val=subscript}'),
-        ('w:r/w:rPr/w:vertAlign{w:val=subscript}',    None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:vertAlign{w:val=baseline}',     True,
-         'w:r/w:rPr/w:vertAlign{w:val=superscript}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", True, "w:r/w:rPr/w:vertAlign{w:val=superscript}"),
+            ("w:r", False, "w:r/w:rPr"),
+            ("w:r", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+                True,
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+            ),
+            ("w:r/w:rPr/w:vertAlign{w:val=superscript}", False, "w:r/w:rPr"),
+            ("w:r/w:rPr/w:vertAlign{w:val=superscript}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+                True,
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+            ),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+                False,
+                "w:r/w:rPr/w:vertAlign{w:val=subscript}",
+            ),
+            ("w:r/w:rPr/w:vertAlign{w:val=subscript}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:vertAlign{w:val=baseline}",
+                True,
+                "w:r/w:rPr/w:vertAlign{w:val=superscript}",
+            ),
+        ]
+    )
     def superscript_set_fixture(self, request):
         r_cxml, value, expected_r_cxml = request.param
         font = Font(element(r_cxml))
         expected_xml = xml(expected_r_cxml)
         return font, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                         None),
-        ('w:r/w:rPr/w:u',               None),
-        ('w:r/w:rPr/w:u{w:val=single}', True),
-        ('w:r/w:rPr/w:u{w:val=none}',   False),
-        ('w:r/w:rPr/w:u{w:val=double}', WD_UNDERLINE.DOUBLE),
-        ('w:r/w:rPr/w:u{w:val=wave}',   WD_UNDERLINE.WAVY),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr/w:u", None),
+            ("w:r/w:rPr/w:u{w:val=single}", True),
+            ("w:r/w:rPr/w:u{w:val=none}", False),
+            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
+            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
+        ]
+    )
     def underline_get_fixture(self, request):
         r_cxml, expected_value = request.param
         run = Font(element(r_cxml), None)
         return run, expected_value
 
-    @pytest.fixture(params=[
-        ('w:r', True,                'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r', False,               'w:r/w:rPr/w:u{w:val=none}'),
-        ('w:r', None,                'w:r/w:rPr'),
-        ('w:r', WD_UNDERLINE.SINGLE, 'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r', WD_UNDERLINE.THICK,  'w:r/w:rPr/w:u{w:val=thick}'),
-        ('w:r/w:rPr/w:u{w:val=single}', True,
-         'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r/w:rPr/w:u{w:val=single}', False,
-         'w:r/w:rPr/w:u{w:val=none}'),
-        ('w:r/w:rPr/w:u{w:val=single}', None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.SINGLE,
-         'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.DOTTED,
-         'w:r/w:rPr/w:u{w:val=dotted}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", True, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r", False, "w:r/w:rPr/w:u{w:val=none}"),
+            ("w:r", None, "w:r/w:rPr"),
+            ("w:r", WD_UNDERLINE.SINGLE, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r", WD_UNDERLINE.THICK, "w:r/w:rPr/w:u{w:val=thick}"),
+            ("w:r/w:rPr/w:u{w:val=single}", True, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r/w:rPr/w:u{w:val=single}", False, "w:r/w:rPr/w:u{w:val=none}"),
+            ("w:r/w:rPr/w:u{w:val=single}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:u{w:val=single}",
+                WD_UNDERLINE.SINGLE,
+                "w:r/w:rPr/w:u{w:val=single}",
+            ),
+            (
+                "w:r/w:rPr/w:u{w:val=single}",
+                WD_UNDERLINE.DOTTED,
+                "w:r/w:rPr/w:u{w:val=dotted}",
+            ),
+        ]
+    )
     def underline_set_fixture(self, request):
         initial_r_cxml, value, expected_cxml = request.param
         run = Font(element(initial_r_cxml), None)
@@ -387,6 +438,4 @@ def color_(self, request):
 
     @pytest.fixture
     def ColorFormat_(self, request, color_):
-        return class_mock(
-            request, 'docx.text.font.ColorFormat', return_value=color_
-        )
+        return class_mock(request, "docx.text.font.ColorFormat", return_value=color_)
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index b8313e61e..e394334e5 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -16,13 +16,10 @@
 import pytest
 
 from ..unitutil.cxml import element, xml
-from ..unitutil.mock import (
-    call, class_mock, instance_mock, method_mock, property_mock
-)
+from ..unitutil.mock import call, class_mock, instance_mock, method_mock, property_mock
 
 
 class DescribeParagraph(object):
-
     def it_knows_its_paragraph_style(self, style_get_fixture):
         paragraph, style_id_, style_ = style_get_fixture
         style = paragraph.style
@@ -68,9 +65,7 @@ def it_provides_access_to_its_paragraph_format(self, parfmt_fixture):
     def it_provides_access_to_the_runs_it_contains(self, runs_fixture):
         paragraph, Run_, r_, r_2_, run_, run_2_ = runs_fixture
         runs = paragraph.runs
-        assert Run_.mock_calls == [
-            call(r_, paragraph), call(r_2_, paragraph)
-        ]
+        assert Run_.mock_calls == [call(r_, paragraph), call(r_2_, paragraph)]
         assert runs == [run_, run_2_]
 
     def it_can_add_a_run_to_itself(self, add_run_fixture):
@@ -93,8 +88,7 @@ def it_can_insert_a_paragraph_before_itself(self, insert_before_fixture):
         assert new_paragraph.style == style
         assert new_paragraph is paragraph_
 
-    def it_can_remove_its_content_while_preserving_formatting(
-            self, clear_fixture):
+    def it_can_remove_its_content_while_preserving_formatting(self, clear_fixture):
         paragraph, expected_xml = clear_fixture
         _paragraph = paragraph.clear()
         assert paragraph._p.xml == expected_xml
@@ -108,60 +102,71 @@ def it_inserts_a_paragraph_before_to_help(self, _insert_before_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:p', None,     None,     'w:p/w:r'),
-        ('w:p', 'foobar', None,     'w:p/w:r/w:t"foobar"'),
-        ('w:p', None,     'Strong', 'w:p/w:r'),
-        ('w:p', 'foobar', 'Strong', 'w:p/w:r/w:t"foobar"'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None, None, "w:p/w:r"),
+            ("w:p", "foobar", None, 'w:p/w:r/w:t"foobar"'),
+            ("w:p", None, "Strong", "w:p/w:r"),
+            ("w:p", "foobar", "Strong", 'w:p/w:r/w:t"foobar"'),
+        ]
+    )
     def add_run_fixture(self, request, run_style_prop_):
         before_cxml, text, style, after_cxml = request.param
         paragraph = Paragraph(element(before_cxml), None)
         expected_xml = xml(after_cxml)
         return paragraph, text, style, run_style_prop_, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.CENTER),
-        ('w:p', None),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p/w:pPr/w:jc{w:val=center}", WD_ALIGN_PARAGRAPH.CENTER),
+            ("w:p", None),
+        ]
+    )
     def alignment_get_fixture(self, request):
         cxml, expected_alignment_value = request.param
         paragraph = Paragraph(element(cxml), None)
         return paragraph, expected_alignment_value
 
-    @pytest.fixture(params=[
-        ('w:p', WD_ALIGN_PARAGRAPH.LEFT,
-         'w:p/w:pPr/w:jc{w:val=left}'),
-        ('w:p/w:pPr/w:jc{w:val=left}', WD_ALIGN_PARAGRAPH.CENTER,
-         'w:p/w:pPr/w:jc{w:val=center}'),
-        ('w:p/w:pPr/w:jc{w:val=left}', None,
-         'w:p/w:pPr'),
-        ('w:p', None, 'w:p/w:pPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", WD_ALIGN_PARAGRAPH.LEFT, "w:p/w:pPr/w:jc{w:val=left}"),
+            (
+                "w:p/w:pPr/w:jc{w:val=left}",
+                WD_ALIGN_PARAGRAPH.CENTER,
+                "w:p/w:pPr/w:jc{w:val=center}",
+            ),
+            ("w:p/w:pPr/w:jc{w:val=left}", None, "w:p/w:pPr"),
+            ("w:p", None, "w:p/w:pPr"),
+        ]
+    )
     def alignment_set_fixture(self, request):
         initial_cxml, new_alignment_value, expected_cxml = request.param
         paragraph = Paragraph(element(initial_cxml), None)
         expected_xml = xml(expected_cxml)
         return paragraph, new_alignment_value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p', 'w:p'),
-        ('w:p/w:pPr', 'w:p/w:pPr'),
-        ('w:p/w:r/w:t"foobar"', 'w:p'),
-        ('w:p/(w:pPr, w:r/w:t"foobar")', 'w:p/w:pPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", "w:p"),
+            ("w:p/w:pPr", "w:p/w:pPr"),
+            ('w:p/w:r/w:t"foobar"', "w:p"),
+            ('w:p/(w:pPr, w:r/w:t"foobar")', "w:p/w:pPr"),
+        ]
+    )
     def clear_fixture(self, request):
         initial_cxml, expected_cxml = request.param
         paragraph = Paragraph(element(initial_cxml), None)
         expected_xml = xml(expected_cxml)
         return paragraph, expected_xml
 
-    @pytest.fixture(params=[
-        (None,  None),
-        ('Foo', None),
-        (None,  'Bar'),
-        ('Foo', 'Bar'),
-    ])
+    @pytest.fixture(
+        params=[
+            (None, None),
+            ("Foo", None),
+            (None, "Bar"),
+            ("Foo", "Bar"),
+        ]
+    )
     def insert_before_fixture(self, request, _insert_paragraph_before_, add_run_):
         text, style = request.param
         paragraph_ = _insert_paragraph_before_.return_value
@@ -169,9 +174,7 @@ def insert_before_fixture(self, request, _insert_paragraph_before_, add_run_):
         paragraph_.style = None
         return text, style, paragraph_, add_run_calls
 
-    @pytest.fixture(params=[
-        ('w:body/w:p{id=42}', 'w:body/(w:p,w:p{id=42})')
-    ])
+    @pytest.fixture(params=[("w:body/w:p{id=42}", "w:body/(w:p,w:p{id=42})")])
     def _insert_before_fixture(self, request):
         body_cxml, expected_cxml = request.param
         body = element(body_cxml)
@@ -181,7 +184,7 @@ def _insert_before_fixture(self, request):
 
     @pytest.fixture
     def parfmt_fixture(self, ParagraphFormat_, paragraph_format_):
-        paragraph = Paragraph(element('w:p'), None)
+        paragraph = Paragraph(element("w:p"), None)
         return paragraph, ParagraphFormat_, paragraph_format_
 
     @pytest.fixture
@@ -192,24 +195,31 @@ def runs_fixture(self, p_, Run_, r_, r_2_, runs_):
 
     @pytest.fixture
     def style_get_fixture(self, part_prop_):
-        style_id = 'Foobar'
-        p_cxml = 'w:p/w:pPr/w:pStyle{w:val=%s}' % style_id
+        style_id = "Foobar"
+        p_cxml = "w:p/w:pPr/w:pStyle{w:val=%s}" % style_id
         paragraph = Paragraph(element(p_cxml), None)
         style_ = part_prop_.return_value.get_style.return_value
         return paragraph, style_id, style_
 
-    @pytest.fixture(params=[
-        ('w:p',                                 'Heading 1', 'Heading1',
-         'w:p/w:pPr/w:pStyle{w:val=Heading1}'),
-        ('w:p/w:pPr',                           'Heading 1', 'Heading1',
-         'w:p/w:pPr/w:pStyle{w:val=Heading1}'),
-        ('w:p/w:pPr/w:pStyle{w:val=Heading1}',  'Heading 2', 'Heading2',
-         'w:p/w:pPr/w:pStyle{w:val=Heading2}'),
-        ('w:p/w:pPr/w:pStyle{w:val=Heading1}',  'Normal',    None,
-         'w:p/w:pPr'),
-        ('w:p',                                 None,        None,
-         'w:p/w:pPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", "Heading 1", "Heading1", "w:p/w:pPr/w:pStyle{w:val=Heading1}"),
+            (
+                "w:p/w:pPr",
+                "Heading 1",
+                "Heading1",
+                "w:p/w:pPr/w:pStyle{w:val=Heading1}",
+            ),
+            (
+                "w:p/w:pPr/w:pStyle{w:val=Heading1}",
+                "Heading 2",
+                "Heading2",
+                "w:p/w:pPr/w:pStyle{w:val=Heading2}",
+            ),
+            ("w:p/w:pPr/w:pStyle{w:val=Heading1}", "Normal", None, "w:p/w:pPr"),
+            ("w:p", None, None, "w:p/w:pPr"),
+        ]
+    )
     def style_set_fixture(self, request, part_prop_):
         p_cxml, value, style_id, expected_cxml = request.param
         paragraph = Paragraph(element(p_cxml), None)
@@ -217,17 +227,19 @@ def style_set_fixture(self, request, part_prop_):
         expected_xml = xml(expected_cxml)
         return paragraph, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p', ''),
-        ('w:p/w:r', ''),
-        ('w:p/w:r/w:t', ''),
-        ('w:p/w:r/w:t"foo"', 'foo'),
-        ('w:p/w:r/(w:t"foo", w:t"bar")', 'foobar'),
-        ('w:p/w:r/(w:t"fo ", w:t"bar")', 'fo bar'),
-        ('w:p/w:r/(w:t"foo", w:tab, w:t"bar")', 'foo\tbar'),
-        ('w:p/w:r/(w:t"foo", w:br,  w:t"bar")', 'foo\nbar'),
-        ('w:p/w:r/(w:t"foo", w:cr,  w:t"bar")', 'foo\nbar'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", ""),
+            ("w:p/w:r", ""),
+            ("w:p/w:r/w:t", ""),
+            ('w:p/w:r/w:t"foo"', "foo"),
+            ('w:p/w:r/(w:t"foo", w:t"bar")', "foobar"),
+            ('w:p/w:r/(w:t"fo ", w:t"bar")', "fo bar"),
+            ('w:p/w:r/(w:t"foo", w:tab, w:t"bar")', "foo\tbar"),
+            ('w:p/w:r/(w:t"foo", w:br,  w:t"bar")', "foo\nbar"),
+            ('w:p/w:r/(w:t"foo", w:cr,  w:t"bar")', "foo\nbar"),
+        ]
+    )
     def text_get_fixture(self, request):
         p_cxml, expected_text_value = request.param
         paragraph = Paragraph(element(p_cxml), None)
@@ -235,17 +247,17 @@ def text_get_fixture(self, request):
 
     @pytest.fixture
     def text_set_fixture(self):
-        paragraph = Paragraph(element('w:p'), None)
-        paragraph.add_run('must not appear in result')
-        new_text_value = 'foo\tbar\rbaz\n'
-        expected_text_value = 'foo\tbar\nbaz\n'
+        paragraph = Paragraph(element("w:p"), None)
+        paragraph.add_run("must not appear in result")
+        new_text_value = "foo\tbar\rbaz\n"
+        expected_text_value = "foo\tbar\nbaz\n"
         return paragraph, new_text_value, expected_text_value
 
     # fixture components ---------------------------------------------
 
     @pytest.fixture
     def add_run_(self, request):
-        return method_mock(request, Paragraph, 'add_run')
+        return method_mock(request, Paragraph, "add_run")
 
     @pytest.fixture
     def document_part_(self, request):
@@ -253,7 +265,7 @@ def document_part_(self, request):
 
     @pytest.fixture
     def _insert_paragraph_before_(self, request):
-        return method_mock(request, Paragraph, '_insert_paragraph_before')
+        return method_mock(request, Paragraph, "_insert_paragraph_before")
 
     @pytest.fixture
     def p_(self, request, r_, r_2_):
@@ -262,8 +274,9 @@ def p_(self, request, r_, r_2_):
     @pytest.fixture
     def ParagraphFormat_(self, request, paragraph_format_):
         return class_mock(
-            request, 'docx.text.paragraph.ParagraphFormat',
-            return_value=paragraph_format_
+            request,
+            "docx.text.paragraph.ParagraphFormat",
+            return_value=paragraph_format_,
         )
 
     @pytest.fixture
@@ -272,15 +285,13 @@ def paragraph_format_(self, request):
 
     @pytest.fixture
     def part_prop_(self, request, document_part_):
-        return property_mock(
-            request, Paragraph, 'part', return_value=document_part_
-        )
+        return property_mock(request, Paragraph, "part", return_value=document_part_)
 
     @pytest.fixture
     def Run_(self, request, runs_):
         run_, run_2_ = runs_
         return class_mock(
-            request, 'docx.text.paragraph.Run', side_effect=[run_, run_2_]
+            request, "docx.text.paragraph.Run", side_effect=[run_, run_2_]
         )
 
     @pytest.fixture
@@ -293,10 +304,10 @@ def r_2_(self, request):
 
     @pytest.fixture
     def run_style_prop_(self, request):
-        return property_mock(request, Run, 'style')
+        return property_mock(request, Run, "style")
 
     @pytest.fixture
     def runs_(self, request):
-        run_ = instance_mock(request, Run, name='run_')
-        run_2_ = instance_mock(request, Run, name='run_2_')
+        run_ = instance_mock(request, Run, name="run_")
+        run_2_ = instance_mock(request, Run, name="run_2_")
         return run_, run_2_
diff --git a/tests/text/test_parfmt.py b/tests/text/test_parfmt.py
index 9e7bb4d52..ce9927798 100644
--- a/tests/text/test_parfmt.py
+++ b/tests/text/test_parfmt.py
@@ -5,9 +5,7 @@
 object.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
 from docx.shared import Pt
@@ -21,7 +19,6 @@
 
 
 class DescribeParagraphFormat(object):
-
     def it_knows_its_alignment_value(self, alignment_get_fixture):
         paragraph_format, expected_value = alignment_get_fixture
         assert paragraph_format.alignment == expected_value
@@ -62,8 +59,7 @@ def it_knows_its_line_spacing_rule(self, line_spacing_rule_get_fixture):
         paragraph_format, expected_value = line_spacing_rule_get_fixture
         assert paragraph_format.line_spacing_rule == expected_value
 
-    def it_can_change_its_line_spacing_rule(self,
-                                            line_spacing_rule_set_fixture):
+    def it_can_change_its_line_spacing_rule(self, line_spacing_rule_set_fixture):
         paragraph_format, value, expected_xml = line_spacing_rule_set_fixture
         paragraph_format.line_spacing_rule = value
         assert paragraph_format._element.xml == expected_xml
@@ -112,290 +108,367 @@ def it_provides_access_to_its_tab_stops(self, tab_stops_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:p',                          None),
-        ('w:p/w:pPr',                    None),
-        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.CENTER),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:jc{w:val=center}", WD_ALIGN_PARAGRAPH.CENTER),
+        ]
+    )
     def alignment_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p',                          WD_ALIGN_PARAGRAPH.LEFT,
-         'w:p/w:pPr/w:jc{w:val=left}'),
-        ('w:p/w:pPr',                    WD_ALIGN_PARAGRAPH.CENTER,
-         'w:p/w:pPr/w:jc{w:val=center}'),
-        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.RIGHT,
-         'w:p/w:pPr/w:jc{w:val=right}'),
-        ('w:p/w:pPr/w:jc{w:val=right}',  None,
-         'w:p/w:pPr'),
-        ('w:p',                          None,
-         'w:p/w:pPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", WD_ALIGN_PARAGRAPH.LEFT, "w:p/w:pPr/w:jc{w:val=left}"),
+            ("w:p/w:pPr", WD_ALIGN_PARAGRAPH.CENTER, "w:p/w:pPr/w:jc{w:val=center}"),
+            (
+                "w:p/w:pPr/w:jc{w:val=center}",
+                WD_ALIGN_PARAGRAPH.RIGHT,
+                "w:p/w:pPr/w:jc{w:val=right}",
+            ),
+            ("w:p/w:pPr/w:jc{w:val=right}", None, "w:p/w:pPr"),
+            ("w:p", None, "w:p/w:pPr"),
+        ]
+    )
     def alignment_set_fixture(self, request):
         p_cxml, value, expected_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                              None),
-        ('w:p/w:pPr',                        None),
-        ('w:p/w:pPr/w:ind',                  None),
-        ('w:p/w:pPr/w:ind{w:firstLine=240}', Pt(12)),
-        ('w:p/w:pPr/w:ind{w:hanging=240}',   Pt(-12)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:ind", None),
+            ("w:p/w:pPr/w:ind{w:firstLine=240}", Pt(12)),
+            ("w:p/w:pPr/w:ind{w:hanging=240}", Pt(-12)),
+        ]
+    )
     def first_indent_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p', Pt(36),  'w:p/w:pPr/w:ind{w:firstLine=720}'),
-        ('w:p', Pt(-36), 'w:p/w:pPr/w:ind{w:hanging=720}'),
-        ('w:p', 0,       'w:p/w:pPr/w:ind{w:firstLine=0}'),
-        ('w:p', None,    'w:p/w:pPr'),
-        ('w:p/w:pPr/w:ind{w:firstLine=240}', None,
-         'w:p/w:pPr/w:ind'),
-        ('w:p/w:pPr/w:ind{w:firstLine=240}', Pt(-18),
-         'w:p/w:pPr/w:ind{w:hanging=360}'),
-        ('w:p/w:pPr/w:ind{w:hanging=240}',   Pt(18),
-         'w:p/w:pPr/w:ind{w:firstLine=360}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", Pt(36), "w:p/w:pPr/w:ind{w:firstLine=720}"),
+            ("w:p", Pt(-36), "w:p/w:pPr/w:ind{w:hanging=720}"),
+            ("w:p", 0, "w:p/w:pPr/w:ind{w:firstLine=0}"),
+            ("w:p", None, "w:p/w:pPr"),
+            ("w:p/w:pPr/w:ind{w:firstLine=240}", None, "w:p/w:pPr/w:ind"),
+            (
+                "w:p/w:pPr/w:ind{w:firstLine=240}",
+                Pt(-18),
+                "w:p/w:pPr/w:ind{w:hanging=360}",
+            ),
+            (
+                "w:p/w:pPr/w:ind{w:hanging=240}",
+                Pt(18),
+                "w:p/w:pPr/w:ind{w:firstLine=360}",
+            ),
+        ]
+    )
     def first_indent_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                             None),
-        ('w:p/w:pPr',                       None),
-        ('w:p/w:pPr/w:ind',                 None),
-        ('w:p/w:pPr/w:ind{w:left=120}',     Pt(6)),
-        ('w:p/w:pPr/w:ind{w:left=-06.3pt}', Pt(-6.3)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:ind", None),
+            ("w:p/w:pPr/w:ind{w:left=120}", Pt(6)),
+            ("w:p/w:pPr/w:ind{w:left=-06.3pt}", Pt(-6.3)),
+        ]
+    )
     def left_indent_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p', Pt(36), 'w:p/w:pPr/w:ind{w:left=720}'),
-        ('w:p', Pt(-3), 'w:p/w:pPr/w:ind{w:left=-60}'),
-        ('w:p', 0,      'w:p/w:pPr/w:ind{w:left=0}'),
-        ('w:p', None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:ind{w:left=240}', None, 'w:p/w:pPr/w:ind'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", Pt(36), "w:p/w:pPr/w:ind{w:left=720}"),
+            ("w:p", Pt(-3), "w:p/w:pPr/w:ind{w:left=-60}"),
+            ("w:p", 0, "w:p/w:pPr/w:ind{w:left=0}"),
+            ("w:p", None, "w:p/w:pPr"),
+            ("w:p/w:pPr/w:ind{w:left=240}", None, "w:p/w:pPr/w:ind"),
+        ]
+    )
     def left_indent_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                                                None),
-        ('w:p/w:pPr',                                          None),
-        ('w:p/w:pPr/w:spacing',                                None),
-        ('w:p/w:pPr/w:spacing{w:line=420}',                    1.75),
-        ('w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}',   Pt(42)),
-        ('w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}', Pt(42)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:spacing", None),
+            ("w:p/w:pPr/w:spacing{w:line=420}", 1.75),
+            ("w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}", Pt(42)),
+            ("w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}", Pt(42)),
+        ]
+    )
     def line_spacing_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p', 1,      'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
-        ('w:p', 2.0,    'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
-        ('w:p', Pt(42), 'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}'),
-        ('w:p/w:pPr',                                          2,
-         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
-        ('w:p/w:pPr/w:spacing{w:line=360}',                    1,
-         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
-        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   1.75,
-         'w:p/w:pPr/w:spacing{w:line=420,w:lineRule=auto}'),
-        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=atLeast}', Pt(42),
-         'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}'),
-        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   None,
-         'w:p/w:pPr/w:spacing'),
-        ('w:p/w:pPr',                                          None,
-         'w:p/w:pPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", 1, "w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}"),
+            ("w:p", 2.0, "w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}"),
+            ("w:p", Pt(42), "w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}"),
+            ("w:p/w:pPr", 2, "w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}"),
+            (
+                "w:p/w:pPr/w:spacing{w:line=360}",
+                1,
+                "w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}",
+            ),
+            (
+                "w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}",
+                1.75,
+                "w:p/w:pPr/w:spacing{w:line=420,w:lineRule=auto}",
+            ),
+            (
+                "w:p/w:pPr/w:spacing{w:line=240,w:lineRule=atLeast}",
+                Pt(42),
+                "w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}",
+            ),
+            (
+                "w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}",
+                None,
+                "w:p/w:pPr/w:spacing",
+            ),
+            ("w:p/w:pPr", None, "w:p/w:pPr"),
+        ]
+    )
     def line_spacing_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                             None),
-        ('w:p/w:pPr',                       None),
-        ('w:p/w:pPr/w:spacing',             None),
-        ('w:p/w:pPr/w:spacing{w:line=240}', WD_LINE_SPACING.SINGLE),
-        ('w:p/w:pPr/w:spacing{w:line=360}', WD_LINE_SPACING.ONE_POINT_FIVE),
-        ('w:p/w:pPr/w:spacing{w:line=480}', WD_LINE_SPACING.DOUBLE),
-        ('w:p/w:pPr/w:spacing{w:line=420}', WD_LINE_SPACING.MULTIPLE),
-        ('w:p/w:pPr/w:spacing{w:lineRule=auto}',
-         WD_LINE_SPACING.MULTIPLE),
-        ('w:p/w:pPr/w:spacing{w:lineRule=exact}',
-         WD_LINE_SPACING.EXACTLY),
-        ('w:p/w:pPr/w:spacing{w:lineRule=atLeast}',
-         WD_LINE_SPACING.AT_LEAST),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:spacing", None),
+            ("w:p/w:pPr/w:spacing{w:line=240}", WD_LINE_SPACING.SINGLE),
+            ("w:p/w:pPr/w:spacing{w:line=360}", WD_LINE_SPACING.ONE_POINT_FIVE),
+            ("w:p/w:pPr/w:spacing{w:line=480}", WD_LINE_SPACING.DOUBLE),
+            ("w:p/w:pPr/w:spacing{w:line=420}", WD_LINE_SPACING.MULTIPLE),
+            ("w:p/w:pPr/w:spacing{w:lineRule=auto}", WD_LINE_SPACING.MULTIPLE),
+            ("w:p/w:pPr/w:spacing{w:lineRule=exact}", WD_LINE_SPACING.EXACTLY),
+            ("w:p/w:pPr/w:spacing{w:lineRule=atLeast}", WD_LINE_SPACING.AT_LEAST),
+        ]
+    )
     def line_spacing_rule_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p', WD_LINE_SPACING.SINGLE,
-         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.ONE_POINT_FIVE,
-         'w:p/w:pPr/w:spacing{w:line=360,w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.DOUBLE,
-         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.MULTIPLE,
-         'w:p/w:pPr/w:spacing{w:lineRule=auto}'),
-        ('w:p', WD_LINE_SPACING.EXACTLY,
-         'w:p/w:pPr/w:spacing{w:lineRule=exact}'),
-        ('w:p/w:pPr/w:spacing{w:line=280,w:lineRule=exact}',
-         WD_LINE_SPACING.AT_LEAST,
-         'w:p/w:pPr/w:spacing{w:line=280,w:lineRule=atLeast}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:p",
+                WD_LINE_SPACING.SINGLE,
+                "w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}",
+            ),
+            (
+                "w:p",
+                WD_LINE_SPACING.ONE_POINT_FIVE,
+                "w:p/w:pPr/w:spacing{w:line=360,w:lineRule=auto}",
+            ),
+            (
+                "w:p",
+                WD_LINE_SPACING.DOUBLE,
+                "w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}",
+            ),
+            ("w:p", WD_LINE_SPACING.MULTIPLE, "w:p/w:pPr/w:spacing{w:lineRule=auto}"),
+            ("w:p", WD_LINE_SPACING.EXACTLY, "w:p/w:pPr/w:spacing{w:lineRule=exact}"),
+            (
+                "w:p/w:pPr/w:spacing{w:line=280,w:lineRule=exact}",
+                WD_LINE_SPACING.AT_LEAST,
+                "w:p/w:pPr/w:spacing{w:line=280,w:lineRule=atLeast}",
+            ),
+        ]
+    )
     def line_spacing_rule_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                                  'keep_together',     None),
-        ('w:p/w:pPr/w:keepLines{w:val=on}',      'keep_together',     True),
-        ('w:p/w:pPr/w:keepLines{w:val=0}',       'keep_together',     False),
-        ('w:p',                                  'keep_with_next',    None),
-        ('w:p/w:pPr/w:keepNext{w:val=1}',        'keep_with_next',    True),
-        ('w:p/w:pPr/w:keepNext{w:val=false}',    'keep_with_next',    False),
-        ('w:p',                                  'page_break_before', None),
-        ('w:p/w:pPr/w:pageBreakBefore',          'page_break_before', True),
-        ('w:p/w:pPr/w:pageBreakBefore{w:val=0}', 'page_break_before', False),
-        ('w:p',                                  'widow_control',     None),
-        ('w:p/w:pPr/w:widowControl{w:val=true}', 'widow_control',     True),
-        ('w:p/w:pPr/w:widowControl{w:val=off}',  'widow_control',     False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", "keep_together", None),
+            ("w:p/w:pPr/w:keepLines{w:val=on}", "keep_together", True),
+            ("w:p/w:pPr/w:keepLines{w:val=0}", "keep_together", False),
+            ("w:p", "keep_with_next", None),
+            ("w:p/w:pPr/w:keepNext{w:val=1}", "keep_with_next", True),
+            ("w:p/w:pPr/w:keepNext{w:val=false}", "keep_with_next", False),
+            ("w:p", "page_break_before", None),
+            ("w:p/w:pPr/w:pageBreakBefore", "page_break_before", True),
+            ("w:p/w:pPr/w:pageBreakBefore{w:val=0}", "page_break_before", False),
+            ("w:p", "widow_control", None),
+            ("w:p/w:pPr/w:widowControl{w:val=true}", "widow_control", True),
+            ("w:p/w:pPr/w:widowControl{w:val=off}", "widow_control", False),
+        ]
+    )
     def on_off_get_fixture(self, request):
         p_cxml, prop_name, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, prop_name, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p', 'keep_together',     True,  'w:p/w:pPr/w:keepLines'),
-        ('w:p', 'keep_with_next',    True,  'w:p/w:pPr/w:keepNext'),
-        ('w:p', 'page_break_before', True,  'w:p/w:pPr/w:pageBreakBefore'),
-        ('w:p', 'widow_control',     True,  'w:p/w:pPr/w:widowControl'),
-        ('w:p/w:pPr/w:keepLines',                 'keep_together',     False,
-         'w:p/w:pPr/w:keepLines{w:val=0}'),
-        ('w:p/w:pPr/w:keepNext',                  'keep_with_next',    False,
-         'w:p/w:pPr/w:keepNext{w:val=0}'),
-        ('w:p/w:pPr/w:pageBreakBefore',           'page_break_before', False,
-         'w:p/w:pPr/w:pageBreakBefore{w:val=0}'),
-        ('w:p/w:pPr/w:widowControl',              'widow_control',     False,
-         'w:p/w:pPr/w:widowControl{w:val=0}'),
-        ('w:p/w:pPr/w:keepLines{w:val=0}',        'keep_together',     None,
-         'w:p/w:pPr'),
-        ('w:p/w:pPr/w:keepNext{w:val=0}',         'keep_with_next',    None,
-         'w:p/w:pPr'),
-        ('w:p/w:pPr/w:pageBreakBefore{w:val=0}',  'page_break_before', None,
-         'w:p/w:pPr'),
-        ('w:p/w:pPr/w:widowControl{w:val=0}',     'widow_control',     None,
-         'w:p/w:pPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", "keep_together", True, "w:p/w:pPr/w:keepLines"),
+            ("w:p", "keep_with_next", True, "w:p/w:pPr/w:keepNext"),
+            ("w:p", "page_break_before", True, "w:p/w:pPr/w:pageBreakBefore"),
+            ("w:p", "widow_control", True, "w:p/w:pPr/w:widowControl"),
+            (
+                "w:p/w:pPr/w:keepLines",
+                "keep_together",
+                False,
+                "w:p/w:pPr/w:keepLines{w:val=0}",
+            ),
+            (
+                "w:p/w:pPr/w:keepNext",
+                "keep_with_next",
+                False,
+                "w:p/w:pPr/w:keepNext{w:val=0}",
+            ),
+            (
+                "w:p/w:pPr/w:pageBreakBefore",
+                "page_break_before",
+                False,
+                "w:p/w:pPr/w:pageBreakBefore{w:val=0}",
+            ),
+            (
+                "w:p/w:pPr/w:widowControl",
+                "widow_control",
+                False,
+                "w:p/w:pPr/w:widowControl{w:val=0}",
+            ),
+            ("w:p/w:pPr/w:keepLines{w:val=0}", "keep_together", None, "w:p/w:pPr"),
+            ("w:p/w:pPr/w:keepNext{w:val=0}", "keep_with_next", None, "w:p/w:pPr"),
+            (
+                "w:p/w:pPr/w:pageBreakBefore{w:val=0}",
+                "page_break_before",
+                None,
+                "w:p/w:pPr",
+            ),
+            ("w:p/w:pPr/w:widowControl{w:val=0}", "widow_control", None, "w:p/w:pPr"),
+        ]
+    )
     def on_off_set_fixture(self, request):
         p_cxml, prop_name, value, expected_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_cxml)
         return paragraph_format, prop_name, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                             None),
-        ('w:p/w:pPr',                       None),
-        ('w:p/w:pPr/w:ind',                 None),
-        ('w:p/w:pPr/w:ind{w:right=160}',    Pt(8)),
-        ('w:p/w:pPr/w:ind{w:right=-4.2pt}', Pt(-4.2)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:ind", None),
+            ("w:p/w:pPr/w:ind{w:right=160}", Pt(8)),
+            ("w:p/w:pPr/w:ind{w:right=-4.2pt}", Pt(-4.2)),
+        ]
+    )
     def right_indent_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p', Pt(36), 'w:p/w:pPr/w:ind{w:right=720}'),
-        ('w:p', Pt(-3), 'w:p/w:pPr/w:ind{w:right=-60}'),
-        ('w:p', 0,      'w:p/w:pPr/w:ind{w:right=0}'),
-        ('w:p', None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:ind{w:right=240}', None, 'w:p/w:pPr/w:ind'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", Pt(36), "w:p/w:pPr/w:ind{w:right=720}"),
+            ("w:p", Pt(-3), "w:p/w:pPr/w:ind{w:right=-60}"),
+            ("w:p", 0, "w:p/w:pPr/w:ind{w:right=0}"),
+            ("w:p", None, "w:p/w:pPr"),
+            ("w:p/w:pPr/w:ind{w:right=240}", None, "w:p/w:pPr/w:ind"),
+        ]
+    )
     def right_indent_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                              None),
-        ('w:p/w:pPr',                        None),
-        ('w:p/w:pPr/w:spacing',              None),
-        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(12)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:spacing", None),
+            ("w:p/w:pPr/w:spacing{w:after=240}", Pt(12)),
+        ]
+    )
     def space_after_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p',                 Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
-        ('w:p',                 None,   'w:p/w:pPr'),
-        ('w:p/w:pPr',           Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
-        ('w:p/w:pPr',           None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:spacing', Pt(12), 'w:p/w:pPr/w:spacing{w:after=240}'),
-        ('w:p/w:pPr/w:spacing', None,   'w:p/w:pPr/w:spacing'),
-        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(42),
-         'w:p/w:pPr/w:spacing{w:after=840}'),
-        ('w:p/w:pPr/w:spacing{w:after=840}', None,
-         'w:p/w:pPr/w:spacing'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", Pt(12), "w:p/w:pPr/w:spacing{w:after=240}"),
+            ("w:p", None, "w:p/w:pPr"),
+            ("w:p/w:pPr", Pt(12), "w:p/w:pPr/w:spacing{w:after=240}"),
+            ("w:p/w:pPr", None, "w:p/w:pPr"),
+            ("w:p/w:pPr/w:spacing", Pt(12), "w:p/w:pPr/w:spacing{w:after=240}"),
+            ("w:p/w:pPr/w:spacing", None, "w:p/w:pPr/w:spacing"),
+            (
+                "w:p/w:pPr/w:spacing{w:after=240}",
+                Pt(42),
+                "w:p/w:pPr/w:spacing{w:after=840}",
+            ),
+            ("w:p/w:pPr/w:spacing{w:after=840}", None, "w:p/w:pPr/w:spacing"),
+        ]
+    )
     def space_after_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:p',                               None),
-        ('w:p/w:pPr',                         None),
-        ('w:p/w:pPr/w:spacing',               None),
-        ('w:p/w:pPr/w:spacing{w:before=420}', Pt(21)),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", None),
+            ("w:p/w:pPr", None),
+            ("w:p/w:pPr/w:spacing", None),
+            ("w:p/w:pPr/w:spacing{w:before=420}", Pt(21)),
+        ]
+    )
     def space_before_get_fixture(self, request):
         p_cxml, expected_value = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
-    @pytest.fixture(params=[
-        ('w:p',                 Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
-        ('w:p',                 None,   'w:p/w:pPr'),
-        ('w:p/w:pPr',           Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
-        ('w:p/w:pPr',           None,   'w:p/w:pPr'),
-        ('w:p/w:pPr/w:spacing', Pt(12), 'w:p/w:pPr/w:spacing{w:before=240}'),
-        ('w:p/w:pPr/w:spacing', None,   'w:p/w:pPr/w:spacing'),
-        ('w:p/w:pPr/w:spacing{w:before=240}', Pt(42),
-         'w:p/w:pPr/w:spacing{w:before=840}'),
-        ('w:p/w:pPr/w:spacing{w:before=840}', None,
-         'w:p/w:pPr/w:spacing'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:p", Pt(12), "w:p/w:pPr/w:spacing{w:before=240}"),
+            ("w:p", None, "w:p/w:pPr"),
+            ("w:p/w:pPr", Pt(12), "w:p/w:pPr/w:spacing{w:before=240}"),
+            ("w:p/w:pPr", None, "w:p/w:pPr"),
+            ("w:p/w:pPr/w:spacing", Pt(12), "w:p/w:pPr/w:spacing{w:before=240}"),
+            ("w:p/w:pPr/w:spacing", None, "w:p/w:pPr/w:spacing"),
+            (
+                "w:p/w:pPr/w:spacing{w:before=240}",
+                Pt(42),
+                "w:p/w:pPr/w:spacing{w:before=840}",
+            ),
+            ("w:p/w:pPr/w:spacing{w:before=840}", None, "w:p/w:pPr/w:spacing"),
+        ]
+    )
     def space_before_set_fixture(self, request):
         p_cxml, value, expected_p_cxml = request.param
         paragraph_format = ParagraphFormat(element(p_cxml))
@@ -404,7 +477,7 @@ def space_before_set_fixture(self, request):
 
     @pytest.fixture
     def tab_stops_fixture(self, TabStops_, tab_stops_):
-        p = element('w:p/w:pPr')
+        p = element("w:p/w:pPr")
         pPr = p.pPr
         paragraph_format = ParagraphFormat(p, None)
         return paragraph_format, TabStops_, pPr, tab_stops_
@@ -413,9 +486,7 @@ def tab_stops_fixture(self, TabStops_, tab_stops_):
 
     @pytest.fixture
     def TabStops_(self, request, tab_stops_):
-        return class_mock(
-            request, 'docx.text.parfmt.TabStops', return_value=tab_stops_
-        )
+        return class_mock(request, "docx.text.parfmt.TabStops", return_value=tab_stops_)
 
     @pytest.fixture
     def tab_stops_(self, request):
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index ae23c641c..02cb87412 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -18,7 +18,6 @@
 
 
 class DescribeRun(object):
-
     def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
         run, prop_name, expected_state = bool_prop_get_fixture
         assert getattr(run, prop_name) == expected_state
@@ -31,17 +30,13 @@ def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
     def it_knows_its_character_style(self, style_get_fixture):
         run, style_id_, style_ = style_get_fixture
         style = run.style
-        run.part.get_style.assert_called_once_with(
-            style_id_, WD_STYLE_TYPE.CHARACTER
-        )
+        run.part.get_style.assert_called_once_with(style_id_, WD_STYLE_TYPE.CHARACTER)
         assert style is style_
 
     def it_can_change_its_character_style(self, style_set_fixture):
         run, value, expected_xml = style_set_fixture
         run.style = value
-        run.part.get_style_id.assert_called_once_with(
-            value, WD_STYLE_TYPE.CHARACTER
-        )
+        run.part.get_style_id.assert_called_once_with(value, WD_STYLE_TYPE.CHARACTER)
         assert run._r.xml == expected_xml
 
     def it_knows_its_underline_type(self, underline_get_fixture):
@@ -53,8 +48,7 @@ def it_can_change_its_underline_type(self, underline_set_fixture):
         run.underline = underline
         assert run._r.xml == expected_xml
 
-    def it_raises_on_assign_invalid_underline_type(
-            self, underline_raise_fixture):
+    def it_raises_on_assign_invalid_underline_type(self, underline_raise_fixture):
         run, underline = underline_raise_fixture
         with pytest.raises(ValueError):
             run.underline = underline
@@ -112,105 +106,111 @@ def it_can_replace_the_text_it_contains(self, text_set_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[
-        (WD_BREAK.LINE,   'w:r/w:br'),
-        (WD_BREAK.PAGE,   'w:r/w:br{w:type=page}'),
-        (WD_BREAK.COLUMN, 'w:r/w:br{w:type=column}'),
-        (WD_BREAK.LINE_CLEAR_LEFT,
-         'w:r/w:br{w:type=textWrapping, w:clear=left}'),
-        (WD_BREAK.LINE_CLEAR_RIGHT,
-         'w:r/w:br{w:type=textWrapping, w:clear=right}'),
-        (WD_BREAK.LINE_CLEAR_ALL,
-         'w:r/w:br{w:type=textWrapping, w:clear=all}'),
-    ])
+    @pytest.fixture(
+        params=[
+            (WD_BREAK.LINE, "w:r/w:br"),
+            (WD_BREAK.PAGE, "w:r/w:br{w:type=page}"),
+            (WD_BREAK.COLUMN, "w:r/w:br{w:type=column}"),
+            (WD_BREAK.LINE_CLEAR_LEFT, "w:r/w:br{w:type=textWrapping, w:clear=left}"),
+            (WD_BREAK.LINE_CLEAR_RIGHT, "w:r/w:br{w:type=textWrapping, w:clear=right}"),
+            (WD_BREAK.LINE_CLEAR_ALL, "w:r/w:br{w:type=textWrapping, w:clear=all}"),
+        ]
+    )
     def add_break_fixture(self, request):
         break_type, expected_cxml = request.param
-        run = Run(element('w:r'), None)
+        run = Run(element("w:r"), None)
         expected_xml = xml(expected_cxml)
         return run, break_type, expected_xml
 
     @pytest.fixture
-    def add_picture_fixture(self, part_prop_, document_part_, InlineShape_,
-                            picture_):
-        run = Run(element('w:r/wp:x'), None)
-        image = 'foobar.png'
-        width, height, inline = 1111, 2222, element('wp:inline{id=42}')
-        expected_xml = xml('w:r/(wp:x,w:drawing/wp:inline{id=42})')
+    def add_picture_fixture(self, part_prop_, document_part_, InlineShape_, picture_):
+        run = Run(element("w:r/wp:x"), None)
+        image = "foobar.png"
+        width, height, inline = 1111, 2222, element("wp:inline{id=42}")
+        expected_xml = xml("w:r/(wp:x,w:drawing/wp:inline{id=42})")
         document_part_.new_pic_inline.return_value = inline
         InlineShape_.return_value = picture_
-        return (
-            run, image, width, height, inline, expected_xml, InlineShape_,
-            picture_
-        )
-
-    @pytest.fixture(params=[
-        ('w:r/w:t"foo"', 'w:r/(w:t"foo", w:tab)'),
-    ])
+        return (run, image, width, height, inline, expected_xml, InlineShape_, picture_)
+
+    @pytest.fixture(
+        params=[
+            ('w:r/w:t"foo"', 'w:r/(w:t"foo", w:tab)'),
+        ]
+    )
     def add_tab_fixture(self, request):
         r_cxml, expected_cxml = request.param
         run = Run(element(r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',          'foo', 'w:r/w:t"foo"'),
-        ('w:r/w:t"foo"', 'bar', 'w:r/(w:t"foo", w:t"bar")'),
-        ('w:r',          'fo ', 'w:r/w:t{xml:space=preserve}"fo "'),
-        ('w:r',          'f o', 'w:r/w:t"f o"'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", "foo", 'w:r/w:t"foo"'),
+            ('w:r/w:t"foo"', "bar", 'w:r/(w:t"foo", w:t"bar")'),
+            ("w:r", "fo ", 'w:r/w:t{xml:space=preserve}"fo "'),
+            ("w:r", "f o", 'w:r/w:t"f o"'),
+        ]
+    )
     def add_text_fixture(self, request):
         r_cxml, text, expected_cxml = request.param
         r = element(r_cxml)
         expected_xml = xml(expected_cxml)
         return r, text, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r/w:rPr',                  'bold',   None),
-        ('w:r/w:rPr/w:b',              'bold',   True),
-        ('w:r/w:rPr/w:b{w:val=on}',    'bold',   True),
-        ('w:r/w:rPr/w:b{w:val=off}',   'bold',   False),
-        ('w:r/w:rPr/w:b{w:val=1}',     'bold',   True),
-        ('w:r/w:rPr/w:i{w:val=0}',     'italic', False),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r/w:rPr", "bold", None),
+            ("w:r/w:rPr/w:b", "bold", True),
+            ("w:r/w:rPr/w:b{w:val=on}", "bold", True),
+            ("w:r/w:rPr/w:b{w:val=off}", "bold", False),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", True),
+            ("w:r/w:rPr/w:i{w:val=0}", "italic", False),
+        ]
+    )
     def bool_prop_get_fixture(self, request):
         r_cxml, bool_prop_name, expected_value = request.param
         run = Run(element(r_cxml), None)
         return run, bool_prop_name, expected_value
 
-    @pytest.fixture(params=[
-        # nothing to True, False, and None ---------------------------
-        ('w:r', 'bold',   True,  'w:r/w:rPr/w:b'),
-        ('w:r', 'bold',   False, 'w:r/w:rPr/w:b{w:val=0}'),
-        ('w:r', 'italic', None,  'w:r/w:rPr'),
-        # default to True, False, and None ---------------------------
-        ('w:r/w:rPr/w:b', 'bold',   True,  'w:r/w:rPr/w:b'),
-        ('w:r/w:rPr/w:b', 'bold',   False, 'w:r/w:rPr/w:b{w:val=0}'),
-        ('w:r/w:rPr/w:i', 'italic', None,  'w:r/w:rPr'),
-        # True to True, False, and None ------------------------------
-        ('w:r/w:rPr/w:b{w:val=on}', 'bold', True,  'w:r/w:rPr/w:b'),
-        ('w:r/w:rPr/w:b{w:val=1}',  'bold', False, 'w:r/w:rPr/w:b{w:val=0}'),
-        ('w:r/w:rPr/w:b{w:val=1}',  'bold', None,  'w:r/w:rPr'),
-        # False to True, False, and None -----------------------------
-        ('w:r/w:rPr/w:i{w:val=false}', 'italic', True,  'w:r/w:rPr/w:i'),
-        ('w:r/w:rPr/w:i{w:val=0}',     'italic', False,
-         'w:r/w:rPr/w:i{w:val=0}'),
-        ('w:r/w:rPr/w:i{w:val=off}',   'italic', None,  'w:r/w:rPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            # nothing to True, False, and None ---------------------------
+            ("w:r", "bold", True, "w:r/w:rPr/w:b"),
+            ("w:r", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r", "italic", None, "w:r/w:rPr"),
+            # default to True, False, and None ---------------------------
+            ("w:r/w:rPr/w:b", "bold", True, "w:r/w:rPr/w:b"),
+            ("w:r/w:rPr/w:b", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r/w:rPr/w:i", "italic", None, "w:r/w:rPr"),
+            # True to True, False, and None ------------------------------
+            ("w:r/w:rPr/w:b{w:val=on}", "bold", True, "w:r/w:rPr/w:b"),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", None, "w:r/w:rPr"),
+            # False to True, False, and None -----------------------------
+            ("w:r/w:rPr/w:i{w:val=false}", "italic", True, "w:r/w:rPr/w:i"),
+            ("w:r/w:rPr/w:i{w:val=0}", "italic", False, "w:r/w:rPr/w:i{w:val=0}"),
+            ("w:r/w:rPr/w:i{w:val=off}", "italic", None, "w:r/w:rPr"),
+        ]
+    )
     def bool_prop_set_fixture(self, request):
         initial_r_cxml, bool_prop_name, value, expected_cxml = request.param
         run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, bool_prop_name, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                   'w:r'),
-        ('w:r/w:t"foo"',          'w:r'),
-        ('w:r/w:br',              'w:r'),
-        ('w:r/w:rPr',             'w:r/w:rPr'),
-        ('w:r/(w:rPr, w:t"foo")', 'w:r/w:rPr'),
-        ('w:r/(w:rPr/(w:b, w:i), w:t"foo", w:cr, w:t"bar")',
-         'w:r/w:rPr/(w:b, w:i)'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", "w:r"),
+            ('w:r/w:t"foo"', "w:r"),
+            ("w:r/w:br", "w:r"),
+            ("w:r/w:rPr", "w:r/w:rPr"),
+            ('w:r/(w:rPr, w:t"foo")', "w:r/w:rPr"),
+            (
+                'w:r/(w:rPr/(w:b, w:i), w:t"foo", w:cr, w:t"bar")',
+                "w:r/w:rPr/(w:b, w:i)",
+            ),
+        ]
+    )
     def clear_fixture(self, request):
         initial_r_cxml, expected_cxml = request.param
         run = Run(element(initial_r_cxml), None)
@@ -219,29 +219,31 @@ def clear_fixture(self, request):
 
     @pytest.fixture
     def font_fixture(self, Font_, font_):
-        run = Run(element('w:r'), None)
+        run = Run(element("w:r"), None)
         return run, Font_, font_
 
     @pytest.fixture
     def style_get_fixture(self, part_prop_):
-        style_id = 'Barfoo'
-        r_cxml = 'w:r/w:rPr/w:rStyle{w:val=%s}' % style_id
+        style_id = "Barfoo"
+        r_cxml = "w:r/w:rPr/w:rStyle{w:val=%s}" % style_id
         run = Run(element(r_cxml), None)
         style_ = part_prop_.return_value.get_style.return_value
         return run, style_id, style_
 
-    @pytest.fixture(params=[
-        ('w:r',                                'Foo Font', 'FooFont',
-         'w:r/w:rPr/w:rStyle{w:val=FooFont}'),
-        ('w:r/w:rPr',                          'Foo Font', 'FooFont',
-         'w:r/w:rPr/w:rStyle{w:val=FooFont}'),
-        ('w:r/w:rPr/w:rStyle{w:val=FooFont}',  'Bar Font', 'BarFont',
-         'w:r/w:rPr/w:rStyle{w:val=BarFont}'),
-        ('w:r/w:rPr/w:rStyle{w:val=FooFont}',  None,       None,
-         'w:r/w:rPr'),
-        ('w:r',                                None,       None,
-         'w:r/w:rPr'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", "Foo Font", "FooFont", "w:r/w:rPr/w:rStyle{w:val=FooFont}"),
+            ("w:r/w:rPr", "Foo Font", "FooFont", "w:r/w:rPr/w:rStyle{w:val=FooFont}"),
+            (
+                "w:r/w:rPr/w:rStyle{w:val=FooFont}",
+                "Bar Font",
+                "BarFont",
+                "w:r/w:rPr/w:rStyle{w:val=BarFont}",
+            ),
+            ("w:r/w:rPr/w:rStyle{w:val=FooFont}", None, None, "w:r/w:rPr"),
+            ("w:r", None, None, "w:r/w:rPr"),
+        ]
+    )
     def style_set_fixture(self, request, part_prop_):
         r_cxml, value, style_id, expected_cxml = request.param
         run = Run(element(r_cxml), None)
@@ -249,23 +251,27 @@ def style_set_fixture(self, request, part_prop_):
         expected_xml = xml(expected_cxml)
         return run, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r', ''),
-        ('w:r/w:t"foobar"', 'foobar'),
-        ('w:r/(w:t"abc", w:tab, w:t"def", w:cr)', 'abc\tdef\n'),
-        ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', '\nabcdef\t'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", ""),
+            ('w:r/w:t"foobar"', "foobar"),
+            ('w:r/(w:t"abc", w:tab, w:t"def", w:cr)', "abc\tdef\n"),
+            ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', "\nabcdef\t"),
+        ]
+    )
     def text_get_fixture(self, request):
         r_cxml, expected_text = request.param
         run = Run(element(r_cxml), None)
         return run, expected_text
 
-    @pytest.fixture(params=[
-        ('abc  def', 'w:r/w:t"abc  def"'),
-        ('abc\tdef', 'w:r/(w:t"abc", w:tab, w:t"def")'),
-        ('abc\ndef', 'w:r/(w:t"abc", w:br,  w:t"def")'),
-        ('abc\rdef', 'w:r/(w:t"abc", w:br,  w:t"def")'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("abc  def", 'w:r/w:t"abc  def"'),
+            ("abc\tdef", 'w:r/(w:t"abc", w:tab, w:t"def")'),
+            ("abc\ndef", 'w:r/(w:t"abc", w:br,  w:t"def")'),
+            ("abc\rdef", 'w:r/(w:t"abc", w:br,  w:t"def")'),
+        ]
+    )
     def text_set_fixture(self, request):
         new_text, expected_cxml = request.param
         initial_r_cxml = 'w:r/w:t"should get deleted"'
@@ -273,46 +279,53 @@ def text_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, new_text, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:r',                         None),
-        ('w:r/w:rPr/w:u',               None),
-        ('w:r/w:rPr/w:u{w:val=single}', True),
-        ('w:r/w:rPr/w:u{w:val=none}',   False),
-        ('w:r/w:rPr/w:u{w:val=double}', WD_UNDERLINE.DOUBLE),
-        ('w:r/w:rPr/w:u{w:val=wave}',   WD_UNDERLINE.WAVY),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", None),
+            ("w:r/w:rPr/w:u", None),
+            ("w:r/w:rPr/w:u{w:val=single}", True),
+            ("w:r/w:rPr/w:u{w:val=none}", False),
+            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
+            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
+        ]
+    )
     def underline_get_fixture(self, request):
         r_cxml, expected_underline = request.param
         run = Run(element(r_cxml), None)
         return run, expected_underline
 
-    @pytest.fixture(params=[
-        ('w:r', True,                'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r', False,               'w:r/w:rPr/w:u{w:val=none}'),
-        ('w:r', None,                'w:r/w:rPr'),
-        ('w:r', WD_UNDERLINE.SINGLE, 'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r', WD_UNDERLINE.THICK,  'w:r/w:rPr/w:u{w:val=thick}'),
-        ('w:r/w:rPr/w:u{w:val=single}', True,
-         'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r/w:rPr/w:u{w:val=single}', False,
-         'w:r/w:rPr/w:u{w:val=none}'),
-        ('w:r/w:rPr/w:u{w:val=single}', None,
-         'w:r/w:rPr'),
-        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.SINGLE,
-         'w:r/w:rPr/w:u{w:val=single}'),
-        ('w:r/w:rPr/w:u{w:val=single}', WD_UNDERLINE.DOTTED,
-         'w:r/w:rPr/w:u{w:val=dotted}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:r", True, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r", False, "w:r/w:rPr/w:u{w:val=none}"),
+            ("w:r", None, "w:r/w:rPr"),
+            ("w:r", WD_UNDERLINE.SINGLE, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r", WD_UNDERLINE.THICK, "w:r/w:rPr/w:u{w:val=thick}"),
+            ("w:r/w:rPr/w:u{w:val=single}", True, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r/w:rPr/w:u{w:val=single}", False, "w:r/w:rPr/w:u{w:val=none}"),
+            ("w:r/w:rPr/w:u{w:val=single}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:u{w:val=single}",
+                WD_UNDERLINE.SINGLE,
+                "w:r/w:rPr/w:u{w:val=single}",
+            ),
+            (
+                "w:r/w:rPr/w:u{w:val=single}",
+                WD_UNDERLINE.DOTTED,
+                "w:r/w:rPr/w:u{w:val=dotted}",
+            ),
+        ]
+    )
     def underline_set_fixture(self, request):
         initial_r_cxml, new_underline, expected_cxml = request.param
         run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, new_underline, expected_xml
 
-    @pytest.fixture(params=['foobar', 42, 'single'])
+    @pytest.fixture(params=["foobar", 42, "single"])
     def underline_raise_fixture(self, request):
         invalid_underline_setting = request.param
-        run = Run(element('w:r/w:rPr'), None)
+        run = Run(element("w:r/w:rPr"), None)
         return run, invalid_underline_setting
 
     # fixture components ---------------------------------------------
@@ -323,7 +336,7 @@ def document_part_(self, request):
 
     @pytest.fixture
     def Font_(self, request, font_):
-        return class_mock(request, 'docx.text.run.Font', return_value=font_)
+        return class_mock(request, "docx.text.run.Font", return_value=font_)
 
     @pytest.fixture
     def font_(self, request):
@@ -331,13 +344,11 @@ def font_(self, request):
 
     @pytest.fixture
     def InlineShape_(self, request):
-        return class_mock(request, 'docx.text.run.InlineShape')
+        return class_mock(request, "docx.text.run.InlineShape")
 
     @pytest.fixture
     def part_prop_(self, request, document_part_):
-        return property_mock(
-            request, Run, 'part', return_value=document_part_
-        )
+        return property_mock(request, Run, "part", return_value=document_part_)
 
     @pytest.fixture
     def picture_(self, request):
@@ -345,4 +356,4 @@ def picture_(self, request):
 
     @pytest.fixture
     def Text_(self, request):
-        return class_mock(request, 'docx.text.run._Text')
+        return class_mock(request, "docx.text.run._Text")
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index 0ca10e62d..29627fcb9 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -5,9 +5,7 @@
 TabStop objects.
 """
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
+from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
 from docx.shared import Twips
@@ -20,7 +18,6 @@
 
 
 class DescribeTabStop(object):
-
     def it_knows_its_position(self, position_get_fixture):
         tab_stop, expected_value = position_get_fixture
         assert tab_stop.position == expected_value
@@ -51,20 +48,24 @@ def it_can_change_its_leader(self, leader_set_fixture):
 
     # fixture --------------------------------------------------------
 
-    @pytest.fixture(params=[
-        ('w:tab{w:val=left}',  'LEFT'),
-        ('w:tab{w:val=right}', 'RIGHT'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tab{w:val=left}", "LEFT"),
+            ("w:tab{w:val=right}", "RIGHT"),
+        ]
+    )
     def alignment_get_fixture(self, request):
         tab_stop_cxml, member = request.param
         tab_stop = TabStop(element(tab_stop_cxml))
         expected_value = getattr(WD_TAB_ALIGNMENT, member)
         return tab_stop, expected_value
 
-    @pytest.fixture(params=[
-        ('w:tab{w:val=left}',  'RIGHT', 'w:tab{w:val=right}'),
-        ('w:tab{w:val=right}', 'LEFT',  'w:tab{w:val=left}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tab{w:val=left}", "RIGHT", "w:tab{w:val=right}"),
+            ("w:tab{w:val=right}", "LEFT", "w:tab{w:val=left}"),
+        ]
+    )
     def alignment_set_fixture(self, request):
         tab_stop_cxml, member, expected_cxml = request.param
         tab_stop = TabStop(element(tab_stop_cxml))
@@ -72,56 +73,75 @@ def alignment_set_fixture(self, request):
         value = getattr(WD_TAB_ALIGNMENT, member)
         return tab_stop, value, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:tab',                'SPACES'),
-        ('w:tab{w:leader=none}', 'SPACES'),
-        ('w:tab{w:leader=dot}',  'DOTS'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tab", "SPACES"),
+            ("w:tab{w:leader=none}", "SPACES"),
+            ("w:tab{w:leader=dot}", "DOTS"),
+        ]
+    )
     def leader_get_fixture(self, request):
         tab_stop_cxml, member = request.param
         tab_stop = TabStop(element(tab_stop_cxml))
         expected_value = getattr(WD_TAB_LEADER, member)
         return tab_stop, expected_value
 
-    @pytest.fixture(params=[
-        ('w:tab',                  'DOTS',   'w:tab{w:leader=dot}'),
-        ('w:tab{w:leader=dot}',    'DASHES', 'w:tab{w:leader=hyphen}'),
-        ('w:tab{w:leader=hyphen}', 'SPACES', 'w:tab'),
-        ('w:tab{w:leader=hyphen}', None,     'w:tab'),
-        ('w:tab',                  'SPACES', 'w:tab'),
-        ('w:tab',                  None,     'w:tab'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:tab", "DOTS", "w:tab{w:leader=dot}"),
+            ("w:tab{w:leader=dot}", "DASHES", "w:tab{w:leader=hyphen}"),
+            ("w:tab{w:leader=hyphen}", "SPACES", "w:tab"),
+            ("w:tab{w:leader=hyphen}", None, "w:tab"),
+            ("w:tab", "SPACES", "w:tab"),
+            ("w:tab", None, "w:tab"),
+        ]
+    )
     def leader_set_fixture(self, request):
         tab_stop_cxml, new_value, expected_cxml = request.param
         tab_stop = TabStop(element(tab_stop_cxml))
-        value = (
-            None if new_value is None else getattr(WD_TAB_LEADER, new_value)
-        )
+        value = None if new_value is None else getattr(WD_TAB_LEADER, new_value)
         expected_xml = xml(expected_cxml)
         return tab_stop, value, expected_xml
 
     @pytest.fixture
     def position_get_fixture(self, request):
-        tab_stop = TabStop(element('w:tab{w:pos=720}'))
+        tab_stop = TabStop(element("w:tab{w:pos=720}"))
         return tab_stop, Twips(720)
 
-    @pytest.fixture(params=[
-        ('w:tabs/w:tab{w:pos=360,w:val=left}',
-         Twips(720), 0,
-         'w:tabs/w:tab{w:pos=720,w:val=left}'),
-        ('w:tabs/(w:tab{w:pos=360,w:val=left},w:tab{w:pos=720,w:val=left})',
-         Twips(180), 0,
-         'w:tabs/(w:tab{w:pos=180,w:val=left},w:tab{w:pos=720,w:val=left})'),
-        ('w:tabs/(w:tab{w:pos=360,w:val=left},w:tab{w:pos=720,w:val=left})',
-         Twips(960), 1,
-         'w:tabs/(w:tab{w:pos=720,w:val=left},w:tab{w:pos=960,w:val=left})'),
-        ('w:tabs/(w:tab{w:pos=-72,w:val=left},w:tab{w:pos=-36,w:val=left})',
-         Twips(-48), 0,
-         'w:tabs/(w:tab{w:pos=-48,w:val=left},w:tab{w:pos=-36,w:val=left})'),
-        ('w:tabs/(w:tab{w:pos=-72,w:val=left},w:tab{w:pos=-36,w:val=left})',
-         Twips(-16), 1,
-         'w:tabs/(w:tab{w:pos=-36,w:val=left},w:tab{w:pos=-16,w:val=left})'),
-    ])
+    @pytest.fixture(
+        params=[
+            (
+                "w:tabs/w:tab{w:pos=360,w:val=left}",
+                Twips(720),
+                0,
+                "w:tabs/w:tab{w:pos=720,w:val=left}",
+            ),
+            (
+                "w:tabs/(w:tab{w:pos=360,w:val=left},w:tab{w:pos=720,w:val=left})",
+                Twips(180),
+                0,
+                "w:tabs/(w:tab{w:pos=180,w:val=left},w:tab{w:pos=720,w:val=left})",
+            ),
+            (
+                "w:tabs/(w:tab{w:pos=360,w:val=left},w:tab{w:pos=720,w:val=left})",
+                Twips(960),
+                1,
+                "w:tabs/(w:tab{w:pos=720,w:val=left},w:tab{w:pos=960,w:val=left})",
+            ),
+            (
+                "w:tabs/(w:tab{w:pos=-72,w:val=left},w:tab{w:pos=-36,w:val=left})",
+                Twips(-48),
+                0,
+                "w:tabs/(w:tab{w:pos=-48,w:val=left},w:tab{w:pos=-36,w:val=left})",
+            ),
+            (
+                "w:tabs/(w:tab{w:pos=-72,w:val=left},w:tab{w:pos=-36,w:val=left})",
+                Twips(-16),
+                1,
+                "w:tabs/(w:tab{w:pos=-36,w:val=left},w:tab{w:pos=-16,w:val=left})",
+            ),
+        ]
+    )
     def position_set_fixture(self, request):
         tabs_cxml, value, new_idx, expected_cxml = request.param
         tabs = element(tabs_cxml)
@@ -132,15 +152,12 @@ def position_set_fixture(self, request):
 
 
 class DescribeTabStops(object):
-
     def it_knows_its_length(self, len_fixture):
         tab_stops, expected_value = len_fixture
         assert len(tab_stops) == expected_value
 
     def it_can_iterate_over_its_tab_stops(self, iter_fixture):
-        tab_stops, expected_count, tab_stop_, TabStop_, expected_calls = (
-            iter_fixture
-        )
+        tab_stops, expected_count, tab_stop_, TabStop_, expected_calls = iter_fixture
         count = 0
         for tab_stop in tab_stops:
             assert tab_stop is tab_stop_
@@ -155,7 +172,7 @@ def it_can_get_a_tab_stop_by_index(self, index_fixture):
         assert tab_stop is tab_stop_
 
     def it_raises_on_indexed_access_when_empty(self):
-        tab_stops = TabStops(element('w:pPr'))
+        tab_stops = TabStops(element("w:pPr"))
         with pytest.raises(IndexError):
             tab_stops[0]
 
@@ -173,7 +190,7 @@ def it_raises_on_del_idx_invalid(self, del_raises_fixture):
         tab_stops, idx = del_raises_fixture
         with pytest.raises(IndexError) as exc:
             del tab_stops[idx]
-        assert exc.value.args[0] == 'tab index out of range'
+        assert exc.value.args[0] == "tab index out of range"
 
     def it_can_clear_all_its_tab_stops(self, clear_all_fixture):
         tab_stops, expected_xml = clear_all_fixture
@@ -182,91 +199,127 @@ def it_can_clear_all_its_tab_stops(self, clear_all_fixture):
 
     # fixture --------------------------------------------------------
 
-    @pytest.fixture(params=[
-        'w:pPr',
-        'w:pPr/w:tabs/w:tab{w:pos=42}',
-        'w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})',
-    ])
+    @pytest.fixture(
+        params=[
+            "w:pPr",
+            "w:pPr/w:tabs/w:tab{w:pos=42}",
+            "w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})",
+        ]
+    )
     def clear_all_fixture(self, request):
         pPr_cxml = request.param
         tab_stops = TabStops(element(pPr_cxml))
-        expected_xml = xml('w:pPr')
+        expected_xml = xml("w:pPr")
         return tab_stops, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:pPr/w:tabs/w:tab{w:pos=42}',                   0,
-         'w:pPr'),
-        ('w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})', 0,
-         'w:pPr/w:tabs/w:tab{w:pos=42}'),
-        ('w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})', 1,
-         'w:pPr/w:tabs/w:tab{w:pos=24}'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:pPr/w:tabs/w:tab{w:pos=42}", 0, "w:pPr"),
+            (
+                "w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})",
+                0,
+                "w:pPr/w:tabs/w:tab{w:pos=42}",
+            ),
+            (
+                "w:pPr/w:tabs/(w:tab{w:pos=24},w:tab{w:pos=42})",
+                1,
+                "w:pPr/w:tabs/w:tab{w:pos=24}",
+            ),
+        ]
+    )
     def del_fixture(self, request):
         pPr_cxml, idx, expected_cxml = request.param
         tab_stops = TabStops(element(pPr_cxml))
         expected_xml = xml(expected_cxml)
         return tab_stops, idx, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:pPr',                        0),
-        ('w:pPr/w:tabs/w:tab{w:pos=42}', 1),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:pPr", 0),
+            ("w:pPr/w:tabs/w:tab{w:pos=42}", 1),
+        ]
+    )
     def del_raises_fixture(self, request):
         tab_stops_cxml, idx = request.param
         tab_stops = TabStops(element(tab_stops_cxml))
         return tab_stops, idx
 
-    @pytest.fixture(params=[
-        ('w:pPr', Twips(42), {},
-         'w:pPr/w:tabs/w:tab{w:pos=42,w:val=left}'),
-        ('w:pPr', Twips(72), {'alignment': WD_TAB_ALIGNMENT.RIGHT},
-         'w:pPr/w:tabs/w:tab{w:pos=72,w:val=right}'),
-        ('w:pPr', Twips(24),
-         {'alignment': WD_TAB_ALIGNMENT.CENTER,
-          'leader': WD_TAB_LEADER.DOTS},
-         'w:pPr/w:tabs/w:tab{w:pos=24,w:val=center,w:leader=dot}'),
-        ('w:pPr/w:tabs/w:tab{w:pos=42}', Twips(72), {},
-         'w:pPr/w:tabs/(w:tab{w:pos=42},w:tab{w:pos=72,w:val=left})'),
-        ('w:pPr/w:tabs/w:tab{w:pos=42}', Twips(24), {},
-         'w:pPr/w:tabs/(w:tab{w:pos=24,w:val=left},w:tab{w:pos=42})'),
-        ('w:pPr/w:tabs/w:tab{w:pos=42}', Twips(42), {},
-         'w:pPr/w:tabs/(w:tab{w:pos=42},w:tab{w:pos=42,w:val=left})'),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:pPr", Twips(42), {}, "w:pPr/w:tabs/w:tab{w:pos=42,w:val=left}"),
+            (
+                "w:pPr",
+                Twips(72),
+                {"alignment": WD_TAB_ALIGNMENT.RIGHT},
+                "w:pPr/w:tabs/w:tab{w:pos=72,w:val=right}",
+            ),
+            (
+                "w:pPr",
+                Twips(24),
+                {"alignment": WD_TAB_ALIGNMENT.CENTER, "leader": WD_TAB_LEADER.DOTS},
+                "w:pPr/w:tabs/w:tab{w:pos=24,w:val=center,w:leader=dot}",
+            ),
+            (
+                "w:pPr/w:tabs/w:tab{w:pos=42}",
+                Twips(72),
+                {},
+                "w:pPr/w:tabs/(w:tab{w:pos=42},w:tab{w:pos=72,w:val=left})",
+            ),
+            (
+                "w:pPr/w:tabs/w:tab{w:pos=42}",
+                Twips(24),
+                {},
+                "w:pPr/w:tabs/(w:tab{w:pos=24,w:val=left},w:tab{w:pos=42})",
+            ),
+            (
+                "w:pPr/w:tabs/w:tab{w:pos=42}",
+                Twips(42),
+                {},
+                "w:pPr/w:tabs/(w:tab{w:pos=42},w:tab{w:pos=42,w:val=left})",
+            ),
+        ]
+    )
     def add_tab_fixture(self, request):
         pPr_cxml, position, kwargs, expected_cxml = request.param
         tab_stops = TabStops(element(pPr_cxml))
         expected_xml = xml(expected_cxml)
         return tab_stops, position, kwargs, expected_xml
 
-    @pytest.fixture(params=[
-        ('w:pPr/w:tabs/w:tab{w:pos=0}',                                 0),
-        ('w:pPr/w:tabs/(w:tab{w:pos=1},w:tab{w:pos=2},w:tab{w:pos=3})', 1),
-        ('w:pPr/w:tabs/(w:tab{w:pos=4},w:tab{w:pos=5},w:tab{w:pos=6})', 2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:pPr/w:tabs/w:tab{w:pos=0}", 0),
+            ("w:pPr/w:tabs/(w:tab{w:pos=1},w:tab{w:pos=2},w:tab{w:pos=3})", 1),
+            ("w:pPr/w:tabs/(w:tab{w:pos=4},w:tab{w:pos=5},w:tab{w:pos=6})", 2),
+        ]
+    )
     def index_fixture(self, request, TabStop_, tab_stop_):
         pPr_cxml, idx = request.param
         pPr = element(pPr_cxml)
-        tab = pPr.xpath('./w:tabs/w:tab')[idx]
+        tab = pPr.xpath("./w:tabs/w:tab")[idx]
         tab_stops = TabStops(pPr)
         return tab_stops, idx, TabStop_, tab, tab_stop_
 
-    @pytest.fixture(params=[
-        ('w:pPr',                                              0),
-        ('w:pPr/w:tabs/w:tab{w:pos=2880}',                     1),
-        ('w:pPr/w:tabs/(w:tab{w:pos=2880},w:tab{w:pos=5760})', 2),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:pPr", 0),
+            ("w:pPr/w:tabs/w:tab{w:pos=2880}", 1),
+            ("w:pPr/w:tabs/(w:tab{w:pos=2880},w:tab{w:pos=5760})", 2),
+        ]
+    )
     def iter_fixture(self, request, TabStop_, tab_stop_):
         pPr_cxml, expected_count = request.param
         pPr = element(pPr_cxml)
-        tab_elms = pPr.xpath('//w:tab')
+        tab_elms = pPr.xpath("//w:tab")
         tab_stops = TabStops(pPr)
         expected_calls = [call(tab) for tab in tab_elms]
         return tab_stops, expected_count, tab_stop_, TabStop_, expected_calls
 
-    @pytest.fixture(params=[
-        ('w:pPr',                          0),
-        ('w:pPr/w:tabs/w:tab{w:pos=2880}', 1),
-    ])
+    @pytest.fixture(
+        params=[
+            ("w:pPr", 0),
+            ("w:pPr/w:tabs/w:tab{w:pos=2880}", 1),
+        ]
+    )
     def len_fixture(self, request):
         tab_stops_cxml, expected_value = request.param
         tab_stops = TabStops(element(tab_stops_cxml))
@@ -276,9 +329,7 @@ def len_fixture(self, request):
 
     @pytest.fixture
     def TabStop_(self, request, tab_stop_):
-        return class_mock(
-            request, 'docx.text.tabstops.TabStop', return_value=tab_stop_
-        )
+        return class_mock(request, "docx.text.tabstops.TabStop", return_value=tab_stop_)
 
     @pytest.fixture
     def tab_stop_(self, request):
diff --git a/tests/unitdata.py b/tests/unitdata.py
index 208be48de..7fe0a7c12 100644
--- a/tests/unitdata.py
+++ b/tests/unitdata.py
@@ -14,17 +14,16 @@ class BaseBuilder(object):
     """
     Provides common behavior for all data builders.
     """
+
     def __init__(self):
         self._empty = False
-        self._nsdecls = ''
-        self._text = ''
+        self._nsdecls = ""
+        self._text = ""
         self._xmlattrs = []
         self._xmlattr_method_map = {}
         for attr_name in self.__attrs__:
-            base_name = (
-                attr_name.split(':')[1] if ':' in attr_name else attr_name
-            )
-            method_name = 'with_%s' % base_name
+            base_name = attr_name.split(":")[1] if ":" in attr_name else attr_name
+            method_name = "with_%s" % base_name
             self._xmlattr_method_map[method_name] = attr_name
         self._child_bldrs = []
 
@@ -34,10 +33,12 @@ def __getattr__(self, name):
         methods.
         """
         if name in self._xmlattr_method_map:
+
             def with_xmlattr(value):
                 xmlattr_name = self._xmlattr_method_map[name]
                 self._set_xmlattr(xmlattr_name, value)
                 return self
+
             return with_xmlattr
         else:
             tmpl = "'%s' object has no attribute '%s'"
@@ -85,45 +86,44 @@ def with_nsdecls(self, *nspfxs):
         """
         if not nspfxs:
             nspfxs = self.__nspfxs__
-        self._nsdecls = ' %s' % nsdecls(*nspfxs)
+        self._nsdecls = " %s" % nsdecls(*nspfxs)
         return self
 
     def xml(self, indent=0):
         """
         Return element XML based on attribute settings
         """
-        indent_str = ' ' * indent
+        indent_str = " " * indent
         if self._is_empty:
-            xml = '%s%s\n' % (indent_str, self._empty_element_tag)
+            xml = "%s%s\n" % (indent_str, self._empty_element_tag)
         else:
-            xml = '%s\n' % self._non_empty_element_xml(indent)
+            xml = "%s\n" % self._non_empty_element_xml(indent)
         return xml
 
     def xml_bytes(self, indent=0):
-        return self.xml(indent=indent).encode('utf-8')
+        return self.xml(indent=indent).encode("utf-8")
 
     @property
     def _empty_element_tag(self):
-        return '<%s%s%s/>' % (self.__tag__, self._nsdecls, self._xmlattrs_str)
+        return "<%s%s%s/>" % (self.__tag__, self._nsdecls, self._xmlattrs_str)
 
     @property
     def _end_tag(self):
-        return '</%s>' % self.__tag__
+        return "</%s>" % self.__tag__
 
     @property
     def _is_empty(self):
         return len(self._child_bldrs) == 0 and len(self._text) == 0
 
     def _non_empty_element_xml(self, indent):
-        indent_str = ' ' * indent
+        indent_str = " " * indent
         if self._text:
-            xml = ('%s%s%s%s' %
-                   (indent_str, self._start_tag, self._text, self._end_tag))
+            xml = "%s%s%s%s" % (indent_str, self._start_tag, self._text, self._end_tag)
         else:
-            xml = '%s%s\n' % (indent_str, self._start_tag)
+            xml = "%s%s\n" % (indent_str, self._start_tag)
             for child_bldr in self._child_bldrs:
-                xml += child_bldr.xml(indent+2)
-            xml += '%s%s' % (indent_str, self._end_tag)
+                xml += child_bldr.xml(indent + 2)
+            xml += "%s%s" % (indent_str, self._end_tag)
         return xml
 
     def _set_xmlattr(self, xmlattr_name, value):
@@ -132,11 +132,11 @@ def _set_xmlattr(self, xmlattr_name, value):
 
     @property
     def _start_tag(self):
-        return '<%s%s%s>' % (self.__tag__, self._nsdecls, self._xmlattrs_str)
+        return "<%s%s%s>" % (self.__tag__, self._nsdecls, self._xmlattrs_str)
 
     @property
     def _xmlattrs_str(self):
         """
         Return all element attributes as a string, like ' foo="bar" x="1"'.
         """
-        return ''.join(self._xmlattrs)
+        return "".join(self._xmlattrs)
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index f583a3c99..3029eda77 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -32,6 +32,7 @@
 # api functions
 # ====================================================================
 
+
 def element(cxel_str):
     """
     Return an oxml element parsed from the XML generated from *cxel_str*.
@@ -59,7 +60,7 @@ def nsdecls(*nspfxs):
     Return a string containing a namespace declaration for each of *nspfxs*,
     in the order they are specified.
     """
-    nsdecls = ''
+    nsdecls = ""
     for nspfx in nspfxs:
         nsdecls += ' xmlns:%s="%s"' % (nspfx, nsmap[nspfx])
     return nsdecls
@@ -70,6 +71,7 @@ class Element(object):
     Represents an XML element, having a namespace, tagname, attributes, and
     may contain either text or children (but not both) or may be empty.
     """
+
     def __init__(self, tagname, attrs, text):
         self._tagname = tagname
         self._attrs = attrs
@@ -122,10 +124,11 @@ def local_nspfxs(self):
         all of its attributes. An empty string (``''``) is used to represent
         the default namespace for an element tag having no prefix.
         """
+
         def nspfx(name, is_element=False):
-            idx = name.find(':')
+            idx = name.find(":")
             if idx == -1:
-                return '' if is_element else None
+                return "" if is_element else None
             return name[:idx]
 
         nspfxs = [nspfx(self._tagname, True)]
@@ -143,6 +146,7 @@ def nspfxs(self):
         this tree. Each prefix appears once and only once, and in document
         order.
         """
+
         def merge(seq, seq_2):
             for item in seq_2:
                 if item in seq:
@@ -168,10 +172,10 @@ def _xml(self, indent):
         Return a string containing the XML of this element and all its
         children with a starting indent of *indent* spaces.
         """
-        self._indent_str = ' ' * indent
+        self._indent_str = " " * indent
         xml = self._start_tag
         for child in self._children:
-            xml += child._xml(indent+2)
+            xml += child._xml(indent + 2)
         xml += self._end_tag
         return xml
 
@@ -187,17 +191,17 @@ def _start_tag(self):
         a newline. The tag is indented by this element's indent value in all
         cases.
         """
-        _nsdecls = nsdecls(*self.nspfxs) if self.is_root else ''
-        tag = '%s<%s%s' % (self._indent_str, self._tagname, _nsdecls)
+        _nsdecls = nsdecls(*self.nspfxs) if self.is_root else ""
+        tag = "%s<%s%s" % (self._indent_str, self._tagname, _nsdecls)
         for attr in self._attrs:
             name, value = attr
             tag += ' %s="%s"' % (name, value)
         if self._text:
-            tag += '>%s' % self._text
+            tag += ">%s" % self._text
         elif self._children:
-            tag += '>\n'
+            tag += ">\n"
         else:
-            tag += '/>\n'
+            tag += "/>\n"
         return tag
 
     @property
@@ -207,11 +211,11 @@ def _end_tag(self):
         element contains text, no leading indentation is included.
         """
         if self._text:
-            tag = '</%s>\n' % self._tagname
+            tag = "</%s>\n" % self._tagname
         elif self._children:
-            tag = '%s</%s>\n' % (self._indent_str, self._tagname)
+            tag = "%s</%s>\n" % (self._indent_str, self._tagname)
         else:
-            tag = ''
+            tag = ""
         return tag
 
 
@@ -221,6 +225,7 @@ def _end_tag(self):
 
 # parse actions ----------------------------------
 
+
 def connect_node_children(s, loc, tokens):
     node = tokens[0]
     node.element.connect_children(node.child_node_list)
@@ -233,13 +238,13 @@ def connect_root_node_children(root_node):
 
 def grammar():
     # terminals ----------------------------------
-    colon = Literal(':')
-    equal = Suppress('=')
-    slash = Suppress('/')
-    open_paren = Suppress('(')
-    close_paren = Suppress(')')
-    open_brace = Suppress('{')
-    close_brace = Suppress('}')
+    colon = Literal(":")
+    equal = Suppress("=")
+    slash = Suppress("/")
+    open_paren = Suppress("(")
+    close_paren = Suppress(")")
+    open_brace = Suppress("{")
+    close_brace = Suppress("}")
 
     # np:tagName ---------------------------------
     nspfx = Word(alphas)
@@ -247,8 +252,8 @@ def grammar():
     tagname = Combine(nspfx + colon + local_name)
 
     # np:attr_name=attr_val ----------------------
-    attr_name = Word(alphas + ':')
-    attr_val = Word(alphanums + ' %-./:_')
+    attr_name = Word(alphas + ":")
+    attr_val = Word(alphanums + " %-./:_")
     attr_def = Group(attr_name + equal + attr_val)
     attr_list = open_brace + delimitedList(attr_def) + close_brace
 
@@ -256,26 +261,22 @@ def grammar():
 
     # w:jc{val=right} ----------------------------
     element = (
-        tagname('tagname')
-        + Group(Optional(attr_list))('attr_list')
-        + Optional(text, default='')('text')
+        tagname("tagname")
+        + Group(Optional(attr_list))("attr_list")
+        + Optional(text, default="")("text")
     ).setParseAction(Element.from_token)
 
     child_node_list = Forward()
 
     node = Group(
-        element('element')
-        + Group(Optional(slash + child_node_list))('child_node_list')
+        element("element") + Group(Optional(slash + child_node_list))("child_node_list")
     ).setParseAction(connect_node_children)
 
-    child_node_list << (
-        open_paren + delimitedList(node) + close_paren
-        | node
-    )
+    child_node_list << (open_paren + delimitedList(node) + close_paren | node)
 
     root_node = (
-        element('element')
-        + Group(Optional(slash + child_node_list))('child_node_list')
+        element("element")
+        + Group(Optional(slash + child_node_list))("child_node_list")
         + stringEnd
     ).setParseAction(connect_root_node_children)
 
diff --git a/tests/unitutil/file.py b/tests/unitutil/file.py
index 8462e6c42..f87def241 100644
--- a/tests/unitutil/file.py
+++ b/tests/unitutil/file.py
@@ -8,7 +8,7 @@
 
 
 _thisdir = os.path.split(__file__)[0]
-test_file_dir = os.path.abspath(os.path.join(_thisdir, '..', 'test_files'))
+test_file_dir = os.path.abspath(os.path.join(_thisdir, "..", "test_files"))
 
 
 def abspath(relpath):
@@ -24,7 +24,7 @@ def docx_path(name):
     """
     Return the absolute path to test .docx file with root name *name*.
     """
-    return absjoin(test_file_dir, '%s.docx' % name)
+    return absjoin(test_file_dir, "%s.docx" % name)
 
 
 def snippet_seq(name, offset=0, count=1024):
@@ -33,11 +33,11 @@ def snippet_seq(name, offset=0, count=1024):
     file having *name*. Snippets are delimited by a blank line. If specified,
     *count* snippets starting at *offset* are returned.
     """
-    path = os.path.join(test_file_dir, 'snippets', '%s.txt' % name)
-    with open(path, 'rb') as f:
-        text = f.read().decode('utf-8')
-    snippets = text.split('\n\n')
-    start, end = offset, offset+count
+    path = os.path.join(test_file_dir, "snippets", "%s.txt" % name)
+    with open(path, "rb") as f:
+        text = f.read().decode("utf-8")
+    snippets = text.split("\n\n")
+    start, end = offset, offset + count
     return tuple(snippets[start:end])
 
 
@@ -47,11 +47,11 @@ def snippet_text(snippet_file_name):
     *snippet_file_name*.
     """
     snippet_file_path = os.path.join(
-        test_file_dir, 'snippets', '%s.txt' % snippet_file_name
+        test_file_dir, "snippets", "%s.txt" % snippet_file_name
     )
-    with open(snippet_file_path, 'rb') as f:
+    with open(snippet_file_path, "rb") as f:
         snippet_bytes = f.read()
-    return snippet_bytes.decode('utf-8')
+    return snippet_bytes.decode("utf-8")
 
 
 def test_file(name):
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
index 828382e7e..4bd1fdccd 100644
--- a/tests/unitutil/mock.py
+++ b/tests/unitutil/mock.py
@@ -70,9 +70,7 @@ def instance_mock(request, cls, name=None, spec_set=True, **kwargs):
     the Mock() call that creates the mock.
     """
     name = name if name is not None else request.fixturename
-    return create_autospec(
-        cls, _name=name, spec_set=spec_set, instance=True, **kwargs
-    )
+    return create_autospec(cls, _name=name, spec_set=spec_set, instance=True, **kwargs)
 
 
 def loose_mock(request, name=None, **kwargs):
@@ -100,7 +98,7 @@ def open_mock(request, module_name, **kwargs):
     """
     Return a mock for the builtin `open()` method in *module_name*.
     """
-    target = '%s.open' % module_name
+    target = "%s.open" % module_name
     _patch = patch(target, mock_open(), create=True, **kwargs)
     request.addfinalizer(_patch.stop)
     return _patch.start()

From 80740f2c858da8f89fc4f2d699a2cfbdfe85d7e0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 24 Sep 2023 22:41:47 -0700
Subject: [PATCH 243/367] build: move docx package under src/ directory

This improves packaging reliability because it prevents tests from
running against the current directory instead of the installed version
of the package.
---
 .gitignore                                          |   3 ++-
 MANIFEST.in                                         |   2 +-
 setup.py                                            |   7 +++++--
 {docx => src/docx}/__init__.py                      |   0
 {docx => src/docx}/api.py                           |   0
 {docx => src/docx}/blkcntnr.py                      |   0
 {docx => src/docx}/compat.py                        |   0
 {docx => src/docx}/dml/__init__.py                  |   0
 {docx => src/docx}/dml/color.py                     |   0
 {docx => src/docx}/document.py                      |   0
 {docx => src/docx}/enum/__init__.py                 |   0
 {docx => src/docx}/enum/base.py                     |   0
 {docx => src/docx}/enum/dml.py                      |   0
 {docx => src/docx}/enum/section.py                  |   0
 {docx => src/docx}/enum/shape.py                    |   0
 {docx => src/docx}/enum/style.py                    |   0
 {docx => src/docx}/enum/table.py                    |   0
 {docx => src/docx}/enum/text.py                     |   0
 {docx => src/docx}/exceptions.py                    |   0
 {docx => src/docx}/image/__init__.py                |   0
 {docx => src/docx}/image/bmp.py                     |   0
 {docx => src/docx}/image/constants.py               |   0
 {docx => src/docx}/image/exceptions.py              |   0
 {docx => src/docx}/image/gif.py                     |   0
 {docx => src/docx}/image/helpers.py                 |   0
 {docx => src/docx}/image/image.py                   |   0
 {docx => src/docx}/image/jpeg.py                    |   0
 {docx => src/docx}/image/png.py                     |   0
 {docx => src/docx}/image/tiff.py                    |   0
 {docx => src/docx}/opc/__init__.py                  |   0
 {docx => src/docx}/opc/compat.py                    |   0
 {docx => src/docx}/opc/constants.py                 |   0
 {docx => src/docx}/opc/coreprops.py                 |   0
 {docx => src/docx}/opc/exceptions.py                |   0
 {docx => src/docx}/opc/oxml.py                      |   0
 {docx => src/docx}/opc/package.py                   |   0
 {docx => src/docx}/opc/packuri.py                   |   0
 {docx => src/docx}/opc/part.py                      |   0
 {docx => src/docx}/opc/parts/__init__.py            |   0
 {docx => src/docx}/opc/parts/coreprops.py           |   0
 {docx => src/docx}/opc/phys_pkg.py                  |   0
 {docx => src/docx}/opc/pkgreader.py                 |   0
 {docx => src/docx}/opc/pkgwriter.py                 |   0
 {docx => src/docx}/opc/rel.py                       |   0
 {docx => src/docx}/opc/shared.py                    |   0
 {docx => src/docx}/opc/spec.py                      |   0
 {docx => src/docx}/oxml/__init__.py                 |   0
 {docx => src/docx}/oxml/coreprops.py                |   0
 {docx => src/docx}/oxml/document.py                 |   0
 {docx => src/docx}/oxml/exceptions.py               |   0
 {docx => src/docx}/oxml/ns.py                       |   0
 {docx => src/docx}/oxml/numbering.py                |   0
 {docx => src/docx}/oxml/section.py                  |   0
 {docx => src/docx}/oxml/settings.py                 |   0
 {docx => src/docx}/oxml/shape.py                    |   0
 {docx => src/docx}/oxml/shared.py                   |   0
 {docx => src/docx}/oxml/simpletypes.py              |   0
 {docx => src/docx}/oxml/styles.py                   |   0
 {docx => src/docx}/oxml/table.py                    |   0
 {docx => src/docx}/oxml/text/__init__.py            |   0
 {docx => src/docx}/oxml/text/font.py                |   0
 {docx => src/docx}/oxml/text/paragraph.py           |   0
 {docx => src/docx}/oxml/text/parfmt.py              |   0
 {docx => src/docx}/oxml/text/run.py                 |   0
 {docx => src/docx}/oxml/xmlchemy.py                 |   0
 {docx => src/docx}/package.py                       |   0
 {docx => src/docx}/parts/__init__.py                |   0
 {docx => src/docx}/parts/document.py                |   0
 {docx => src/docx}/parts/hdrftr.py                  |   0
 {docx => src/docx}/parts/image.py                   |   0
 {docx => src/docx}/parts/numbering.py               |   0
 {docx => src/docx}/parts/settings.py                |   0
 {docx => src/docx}/parts/story.py                   |   0
 {docx => src/docx}/parts/styles.py                  |   0
 {docx => src/docx}/section.py                       |   0
 {docx => src/docx}/settings.py                      |   0
 {docx => src/docx}/shape.py                         |   0
 {docx => src/docx}/shared.py                        |   0
 {docx => src/docx}/styles/__init__.py               |   0
 {docx => src/docx}/styles/latent.py                 |   0
 {docx => src/docx}/styles/style.py                  |   0
 {docx => src/docx}/styles/styles.py                 |   0
 {docx => src/docx}/table.py                         |   0
 .../default-docx-template/[Content_Types].xml       |   0
 .../templates/default-docx-template/_rels/.rels     |   0
 .../customXml/_rels/item1.xml.rels                  |   0
 .../default-docx-template/customXml/item1.xml       |   0
 .../default-docx-template/customXml/itemProps1.xml  |   0
 .../default-docx-template/docProps/app.xml          |   0
 .../default-docx-template/docProps/core.xml         |   0
 .../default-docx-template/docProps/thumbnail.jpeg   | Bin
 .../word/_rels/document.xml.rels                    |   0
 .../default-docx-template/word/document.xml         |   0
 .../default-docx-template/word/fontTable.xml        |   0
 .../default-docx-template/word/numbering.xml        |   0
 .../default-docx-template/word/settings.xml         |   0
 .../templates/default-docx-template/word/styles.xml |   0
 .../word/stylesWithEffects.xml                      |   0
 .../default-docx-template/word/theme/theme1.xml     |   0
 .../default-docx-template/word/webSettings.xml      |   0
 {docx => src/docx}/templates/default-footer.xml     |   0
 {docx => src/docx}/templates/default-header.xml     |   0
 {docx => src/docx}/templates/default-settings.xml   |   0
 {docx => src/docx}/templates/default-styles.xml     |   0
 {docx => src/docx}/templates/default.docx           | Bin
 {docx => src/docx}/text/__init__.py                 |   0
 {docx => src/docx}/text/font.py                     |   0
 {docx => src/docx}/text/paragraph.py                |   0
 {docx => src/docx}/text/parfmt.py                   |   0
 {docx => src/docx}/text/run.py                      |   0
 {docx => src/docx}/text/tabstops.py                 |   0
 111 files changed, 8 insertions(+), 4 deletions(-)
 rename {docx => src/docx}/__init__.py (100%)
 rename {docx => src/docx}/api.py (100%)
 rename {docx => src/docx}/blkcntnr.py (100%)
 rename {docx => src/docx}/compat.py (100%)
 rename {docx => src/docx}/dml/__init__.py (100%)
 rename {docx => src/docx}/dml/color.py (100%)
 rename {docx => src/docx}/document.py (100%)
 rename {docx => src/docx}/enum/__init__.py (100%)
 rename {docx => src/docx}/enum/base.py (100%)
 rename {docx => src/docx}/enum/dml.py (100%)
 rename {docx => src/docx}/enum/section.py (100%)
 rename {docx => src/docx}/enum/shape.py (100%)
 rename {docx => src/docx}/enum/style.py (100%)
 rename {docx => src/docx}/enum/table.py (100%)
 rename {docx => src/docx}/enum/text.py (100%)
 rename {docx => src/docx}/exceptions.py (100%)
 rename {docx => src/docx}/image/__init__.py (100%)
 rename {docx => src/docx}/image/bmp.py (100%)
 rename {docx => src/docx}/image/constants.py (100%)
 rename {docx => src/docx}/image/exceptions.py (100%)
 rename {docx => src/docx}/image/gif.py (100%)
 rename {docx => src/docx}/image/helpers.py (100%)
 rename {docx => src/docx}/image/image.py (100%)
 rename {docx => src/docx}/image/jpeg.py (100%)
 rename {docx => src/docx}/image/png.py (100%)
 rename {docx => src/docx}/image/tiff.py (100%)
 rename {docx => src/docx}/opc/__init__.py (100%)
 rename {docx => src/docx}/opc/compat.py (100%)
 rename {docx => src/docx}/opc/constants.py (100%)
 rename {docx => src/docx}/opc/coreprops.py (100%)
 rename {docx => src/docx}/opc/exceptions.py (100%)
 rename {docx => src/docx}/opc/oxml.py (100%)
 rename {docx => src/docx}/opc/package.py (100%)
 rename {docx => src/docx}/opc/packuri.py (100%)
 rename {docx => src/docx}/opc/part.py (100%)
 rename {docx => src/docx}/opc/parts/__init__.py (100%)
 rename {docx => src/docx}/opc/parts/coreprops.py (100%)
 rename {docx => src/docx}/opc/phys_pkg.py (100%)
 rename {docx => src/docx}/opc/pkgreader.py (100%)
 rename {docx => src/docx}/opc/pkgwriter.py (100%)
 rename {docx => src/docx}/opc/rel.py (100%)
 rename {docx => src/docx}/opc/shared.py (100%)
 rename {docx => src/docx}/opc/spec.py (100%)
 rename {docx => src/docx}/oxml/__init__.py (100%)
 rename {docx => src/docx}/oxml/coreprops.py (100%)
 rename {docx => src/docx}/oxml/document.py (100%)
 rename {docx => src/docx}/oxml/exceptions.py (100%)
 rename {docx => src/docx}/oxml/ns.py (100%)
 rename {docx => src/docx}/oxml/numbering.py (100%)
 rename {docx => src/docx}/oxml/section.py (100%)
 rename {docx => src/docx}/oxml/settings.py (100%)
 rename {docx => src/docx}/oxml/shape.py (100%)
 rename {docx => src/docx}/oxml/shared.py (100%)
 rename {docx => src/docx}/oxml/simpletypes.py (100%)
 rename {docx => src/docx}/oxml/styles.py (100%)
 rename {docx => src/docx}/oxml/table.py (100%)
 rename {docx => src/docx}/oxml/text/__init__.py (100%)
 rename {docx => src/docx}/oxml/text/font.py (100%)
 rename {docx => src/docx}/oxml/text/paragraph.py (100%)
 rename {docx => src/docx}/oxml/text/parfmt.py (100%)
 rename {docx => src/docx}/oxml/text/run.py (100%)
 rename {docx => src/docx}/oxml/xmlchemy.py (100%)
 rename {docx => src/docx}/package.py (100%)
 rename {docx => src/docx}/parts/__init__.py (100%)
 rename {docx => src/docx}/parts/document.py (100%)
 rename {docx => src/docx}/parts/hdrftr.py (100%)
 rename {docx => src/docx}/parts/image.py (100%)
 rename {docx => src/docx}/parts/numbering.py (100%)
 rename {docx => src/docx}/parts/settings.py (100%)
 rename {docx => src/docx}/parts/story.py (100%)
 rename {docx => src/docx}/parts/styles.py (100%)
 rename {docx => src/docx}/section.py (100%)
 rename {docx => src/docx}/settings.py (100%)
 rename {docx => src/docx}/shape.py (100%)
 rename {docx => src/docx}/shared.py (100%)
 rename {docx => src/docx}/styles/__init__.py (100%)
 rename {docx => src/docx}/styles/latent.py (100%)
 rename {docx => src/docx}/styles/style.py (100%)
 rename {docx => src/docx}/styles/styles.py (100%)
 rename {docx => src/docx}/table.py (100%)
 rename {docx => src/docx}/templates/default-docx-template/[Content_Types].xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/_rels/.rels (100%)
 rename {docx => src/docx}/templates/default-docx-template/customXml/_rels/item1.xml.rels (100%)
 rename {docx => src/docx}/templates/default-docx-template/customXml/item1.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/customXml/itemProps1.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/docProps/app.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/docProps/core.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/docProps/thumbnail.jpeg (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/_rels/document.xml.rels (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/document.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/fontTable.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/numbering.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/settings.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/styles.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/stylesWithEffects.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/theme/theme1.xml (100%)
 rename {docx => src/docx}/templates/default-docx-template/word/webSettings.xml (100%)
 rename {docx => src/docx}/templates/default-footer.xml (100%)
 rename {docx => src/docx}/templates/default-header.xml (100%)
 rename {docx => src/docx}/templates/default-settings.xml (100%)
 rename {docx => src/docx}/templates/default-styles.xml (100%)
 rename {docx => src/docx}/templates/default.docx (100%)
 rename {docx => src/docx}/text/__init__.py (100%)
 rename {docx => src/docx}/text/font.py (100%)
 rename {docx => src/docx}/text/paragraph.py (100%)
 rename {docx => src/docx}/text/parfmt.py (100%)
 rename {docx => src/docx}/text/run.py (100%)
 rename {docx => src/docx}/text/tabstops.py (100%)

diff --git a/.gitignore b/.gitignore
index e24445137..5aabfd8cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
+/build/
 .coverage
 /dist/
 /docs/.build/
-/*.egg-info
+/src/*.egg-info
 *.pyc
 .pytest_cache/
 _scratch/
diff --git a/MANIFEST.in b/MANIFEST.in
index 90c2f9fdc..c75168672 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include HISTORY.rst LICENSE README.rst tox.ini
-graft docx/templates
+graft src/docx/templates
 graft features
 graft tests
 graft docs
diff --git a/setup.py b/setup.py
index 7c34edcca..d99f736b5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,9 @@ def text_of(relpath):
 # Read the version from docx.__version__ without importing the package
 # (and thus attempting to import packages it depends on that may not be
 # installed yet)
-version = re.search(r'__version__ = "([^"]+)"', text_of("docx/__init__.py")).group(1)
+version = re.search(r'__version__ = "([^"]+)"', text_of("src/docx/__init__.py")).group(
+    1
+)
 
 
 NAME = "python-docx"
@@ -32,7 +34,7 @@ def text_of(relpath):
 AUTHOR_EMAIL = "python-docx@googlegroups.com"
 URL = "https://github.com/python-openxml/python-docx"
 LICENSE = text_of("LICENSE")
-PACKAGES = find_packages(exclude=["tests", "tests.*"])
+PACKAGES = find_packages(where="src")
 PACKAGE_DATA = {"docx": ["templates/*.xml", "templates/*.docx"]}
 
 INSTALL_REQUIRES = ["lxml>=2.3.2"]
@@ -72,6 +74,7 @@ def text_of(relpath):
     "license": LICENSE,
     "packages": PACKAGES,
     "package_data": PACKAGE_DATA,
+    "package_dir": {"": "src"},
     "install_requires": INSTALL_REQUIRES,
     "tests_require": TESTS_REQUIRE,
     "test_suite": TEST_SUITE,
diff --git a/docx/__init__.py b/src/docx/__init__.py
similarity index 100%
rename from docx/__init__.py
rename to src/docx/__init__.py
diff --git a/docx/api.py b/src/docx/api.py
similarity index 100%
rename from docx/api.py
rename to src/docx/api.py
diff --git a/docx/blkcntnr.py b/src/docx/blkcntnr.py
similarity index 100%
rename from docx/blkcntnr.py
rename to src/docx/blkcntnr.py
diff --git a/docx/compat.py b/src/docx/compat.py
similarity index 100%
rename from docx/compat.py
rename to src/docx/compat.py
diff --git a/docx/dml/__init__.py b/src/docx/dml/__init__.py
similarity index 100%
rename from docx/dml/__init__.py
rename to src/docx/dml/__init__.py
diff --git a/docx/dml/color.py b/src/docx/dml/color.py
similarity index 100%
rename from docx/dml/color.py
rename to src/docx/dml/color.py
diff --git a/docx/document.py b/src/docx/document.py
similarity index 100%
rename from docx/document.py
rename to src/docx/document.py
diff --git a/docx/enum/__init__.py b/src/docx/enum/__init__.py
similarity index 100%
rename from docx/enum/__init__.py
rename to src/docx/enum/__init__.py
diff --git a/docx/enum/base.py b/src/docx/enum/base.py
similarity index 100%
rename from docx/enum/base.py
rename to src/docx/enum/base.py
diff --git a/docx/enum/dml.py b/src/docx/enum/dml.py
similarity index 100%
rename from docx/enum/dml.py
rename to src/docx/enum/dml.py
diff --git a/docx/enum/section.py b/src/docx/enum/section.py
similarity index 100%
rename from docx/enum/section.py
rename to src/docx/enum/section.py
diff --git a/docx/enum/shape.py b/src/docx/enum/shape.py
similarity index 100%
rename from docx/enum/shape.py
rename to src/docx/enum/shape.py
diff --git a/docx/enum/style.py b/src/docx/enum/style.py
similarity index 100%
rename from docx/enum/style.py
rename to src/docx/enum/style.py
diff --git a/docx/enum/table.py b/src/docx/enum/table.py
similarity index 100%
rename from docx/enum/table.py
rename to src/docx/enum/table.py
diff --git a/docx/enum/text.py b/src/docx/enum/text.py
similarity index 100%
rename from docx/enum/text.py
rename to src/docx/enum/text.py
diff --git a/docx/exceptions.py b/src/docx/exceptions.py
similarity index 100%
rename from docx/exceptions.py
rename to src/docx/exceptions.py
diff --git a/docx/image/__init__.py b/src/docx/image/__init__.py
similarity index 100%
rename from docx/image/__init__.py
rename to src/docx/image/__init__.py
diff --git a/docx/image/bmp.py b/src/docx/image/bmp.py
similarity index 100%
rename from docx/image/bmp.py
rename to src/docx/image/bmp.py
diff --git a/docx/image/constants.py b/src/docx/image/constants.py
similarity index 100%
rename from docx/image/constants.py
rename to src/docx/image/constants.py
diff --git a/docx/image/exceptions.py b/src/docx/image/exceptions.py
similarity index 100%
rename from docx/image/exceptions.py
rename to src/docx/image/exceptions.py
diff --git a/docx/image/gif.py b/src/docx/image/gif.py
similarity index 100%
rename from docx/image/gif.py
rename to src/docx/image/gif.py
diff --git a/docx/image/helpers.py b/src/docx/image/helpers.py
similarity index 100%
rename from docx/image/helpers.py
rename to src/docx/image/helpers.py
diff --git a/docx/image/image.py b/src/docx/image/image.py
similarity index 100%
rename from docx/image/image.py
rename to src/docx/image/image.py
diff --git a/docx/image/jpeg.py b/src/docx/image/jpeg.py
similarity index 100%
rename from docx/image/jpeg.py
rename to src/docx/image/jpeg.py
diff --git a/docx/image/png.py b/src/docx/image/png.py
similarity index 100%
rename from docx/image/png.py
rename to src/docx/image/png.py
diff --git a/docx/image/tiff.py b/src/docx/image/tiff.py
similarity index 100%
rename from docx/image/tiff.py
rename to src/docx/image/tiff.py
diff --git a/docx/opc/__init__.py b/src/docx/opc/__init__.py
similarity index 100%
rename from docx/opc/__init__.py
rename to src/docx/opc/__init__.py
diff --git a/docx/opc/compat.py b/src/docx/opc/compat.py
similarity index 100%
rename from docx/opc/compat.py
rename to src/docx/opc/compat.py
diff --git a/docx/opc/constants.py b/src/docx/opc/constants.py
similarity index 100%
rename from docx/opc/constants.py
rename to src/docx/opc/constants.py
diff --git a/docx/opc/coreprops.py b/src/docx/opc/coreprops.py
similarity index 100%
rename from docx/opc/coreprops.py
rename to src/docx/opc/coreprops.py
diff --git a/docx/opc/exceptions.py b/src/docx/opc/exceptions.py
similarity index 100%
rename from docx/opc/exceptions.py
rename to src/docx/opc/exceptions.py
diff --git a/docx/opc/oxml.py b/src/docx/opc/oxml.py
similarity index 100%
rename from docx/opc/oxml.py
rename to src/docx/opc/oxml.py
diff --git a/docx/opc/package.py b/src/docx/opc/package.py
similarity index 100%
rename from docx/opc/package.py
rename to src/docx/opc/package.py
diff --git a/docx/opc/packuri.py b/src/docx/opc/packuri.py
similarity index 100%
rename from docx/opc/packuri.py
rename to src/docx/opc/packuri.py
diff --git a/docx/opc/part.py b/src/docx/opc/part.py
similarity index 100%
rename from docx/opc/part.py
rename to src/docx/opc/part.py
diff --git a/docx/opc/parts/__init__.py b/src/docx/opc/parts/__init__.py
similarity index 100%
rename from docx/opc/parts/__init__.py
rename to src/docx/opc/parts/__init__.py
diff --git a/docx/opc/parts/coreprops.py b/src/docx/opc/parts/coreprops.py
similarity index 100%
rename from docx/opc/parts/coreprops.py
rename to src/docx/opc/parts/coreprops.py
diff --git a/docx/opc/phys_pkg.py b/src/docx/opc/phys_pkg.py
similarity index 100%
rename from docx/opc/phys_pkg.py
rename to src/docx/opc/phys_pkg.py
diff --git a/docx/opc/pkgreader.py b/src/docx/opc/pkgreader.py
similarity index 100%
rename from docx/opc/pkgreader.py
rename to src/docx/opc/pkgreader.py
diff --git a/docx/opc/pkgwriter.py b/src/docx/opc/pkgwriter.py
similarity index 100%
rename from docx/opc/pkgwriter.py
rename to src/docx/opc/pkgwriter.py
diff --git a/docx/opc/rel.py b/src/docx/opc/rel.py
similarity index 100%
rename from docx/opc/rel.py
rename to src/docx/opc/rel.py
diff --git a/docx/opc/shared.py b/src/docx/opc/shared.py
similarity index 100%
rename from docx/opc/shared.py
rename to src/docx/opc/shared.py
diff --git a/docx/opc/spec.py b/src/docx/opc/spec.py
similarity index 100%
rename from docx/opc/spec.py
rename to src/docx/opc/spec.py
diff --git a/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
similarity index 100%
rename from docx/oxml/__init__.py
rename to src/docx/oxml/__init__.py
diff --git a/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
similarity index 100%
rename from docx/oxml/coreprops.py
rename to src/docx/oxml/coreprops.py
diff --git a/docx/oxml/document.py b/src/docx/oxml/document.py
similarity index 100%
rename from docx/oxml/document.py
rename to src/docx/oxml/document.py
diff --git a/docx/oxml/exceptions.py b/src/docx/oxml/exceptions.py
similarity index 100%
rename from docx/oxml/exceptions.py
rename to src/docx/oxml/exceptions.py
diff --git a/docx/oxml/ns.py b/src/docx/oxml/ns.py
similarity index 100%
rename from docx/oxml/ns.py
rename to src/docx/oxml/ns.py
diff --git a/docx/oxml/numbering.py b/src/docx/oxml/numbering.py
similarity index 100%
rename from docx/oxml/numbering.py
rename to src/docx/oxml/numbering.py
diff --git a/docx/oxml/section.py b/src/docx/oxml/section.py
similarity index 100%
rename from docx/oxml/section.py
rename to src/docx/oxml/section.py
diff --git a/docx/oxml/settings.py b/src/docx/oxml/settings.py
similarity index 100%
rename from docx/oxml/settings.py
rename to src/docx/oxml/settings.py
diff --git a/docx/oxml/shape.py b/src/docx/oxml/shape.py
similarity index 100%
rename from docx/oxml/shape.py
rename to src/docx/oxml/shape.py
diff --git a/docx/oxml/shared.py b/src/docx/oxml/shared.py
similarity index 100%
rename from docx/oxml/shared.py
rename to src/docx/oxml/shared.py
diff --git a/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
similarity index 100%
rename from docx/oxml/simpletypes.py
rename to src/docx/oxml/simpletypes.py
diff --git a/docx/oxml/styles.py b/src/docx/oxml/styles.py
similarity index 100%
rename from docx/oxml/styles.py
rename to src/docx/oxml/styles.py
diff --git a/docx/oxml/table.py b/src/docx/oxml/table.py
similarity index 100%
rename from docx/oxml/table.py
rename to src/docx/oxml/table.py
diff --git a/docx/oxml/text/__init__.py b/src/docx/oxml/text/__init__.py
similarity index 100%
rename from docx/oxml/text/__init__.py
rename to src/docx/oxml/text/__init__.py
diff --git a/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
similarity index 100%
rename from docx/oxml/text/font.py
rename to src/docx/oxml/text/font.py
diff --git a/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
similarity index 100%
rename from docx/oxml/text/paragraph.py
rename to src/docx/oxml/text/paragraph.py
diff --git a/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
similarity index 100%
rename from docx/oxml/text/parfmt.py
rename to src/docx/oxml/text/parfmt.py
diff --git a/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
similarity index 100%
rename from docx/oxml/text/run.py
rename to src/docx/oxml/text/run.py
diff --git a/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
similarity index 100%
rename from docx/oxml/xmlchemy.py
rename to src/docx/oxml/xmlchemy.py
diff --git a/docx/package.py b/src/docx/package.py
similarity index 100%
rename from docx/package.py
rename to src/docx/package.py
diff --git a/docx/parts/__init__.py b/src/docx/parts/__init__.py
similarity index 100%
rename from docx/parts/__init__.py
rename to src/docx/parts/__init__.py
diff --git a/docx/parts/document.py b/src/docx/parts/document.py
similarity index 100%
rename from docx/parts/document.py
rename to src/docx/parts/document.py
diff --git a/docx/parts/hdrftr.py b/src/docx/parts/hdrftr.py
similarity index 100%
rename from docx/parts/hdrftr.py
rename to src/docx/parts/hdrftr.py
diff --git a/docx/parts/image.py b/src/docx/parts/image.py
similarity index 100%
rename from docx/parts/image.py
rename to src/docx/parts/image.py
diff --git a/docx/parts/numbering.py b/src/docx/parts/numbering.py
similarity index 100%
rename from docx/parts/numbering.py
rename to src/docx/parts/numbering.py
diff --git a/docx/parts/settings.py b/src/docx/parts/settings.py
similarity index 100%
rename from docx/parts/settings.py
rename to src/docx/parts/settings.py
diff --git a/docx/parts/story.py b/src/docx/parts/story.py
similarity index 100%
rename from docx/parts/story.py
rename to src/docx/parts/story.py
diff --git a/docx/parts/styles.py b/src/docx/parts/styles.py
similarity index 100%
rename from docx/parts/styles.py
rename to src/docx/parts/styles.py
diff --git a/docx/section.py b/src/docx/section.py
similarity index 100%
rename from docx/section.py
rename to src/docx/section.py
diff --git a/docx/settings.py b/src/docx/settings.py
similarity index 100%
rename from docx/settings.py
rename to src/docx/settings.py
diff --git a/docx/shape.py b/src/docx/shape.py
similarity index 100%
rename from docx/shape.py
rename to src/docx/shape.py
diff --git a/docx/shared.py b/src/docx/shared.py
similarity index 100%
rename from docx/shared.py
rename to src/docx/shared.py
diff --git a/docx/styles/__init__.py b/src/docx/styles/__init__.py
similarity index 100%
rename from docx/styles/__init__.py
rename to src/docx/styles/__init__.py
diff --git a/docx/styles/latent.py b/src/docx/styles/latent.py
similarity index 100%
rename from docx/styles/latent.py
rename to src/docx/styles/latent.py
diff --git a/docx/styles/style.py b/src/docx/styles/style.py
similarity index 100%
rename from docx/styles/style.py
rename to src/docx/styles/style.py
diff --git a/docx/styles/styles.py b/src/docx/styles/styles.py
similarity index 100%
rename from docx/styles/styles.py
rename to src/docx/styles/styles.py
diff --git a/docx/table.py b/src/docx/table.py
similarity index 100%
rename from docx/table.py
rename to src/docx/table.py
diff --git a/docx/templates/default-docx-template/[Content_Types].xml b/src/docx/templates/default-docx-template/[Content_Types].xml
similarity index 100%
rename from docx/templates/default-docx-template/[Content_Types].xml
rename to src/docx/templates/default-docx-template/[Content_Types].xml
diff --git a/docx/templates/default-docx-template/_rels/.rels b/src/docx/templates/default-docx-template/_rels/.rels
similarity index 100%
rename from docx/templates/default-docx-template/_rels/.rels
rename to src/docx/templates/default-docx-template/_rels/.rels
diff --git a/docx/templates/default-docx-template/customXml/_rels/item1.xml.rels b/src/docx/templates/default-docx-template/customXml/_rels/item1.xml.rels
similarity index 100%
rename from docx/templates/default-docx-template/customXml/_rels/item1.xml.rels
rename to src/docx/templates/default-docx-template/customXml/_rels/item1.xml.rels
diff --git a/docx/templates/default-docx-template/customXml/item1.xml b/src/docx/templates/default-docx-template/customXml/item1.xml
similarity index 100%
rename from docx/templates/default-docx-template/customXml/item1.xml
rename to src/docx/templates/default-docx-template/customXml/item1.xml
diff --git a/docx/templates/default-docx-template/customXml/itemProps1.xml b/src/docx/templates/default-docx-template/customXml/itemProps1.xml
similarity index 100%
rename from docx/templates/default-docx-template/customXml/itemProps1.xml
rename to src/docx/templates/default-docx-template/customXml/itemProps1.xml
diff --git a/docx/templates/default-docx-template/docProps/app.xml b/src/docx/templates/default-docx-template/docProps/app.xml
similarity index 100%
rename from docx/templates/default-docx-template/docProps/app.xml
rename to src/docx/templates/default-docx-template/docProps/app.xml
diff --git a/docx/templates/default-docx-template/docProps/core.xml b/src/docx/templates/default-docx-template/docProps/core.xml
similarity index 100%
rename from docx/templates/default-docx-template/docProps/core.xml
rename to src/docx/templates/default-docx-template/docProps/core.xml
diff --git a/docx/templates/default-docx-template/docProps/thumbnail.jpeg b/src/docx/templates/default-docx-template/docProps/thumbnail.jpeg
similarity index 100%
rename from docx/templates/default-docx-template/docProps/thumbnail.jpeg
rename to src/docx/templates/default-docx-template/docProps/thumbnail.jpeg
diff --git a/docx/templates/default-docx-template/word/_rels/document.xml.rels b/src/docx/templates/default-docx-template/word/_rels/document.xml.rels
similarity index 100%
rename from docx/templates/default-docx-template/word/_rels/document.xml.rels
rename to src/docx/templates/default-docx-template/word/_rels/document.xml.rels
diff --git a/docx/templates/default-docx-template/word/document.xml b/src/docx/templates/default-docx-template/word/document.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/document.xml
rename to src/docx/templates/default-docx-template/word/document.xml
diff --git a/docx/templates/default-docx-template/word/fontTable.xml b/src/docx/templates/default-docx-template/word/fontTable.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/fontTable.xml
rename to src/docx/templates/default-docx-template/word/fontTable.xml
diff --git a/docx/templates/default-docx-template/word/numbering.xml b/src/docx/templates/default-docx-template/word/numbering.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/numbering.xml
rename to src/docx/templates/default-docx-template/word/numbering.xml
diff --git a/docx/templates/default-docx-template/word/settings.xml b/src/docx/templates/default-docx-template/word/settings.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/settings.xml
rename to src/docx/templates/default-docx-template/word/settings.xml
diff --git a/docx/templates/default-docx-template/word/styles.xml b/src/docx/templates/default-docx-template/word/styles.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/styles.xml
rename to src/docx/templates/default-docx-template/word/styles.xml
diff --git a/docx/templates/default-docx-template/word/stylesWithEffects.xml b/src/docx/templates/default-docx-template/word/stylesWithEffects.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/stylesWithEffects.xml
rename to src/docx/templates/default-docx-template/word/stylesWithEffects.xml
diff --git a/docx/templates/default-docx-template/word/theme/theme1.xml b/src/docx/templates/default-docx-template/word/theme/theme1.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/theme/theme1.xml
rename to src/docx/templates/default-docx-template/word/theme/theme1.xml
diff --git a/docx/templates/default-docx-template/word/webSettings.xml b/src/docx/templates/default-docx-template/word/webSettings.xml
similarity index 100%
rename from docx/templates/default-docx-template/word/webSettings.xml
rename to src/docx/templates/default-docx-template/word/webSettings.xml
diff --git a/docx/templates/default-footer.xml b/src/docx/templates/default-footer.xml
similarity index 100%
rename from docx/templates/default-footer.xml
rename to src/docx/templates/default-footer.xml
diff --git a/docx/templates/default-header.xml b/src/docx/templates/default-header.xml
similarity index 100%
rename from docx/templates/default-header.xml
rename to src/docx/templates/default-header.xml
diff --git a/docx/templates/default-settings.xml b/src/docx/templates/default-settings.xml
similarity index 100%
rename from docx/templates/default-settings.xml
rename to src/docx/templates/default-settings.xml
diff --git a/docx/templates/default-styles.xml b/src/docx/templates/default-styles.xml
similarity index 100%
rename from docx/templates/default-styles.xml
rename to src/docx/templates/default-styles.xml
diff --git a/docx/templates/default.docx b/src/docx/templates/default.docx
similarity index 100%
rename from docx/templates/default.docx
rename to src/docx/templates/default.docx
diff --git a/docx/text/__init__.py b/src/docx/text/__init__.py
similarity index 100%
rename from docx/text/__init__.py
rename to src/docx/text/__init__.py
diff --git a/docx/text/font.py b/src/docx/text/font.py
similarity index 100%
rename from docx/text/font.py
rename to src/docx/text/font.py
diff --git a/docx/text/paragraph.py b/src/docx/text/paragraph.py
similarity index 100%
rename from docx/text/paragraph.py
rename to src/docx/text/paragraph.py
diff --git a/docx/text/parfmt.py b/src/docx/text/parfmt.py
similarity index 100%
rename from docx/text/parfmt.py
rename to src/docx/text/parfmt.py
diff --git a/docx/text/run.py b/src/docx/text/run.py
similarity index 100%
rename from docx/text/run.py
rename to src/docx/text/run.py
diff --git a/docx/text/tabstops.py b/src/docx/text/tabstops.py
similarity index 100%
rename from docx/text/tabstops.py
rename to src/docx/text/tabstops.py

From 6ac2c6909b3720abdcb8bab0088659306336a63e Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 24 Sep 2023 22:13:46 -0700
Subject: [PATCH 244/367] build: modernize packaging

---
 Makefile              | 52 +++++++++++++++++---------
 README.rst            |  2 +-
 pyproject.toml        | 79 ++++++++++++++++++++++++++++++++++++++++
 requirements-dev.txt  |  5 +++
 requirements-test.txt |  5 +++
 requirements.txt      |  5 ---
 setup.py              | 85 -------------------------------------------
 src/docx/__init__.py  |  2 +-
 tox.ini               | 32 +---------------
 9 files changed, 127 insertions(+), 140 deletions(-)
 create mode 100644 pyproject.toml
 create mode 100644 requirements-dev.txt
 create mode 100644 requirements-test.txt
 delete mode 100644 setup.py

diff --git a/Makefile b/Makefile
index f335818fe..6d5dd85b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,34 @@
 BEHAVE = behave
 MAKE   = make
 PYTHON = python
-SETUP  = $(PYTHON) ./setup.py
+BUILD  = $(PYTHON) -m build
+TWINE  = $(PYTHON) -m twine
 
-.PHONY: accept clean coverage docs readme register sdist test upload
+.PHONY: accept build clean cleandocs coverage docs install opendocs sdist test
+.PHONY: test-upload wheel
 
 help:
 	@echo "Please use \`make <target>' where <target> is one or more of"
-	@echo "  accept    run acceptance tests using behave"
-	@echo "  clean     delete intermediate work product and start fresh"
-	@echo "  cleandocs delete intermediate documentation files"
-	@echo "  coverage  run nosetests with coverage"
-	@echo "  docs      generate documentation"
-	@echo "  opendocs  open browser to local version of documentation"
-	@echo "  register  update metadata (README.rst) on PyPI"
-	@echo "  sdist     generate a source distribution into dist/"
-	@echo "  upload    upload distribution tarball to PyPI"
+	@echo "  accept       run acceptance tests using behave"
+	@echo "  build        generate both sdist and wheel suitable for upload to PyPI"
+	@echo "  clean        delete intermediate work product and start fresh"
+	@echo "  cleandocs    delete intermediate documentation files"
+	@echo "  coverage     run pytest with coverage"
+	@echo "  docs         generate documentation"
+	@echo "  opendocs     open browser to local version of documentation"
+	@echo "  register     update metadata (README.rst) on PyPI"
+	@echo "  sdist        generate a source distribution into dist/"
+	@echo "  test         run unit tests using pytest"
+	@echo "  test-upload  upload distribution to TestPyPI"
+	@echo "  upload       upload distribution tarball to PyPI"
+	@echo "  wheel        generate a binary distribution into dist/"
 
 accept:
 	$(BEHAVE) --stop
 
+build:
+	$(BUILD)
+
 clean:
 	find . -type f -name \*.pyc -exec rm {} \;
 	rm -rf dist *.egg-info .coverage .DS_Store
@@ -33,14 +42,23 @@ coverage:
 docs:
 	$(MAKE) -C docs html
 
+install:
+	pip install -Ue .
+
 opendocs:
 	open docs/.build/html/index.html
 
-register:
-	$(SETUP) register
-
 sdist:
-	$(SETUP) sdist
+	$(BUILD) --sdist .
+
+test:
+	pytest -x
+
+test-upload: sdist wheel
+	$(TWINE) upload --repository testpypi dist/*
+
+upload: sdist wheel
+	$(TWINE) upload dist/*
 
-upload:
-	$(SETUP) sdist upload
+wheel:
+	$(BUILD) --wheel .
diff --git a/README.rst b/README.rst
index 82d1f0bd7..afc1dadeb 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 .. image:: https://travis-ci.org/python-openxml/python-docx.svg?branch=master
    :target: https://travis-ci.org/python-openxml/python-docx
 
-*python-docx* is a Python library for creating and updating Microsoft Word
+*python-docx* is a Python library for reading, creating, and updating Microsoft Word
 (.docx) files.
 
 More information is available in the `python-docx documentation`_.
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..251d4e955
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,79 @@
+[build-system]
+requires = ["setuptools>=61.0.0"]
+
+[project]
+name = "python-docx"
+authors = [{name = "Steve Canny", email = "stcanny@gmail.com"}]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: Office/Business :: Office Suites",
+    "Topic :: Software Development :: Libraries",
+]
+dependencies = [
+    "lxml>=2.3.2",
+]
+description = "Create, read, and update Microsoft Word .docx files."
+dynamic = ["version"]
+keywords = ["docx", "office", "openxml", "word"]
+license = { text = "MIT" }
+readme = "README.rst"
+requires-python = ">=3.7"
+
+[project.urls]
+Changelog = "https://github.com/python-openxml/python-docx/blob/master/HISTORY.rst"
+Documentation = "https://python-docx.readthedocs.org/en/latest/"
+Homepage = "https://github.com/python-openxml/python-docx"
+Repository = "https://github.com/python-openxml/python-docx"
+
+[tool.black]
+target-version = ["py37", "py38", "py39", "py310", "py311"]
+
+[tool.pytest.ini_options]
+norecursedirs = [
+    "doc",
+    "docx",
+    "*.egg-info",
+    "features",
+    ".git",
+    "ref",
+    "_scratch",
+    ".tox",
+]
+python_files = ["test_*.py"]
+python_classes = ["Test", "Describe"]
+python_functions = ["it_", "they_", "and_it_", "but_it_"]
+
+[tool.ruff]
+exclude = []
+ignore = [
+    "COM812",   # -- over-aggressively insists on trailing commas where not desired --
+]
+select = [
+    # "C4",       # -- flake8-comprehensions --
+    "COM",      # -- flake8-commas --
+    "E",        # -- pycodestyle errors --
+    "F",        # -- pyflakes --
+    # "I",        # -- isort (imports) --
+    "PLR0402",  # -- Name compared with itself like `foo == foo` --
+    # "PT",       # -- flake8-pytest-style --
+    # "SIM",      # -- flake8-simplify --
+    "UP015",    # -- redundant `open()` mode parameter (like "r" is default) --
+    "UP018",    # -- Unnecessary {literal_type} call like `str("abc")`. (rewrite as a literal) --
+    "UP032",    # -- Use f-string instead of `.format()` call --
+    "UP034",    # -- Avoid extraneous parentheses --
+]
+target-version = "py37"
+
+[tool.setuptools.dynamic]
+version = {attr = "docx.__version__"}
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 000000000..45e5f78c3
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,5 @@
+-r requirements-test.txt
+build
+setuptools>=61.0.0
+tox
+twine
diff --git a/requirements-test.txt b/requirements-test.txt
new file mode 100644
index 000000000..85d9f6ba3
--- /dev/null
+++ b/requirements-test.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+behave>=1.2.3
+pyparsing>=2.0.1
+pytest>=2.5
+ruff
diff --git a/requirements.txt b/requirements.txt
index de244afa3..17b9696d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1 @@
-behave>=1.2.3
-flake8>=2.0
 lxml>=3.1.0
-mock>=1.0.1
-pyparsing>=2.0.1
-pytest>=2.5
diff --git a/setup.py b/setup.py
deleted file mode 100644
index d99f736b5..000000000
--- a/setup.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import re
-
-from setuptools import find_packages, setup
-
-
-def text_of(relpath):
-    """
-    Return string containing the contents of the file at *relpath* relative to
-    this file.
-    """
-    thisdir = os.path.dirname(__file__)
-    file_path = os.path.join(thisdir, os.path.normpath(relpath))
-    with open(file_path) as f:
-        text = f.read()
-    return text
-
-
-# Read the version from docx.__version__ without importing the package
-# (and thus attempting to import packages it depends on that may not be
-# installed yet)
-version = re.search(r'__version__ = "([^"]+)"', text_of("src/docx/__init__.py")).group(
-    1
-)
-
-
-NAME = "python-docx"
-VERSION = version
-DESCRIPTION = "Create and update Microsoft Word .docx files."
-KEYWORDS = "docx office openxml word"
-AUTHOR = "Steve Canny"
-AUTHOR_EMAIL = "python-docx@googlegroups.com"
-URL = "https://github.com/python-openxml/python-docx"
-LICENSE = text_of("LICENSE")
-PACKAGES = find_packages(where="src")
-PACKAGE_DATA = {"docx": ["templates/*.xml", "templates/*.docx"]}
-
-INSTALL_REQUIRES = ["lxml>=2.3.2"]
-TEST_SUITE = "tests"
-TESTS_REQUIRE = ["behave", "mock", "pyparsing", "pytest"]
-
-CLASSIFIERS = [
-    "Development Status :: 3 - Alpha",
-    "Environment :: Console",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.6",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.3",
-    "Programming Language :: Python :: 3.4",
-    "Topic :: Office/Business :: Office Suites",
-    "Topic :: Software Development :: Libraries",
-]
-
-LONG_DESCRIPTION = text_of("README.rst") + "\n\n" + text_of("HISTORY.rst")
-
-ZIP_SAFE = False
-
-params = {
-    "name": NAME,
-    "version": VERSION,
-    "description": DESCRIPTION,
-    "keywords": KEYWORDS,
-    "long_description": LONG_DESCRIPTION,
-    "author": AUTHOR,
-    "author_email": AUTHOR_EMAIL,
-    "url": URL,
-    "license": LICENSE,
-    "packages": PACKAGES,
-    "package_data": PACKAGE_DATA,
-    "package_dir": {"": "src"},
-    "install_requires": INSTALL_REQUIRES,
-    "tests_require": TESTS_REQUIRE,
-    "test_suite": TEST_SUITE,
-    "classifiers": CLASSIFIERS,
-    "zip_safe": ZIP_SAFE,
-}
-
-setup(**params)
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index 59756c021..c3543088b 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -2,7 +2,7 @@
 
 from docx.api import Document  # noqa
 
-__version__ = "0.8.11"
+__version__ = "1.0.0rc1"
 
 
 # register custom Part classes with opc package reader
diff --git a/tox.ini b/tox.ini
index 6ced79b71..f8c0ce994 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,5 @@
-#
-# Configuration for tox and pytest
-
-[flake8]
-exclude = dist,docs,*.egg-info,.git,ref,_scratch,.tox
-max-line-length = 88
-
-[pytest]
-norecursedirs = doc docx *.egg-info features .git ref _scratch .tox
-python_files = test_*.py
-python_classes = Test Describe
-python_functions = it_ they_ and_it_ but_it_
-
 [tox]
-envlist = py26, py27, py34, py35, py36, py38
+envlist = py37, py38, py39, py310, py311
 
 [testenv]
 deps =
@@ -24,20 +11,3 @@ deps =
 commands =
     py.test -qx
     behave --format progress --stop --tags=-wip
-
-[testenv:py26]
-deps =
-    importlib>=1.0.3
-    behave
-    lxml
-    mock
-    pyparsing
-    pytest
-
-[testenv:py27]
-deps =
-    behave
-    lxml
-    mock
-    pyparsing
-    pytest

From 163cfc1bf7f23914742678310c15db4ece19d418 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 25 Sep 2023 00:07:59 -0700
Subject: [PATCH 245/367] lint: add isort linting in ruff

This required a large number of adjustments. I took the opportunity to
make some further clean-up of top-matter.
---
 features/steps/api.py             |  8 +-------
 features/steps/block.py           |  7 +------
 features/steps/cell.py            |  9 +--------
 features/steps/coreprops.py       |  9 +--------
 features/steps/document.py        | 11 ++---------
 features/steps/font.py            |  9 +--------
 features/steps/hdrftr.py          |  7 +------
 features/steps/helpers.py         |  6 +-----
 features/steps/image.py           |  9 +--------
 features/steps/numbering.py       |  7 +------
 features/steps/paragraph.py       |  7 +------
 features/steps/parfmt.py          |  9 +--------
 features/steps/section.py         |  9 +--------
 features/steps/settings.py        |  7 +------
 features/steps/shape.py           |  9 +--------
 features/steps/shared.py          |  7 +------
 features/steps/styles.py          |  8 ++------
 features/steps/table.py           | 23 ++++++++++++-----------
 features/steps/tabstops.py        |  7 +------
 features/steps/text.py            |  9 +--------
 pyproject.toml                    |  6 +++++-
 src/docx/__init__.py              |  6 ++----
 src/docx/enum/dml.py              | 10 ++--------
 src/docx/enum/section.py          | 10 ++--------
 src/docx/enum/style.py            | 10 ++--------
 src/docx/enum/table.py            | 10 ++--------
 src/docx/enum/text.py             | 10 ++--------
 src/docx/image/__init__.py        | 10 +++-------
 src/docx/image/helpers.py         |  5 -----
 src/docx/image/image.py           | 15 ++++++---------
 src/docx/opc/oxml.py              | 16 ++++++----------
 src/docx/opc/part.py              | 22 ++++++++--------------
 src/docx/opc/parts/coreprops.py   | 18 ++++++------------
 src/docx/opc/phys_pkg.py          | 17 +++++------------
 src/docx/opc/spec.py              |  9 ++-------
 src/docx/oxml/__init__.py         | 11 +++--------
 src/docx/oxml/coreprops.py        |  7 +------
 src/docx/oxml/document.py         |  9 ++-------
 src/docx/oxml/ns.py               |  9 +--------
 src/docx/oxml/table.py            | 22 +++++++++-------------
 src/docx/oxml/text/font.py        | 30 ++++++++++++++++++------------
 src/docx/oxml/xmlchemy.py         | 11 ++---------
 src/docx/styles/latent.py         | 12 +++---------
 src/docx/styles/style.py          | 18 ++++++------------
 src/docx/table.py                 | 16 +++++-----------
 src/docx/text/paragraph.py        | 16 +++++-----------
 src/docx/text/parfmt.py           | 14 ++++----------
 src/docx/text/run.py              | 18 ++++++------------
 src/docx/text/tabstops.py         | 10 ++--------
 tests/dml/test_color.py           | 12 +++---------
 tests/image/test_bmp.py           | 10 ++--------
 tests/image/test_gif.py           |  6 +-----
 tests/image/test_helpers.py       |  8 +-------
 tests/image/test_image.py         |  4 ----
 tests/image/test_jpeg.py          | 10 +++-------
 tests/image/test_png.py           | 10 +++-------
 tests/image/test_tiff.py          |  6 +-----
 tests/opc/parts/test_coreprops.py |  8 +-------
 tests/opc/test_coreprops.py       | 10 ++--------
 tests/opc/test_oxml.py            |  8 ++------
 tests/opc/test_package.py         | 10 +++-------
 tests/opc/test_packuri.py         |  6 +-----
 tests/opc/test_part.py            |  8 ++------
 tests/opc/test_phys_pkg.py        | 17 +++++------------
 tests/opc/test_pkgreader.py       | 15 ++++++---------
 tests/opc/test_pkgwriter.py       | 14 +++++---------
 tests/opc/test_rel.py             | 12 +++---------
 tests/opc/unitdata/rels.py        | 13 +++----------
 tests/oxml/test__init__.py        |  9 +--------
 tests/oxml/test_ns.py             |  8 +-------
 tests/oxml/test_styles.py         |  8 +-------
 tests/oxml/test_table.py          |  6 +-----
 tests/oxml/test_xmlchemy.py       | 14 ++++----------
 tests/parts/test_document.py      |  6 +-----
 tests/parts/test_hdrftr.py        |  9 +++------
 tests/parts/test_image.py         |  9 +++------
 tests/parts/test_numbering.py     |  8 +-------
 tests/parts/test_settings.py      |  4 ----
 tests/parts/test_story.py         |  6 +-----
 tests/parts/test_styles.py        |  8 +-------
 tests/styles/test_latent.py       | 10 ++--------
 tests/styles/test_style.py        | 12 +++---------
 tests/styles/test_styles.py       |  6 +-----
 tests/test_api.py                 | 11 ++---------
 tests/test_blkcntnr.py            |  6 +-----
 tests/test_document.py            |  8 ++------
 tests/test_enum.py                | 12 ++++--------
 tests/test_package.py             |  6 +-----
 tests/test_section.py             |  8 ++------
 tests/test_settings.py            |  6 +-----
 tests/test_shape.py               |  8 +-------
 tests/test_shared.py              | 10 ++--------
 tests/test_table.py               |  8 ++------
 tests/text/test_font.py           | 10 ++--------
 tests/text/test_paragraph.py      |  8 ++------
 tests/text/test_parfmt.py         | 11 ++---------
 tests/text/test_run.py            |  8 ++------
 tests/text/test_tabstops.py       | 11 ++---------
 tests/unitutil/cxml.py            | 17 ++++++-----------
 tests/unitutil/file.py            |  7 +------
 100 files changed, 259 insertions(+), 760 deletions(-)

diff --git a/features/steps/api.py b/features/steps/api.py
index 1c66c4c89..16038ffe7 100644
--- a/features/steps/api.py
+++ b/features/steps/api.py
@@ -1,18 +1,12 @@
-# encoding: utf-8
-
-"""
-Step implementations for basic API features
-"""
+"""Step implementations for basic API features."""
 
 from behave import given, then, when
 
 import docx
-
 from docx import Document
 
 from helpers import test_docx
 
-
 # given ====================================================
 
 
diff --git a/features/steps/block.py b/features/steps/block.py
index 686da2c99..a091694ad 100644
--- a/features/steps/block.py
+++ b/features/steps/block.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for block content containers
-"""
+"""Step implementations for block content containers."""
 
 from behave import given, then, when
 
@@ -11,7 +7,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/cell.py b/features/steps/cell.py
index 4ec633ae3..10896872b 100644
--- a/features/steps/cell.py
+++ b/features/steps/cell.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for table cell-related features
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Step implementations for table cell-related features."""
 
 from behave import given, then, when
 
@@ -12,7 +6,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/coreprops.py b/features/steps/coreprops.py
index e13c5f8fb..0f6b6a854 100644
--- a/features/steps/coreprops.py
+++ b/features/steps/coreprops.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Gherkin step implementations for core properties-related features.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Gherkin step implementations for core properties-related features."""
 
 from datetime import datetime, timedelta
 
@@ -15,7 +9,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/document.py b/features/steps/document.py
index 2aae3e191..49165efc3 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -1,25 +1,18 @@
-# encoding: utf-8
-
-"""
-Step implementations for document-related features
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Step implementations for document-related features."""
 
 from behave import given, then, when
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
+from docx.section import Sections
 from docx.shape import InlineShapes
 from docx.shared import Inches
-from docx.section import Sections
 from docx.styles.styles import Styles
 from docx.table import Table
 from docx.text.paragraph import Paragraph
 
 from helpers import test_docx, test_file
 
-
 # given ===================================================
 
 
diff --git a/features/steps/font.py b/features/steps/font.py
index ed6e51f25..63ca6b48e 100644
--- a/features/steps/font.py
+++ b/features/steps/font.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for font-related features.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Step implementations for font-related features."""
 
 from behave import given, then, when
 
@@ -16,7 +10,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/hdrftr.py b/features/steps/hdrftr.py
index 4f0e3b915..5949f961c 100644
--- a/features/steps/hdrftr.py
+++ b/features/steps/hdrftr.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Step implementations for header and footer-related features"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Step implementations for header and footer-related features."""
 
 from behave import given, then, when
 
@@ -10,7 +6,6 @@
 
 from helpers import test_docx, test_file
 
-
 # given ====================================================
 
 
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
index cd64a7861..6b4300e94 100644
--- a/features/steps/helpers.py
+++ b/features/steps/helpers.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Helper methods and variables for acceptance tests.
-"""
+"""Helper methods and variables for acceptance tests."""
 
 import os
 
diff --git a/features/steps/image.py b/features/steps/image.py
index 7f80baa59..5ac54169b 100644
--- a/features/steps/image.py
+++ b/features/steps/image.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for image characterization features
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Step implementations for image characterization features."""
 
 from behave import given, then, when
 
@@ -12,7 +6,6 @@
 
 from helpers import test_file
 
-
 # given ===================================================
 
 
diff --git a/features/steps/numbering.py b/features/steps/numbering.py
index 2a20fd087..be88ceee7 100644
--- a/features/steps/numbering.py
+++ b/features/steps/numbering.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for numbering-related features
-"""
+"""Step implementations for numbering-related features."""
 
 from behave import given, then, when
 
@@ -10,7 +6,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index d372983a0..ae827a1ab 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for paragraph-related features
-"""
+"""Step implementations for paragraph-related features."""
 
 from behave import given, then, when
 
@@ -12,7 +8,6 @@
 
 from helpers import saved_docx_path, test_docx, test_text
 
-
 # given ===================================================
 
 
diff --git a/features/steps/parfmt.py b/features/steps/parfmt.py
index 197cf1626..ca39c8575 100644
--- a/features/steps/parfmt.py
+++ b/features/steps/parfmt.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for paragraph format-related features.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Step implementations for paragraph format-related features."""
 
 from behave import given, then, when
 
@@ -15,7 +9,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/section.py b/features/steps/section.py
index 1eae8017c..4e0621056 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for section-related features
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Step implementations for section-related features."""
 
 from behave import given, then, when
 
@@ -15,7 +9,6 @@
 
 from helpers import test_docx
 
-
 # given ====================================================
 
 
diff --git a/features/steps/settings.py b/features/steps/settings.py
index 9c6d94e2d..286ec6c2d 100644
--- a/features/steps/settings.py
+++ b/features/steps/settings.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Step implementations for document settings-related features"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Step implementations for document settings-related features."""
 
 from behave import given, then, when
 
@@ -11,7 +7,6 @@
 
 from helpers import test_docx
 
-
 # given ====================================================
 
 
diff --git a/features/steps/shape.py b/features/steps/shape.py
index b35b385ad..d0acb7fd5 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for graphical object (shape) related features
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Step implementations for graphical object (shape) related features."""
 
 import hashlib
 
@@ -17,7 +11,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/shared.py b/features/steps/shared.py
index c5e2881fe..987721648 100644
--- a/features/steps/shared.py
+++ b/features/steps/shared.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-General-purpose step implementations
-"""
+"""General-purpose step implementations."""
 
 import os
 
@@ -12,7 +8,6 @@
 
 from helpers import saved_docx_path
 
-
 # given ===================================================
 
 
diff --git a/features/steps/styles.py b/features/steps/styles.py
index c4b34be85..ad8730965 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -1,14 +1,10 @@
-# encoding: utf-8
-
-"""
-Step implementations for styles-related features
-"""
+"""Step implementations for styles-related features."""
 
 from behave import given, then, when
 
 from docx import Document
 from docx.enum.style import WD_STYLE_TYPE
-from docx.styles.latent import _LatentStyle, LatentStyles
+from docx.styles.latent import LatentStyles, _LatentStyle
 from docx.styles.style import BaseStyle
 from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
diff --git a/features/steps/table.py b/features/steps/table.py
index 83751d1f2..95f2fab75 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -1,22 +1,19 @@
-# encoding: utf-8
-
-"""
-Step implementations for table-related features
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Step implementations for table-related features."""
 
 from behave import given, then, when
 
 from docx import Document
-from docx.enum.table import WD_ALIGN_VERTICAL  # noqa
-from docx.enum.table import WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+from docx.enum.table import (
+    WD_ALIGN_VERTICAL,
+    WD_ROW_HEIGHT_RULE,
+    WD_TABLE_ALIGNMENT,
+    WD_TABLE_DIRECTION,
+)
 from docx.shared import Inches
 from docx.table import _Column, _Columns, _Row, _Rows
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
@@ -263,7 +260,11 @@ def when_I_set_the_table_autofit_to_setting(context, setting):
 
 @then("cell.vertical_alignment is {value}")
 def then_cell_vertical_alignment_is_value(context, value):
-    expected_value = eval(value)
+    expected_value = {
+        "None": None,
+        "WD_ALIGN_VERTICAL.BOTTOM": WD_ALIGN_VERTICAL.BOTTOM,
+        "WD_ALIGN_VERTICAL.CENTER": WD_ALIGN_VERTICAL.CENTER,
+    }[value]
     actual_value = context.cell.vertical_alignment
     assert actual_value is expected_value, (
         "cell.vertical_alignment is %s" % actual_value
diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
index b360d480e..03f6f203c 100644
--- a/features/steps/tabstops.py
+++ b/features/steps/tabstops.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for paragraph-related features
-"""
+"""Step implementations for paragraph-related features."""
 
 from behave import given, then, when
 
@@ -13,7 +9,6 @@
 
 from helpers import test_docx
 
-
 # given ===================================================
 
 
diff --git a/features/steps/text.py b/features/steps/text.py
index 57451a1bb..3eb5b0fee 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Step implementations for text-related features
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Step implementations for text-related features."""
 
 import hashlib
 
@@ -19,7 +13,6 @@
 
 from helpers import test_docx, test_file, test_text
 
-
 # given ===================================================
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 251d4e955..d64b2d130 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -64,7 +64,7 @@ select = [
     "COM",      # -- flake8-commas --
     "E",        # -- pycodestyle errors --
     "F",        # -- pyflakes --
-    # "I",        # -- isort (imports) --
+    "I",        # -- isort (imports) --
     "PLR0402",  # -- Name compared with itself like `foo == foo` --
     # "PT",       # -- flake8-pytest-style --
     # "SIM",      # -- flake8-simplify --
@@ -75,5 +75,9 @@ select = [
 ]
 target-version = "py37"
 
+[tool.ruff.isort]
+known-first-party = ["docx"]
+known-local-folder = ["helpers"]
+
 [tool.setuptools.dynamic]
 version = {attr = "docx.__version__"}
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index c3543088b..19fea99eb 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 from docx.api import Document  # noqa
 
 __version__ = "1.0.0rc1"
@@ -7,10 +5,10 @@
 
 # register custom Part classes with opc package reader
 
-from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import PartFactory
 from docx.opc.parts.coreprops import CorePropertiesPart
-
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.image import ImagePart
diff --git a/src/docx/enum/dml.py b/src/docx/enum/dml.py
index 133d824d6..f85923182 100644
--- a/src/docx/enum/dml.py
+++ b/src/docx/enum/dml.py
@@ -1,12 +1,6 @@
-# encoding: utf-8
+"""Enumerations used by DrawingML objects."""
 
-"""
-Enumerations used by DrawingML objects
-"""
-
-from __future__ import absolute_import
-
-from .base import alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
+from .base import Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
 
 
 class MSO_COLOR_TYPE(Enumeration):
diff --git a/src/docx/enum/section.py b/src/docx/enum/section.py
index 814e4cfba..df0cd5414 100644
--- a/src/docx/enum/section.py
+++ b/src/docx/enum/section.py
@@ -1,12 +1,6 @@
-# encoding: utf-8
+"""Enumerations related to the main document in WordprocessingML files."""
 
-"""
-Enumerations related to the main document in WordprocessingML files
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from .base import alias, XmlEnumeration, XmlMappedEnumMember
+from .base import XmlEnumeration, XmlMappedEnumMember, alias
 
 
 @alias("WD_HEADER_FOOTER")
diff --git a/src/docx/enum/style.py b/src/docx/enum/style.py
index 1915429c0..3330f0a0e 100644
--- a/src/docx/enum/style.py
+++ b/src/docx/enum/style.py
@@ -1,12 +1,6 @@
-# encoding: utf-8
+"""Enumerations related to styles."""
 
-"""
-Enumerations related to styles
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from .base import alias, EnumMember, XmlEnumeration, XmlMappedEnumMember
+from .base import EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
 
 
 @alias("WD_STYLE")
diff --git a/src/docx/enum/table.py b/src/docx/enum/table.py
index f66fdccd5..30982a83c 100644
--- a/src/docx/enum/table.py
+++ b/src/docx/enum/table.py
@@ -1,12 +1,6 @@
-# encoding: utf-8
+"""Enumerations related to tables in WordprocessingML files."""
 
-"""
-Enumerations related to tables in WordprocessingML files
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from .base import alias, Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember
+from .base import Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
 
 
 @alias("WD_ALIGN_VERTICAL")
diff --git a/src/docx/enum/text.py b/src/docx/enum/text.py
index 1de05326f..8015187e4 100644
--- a/src/docx/enum/text.py
+++ b/src/docx/enum/text.py
@@ -1,12 +1,6 @@
-# encoding: utf-8
+"""Enumerations related to text in WordprocessingML files."""
 
-"""
-Enumerations related to text in WordprocessingML files
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from .base import alias, EnumMember, XmlEnumeration, XmlMappedEnumMember
+from .base import EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
 
 
 @alias("WD_ALIGN_PARAGRAPH")
diff --git a/src/docx/image/__init__.py b/src/docx/image/__init__.py
index e85234545..d28033ef1 100644
--- a/src/docx/image/__init__.py
+++ b/src/docx/image/__init__.py
@@ -1,11 +1,8 @@
-# encoding: utf-8
+"""Provides objects that can characterize image streams.
 
+That characterization is as to content type and size, as a required step in including
+them in a document.
 """
-Provides objects that can characterize image streams as to content type and
-size, as a required step in including them in a document.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 from docx.image.bmp import Bmp
 from docx.image.gif import Gif
@@ -13,7 +10,6 @@
 from docx.image.png import Png
 from docx.image.tiff import Tiff
 
-
 SIGNATURES = (
     # class, offset, signature_bytes
     (Png, 0, b"\x89PNG\x0D\x0A\x1A\x0A"),
diff --git a/src/docx/image/helpers.py b/src/docx/image/helpers.py
index 83b593bf3..c98795657 100644
--- a/src/docx/image/helpers.py
+++ b/src/docx/image/helpers.py
@@ -1,12 +1,7 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from struct import Struct
 
 from .exceptions import UnexpectedEndOfFileError
 
-
 BIG_ENDIAN = ">"
 LITTLE_ENDIAN = "<"
 
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 8fddaabc4..fe31b7111 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -1,18 +1,15 @@
-# encoding: utf-8
+"""Provides objects that can characterize image streams.
 
+That characterization is as to content type and size, as a required step in including
+them in a document.
 """
-Provides objects that can characterize image streams as to content type and
-size, as a required step in including them in a document.
-"""
-
-from __future__ import absolute_import, division, print_function
 
 import hashlib
 import os
 
-from ..compat import BytesIO, is_string
-from .exceptions import UnrecognizedImageError
-from ..shared import Emu, Inches, lazyproperty
+from docx.compat import BytesIO, is_string
+from docx.image.exceptions import UnrecognizedImageError
+from docx.shared import Emu, Inches, lazyproperty
 
 
 class Image(object):
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index 432dcf9f7..b09a6d7a4 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -1,18 +1,14 @@
-# encoding: utf-8
+"""Temporary stand-in for main oxml module.
 
+This module came across with the PackageReader transplant. Probably much will get
+replaced with objects from the pptx.oxml.core and then this module will either get
+deleted or only hold the package related custom element classes.
 """
-Temporary stand-in for main oxml module that came across with the
-PackageReader transplant. Probably much will get replaced with objects from
-the pptx.oxml.core and then this module will either get deleted or only hold
-the package related custom element classes.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
 
 from lxml import etree
 
-from .constants import NAMESPACE as NS, RELATIONSHIP_TARGET_MODE as RTM
-
+from docx.opc.constants import NAMESPACE as NS
+from docx.opc.constants import RELATIONSHIP_TARGET_MODE as RTM
 
 # configure XML parser
 element_class_lookup = etree.ElementNamespaceClassLookup()
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index df20253e7..048a06753 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -1,17 +1,11 @@
-# encoding: utf-8
-
-"""
-Open Packaging Convention (OPC) objects related to package parts.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from .compat import cls_method_fn
-from .oxml import serialize_part_xml
-from ..oxml import parse_xml
-from .packuri import PackURI
-from .rel import Relationships
-from .shared import lazyproperty
+"""Open Packaging Convention (OPC) objects related to package parts."""
+
+from docx.opc.compat import cls_method_fn
+from docx.opc.oxml import serialize_part_xml
+from docx.opc.packuri import PackURI
+from docx.opc.rel import Relationships
+from docx.opc.shared import lazyproperty
+from docx.oxml import parse_xml
 
 
 class Part(object):
diff --git a/src/docx/opc/parts/coreprops.py b/src/docx/opc/parts/coreprops.py
index 7e5b8c17b..2bb43c9ce 100644
--- a/src/docx/opc/parts/coreprops.py
+++ b/src/docx/opc/parts/coreprops.py
@@ -1,18 +1,12 @@
-# encoding: utf-8
-
-"""
-Core properties part, corresponds to ``/docProps/core.xml`` part in package.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Core properties part, corresponds to ``/docProps/core.xml`` part in package."""
 
 from datetime import datetime
 
-from ..constants import CONTENT_TYPE as CT
-from ..coreprops import CoreProperties
-from ...oxml.coreprops import CT_CoreProperties
-from ..packuri import PackURI
-from ..part import XmlPart
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.coreprops import CoreProperties
+from docx.opc.packuri import PackURI
+from docx.opc.part import XmlPart
+from docx.oxml.coreprops import CT_CoreProperties
 
 
 class CorePropertiesPart(XmlPart):
diff --git a/src/docx/opc/phys_pkg.py b/src/docx/opc/phys_pkg.py
index 6d68198df..3d2f768ab 100644
--- a/src/docx/opc/phys_pkg.py
+++ b/src/docx/opc/phys_pkg.py
@@ -1,18 +1,11 @@
-# encoding: utf-8
-
-"""
-Provides a general interface to a *physical* OPC package, such as a zip file.
-"""
-
-from __future__ import absolute_import
+"""Provides a general interface to a *physical* OPC package, such as a zip file."""
 
 import os
+from zipfile import ZIP_DEFLATED, ZipFile, is_zipfile
 
-from zipfile import ZipFile, is_zipfile, ZIP_DEFLATED
-
-from .compat import is_string
-from .exceptions import PackageNotFoundError
-from .packuri import CONTENT_TYPES_URI
+from docx.opc.compat import is_string
+from docx.opc.exceptions import PackageNotFoundError
+from docx.opc.packuri import CONTENT_TYPES_URI
 
 
 class PhysPkgReader(object):
diff --git a/src/docx/opc/spec.py b/src/docx/opc/spec.py
index 87489fcfb..011a4825d 100644
--- a/src/docx/opc/spec.py
+++ b/src/docx/opc/spec.py
@@ -1,11 +1,6 @@
-# encoding: utf-8
-
-"""
-Provides mappings that embody aspects of the Open XML spec ISO/IEC 29500.
-"""
-
-from .constants import CONTENT_TYPE as CT
+"""Provides mappings that embody aspects of the Open XML spec ISO/IEC 29500."""
 
+from docx.opc.constants import CONTENT_TYPE as CT
 
 default_content_types = (
     ("bin", CT.PML_PRINTER_SETTINGS),
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 36539340c..80327205c 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -1,16 +1,11 @@
-# encoding: utf-8
+"""Initializes oxml sub-package.
 
+This including registering custom element classes corresponding to Open XML elements.
 """
-Initializes oxml sub-package, including registering custom element classes
-corresponding to Open XML elements.
-"""
-
-from __future__ import absolute_import
 
 from lxml import etree
 
-from .ns import NamespacePrefixedTag, nsmap
-
+from docx.oxml.ns import NamespacePrefixedTag, nsmap
 
 # configure XML parser
 element_class_lookup = etree.ElementNamespaceClassLookup()
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 3d4f64e75..8c0dd414e 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -1,11 +1,6 @@
-# encoding: utf-8
-
-"""Custom element classes for core properties-related XML elements"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Custom element classes for core properties-related XML elements."""
 
 import re
-
 from datetime import datetime, timedelta
 
 from docx.compat import is_string
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index 5c3e6f2be..b8de0221f 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -1,11 +1,6 @@
-# encoding: utf-8
+"""Custom element classes that correspond to the document part, e.g. <w:document>."""
 
-"""
-Custom element classes that correspond to the document part, e.g.
-<w:document>.
-"""
-
-from .xmlchemy import BaseOxmlElement, ZeroOrOne, ZeroOrMore
+from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore, ZeroOrOne
 
 
 class CT_Document(BaseOxmlElement):
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index 192f73ce0..a94333752 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -1,11 +1,4 @@
-# encoding: utf-8
-
-"""
-Namespace-related objects.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
+"""Namespace-related objects."""
 
 nsmap = {
     "a": "http://schemas.openxmlformats.org/drawingml/2006/main",
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index f9423da6b..063105505 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -1,30 +1,26 @@
-# encoding: utf-8
+"""Custom element classes for tables."""
 
-"""Custom element classes for tables"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from . import parse_xml
-from ..enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
-from ..exceptions import InvalidSpanError
-from .ns import nsdecls, qn
-from ..shared import Emu, Twips
-from .simpletypes import (
+from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
+from docx.exceptions import InvalidSpanError
+from docx.oxml import parse_xml
+from docx.oxml.ns import nsdecls, qn
+from docx.oxml.simpletypes import (
     ST_Merge,
     ST_TblLayoutType,
     ST_TblWidth,
     ST_TwipsMeasure,
     XsdInt,
 )
-from .xmlchemy import (
+from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OneAndOnlyOne,
     OneOrMore,
     OptionalAttribute,
     RequiredAttribute,
-    ZeroOrOne,
     ZeroOrMore,
+    ZeroOrOne,
 )
+from docx.shared import Emu, Twips
 
 
 class CT_Height(BaseOxmlElement):
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 73913af9a..1c8ddd986 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -1,15 +1,21 @@
-# encoding: utf-8
-
-"""
-Custom element classes related to run properties (font).
-"""
-
-from .. import parse_xml
-from ...enum.dml import MSO_THEME_COLOR
-from ...enum.text import WD_COLOR, WD_UNDERLINE
-from ..ns import nsdecls, qn
-from ..simpletypes import ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
-from ..xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrOne
+"""Custom element classes related to run properties (font)."""
+
+from docx.enum.dml import MSO_THEME_COLOR
+from docx.enum.text import WD_COLOR, WD_UNDERLINE
+from docx.oxml import parse_xml
+from docx.oxml.ns import nsdecls, qn
+from docx.oxml.simpletypes import (
+    ST_HexColor,
+    ST_HpsMeasure,
+    ST_String,
+    ST_VerticalAlignRun,
+)
+from docx.oxml.xmlchemy import (
+    BaseOxmlElement,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrOne,
+)
 
 
 class CT_Color(BaseOxmlElement):
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 0fff364dc..f913bb792 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -1,16 +1,9 @@
-# encoding: utf-8
+"""Enabling declarative definition of lxml custom element classes."""
 
-"""
-Provides a wrapper around lxml that enables declarative definition of custom
-element classes.
-"""
-
-from __future__ import absolute_import
+import re
 
 from lxml import etree
 
-import re
-
 from docx.compat import Unicode
 from docx.oxml import OxmlElement
 from docx.oxml.exceptions import InvalidXmlError
diff --git a/src/docx/styles/latent.py b/src/docx/styles/latent.py
index 6f723692b..f790fdb3c 100644
--- a/src/docx/styles/latent.py
+++ b/src/docx/styles/latent.py
@@ -1,13 +1,7 @@
-# encoding: utf-8
+"""Latent style-related objects."""
 
-"""
-Latent style-related objects.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from . import BabelFish
-from ..shared import ElementProxy
+from docx.shared import ElementProxy
+from docx.styles import BabelFish
 
 
 class LatentStyles(ElementProxy):
diff --git a/src/docx/styles/style.py b/src/docx/styles/style.py
index ff63a819b..89096a592 100644
--- a/src/docx/styles/style.py
+++ b/src/docx/styles/style.py
@@ -1,16 +1,10 @@
-# encoding: utf-8
+"""Style object hierarchy."""
 
-"""
-Style object hierarchy.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from . import BabelFish
-from ..enum.style import WD_STYLE_TYPE
-from ..shared import ElementProxy
-from ..text.font import Font
-from ..text.parfmt import ParagraphFormat
+from docx.enum.style import WD_STYLE_TYPE
+from docx.shared import ElementProxy
+from docx.styles import BabelFish
+from docx.text.font import Font
+from docx.text.parfmt import ParagraphFormat
 
 
 def StyleFactory(style_elm):
diff --git a/src/docx/table.py b/src/docx/table.py
index bd4e1e277..3191ec1ea 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -1,15 +1,9 @@
-# encoding: utf-8
+"""The |Table| object and related proxy classes."""
 
-"""
-The |Table| object and related proxy classes.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from .blkcntnr import BlockItemContainer
-from .enum.style import WD_STYLE_TYPE
-from .oxml.simpletypes import ST_Merge
-from .shared import Inches, lazyproperty, Parented
+from docx.blkcntnr import BlockItemContainer
+from docx.enum.style import WD_STYLE_TYPE
+from docx.oxml.simpletypes import ST_Merge
+from docx.shared import Inches, Parented, lazyproperty
 
 
 class Table(Parented):
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index d349e5378..59dab690c 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -1,15 +1,9 @@
-# encoding: utf-8
+"""Paragraph-related proxy types."""
 
-"""
-Paragraph-related proxy types.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from ..enum.style import WD_STYLE_TYPE
-from .parfmt import ParagraphFormat
-from .run import Run
-from ..shared import Parented
+from docx.enum.style import WD_STYLE_TYPE
+from docx.shared import Parented
+from docx.text.parfmt import ParagraphFormat
+from docx.text.run import Run
 
 
 class Paragraph(Parented):
diff --git a/src/docx/text/parfmt.py b/src/docx/text/parfmt.py
index 6d9215549..4a99b0b59 100644
--- a/src/docx/text/parfmt.py
+++ b/src/docx/text/parfmt.py
@@ -1,14 +1,8 @@
-# encoding: utf-8
+"""Paragraph-related proxy types."""
 
-"""
-Paragraph-related proxy types.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from ..enum.text import WD_LINE_SPACING
-from ..shared import ElementProxy, Emu, lazyproperty, Length, Pt, Twips
-from .tabstops import TabStops
+from docx.enum.text import WD_LINE_SPACING
+from docx.shared import ElementProxy, Emu, Length, Pt, Twips, lazyproperty
+from docx.text.tabstops import TabStops
 
 
 class ParagraphFormat(ElementProxy):
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 88c37fa3c..09d95f206 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -1,16 +1,10 @@
-# encoding: utf-8
+"""Run-related proxy objects for python-docx, Run in particular."""
 
-"""
-Run-related proxy objects for python-docx, Run in particular.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from ..enum.style import WD_STYLE_TYPE
-from ..enum.text import WD_BREAK
-from .font import Font
-from ..shape import InlineShape
-from ..shared import Parented
+from docx.enum.style import WD_STYLE_TYPE
+from docx.enum.text import WD_BREAK
+from docx.shape import InlineShape
+from docx.shared import Parented
+from docx.text.font import Font
 
 
 class Run(Parented):
diff --git a/src/docx/text/tabstops.py b/src/docx/text/tabstops.py
index 6915285cf..c6b899c05 100644
--- a/src/docx/text/tabstops.py
+++ b/src/docx/text/tabstops.py
@@ -1,13 +1,7 @@
-# encoding: utf-8
+"""Tabstop-related proxy types."""
 
-"""
-Tabstop-related proxy types.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from ..shared import ElementProxy
 from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
+from docx.shared import ElementProxy
 
 
 class TabStops(ElementProxy):
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index 421f72922..a461650f5 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -1,19 +1,13 @@
-# encoding: utf-8
+"""Test suite for docx.dml.color module."""
 
-"""
-Test suite for docx.dml.color module.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+import pytest
 
-from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
 from docx.dml.color import ColorFormat
+from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
 from docx.shared import RGBColor
 
 from ..unitutil.cxml import element, xml
 
-import pytest
-
 
 class DescribeColorFormat(object):
     def it_knows_its_color_type(self, type_fixture):
diff --git a/tests/image/test_bmp.py b/tests/image/test_bmp.py
index 9eb371643..bdd2ff4e7 100644
--- a/tests/image/test_bmp.py
+++ b/tests/image/test_bmp.py
@@ -1,16 +1,10 @@
-# encoding: utf-8
-
-"""
-Test suite for docx.image.bmp module
-"""
-
-from __future__ import absolute_import, print_function
+"""Test suite for docx.image.bmp module."""
 
 import pytest
 
 from docx.compat import BytesIO
-from docx.image.constants import MIME_TYPE
 from docx.image.bmp import Bmp
+from docx.image.constants import MIME_TYPE
 
 from ..unitutil.mock import ANY, initializer_mock
 
diff --git a/tests/image/test_gif.py b/tests/image/test_gif.py
index fc00af690..fd9eac2ea 100644
--- a/tests/image/test_gif.py
+++ b/tests/image/test_gif.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for docx.image.gif module"""
-
-from __future__ import absolute_import, print_function
+"""Unit test suite for docx.image.gif module."""
 
 import pytest
 
diff --git a/tests/image/test_helpers.py b/tests/image/test_helpers.py
index 8716257d7..e98ac6ca7 100644
--- a/tests/image/test_helpers.py
+++ b/tests/image/test_helpers.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for docx.image.helpers module
-"""
-
-from __future__ import absolute_import, print_function
+"""Test suite for docx.image.helpers module."""
 
 import pytest
 
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index 5893f053c..791831077 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Unit test suite for docx.image package"""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import pytest
 
 from docx.compat import BytesIO
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index 759bd94cc..53ed9b6cc 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -1,21 +1,17 @@
-# encoding: utf-8
-
 """Unit test suite for docx.image.jpeg module"""
 
-from __future__ import absolute_import, print_function
-
 import pytest
 
 from docx.compat import BytesIO
 from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.jpeg import (
-    _App0Marker,
-    _App1Marker,
     Exif,
     Jfif,
-    _JfifMarkers,
     Jpeg,
+    _App0Marker,
+    _App1Marker,
+    _JfifMarkers,
     _Marker,
     _MarkerFactory,
     _MarkerFinder,
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index 71b2c7e14..d86d43d84 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for docx.image.png module"""
-
-from __future__ import absolute_import, print_function
+"""Unit test suite for docx.image.png module."""
 
 import pytest
 
@@ -11,13 +7,13 @@
 from docx.image.exceptions import InvalidImageStreamError
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.png import (
+    Png,
     _Chunk,
-    _Chunks,
     _ChunkFactory,
     _ChunkParser,
+    _Chunks,
     _IHDRChunk,
     _pHYsChunk,
-    Png,
     _PngParser,
 )
 
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index a5f07acdb..f073bafac 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -1,15 +1,12 @@
-# encoding: utf-8
-
 """Unit test suite for docx.image.tiff module"""
 
-from __future__ import absolute_import, print_function
-
 import pytest
 
 from docx.compat import BytesIO
 from docx.image.constants import MIME_TYPE, TIFF_TAG
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from docx.image.tiff import (
+    Tiff,
     _AsciiIfdEntry,
     _IfdEntries,
     _IfdEntry,
@@ -18,7 +15,6 @@
     _LongIfdEntry,
     _RationalIfdEntry,
     _ShortIfdEntry,
-    Tiff,
     _TiffParser,
 )
 
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
index 66222cef7..0f528829a 100644
--- a/tests/opc/parts/test_coreprops.py
+++ b/tests/opc/parts/test_coreprops.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Unit test suite for the docx.opc.parts.coreprops module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.opc.parts.coreprops module."""
 
 from datetime import datetime, timedelta
 
diff --git a/tests/opc/test_coreprops.py b/tests/opc/test_coreprops.py
index 97da5dead..a5e08bed4 100644
--- a/tests/opc/test_coreprops.py
+++ b/tests/opc/test_coreprops.py
@@ -1,15 +1,9 @@
-# encoding: utf-8
+"""Unit test suite for the docx.opc.coreprops module."""
 
-"""
-Unit test suite for the docx.opc.coreprops module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+from datetime import datetime
 
 import pytest
 
-from datetime import datetime
-
 from docx.opc.coreprops import CoreProperties
 from docx.oxml import parse_xml
 
diff --git a/tests/opc/test_oxml.py b/tests/opc/test_oxml.py
index c269bde35..2fc2a22db 100644
--- a/tests/opc/test_oxml.py
+++ b/tests/opc/test_oxml.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for opc.oxml module
-"""
+"""Test suite for opc.oxml module."""
 
 from docx.opc.constants import RELATIONSHIP_TARGET_MODE as RTM
 from docx.opc.oxml import (
@@ -16,10 +12,10 @@
 
 from .unitdata.rels import (
     a_Default,
-    an_Override,
     a_Relationship,
     a_Relationships,
     a_Types,
+    an_Override,
 )
 
 
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index e2edb3ae6..790d6fbc9 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Unit test suite for docx.opc.package module"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import pytest
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
@@ -13,17 +9,17 @@
 from docx.opc.part import Part
 from docx.opc.parts.coreprops import CorePropertiesPart
 from docx.opc.pkgreader import PackageReader
-from docx.opc.rel import _Relationship, Relationships
+from docx.opc.rel import Relationships, _Relationship
 
 from ..unitutil.mock import (
+    Mock,
+    PropertyMock,
     call,
     class_mock,
     instance_mock,
     loose_mock,
     method_mock,
-    Mock,
     patch,
-    PropertyMock,
     property_mock,
 )
 
diff --git a/tests/opc/test_packuri.py b/tests/opc/test_packuri.py
index a56badcda..71c8722c9 100644
--- a/tests/opc/test_packuri.py
+++ b/tests/opc/test_packuri.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.opc.packuri module
-"""
+"""Test suite for the docx.opc.packuri module."""
 
 import pytest
 
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index b32bf7f4f..df0b6eb12 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -1,27 +1,23 @@
-# encoding: utf-8
-
 """Unit test suite for docx.opc.part module"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import pytest
 
 from docx.opc.package import OpcPackage
 from docx.opc.packuri import PackURI
 from docx.opc.part import Part, PartFactory, XmlPart
-from docx.opc.rel import _Relationship, Relationships
+from docx.opc.rel import Relationships, _Relationship
 from docx.oxml.xmlchemy import BaseOxmlElement
 
 from ..unitutil.cxml import element
 from ..unitutil.mock import (
     ANY,
+    Mock,
     class_mock,
     cls_attr_mock,
     function_mock,
     initializer_mock,
     instance_mock,
     loose_mock,
-    Mock,
 )
 
 
diff --git a/tests/opc/test_phys_pkg.py b/tests/opc/test_phys_pkg.py
index 5fa1e9e75..800819f80 100644
--- a/tests/opc/test_phys_pkg.py
+++ b/tests/opc/test_phys_pkg.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for docx.opc.phys_pkg module
-"""
-
-from __future__ import absolute_import
+"""Test suite for docx.opc.phys_pkg module."""
 
 try:
     from io import BytesIO  # Python 3
@@ -12,23 +6,22 @@
     from StringIO import StringIO as BytesIO
 
 import hashlib
-import pytest
-
 from zipfile import ZIP_DEFLATED, ZipFile
 
+import pytest
+
 from docx.opc.exceptions import PackageNotFoundError
 from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.phys_pkg import (
-    _DirPkgReader,
     PhysPkgReader,
     PhysPkgWriter,
+    _DirPkgReader,
     _ZipPkgReader,
     _ZipPkgWriter,
 )
 
 from ..unitutil.file import absjoin, test_file_dir
-from ..unitutil.mock import class_mock, loose_mock, Mock
-
+from ..unitutil.mock import Mock, class_mock, loose_mock
 
 test_docx_path = absjoin(test_file_dir, "test.docx")
 dir_pkg_path = absjoin(test_file_dir, "expanded_docx")
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index ac75e8365..ad63aaf2e 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -1,25 +1,22 @@
-# encoding: utf-8
-
-"""Unit test suite for docx.opc.pkgreader module"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Unit test suite for docx.opc.pkgreader module."""
 
 import pytest
 
-from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TARGET_MODE as RTM
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import RELATIONSHIP_TARGET_MODE as RTM
 from docx.opc.packuri import PackURI
 from docx.opc.phys_pkg import _ZipPkgReader
 from docx.opc.pkgreader import (
-    _ContentTypeMap,
     PackageReader,
+    _ContentTypeMap,
     _SerializedPart,
     _SerializedRelationship,
     _SerializedRelationships,
 )
 
-from .unitdata.types import a_Default, a_Types, an_Override
 from ..unitutil.mock import (
     ANY,
+    Mock,
     call,
     class_mock,
     function_mock,
@@ -27,9 +24,9 @@
     instance_mock,
     loose_mock,
     method_mock,
-    Mock,
     patch,
 )
+from .unitdata.types import a_Default, a_Types, an_Override
 
 
 class DescribePackageReader(object):
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
index 25bcadb42..7b0286ce8 100644
--- a/tests/opc/test_pkgwriter.py
+++ b/tests/opc/test_pkgwriter.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for opc.pkgwriter module
-"""
+"""Test suite for opc.pkgwriter module."""
 
 import pytest
 
@@ -10,18 +6,18 @@
 from docx.opc.packuri import PackURI
 from docx.opc.part import Part
 from docx.opc.phys_pkg import _ZipPkgWriter
-from docx.opc.pkgwriter import _ContentTypesItem, PackageWriter
+from docx.opc.pkgwriter import PackageWriter, _ContentTypesItem
 
-from .unitdata.types import a_Default, a_Types, an_Override
 from ..unitutil.mock import (
+    MagicMock,
+    Mock,
     call,
     class_mock,
     instance_mock,
-    MagicMock,
     method_mock,
-    Mock,
     patch,
 )
+from .unitdata.types import a_Default, a_Types, an_Override
 
 
 class DescribePackageWriter(object):
diff --git a/tests/opc/test_rel.py b/tests/opc/test_rel.py
index d94750027..45a218bb7 100644
--- a/tests/opc/test_rel.py
+++ b/tests/opc/test_rel.py
@@ -1,19 +1,13 @@
-# encoding: utf-8
-
-"""
-Unit test suite for the docx.opc.rel module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.opc.rel module."""
 
 import pytest
 
 from docx.opc.oxml import CT_Relationships
 from docx.opc.packuri import PackURI
 from docx.opc.part import Part
-from docx.opc.rel import _Relationship, Relationships
+from docx.opc.rel import Relationships, _Relationship
 
-from ..unitutil.mock import call, class_mock, instance_mock, Mock, patch, PropertyMock
+from ..unitutil.mock import Mock, PropertyMock, call, class_mock, instance_mock, patch
 
 
 class Describe_Relationship(object):
diff --git a/tests/opc/unitdata/rels.py b/tests/opc/unitdata/rels.py
index 73663d188..c0b6024fa 100644
--- a/tests/opc/unitdata/rels.py
+++ b/tests/opc/unitdata/rels.py
@@ -1,16 +1,9 @@
-# encoding: utf-8
-
-"""
-Test data for relationship-related unit tests.
-"""
-
-from __future__ import absolute_import
-
-from docx.opc.constants import RELATIONSHIP_TYPE as RT
-from docx.opc.rel import Relationships
+"""Test data for relationship-related unit tests."""
 
 from docx.opc.constants import NAMESPACE as NS
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.oxml import parse_xml
+from docx.opc.rel import Relationships
 
 
 class BaseBuilder(object):
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
index 85302d64c..51889b97e 100644
--- a/tests/oxml/test__init__.py
+++ b/tests/oxml/test__init__.py
@@ -1,13 +1,6 @@
-# encoding: utf-8
-
-"""
-Test suite for pptx.oxml.__init__.py module, primarily XML parser-related.
-"""
-
-from __future__ import print_function, unicode_literals
+"""Test suite for pptx.oxml.__init__.py module, primarily XML parser-related."""
 
 import pytest
-
 from lxml import etree
 
 from docx.oxml import OxmlElement, oxml_parser, parse_xml, register_element_cls
diff --git a/tests/oxml/test_ns.py b/tests/oxml/test_ns.py
index 413d10bde..7e1d659f9 100644
--- a/tests/oxml/test_ns.py
+++ b/tests/oxml/test_ns.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for docx.oxml.ns
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for docx.oxml.ns."""
 
 import pytest
 
diff --git a/tests/oxml/test_styles.py b/tests/oxml/test_styles.py
index 0c34f6637..a6748b4f0 100644
--- a/tests/oxml/test_styles.py
+++ b/tests/oxml/test_styles.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.oxml.styles module.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.oxml.styles module."""
 
 import pytest
 
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index bc40b5fba..0e1eeb9c1 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Test suite for the docx.oxml.text module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.oxml.text module."""
 
 import pytest
 
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
index 15f68face..c81a8de52 100644
--- a/tests/oxml/test_xmlchemy.py
+++ b/tests/oxml/test_xmlchemy.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for docx.oxml.xmlchemy
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for docx.oxml.xmlchemy."""
 
 import pytest
 
@@ -16,15 +10,15 @@
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     Choice,
-    serialize_for_reading,
-    OneOrMore,
     OneAndOnlyOne,
+    OneOrMore,
     OptionalAttribute,
     RequiredAttribute,
+    XmlString,
     ZeroOrMore,
     ZeroOrOne,
     ZeroOrOneChoice,
-    XmlString,
+    serialize_for_reading,
 )
 
 from ..unitdata import BaseBuilder
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 36616590b..b9b50676a 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.parts.document module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.parts.document module."""
 
 import pytest
 
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index 815b207cc..d153ad348 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -1,12 +1,9 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.parts.hdrftr module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.parts.hdrftr module."""
 
 import pytest
 
-from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import PartFactory
 from docx.package import Package
 from docx.parts.hdrftr import FooterPart, HeaderPart
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
index 90a59c2fb..3b6424fe4 100644
--- a/tests/parts/test_image.py
+++ b/tests/parts/test_image.py
@@ -1,13 +1,10 @@
-# encoding: utf-8
-
-"""Unit test suite for docx.parts.image module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for docx.parts.image module."""
 
 import pytest
 
 from docx.image.image import Image
-from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.packuri import PackURI
 from docx.opc.part import PartFactory
 from docx.package import Package
diff --git a/tests/parts/test_numbering.py b/tests/parts/test_numbering.py
index 44dedde78..2783b9eea 100644
--- a/tests/parts/test_numbering.py
+++ b/tests/parts/test_numbering.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.parts.numbering module
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for the docx.parts.numbering module."""
 
 import pytest
 
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index 21ba2ec42..20ec8cdff 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Unit test suite for the docx.parts.settings module"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import pytest
 
 from docx.opc.constants import CONTENT_TYPE as CT
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index 671547582..5fb461fe1 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.parts.story module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.parts.story module."""
 
 import pytest
 
diff --git a/tests/parts/test_styles.py b/tests/parts/test_styles.py
index 0f2a7b11d..faad075b5 100644
--- a/tests/parts/test_styles.py
+++ b/tests/parts/test_styles.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.parts.styles module
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for the docx.parts.styles module."""
 
 import pytest
 
diff --git a/tests/styles/test_latent.py b/tests/styles/test_latent.py
index ee4bead87..4faf63bb4 100644
--- a/tests/styles/test_latent.py
+++ b/tests/styles/test_latent.py
@@ -1,14 +1,8 @@
-# encoding: utf-8
-
-"""
-Unit test suite for the docx.styles.latent module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.styles.latent module."""
 
 import pytest
 
-from docx.styles.latent import _LatentStyle, LatentStyles
+from docx.styles.latent import LatentStyles, _LatentStyle
 
 from ..unitutil.cxml import element, xml
 
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index caa281db8..7d028ea0d 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -1,20 +1,14 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.styles.style module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.styles.style module."""
 
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.styles.style import (
     BaseStyle,
+    StyleFactory,
     _CharacterStyle,
-    _ParagraphStyle,
     _NumberingStyle,
-    StyleFactory,
+    _ParagraphStyle,
     _TableStyle,
 )
 from docx.text.font import Font
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index c01d2138a..419db3570 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.styles.styles module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.styles.styles module."""
 
 import pytest
 
diff --git a/tests/test_api.py b/tests/test_api.py
index 23251cf34..6e8baf5ca 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1,19 +1,12 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.api module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.api module."""
 
 import pytest
 
 import docx
-
 from docx.api import Document
 from docx.opc.constants import CONTENT_TYPE as CT
 
-from .unitutil.mock import function_mock, instance_mock, class_mock
+from .unitutil.mock import class_mock, function_mock, instance_mock
 
 
 class DescribeDocument(object):
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 3fe2d0ff5..9da168e1d 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Test suite for the docx.blkcntnr (block item container) module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.blkcntnr (block item container) module."""
 
 import pytest
 
diff --git a/tests/test_document.py b/tests/test_document.py
index 27f17f978..79dbc3d60 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -1,12 +1,8 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.document module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.document module."""
 
 import pytest
 
-from docx.document import _Body, Document
+from docx.document import Document, _Body
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
diff --git a/tests/test_enum.py b/tests/test_enum.py
index a07795ed5..72c74f82a 100644
--- a/tests/test_enum.py
+++ b/tests/test_enum.py
@@ -1,23 +1,19 @@
-# encoding: utf-8
+"""Test suite for docx.enum module, focused on base classes.
 
-"""
-Test suite for docx.enum module, focused on base classes. Configured a little
-differently because of the meta-programming, the two enumeration classes at
-the top constitute the entire fixture and the tests themselves just make
+Configured a little differently because of the meta-programming, the two enumeration
+classes at the top constitute the entire fixture and the tests themselves just make
 assertions on those.
 """
 
-from __future__ import absolute_import, print_function
-
 import pytest
 
 from docx.enum.base import (
-    alias,
     Enumeration,
     EnumMember,
     ReturnValueOnlyEnumMember,
     XmlEnumeration,
     XmlMappedEnumMember,
+    alias,
 )
 
 
diff --git a/tests/test_package.py b/tests/test_package.py
index e94e5f318..978670b1d 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for docx.package module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for docx.package module."""
 
 import pytest
 
diff --git a/tests/test_section.py b/tests/test_section.py
index ae887a960..a5997d581 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -1,15 +1,11 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.section module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.section module."""
 
 import pytest
 
 from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENT, WD_SECTION
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
-from docx.section import _BaseHeaderFooter, _Footer, _Header, Section, Sections
+from docx.section import Section, Sections, _BaseHeaderFooter, _Footer, _Header
 from docx.shared import Inches
 
 from .unitutil.cxml import element, xml
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 5c07a6652..a4dc5d786 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Unit test suite for the docx.settings module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Unit test suite for the docx.settings module."""
 
 import pytest
 
diff --git a/tests/test_shape.py b/tests/test_shape.py
index 5e08e9743..e0f73bcb6 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.shape module
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for the docx.shape module."""
 
 import pytest
 
diff --git a/tests/test_shared.py b/tests/test_shared.py
index 7641c158d..ac1c01fcd 100644
--- a/tests/test_shared.py
+++ b/tests/test_shared.py
@@ -1,15 +1,9 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.shared module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.shared module."""
 
 import pytest
 
 from docx.opc.part import XmlPart
-from docx.shared import ElementProxy, Length, Cm, Emu, Inches, Mm, Pt, RGBColor, Twips
+from docx.shared import Cm, ElementProxy, Emu, Inches, Length, Mm, Pt, RGBColor, Twips
 
 from .unitutil.cxml import element
 from .unitutil.mock import instance_mock
diff --git a/tests/test_table.py b/tests/test_table.py
index b314b801e..87c7f07c4 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Test suite for the docx.table module"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for the docx.table module."""
 
 import pytest
 
@@ -17,7 +13,7 @@
 from docx.oxml.table import CT_Tc
 from docx.parts.document import DocumentPart
 from docx.shared import Inches
-from docx.table import _Cell, _Column, _Columns, _Row, _Rows, Table
+from docx.table import Table, _Cell, _Column, _Columns, _Row, _Rows
 from docx.text.paragraph import Paragraph
 
 from .oxml.unitdata.table import a_gridCol, a_tbl, a_tblGrid, a_tc, a_tr
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index 5b4b15eb4..d37c4252c 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -1,18 +1,12 @@
-# encoding: utf-8
+"""Test suite for the docx.text.run module."""
 
-"""
-Test suite for the docx.text.run module
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+import pytest
 
 from docx.dml.color import ColorFormat
 from docx.enum.text import WD_COLOR, WD_UNDERLINE
 from docx.shared import Pt
 from docx.text.font import Font
 
-import pytest
-
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import class_mock, instance_mock
 
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index e394334e5..29778c284 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -1,8 +1,6 @@
-# encoding: utf-8
+"""Unit test suite for the docx.text.paragraph module."""
 
-"""Unit test suite for the docx.text.paragraph module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_ALIGN_PARAGRAPH
@@ -13,8 +11,6 @@
 from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Run
 
-import pytest
-
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import call, class_mock, instance_mock, method_mock, property_mock
 
diff --git a/tests/text/test_parfmt.py b/tests/text/test_parfmt.py
index ce9927798..5f9da996b 100644
--- a/tests/text/test_parfmt.py
+++ b/tests/text/test_parfmt.py
@@ -1,19 +1,12 @@
-# encoding: utf-8
+"""Test suite for docx.text.parfmt module, containing the ParagraphFormat object."""
 
-"""
-Test suite for the docx.text.parfmt module, containing the ParagraphFormat
-object.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+import pytest
 
 from docx.enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
 from docx.shared import Pt
 from docx.text.parfmt import ParagraphFormat
 from docx.text.tabstops import TabStops
 
-import pytest
-
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import class_mock, instance_mock
 
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 02cb87412..ef1b79bf1 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -1,8 +1,6 @@
-# encoding: utf-8
+"""Test suite for the docx.text.run module."""
 
-"""Test suite for the docx.text.run module"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
@@ -11,8 +9,6 @@
 from docx.text.font import Font
 from docx.text.run import Run
 
-import pytest
-
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import class_mock, instance_mock, property_mock
 
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index 29627fcb9..ca2122206 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -1,18 +1,11 @@
-# encoding: utf-8
+"""Test suite for the docx.text.tabstops module."""
 
-"""
-Test suite for the docx.text.tabstops module, containing the TabStops and
-TabStop objects.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+import pytest
 
 from docx.enum.text import WD_TAB_ALIGNMENT, WD_TAB_LEADER
 from docx.shared import Twips
 from docx.text.tabstops import TabStop, TabStops
 
-import pytest
-
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import call, class_mock, instance_mock
 
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index 3029eda77..f212a4c07 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -1,33 +1,28 @@
-# encoding: utf-8
-
 """Parser for Compact XML Expression Language (CXEL) ('see-ex-ell').
 
 CXEL is a compact XML specification language I made up that's useful for producing XML
 element trees suitable for unit testing.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from pyparsing import (
-    alphas,
-    alphanums,
     Combine,
-    dblQuotedString,
-    delimitedList,
     Forward,
     Group,
     Literal,
     Optional,
-    removeQuotes,
-    stringEnd,
     Suppress,
     Word,
+    alphanums,
+    alphas,
+    dblQuotedString,
+    delimitedList,
+    removeQuotes,
+    stringEnd,
 )
 
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsmap
 
-
 # ====================================================================
 # api functions
 # ====================================================================
diff --git a/tests/unitutil/file.py b/tests/unitutil/file.py
index f87def241..0d1562942 100644
--- a/tests/unitutil/file.py
+++ b/tests/unitutil/file.py
@@ -1,12 +1,7 @@
-# encoding: utf-8
-
-"""
-Utility functions for loading files for unit testing
-"""
+"""Utility functions for loading files for unit testing."""
 
 import os
 
-
 _thisdir = os.path.split(__file__)[0]
 test_file_dir = os.path.abspath(os.path.join(_thisdir, "..", "test_files"))
 

From d5097841991ad00a9a4f3bc9a0cc9f510f3a6c7f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 25 Sep 2023 17:25:34 -0700
Subject: [PATCH 246/367] lint: fix C4xx comprehension errors

Also any Python 2 clean-up that was handy.
---
 features/steps/styles.py    |  4 ++--
 features/steps/tabstops.py  |  2 +-
 pyproject.toml              |  2 +-
 src/docx/document.py        |  4 ----
 src/docx/enum/base.py       | 12 +++---------
 src/docx/image/png.py       |  6 +-----
 src/docx/image/tiff.py      |  6 +-----
 src/docx/opc/package.py     |  8 ++------
 src/docx/opc/pkgwriter.py   | 23 ++++++++++-------------
 src/docx/oxml/ns.py         |  4 ++--
 src/docx/shape.py           | 14 +++++---------
 src/docx/styles/__init__.py | 10 ++--------
 tests/image/test_jpeg.py    |  2 +-
 tests/image/test_png.py     |  4 ++--
 tests/image/test_tiff.py    |  2 +-
 tests/opc/test_package.py   |  2 +-
 tests/opc/test_pkgreader.py |  4 ++--
 tests/styles/test_latent.py |  2 +-
 tests/test_section.py       |  2 +-
 19 files changed, 39 insertions(+), 74 deletions(-)

diff --git a/features/steps/styles.py b/features/steps/styles.py
index ad8730965..a40f2dc6a 100644
--- a/features/steps/styles.py
+++ b/features/steps/styles.py
@@ -318,14 +318,14 @@ def then_I_can_access_a_style_by_style_id(context):
 
 @then("I can iterate over its styles")
 def then_I_can_iterate_over_its_styles(context):
-    styles = [s for s in context.document.styles]
+    styles = list(context.document.styles)
     assert len(styles) > 0
     assert all(isinstance(s, BaseStyle) for s in styles)
 
 
 @then("I can iterate over the latent styles")
 def then_I_can_iterate_over_the_latent_styles(context):
-    latent_styles = [ls for ls in context.latent_styles]
+    latent_styles = list(context.latent_styles)
     assert len(latent_styles) == 137
     assert all(isinstance(ls, _LatentStyle) for ls in latent_styles)
 
diff --git a/features/steps/tabstops.py b/features/steps/tabstops.py
index 03f6f203c..ceb9d8f9b 100644
--- a/features/steps/tabstops.py
+++ b/features/steps/tabstops.py
@@ -96,7 +96,7 @@ def then_I_can_access_a_tab_stop_by_index(context):
 
 @then("I can iterate the TabStops object")
 def then_I_can_iterate_the_TabStops_object(context):
-    items = [ts for ts in context.tab_stops]
+    items = list(context.tab_stops)
     assert len(items) == 3
     assert all(isinstance(item, TabStop) for item in items)
 
diff --git a/pyproject.toml b/pyproject.toml
index d64b2d130..a7310da4e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,7 +60,7 @@ ignore = [
     "COM812",   # -- over-aggressively insists on trailing commas where not desired --
 ]
 select = [
-    # "C4",       # -- flake8-comprehensions --
+    "C4",       # -- flake8-comprehensions --
     "COM",      # -- flake8-commas --
     "E",        # -- pycodestyle errors --
     "F",        # -- pyflakes --
diff --git a/src/docx/document.py b/src/docx/document.py
index 6acdb839a..e47bfc816 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """|Document| and closely related objects"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index 0bcdbd6dd..fae7c9aff 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Base classes and other objects used by enumerations
-"""
-
-from __future__ import absolute_import, print_function
+"""Base classes and other objects used by enumerations."""
 
 import sys
 import textwrap
@@ -358,7 +352,7 @@ def _get_or_add_member_to_xml(clsdict):
         Add the enum -> xml value mapping to the enumeration class state
         """
         if "_member_to_xml" not in clsdict:
-            clsdict["_member_to_xml"] = dict()
+            clsdict["_member_to_xml"] = {}
         return clsdict["_member_to_xml"]
 
     @staticmethod
@@ -367,5 +361,5 @@ def _get_or_add_xml_to_member(clsdict):
         Add the xml -> enum value mapping to the enumeration class state
         """
         if "_xml_to_member" not in clsdict:
-            clsdict["_xml_to_member"] = dict()
+            clsdict["_xml_to_member"] = {}
         return clsdict["_xml_to_member"]
diff --git a/src/docx/image/png.py b/src/docx/image/png.py
index c2e4ae820..72f2ec83a 100644
--- a/src/docx/image/png.py
+++ b/src/docx/image/png.py
@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from .constants import MIME_TYPE, PNG_CHUNK_TYPE
 from .exceptions import InvalidImageStreamError
 from .helpers import BIG_ENDIAN, StreamReader
@@ -127,7 +123,7 @@ def from_stream(cls, stream):
         Return a |_Chunks| instance containing the PNG chunks in *stream*.
         """
         chunk_parser = _ChunkParser.from_stream(stream)
-        chunks = [chunk for chunk in chunk_parser.iter_chunks()]
+        chunks = list(chunk_parser.iter_chunks())
         return cls(chunks)
 
     @property
diff --git a/src/docx/image/tiff.py b/src/docx/image/tiff.py
index 5b5e8b748..05b1addf8 100644
--- a/src/docx/image/tiff.py
+++ b/src/docx/image/tiff.py
@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from .constants import MIME_TYPE, TIFF_FLD, TIFF_TAG
 from .helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from .image import BaseImageHeader
@@ -177,7 +173,7 @@ def from_stream(cls, stream, offset):
         *offset*.
         """
         ifd_parser = _IfdParser(stream, offset)
-        entries = dict((e.tag, e.value) for e in ifd_parser.iter_entries())
+        entries = {e.tag: e.value for e in ifd_parser.iter_entries()}
         return cls(entries)
 
     def get(self, tag_code, default=None):
diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index 2e81d93c6..014c11f10 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Objects that implement reading and writing OPC packages."""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.part import PartFactory
@@ -70,7 +66,7 @@ def iter_parts(self):
         performing a depth-first traversal of the rels graph.
         """
 
-        def walk_parts(source, visited=list()):
+        def walk_parts(source, visited=[]):
             for rel in source.rels.values():
                 if rel.is_external:
                     continue
@@ -146,7 +142,7 @@ def parts(self):
         Return a list containing a reference to each of the parts in this
         package.
         """
-        return [part for part in self.iter_parts()]
+        return list(self.iter_parts())
 
     def relate_to(self, part, reltype):
         """
diff --git a/src/docx/opc/pkgwriter.py b/src/docx/opc/pkgwriter.py
index 1610cbb06..1f8901eea 100644
--- a/src/docx/opc/pkgwriter.py
+++ b/src/docx/opc/pkgwriter.py
@@ -1,18 +1,15 @@
-# encoding: utf-8
+"""Provides low-level, write-only API to serialized (OPC) package.
 
+OPC stands for Open Packaging Convention. This is e, essentially an implementation of
+OpcPackage.save().
 """
-Provides a low-level, write-only API to a serialized Open Packaging
-Convention (OPC) package, essentially an implementation of OpcPackage.save()
-"""
-
-from __future__ import absolute_import
 
-from .constants import CONTENT_TYPE as CT
-from .oxml import CT_Types, serialize_part_xml
-from .packuri import CONTENT_TYPES_URI, PACKAGE_URI
-from .phys_pkg import PhysPkgWriter
-from .shared import CaseInsensitiveDict
-from .spec import default_content_types
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.oxml import CT_Types, serialize_part_xml
+from docx.opc.packuri import CONTENT_TYPES_URI, PACKAGE_URI
+from docx.opc.phys_pkg import PhysPkgWriter
+from docx.opc.shared import CaseInsensitiveDict
+from docx.opc.spec import default_content_types
 
 
 class PackageWriter(object):
@@ -75,7 +72,7 @@ class _ContentTypesItem(object):
 
     def __init__(self):
         self._defaults = CaseInsensitiveDict()
-        self._overrides = dict()
+        self._overrides = {}
 
     @property
     def blob(self):
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index a94333752..868a1356e 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -19,7 +19,7 @@
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 
-pfxmap = dict((value, key) for key, value in nsmap.items())
+pfxmap = {value: key for key, value in nsmap.items()}
 
 
 class NamespacePrefixedTag(str):
@@ -94,7 +94,7 @@ def nspfxmap(*nspfxs):
     *nspfxs*. Any number of namespace prefixes can be supplied, e.g.
     namespaces('a', 'r', 'p').
     """
-    return dict((pfx, nsmap[pfx]) for pfx in nspfxs)
+    return {pfx: nsmap[pfx] for pfx in nspfxs}
 
 
 def qn(tag):
diff --git a/src/docx/shape.py b/src/docx/shape.py
index 036118d46..1f7a938a3 100644
--- a/src/docx/shape.py
+++ b/src/docx/shape.py
@@ -1,15 +1,11 @@
-# encoding: utf-8
+"""Objects related to shapes.
 
+A shape is a visual object that appears on the drawing layer of a document.
 """
-Objects related to shapes, visual objects that appear on the drawing layer of
-a document.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .enum.shape import WD_INLINE_SHAPE
-from .oxml.ns import nsmap
-from .shared import Parented
+from docx.enum.shape import WD_INLINE_SHAPE
+from docx.oxml.ns import nsmap
+from docx.shared import Parented
 
 
 class InlineShapes(Parented):
diff --git a/src/docx/styles/__init__.py b/src/docx/styles/__init__.py
index 61d011d38..ff2e71ce7 100644
--- a/src/docx/styles/__init__.py
+++ b/src/docx/styles/__init__.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Sub-package module for docx.styles sub-package.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Sub-package module for docx.styles sub-package."""
 
 
 class BabelFish(object):
@@ -29,7 +23,7 @@ class BabelFish(object):
     )
 
     internal_style_names = dict(style_aliases)
-    ui_style_names = dict((item[1], item[0]) for item in style_aliases)
+    ui_style_names = {item[1]: item[0] for item in style_aliases}
 
     @classmethod
     def ui2internal(cls, ui_style_name):
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index 53ed9b6cc..bd77bb3a1 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -541,7 +541,7 @@ def it_can_iterate_over_the_jfif_markers_in_its_stream(self, iter_markers_fixtur
             offsets,
             marker_lst,
         ) = iter_markers_fixture
-        markers = [marker for marker in marker_parser.iter_markers()]
+        markers = list(marker_parser.iter_markers())
         _MarkerFinder_.from_stream.assert_called_once_with(stream_)
         assert marker_finder_.next.call_args_list == [call(0), call(2), call(20)]
         assert _MarkerFactory_.call_args_list == [
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index d86d43d84..38a7ab935 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -250,7 +250,7 @@ def it_can_iterate_over_the_chunks_in_its_png_stream(
         chunk_lst = [chunk_, chunk_2_]
         chunk_parser = _ChunkParser(stream_rdr_)
 
-        chunks = [chunk for chunk in chunk_parser.iter_chunks()]
+        chunks = list(chunk_parser.iter_chunks())
 
         _iter_chunk_offsets_.assert_called_once_with(chunk_parser)
         assert _ChunkFactory_.call_args_list == [
@@ -261,7 +261,7 @@ def it_can_iterate_over_the_chunks_in_its_png_stream(
 
     def it_iterates_over_the_chunk_offsets_to_help_parse(self, iter_offsets_fixture):
         chunk_parser, expected_chunk_offsets = iter_offsets_fixture
-        chunk_offsets = [co for co in chunk_parser._iter_chunk_offsets()]
+        chunk_offsets = list(chunk_parser._iter_chunk_offsets())
         assert chunk_offsets == expected_chunk_offsets
 
     # fixtures -------------------------------------------------------
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index f073bafac..6768f6bd9 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -269,7 +269,7 @@ def it_can_iterate_through_the_directory_entries_in_an_IFD(self, iter_fixture):
             offsets,
             expected_entries,
         ) = iter_fixture
-        entries = [e for e in ifd_parser.iter_entries()]
+        entries = list(ifd_parser.iter_entries())
         assert _IfdEntryFactory_.call_args_list == [
             call(stream_rdr, offsets[0]),
             call(stream_rdr, offsets[1]),
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index 790d6fbc9..1e88a1660 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -84,7 +84,7 @@ def it_can_iterate_over_parts_by_walking_rels_graph(self):
         # verify -----------------------
         assert part1 in pkg.iter_parts()
         assert part2 in pkg.iter_parts()
-        assert len([p for p in pkg.iter_parts()]) == 2
+        assert len(list(pkg.iter_parts())) == 2
 
     def it_can_find_the_next_available_vector_partname(
         self, next_partname_fixture, iter_parts_, PackURI_, packuri_
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index ad63aaf2e..3d83f1d63 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -65,7 +65,7 @@ def it_can_iterate_over_all_the_srels(self):
         ]
         pkg_reader = PackageReader(None, pkg_srels, sparts)
         # exercise ---------------------
-        generated_tuples = [t for t in pkg_reader.iter_srels()]
+        generated_tuples = list(pkg_reader.iter_srels())
         # verify -----------------------
         expected_tuples = [
             ("/", "srel1"),
@@ -84,7 +84,7 @@ def it_can_load_serialized_parts(self, _SerializedPart_, _walk_phys_parts):
             ("/part/name2.xml", "app/vnd.type_2", "reltype2", "<Part_2/>", "srels_2"),
         )
         iter_vals = [(t[0], t[2], t[3], t[4]) for t in test_data]
-        content_types = dict((t[0], t[1]) for t in test_data)
+        content_types = {t[0]: t[1] for t in test_data}
         # mockery ----------------------
         phys_reader = Mock(name="phys_reader")
         pkg_srels = Mock(name="pkg_srels")
diff --git a/tests/styles/test_latent.py b/tests/styles/test_latent.py
index 4faf63bb4..5ab235445 100644
--- a/tests/styles/test_latent.py
+++ b/tests/styles/test_latent.py
@@ -145,7 +145,7 @@ def it_knows_how_many_latent_styles_it_contains(self, len_fixture):
 
     def it_can_iterate_over_its_latent_styles(self, iter_fixture):
         latent_styles, expected_count = iter_fixture
-        lst = [ls for ls in latent_styles]
+        lst = list(latent_styles)
         assert len(lst) == expected_count
         for latent_style in lst:
             assert isinstance(latent_style, _LatentStyle)
diff --git a/tests/test_section.py b/tests/test_section.py
index a5997d581..a810eb418 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -27,7 +27,7 @@ def it_can_iterate_over_its_Section_instances(
         Section_.return_value = section_
         sections = Sections(document_elm, document_part_)
 
-        section_lst = [s for s in sections]
+        section_lst = list(sections)
 
         assert Section_.call_args_list == [
             call(sectPrs[0], document_part_),

From 878f75854ec80f96263eee6dbdfa329e0ce6dd27 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 25 Sep 2023 20:08:00 -0700
Subject: [PATCH 247/367] lint: fix flake8-pytest-style diagnostics

---
 pyproject.toml              |  4 +++-
 tests/opc/test_package.py   |  8 ++++----
 tests/opc/test_packuri.py   |  2 +-
 tests/opc/test_part.py      |  8 ++------
 tests/opc/test_phys_pkg.py  | 20 ++++++++------------
 tests/opc/test_pkgreader.py | 10 +++++-----
 tests/opc/test_pkgwriter.py | 20 +++++++++-----------
 tests/opc/test_rel.py       | 10 ++++++----
 tests/oxml/test__init__.py  |  2 +-
 tests/oxml/test_table.py    |  4 ++--
 tests/styles/test_styles.py |  4 ++--
 tests/test_api.py           |  2 +-
 tests/test_document.py      |  4 ++--
 tests/test_enum.py          |  6 +++---
 tests/test_shape.py         |  8 ++++----
 tests/test_shared.py        |  6 +++---
 tests/test_table.py         |  9 +++++----
 tests/text/test_run.py      |  2 +-
 18 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a7310da4e..60b7e3ed2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -58,6 +58,8 @@ python_functions = ["it_", "they_", "and_it_", "but_it_"]
 exclude = []
 ignore = [
     "COM812",   # -- over-aggressively insists on trailing commas where not desired --
+    "PT001",    # -- wants @pytest.fixture() instead of @pytest.fixture --
+    "PT005",    # -- wants @pytest.fixture() instead of @pytest.fixture --
 ]
 select = [
     "C4",       # -- flake8-comprehensions --
@@ -66,7 +68,7 @@ select = [
     "F",        # -- pyflakes --
     "I",        # -- isort (imports) --
     "PLR0402",  # -- Name compared with itself like `foo == foo` --
-    # "PT",       # -- flake8-pytest-style --
+    "PT",       # -- flake8-pytest-style --
     # "SIM",      # -- flake8-simplify --
     "UP015",    # -- redundant `open()` mode parameter (like "r" is default) --
     "UP018",    # -- Unnecessary {literal_type} call like `str("abc")`. (rewrite as a literal) --
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index 1e88a1660..7bb6ae62e 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -233,16 +233,16 @@ def part_related_by_(self, request):
         return method_mock(request, OpcPackage, "part_related_by")
 
     @pytest.fixture
-    def parts(self, request, parts_):
+    def parts(self, parts_):
         """
         Return a mock patching property OpcPackage.parts, reversing the
         patch after each use.
         """
-        _patch = patch.object(
+        p = patch.object(
             OpcPackage, "parts", new_callable=PropertyMock, return_value=parts_
         )
-        request.addfinalizer(_patch.stop)
-        return _patch.start()
+        yield p.start()
+        p.stop()
 
     @pytest.fixture
     def parts_(self, request):
diff --git a/tests/opc/test_packuri.py b/tests/opc/test_packuri.py
index 71c8722c9..1d5732a85 100644
--- a/tests/opc/test_packuri.py
+++ b/tests/opc/test_packuri.py
@@ -29,7 +29,7 @@ def it_can_construct_from_relative_ref(self):
         assert pack_uri == "/ppt/slideLayouts/slideLayout1.xml"
 
     def it_should_raise_on_construct_with_bad_pack_uri_str(self):
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="PackURI must begin with slash"):
             PackURI("foobar")
 
     def it_can_calculate_baseURI(self):
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index df0b6eb12..f9b5f8732 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -326,24 +326,20 @@ def cls_method_fn_(self, request, cls_selector_fn_):
     @pytest.fixture
     def cls_selector_fixture(
         self,
-        request,
         cls_selector_fn_,
         cls_method_fn_,
         part_load_params,
         CustomPartClass_,
         part_of_custom_type_,
     ):
-        def reset_part_class_selector():
-            PartFactory.part_class_selector = original_part_class_selector
-
         original_part_class_selector = PartFactory.part_class_selector
-        request.addfinalizer(reset_part_class_selector)
-        return (
+        yield (
             cls_selector_fn_,
             part_load_params,
             CustomPartClass_,
             part_of_custom_type_,
         )
+        PartFactory.part_class_selector = original_part_class_selector
 
     @pytest.fixture
     def cls_selector_fn_(self, request, CustomPartClass_):
diff --git a/tests/opc/test_phys_pkg.py b/tests/opc/test_phys_pkg.py
index 800819f80..e33d5cf5a 100644
--- a/tests/opc/test_phys_pkg.py
+++ b/tests/opc/test_phys_pkg.py
@@ -1,11 +1,7 @@
 """Test suite for docx.opc.phys_pkg module."""
 
-try:
-    from io import BytesIO  # Python 3
-except ImportError:
-    from StringIO import StringIO as BytesIO
-
 import hashlib
+import io
 from zipfile import ZIP_DEFLATED, ZipFile
 
 import pytest
@@ -119,10 +115,10 @@ def it_returns_none_when_part_has_no_rels_xml(self, phys_reader):
     # fixtures ---------------------------------------------
 
     @pytest.fixture(scope="class")
-    def phys_reader(self, request):
+    def phys_reader(self):
         phys_reader = _ZipPkgReader(zip_pkg_path)
-        request.addfinalizer(phys_reader.close)
-        return phys_reader
+        yield phys_reader
+        phys_reader.close()
 
     @pytest.fixture
     def pkg_file_(self, request):
@@ -167,10 +163,10 @@ def it_can_write_a_blob(self, pkg_file):
     # fixtures ---------------------------------------------
 
     @pytest.fixture
-    def pkg_file(self, request):
-        pkg_file = BytesIO()
-        request.addfinalizer(pkg_file.close)
-        return pkg_file
+    def pkg_file(self):
+        pkg_file = io.BytesIO()
+        yield pkg_file
+        pkg_file.close()
 
 
 # fixtures -------------------------------------------------
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index 3d83f1d63..cd010e396 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -231,10 +231,10 @@ def partnames_(self, request):
         return partname_, partname_2_
 
     @pytest.fixture
-    def PhysPkgReader_(self, request):
-        _patch = patch("docx.opc.pkgreader.PhysPkgReader", spec_set=_ZipPkgReader)
-        request.addfinalizer(_patch.stop)
-        return _patch.start()
+    def PhysPkgReader_(self):
+        p = patch("docx.opc.pkgreader.PhysPkgReader", spec_set=_ZipPkgReader)
+        yield p.start()
+        p.stop()
 
     @pytest.fixture
     def reltypes_(self, request):
@@ -464,7 +464,7 @@ def it_raises_on_target_partname_when_external(self):
             target_mode=RTM.EXTERNAL,
         )
         srel = _SerializedRelationship("/", rel_elm)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="target_partname attribute on Relat"):
             srel.target_partname
 
 
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
index 7b0286ce8..77d44ea63 100644
--- a/tests/opc/test_pkgwriter.py
+++ b/tests/opc/test_pkgwriter.py
@@ -92,10 +92,10 @@ def parts_(self, request):
         return instance_mock(request, list)
 
     @pytest.fixture
-    def PhysPkgWriter_(self, request):
-        _patch = patch("docx.opc.pkgwriter.PhysPkgWriter")
-        request.addfinalizer(_patch.stop)
-        return _patch.start()
+    def PhysPkgWriter_(self):
+        p = patch("docx.opc.pkgwriter.PhysPkgWriter")
+        yield p.start()
+        p.stop()
 
     @pytest.fixture
     def phys_pkg_writer_(self, request):
@@ -106,7 +106,7 @@ def write_cti_fixture(self, _ContentTypesItem_, parts_, phys_pkg_writer_, blob_)
         return _ContentTypesItem_, parts_, phys_pkg_writer_, blob_
 
     @pytest.fixture
-    def _write_methods(self, request):
+    def _write_methods(self):
         """Mock that patches all the _write_* methods of PackageWriter"""
         root_mock = Mock(name="PackageWriter")
         patch1 = patch.object(PackageWriter, "_write_content_types_stream")
@@ -116,13 +116,11 @@ def _write_methods(self, request):
         root_mock.attach_mock(patch2.start(), "_write_pkg_rels")
         root_mock.attach_mock(patch3.start(), "_write_parts")
 
-        def fin():
-            patch1.stop()
-            patch2.stop()
-            patch3.stop()
+        yield root_mock
 
-        request.addfinalizer(fin)
-        return root_mock
+        patch1.stop()
+        patch2.stop()
+        patch3.stop()
 
     @pytest.fixture
     def xml_for_(self, request):
diff --git a/tests/opc/test_rel.py b/tests/opc/test_rel.py
index 45a218bb7..65d756ec0 100644
--- a/tests/opc/test_rel.py
+++ b/tests/opc/test_rel.py
@@ -1,3 +1,5 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for the docx.opc.rel module."""
 
 import pytest
@@ -27,7 +29,7 @@ def it_remembers_construction_values(self):
 
     def it_should_raise_on_target_part_access_on_external_rel(self):
         rel = _Relationship(None, None, None, None, external=True)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="target_part property on _Relat"):
             rel.target_part
 
     def it_should_have_target_ref_for_external_rel(self):
@@ -172,7 +174,7 @@ def rels(self):
         return rels
 
     @pytest.fixture
-    def rels_elm(self, request):
+    def rels_elm(self):
         """
         Return a rels_elm mock that will be returned from
         CT_Relationships.new()
@@ -186,8 +188,8 @@ def rels_elm(self, request):
         # patch CT_Relationships to return that rels_elm
         patch_ = patch.object(CT_Relationships, "new", return_value=rels_elm)
         patch_.start()
-        request.addfinalizer(patch_.stop)
-        return rels_elm
+        yield rels_elm
+        patch_.stop()
 
     @pytest.fixture
     def _rel_with_known_target_part(self, _rId, reltype, _target_part, _baseURI):
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
index 51889b97e..6a5a2f901 100644
--- a/tests/oxml/test__init__.py
+++ b/tests/oxml/test__init__.py
@@ -63,7 +63,7 @@ def it_accepts_unicode_providing_there_is_no_encoding_declaration(self):
         parse_xml(xml_text)
         # but adding encoding in the declaration raises ValueError
         xml_text = "%s\n%s" % (enc_decl, xml_body)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Unicode strings with encoding declara"):
             parse_xml(xml_text)
 
     def it_uses_registered_element_classes(self, xml_bytes):
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 0e1eeb9c1..b24c4abf3 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -19,7 +19,7 @@ def it_can_add_a_trPr(self, add_trPr_fixture):
 
     def it_raises_on_tc_at_grid_col(self, tc_raise_fixture):
         tr, idx = tc_raise_fixture
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError):  # noqa: PT011
             tr.tc_at_grid_col(idx)
 
     # fixtures -------------------------------------------------------
@@ -123,7 +123,7 @@ def it_can_move_its_content_to_help_merge(self, move_fixture):
 
     def it_raises_on_tr_above(self, tr_above_raise_fixture):
         tc = tr_above_raise_fixture
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="no tr above topmost tr"):
             tc._tr_above
 
     # fixtures -------------------------------------------------------
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index 419db3570..bdee6d2b5 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -60,7 +60,7 @@ def it_can_add_a_new_style(self, add_fixture):
 
     def it_raises_when_style_name_already_used(self, add_raises_fixture):
         styles, name = add_raises_fixture
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="document already contains style 'Hea"):
             styles.add_style(name, None)
 
     def it_can_get_the_default_style_for_a_type(self, default_fixture):
@@ -156,7 +156,7 @@ def it_gets_a_style_id_from_a_style_to_help(self, id_style_fixture):
 
     def it_raises_on_style_type_mismatch(self, id_style_raises_fixture):
         styles, style_, style_type = id_style_raises_fixture
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="assigned style is type 1, need type 2"):
             styles._get_style_id_from_style(style_, style_type)
 
     def it_provides_access_to_the_latent_styles(self, latent_styles_fixture):
diff --git a/tests/test_api.py b/tests/test_api.py
index 6e8baf5ca..acd3606d5 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -24,7 +24,7 @@ def it_opens_the_default_docx_if_none_specified(self, default_fixture):
 
     def it_raises_on_not_a_Word_file(self, raise_fixture):
         not_a_docx = raise_fixture
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="file 'foobar.xlsx' is not a Word file,"):
             Document(not_a_docx)
 
     # fixtures -------------------------------------------------------
diff --git a/tests/test_document.py b/tests/test_document.py
index 79dbc3d60..b5d58aefd 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -33,9 +33,9 @@ def it_can_add_a_heading(self, add_heading_fixture, add_paragraph_, paragraph_):
 
     def it_raises_on_heading_level_out_of_range(self):
         document = Document(None, None)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="level must be in range 0-9, got -1"):
             document.add_heading(level=-1)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="level must be in range 0-9, got 10"):
             document.add_heading(level=10)
 
     def it_can_add_a_page_break(self, add_paragraph_, paragraph_, run_):
diff --git a/tests/test_enum.py b/tests/test_enum.py
index 72c74f82a..51f95f2d8 100644
--- a/tests/test_enum.py
+++ b/tests/test_enum.py
@@ -68,9 +68,9 @@ def it_provides_the_enumeration_value_for_each_named_member(self):
     def it_knows_if_a_setting_is_valid(self):
         FOOBAR.validate(None)
         FOOBAR.validate(FOOBAR.READ_WRITE)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="foobar not a member of FOOBAR enumerat"):
             FOOBAR.validate("foobar")
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match=r"READ_ONLY \(-2\) not a member of FOOB"):
             FOOBAR.validate(FOOBAR.READ_ONLY)
 
     def it_can_be_referred_to_by_a_convenience_alias_if_defined(self):
@@ -89,7 +89,7 @@ class DescribeXmlEnumeration(object):
     def it_knows_the_XML_value_for_each_of_its_xml_members(self):
         assert XMLFOO.to_xml(XMLFOO.XML_RW) == "attrVal"
         assert XMLFOO.to_xml(42) == "attrVal"
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match=r"value 'RO \(-2\)' not in enumeration "):
             XMLFOO.to_xml(XMLFOO.RO)
 
     def it_can_map_each_of_its_xml_members_from_the_XML_value(self):
diff --git a/tests/test_shape.py b/tests/test_shape.py
index e0f73bcb6..647ae683c 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -40,11 +40,11 @@ def it_provides_indexed_access_to_inline_shapes(self, inline_shapes_fixture):
 
     def it_raises_on_indexed_access_out_of_range(self, inline_shapes_fixture):
         inline_shapes, inline_shape_count = inline_shapes_fixture
-        with pytest.raises(IndexError):
-            too_low = -1 - inline_shape_count
+        too_low = -1 - inline_shape_count
+        with pytest.raises(IndexError, match=r"inline shape index \[-3\] out of rang"):
             inline_shapes[too_low]
-        with pytest.raises(IndexError):
-            too_high = inline_shape_count
+        too_high = inline_shape_count
+        with pytest.raises(IndexError, match=r"inline shape index \[2\] out of range"):
             inline_shapes[too_high]
 
     def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
diff --git a/tests/test_shared.py b/tests/test_shared.py
index ac1c01fcd..7a026c456 100644
--- a/tests/test_shared.py
+++ b/tests/test_shared.py
@@ -112,11 +112,11 @@ def units_fixture(self, request):
 class DescribeRGBColor(object):
     def it_is_natively_constructed_using_three_ints_0_to_255(self):
         RGBColor(0x12, 0x34, 0x56)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match=r"RGBColor\(\) takes three integer valu"):
             RGBColor("12", "34", "56")
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match=r"\(\) takes three integer values 0-255"):
             RGBColor(-1, 34, 56)
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match=r"RGBColor\(\) takes three integer valu"):
             RGBColor(12, 256, 56)
 
     def it_can_construct_from_a_hex_string_rgb_value(self):
diff --git a/tests/test_table.py b/tests/test_table.py
index 87c7f07c4..11823117f 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -930,11 +930,12 @@ def it_provides_sliced_access_to_rows(self, slice_fixture):
 
     def it_raises_on_indexed_access_out_of_range(self, rows_fixture):
         rows, row_count = rows_fixture
-        with pytest.raises(IndexError):
-            too_low = -1 - row_count
+        too_low = -1 - row_count
+        too_high = row_count
+
+        with pytest.raises(IndexError, match="list index out of range"):
             rows[too_low]
-        with pytest.raises(IndexError):
-            too_high = row_count
+        with pytest.raises(IndexError, match="list index out of range"):
             rows[too_high]
 
     def it_provides_access_to_the_table_it_belongs_to(self, table_fixture):
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index ef1b79bf1..dd546f005 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -46,7 +46,7 @@ def it_can_change_its_underline_type(self, underline_set_fixture):
 
     def it_raises_on_assign_invalid_underline_type(self, underline_raise_fixture):
         run, underline = underline_raise_fixture
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="' not in enumeration WD_UNDERLINE"):
             run.underline = underline
 
     def it_provides_access_to_its_font(self, font_fixture):

From c8aad1c7f603d37a0c32bd9067a5164fc8df239c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 25 Sep 2023 20:25:49 -0700
Subject: [PATCH 248/367] lint: fix flake8-simplify diagnostics

---
 pyproject.toml             |  2 +-
 src/docx/image/tiff.py     |  7 ++-----
 src/docx/opc/packuri.py    | 14 ++++----------
 src/docx/oxml/document.py  | 11 ++++-------
 src/docx/oxml/table.py     | 10 ++++------
 src/docx/oxml/xmlchemy.py  |  9 ++-------
 src/docx/section.py        |  8 ++++----
 src/docx/styles/styles.py  |  5 +----
 tests/image/test_png.py    |  2 +-
 tests/styles/test_style.py |  5 +----
 10 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 60b7e3ed2..72591d894 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,7 +69,7 @@ select = [
     "I",        # -- isort (imports) --
     "PLR0402",  # -- Name compared with itself like `foo == foo` --
     "PT",       # -- flake8-pytest-style --
-    # "SIM",      # -- flake8-simplify --
+    "SIM",      # -- flake8-simplify --
     "UP015",    # -- redundant `open()` mode parameter (like "r" is default) --
     "UP018",    # -- Unnecessary {literal_type} call like `str("abc")`. (rewrite as a literal) --
     "UP032",    # -- Use f-string instead of `.format()` call --
diff --git a/src/docx/image/tiff.py b/src/docx/image/tiff.py
index 05b1addf8..1aca7a0e8 100644
--- a/src/docx/image/tiff.py
+++ b/src/docx/image/tiff.py
@@ -225,11 +225,8 @@ def _IfdEntryFactory(stream_rdr, offset):
         TIFF_FLD.RATIONAL: _RationalIfdEntry,
     }
     field_type = stream_rdr.read_short(offset, 2)
-    if field_type in ifd_entry_classes:
-        entry_cls = ifd_entry_classes[field_type]
-    else:
-        entry_cls = _IfdEntry
-    return entry_cls.from_stream(stream_rdr, offset)
+    EntryCls = ifd_entry_classes.get(field_type, _IfdEntry)
+    return EntryCls.from_stream(stream_rdr, offset)
 
 
 class _IfdEntry(object):
diff --git a/src/docx/opc/packuri.py b/src/docx/opc/packuri.py
index f20af84f8..50fa6e214 100644
--- a/src/docx/opc/packuri.py
+++ b/src/docx/opc/packuri.py
@@ -1,8 +1,6 @@
-# encoding: utf-8
+"""Provides the PackURI value type.
 
-"""
-Provides the PackURI value type along with some useful known pack URI strings
-such as PACKAGE_URI.
+Also some useful known pack URI strings such as PACKAGE_URI.
 """
 
 import posixpath
@@ -18,7 +16,7 @@ class PackURI(str):
     _filename_re = re.compile("([a-zA-Z]+)([1-9][0-9]*)?")
 
     def __new__(cls, pack_uri_str):
-        if not pack_uri_str[0] == "/":
+        if pack_uri_str[0] != "/":
             tmpl = "PackURI must begin with slash, got '%s'"
             raise ValueError(tmpl % pack_uri_str)
         return str.__new__(cls, pack_uri_str)
@@ -96,11 +94,7 @@ def relative_ref(self, baseURI):
         """
         # workaround for posixpath bug in 2.6, doesn't generate correct
         # relative path when *start* (second) parameter is root ('/')
-        if baseURI == "/":
-            relpath = self[1:]
-        else:
-            relpath = posixpath.relpath(self, baseURI)
-        return relpath
+        return self[1:] if baseURI == "/" else posixpath.relpath(self, baseURI)
 
     @property
     def rels_uri(self):
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index b8de0221f..a97f31990 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -52,13 +52,10 @@ def add_section_break(self):
         return sentinel_sectPr
 
     def clear_content(self):
+        """Remove all content child elements from this <w:body> element.
+
+        Leave the <w:sectPr> element if it is present.
         """
-        Remove all content child elements from this <w:body> element. Leave
-        the <w:sectPr> element if it is present.
-        """
-        if self.sectPr is not None:
-            content_elms = self[:-1]
-        else:
-            content_elms = self[:]
+        content_elms = self[:-1] if self.sectPr is not None else self[:]
         for content_elm in content_elms:
             self.remove(content_elm)
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 063105505..fc131f88e 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -327,14 +327,12 @@ def alignment(self, value):
 
     @property
     def autofit(self):
-        """
-        Return |False| if there is a ``<w:tblLayout>`` child with ``w:type``
-        attribute set to ``'fixed'``. Otherwise return |True|.
+        """|False| when there is a `w:tblLayout` child with `@w:type="fixed"`.
+
+        Otherwise |True|.
         """
         tblLayout = self.tblLayout
-        if tblLayout is None:
-            return True
-        return False if tblLayout.type == "fixed" else True
+        return True if tblLayout is None else tblLayout.type != "fixed"
 
     @autofit.setter
     def autofit(self, value):
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index f913bb792..4b994b773 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -482,13 +482,8 @@ def get_or_change_to_child(obj):
 
     @property
     def _prop_name(self):
-        """
-        Calculate property name from tag name, e.g. a:schemeClr -> schemeClr.
-        """
-        if ":" in self._nsptagname:
-            start = self._nsptagname.index(":") + 1
-        else:
-            start = 0
+        """property name computed from tag name, e.g. a:schemeClr -> schemeClr."""
+        start = self._nsptagname.index(":") + 1 if ":" in self._nsptagname else 0
         return self._nsptagname[start:]
 
     @lazyproperty
diff --git a/src/docx/section.py b/src/docx/section.py
index 32ceec7da..c230eefd7 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -383,10 +383,10 @@ def _drop_definition(self):
         self._document_part.drop_rel(rId)
 
     @property
-    def _has_definition(self):
+    def _has_definition(self) -> bool:
         """True if a footer is defined for this section."""
         footerReference = self._sectPr.get_footerReference(self._hdrftr_index)
-        return False if footerReference is None else True
+        return footerReference is not None
 
     @property
     def _prior_headerfooter(self):
@@ -427,10 +427,10 @@ def _drop_definition(self):
         self._document_part.drop_header_part(rId)
 
     @property
-    def _has_definition(self):
+    def _has_definition(self) -> bool:
         """True if a header is explicitly defined for this section."""
         headerReference = self._sectPr.get_headerReference(self._hdrftr_index)
-        return False if headerReference is None else True
+        return headerReference is not None
 
     @property
     def _prior_headerfooter(self):
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index d09fbd137..e19e97c1c 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -26,10 +26,7 @@ def __contains__(self, name):
         Enables `in` operator on style name.
         """
         internal_name = BabelFish.ui2internal(name)
-        for style in self._element.style_lst:
-            if style.name_val == internal_name:
-                return True
-        return False
+        return any(style.name_val == internal_name for style in self._element.style_lst)
 
     def __getitem__(self, key):
         """
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index 38a7ab935..07b50eda0 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -171,7 +171,7 @@ def it_can_construct_from_a_stream(
 
     def it_provides_access_to_the_IHDR_chunk(self, IHDR_fixture):
         chunks, IHDR_chunk_ = IHDR_fixture
-        assert chunks.IHDR == IHDR_chunk_
+        assert IHDR_chunk_ == chunks.IHDR
 
     def it_provides_access_to_the_pHYs_chunk(self, pHYs_fixture):
         chunks, expected_chunk = pHYs_fixture
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index 7d028ea0d..113da3339 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -516,10 +516,7 @@ def next_get_fixture(self, request):
         style_elm = styles[style_names.index(style_name)]
         next_style_elm = styles[style_names.index(next_style_name)]
         style = _ParagraphStyle(style_elm)
-        if style_name == "H1":
-            next_style = _ParagraphStyle(next_style_elm)
-        else:
-            next_style = style
+        next_style = _ParagraphStyle(next_style_elm) if style_name == "H1" else style
         return style, next_style
 
     @pytest.fixture(

From 5cb952f560eae017244e570b9f098da87116eb26 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 25 Sep 2023 21:41:17 -0700
Subject: [PATCH 249/367] rfctr: remove Python 2 compatibility layer

---
 ref/xsd/vml-wordprocessingDrawing.xsd |  9 +++--
 src/docx/compat.py                    | 37 --------------------
 src/docx/image/image.py               |  8 ++---
 src/docx/image/jpeg.py                | 19 +++++------
 src/docx/opc/compat.py                | 49 ---------------------------
 src/docx/opc/part.py                  |  3 +-
 src/docx/opc/phys_pkg.py              |  3 +-
 src/docx/opc/shared.py                | 13 ++++---
 src/docx/oxml/coreprops.py            |  3 +-
 src/docx/oxml/settings.py             |  4 ---
 src/docx/oxml/xmlchemy.py             |  3 +-
 src/docx/section.py                   |  7 ++--
 tests/image/test_bmp.py               |  5 +--
 tests/image/test_gif.py               |  5 +--
 tests/image/test_helpers.py           |  7 ++--
 tests/image/test_image.py             | 13 +++----
 tests/image/test_jpeg.py              | 38 ++++++++++-----------
 tests/image/test_png.py               | 17 +++++-----
 tests/image/test_tiff.py              | 25 +++++++-------
 tests/oxml/test_xmlchemy.py           |  3 +-
 20 files changed, 89 insertions(+), 182 deletions(-)
 delete mode 100644 src/docx/compat.py
 delete mode 100644 src/docx/opc/compat.py

diff --git a/ref/xsd/vml-wordprocessingDrawing.xsd b/ref/xsd/vml-wordprocessingDrawing.xsd
index f1041e34e..f36e1acde 100644
--- a/ref/xsd/vml-wordprocessingDrawing.xsd
+++ b/ref/xsd/vml-wordprocessingDrawing.xsd
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xsd:schema
   xmlns="urn:schemas-microsoft-com:office:word"
-  targetNamespace="urn:schemas-microsoft-com:office:word" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  attributeFormDefault="unqualified"
+  elementFormDefault="qualified"
+  targetNamespace="urn:schemas-microsoft-com:office:word"
+>
   <xsd:element name="bordertop" type="CT_Border"/>
   <xsd:element name="borderleft" type="CT_Border"/>
   <xsd:element name="borderright" type="CT_Border"/>
diff --git a/src/docx/compat.py b/src/docx/compat.py
deleted file mode 100644
index dfa8ea054..000000000
--- a/src/docx/compat.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# encoding: utf-8
-
-"""
-Provides Python 2/3 compatibility objects
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-import sys
-
-# ===========================================================================
-# Python 3 versions
-# ===========================================================================
-
-if sys.version_info >= (3, 0):
-    from collections.abc import Sequence
-    from io import BytesIO
-
-    def is_string(obj):
-        """Return True if *obj* is a string, False otherwise."""
-        return isinstance(obj, str)
-
-    Unicode = str
-
-# ===========================================================================
-# Python 2 versions
-# ===========================================================================
-
-else:
-    from collections import Sequence  # noqa
-    from StringIO import StringIO as BytesIO  # noqa
-
-    def is_string(obj):
-        """Return True if *obj* is a string, False otherwise."""
-        return isinstance(obj, basestring)  # noqa
-
-    Unicode = unicode  # noqa
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index fe31b7111..530a90f8f 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -5,9 +5,9 @@
 """
 
 import hashlib
+import io
 import os
 
-from docx.compat import BytesIO, is_string
 from docx.image.exceptions import UnrecognizedImageError
 from docx.shared import Emu, Inches, lazyproperty
 
@@ -30,7 +30,7 @@ def from_blob(cls, blob):
         Return a new |Image| subclass instance parsed from the image binary
         contained in *blob*.
         """
-        stream = BytesIO(blob)
+        stream = io.BytesIO(blob)
         return cls._from_stream(stream, blob)
 
     @classmethod
@@ -39,11 +39,11 @@ def from_file(cls, image_descriptor):
         Return a new |Image| subclass instance loaded from the image file
         identified by *image_descriptor*, a path or file-like object.
         """
-        if is_string(image_descriptor):
+        if isinstance(image_descriptor, str):
             path = image_descriptor
             with open(path, "rb") as f:
                 blob = f.read()
-                stream = BytesIO(blob)
+                stream = io.BytesIO(blob)
             filename = os.path.basename(path)
         else:
             stream = image_descriptor
diff --git a/src/docx/image/jpeg.py b/src/docx/image/jpeg.py
index adba5c1ad..6a9db9438 100644
--- a/src/docx/image/jpeg.py
+++ b/src/docx/image/jpeg.py
@@ -1,17 +1,14 @@
-# encoding: utf-8
+"""Objects related to parsing headers of JPEG image streams.
 
-"""
-Objects related to parsing headers of JPEG image streams, both JFIF and Exif
-sub-formats.
+Includes both JFIF and Exif sub-formats.
 """
 
-from __future__ import absolute_import, division, print_function
+import io
 
-from ..compat import BytesIO
-from .constants import JPEG_MARKER_CODE, MIME_TYPE
-from .helpers import BIG_ENDIAN, StreamReader
-from .image import BaseImageHeader
-from .tiff import Tiff
+from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
+from docx.image.helpers import BIG_ENDIAN, StreamReader
+from docx.image.image import BaseImageHeader
+from docx.image.tiff import Tiff
 
 
 class Jpeg(BaseImageHeader):
@@ -460,7 +457,7 @@ def _tiff_from_exif_segment(cls, stream, offset, segment_length):
         # wrap full segment in its own stream and feed to Tiff()
         stream.seek(offset + 8)
         segment_bytes = stream.read(segment_length - 8)
-        substream = BytesIO(segment_bytes)
+        substream = io.BytesIO(segment_bytes)
         return Tiff.from_stream(substream)
 
 
diff --git a/src/docx/opc/compat.py b/src/docx/opc/compat.py
deleted file mode 100644
index d5f63ac19..000000000
--- a/src/docx/opc/compat.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# encoding: utf-8
-
-"""
-Provides Python 2/3 compatibility objects
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-import sys
-
-# ===========================================================================
-# Python 3 versions
-# ===========================================================================
-
-if sys.version_info >= (3, 0):
-
-    def cls_method_fn(cls, method_name):
-        """
-        Return the function object associated with the method of *cls* having
-        *method_name*.
-        """
-        return getattr(cls, method_name)
-
-    def is_string(obj):
-        """
-        Return True if *obj* is a string, False otherwise.
-        """
-        return isinstance(obj, str)
-
-
-# ===========================================================================
-# Python 2 versions
-# ===========================================================================
-
-else:
-
-    def cls_method_fn(cls, method_name):
-        """
-        Return the function object associated with the method of *cls* having
-        *method_name*.
-        """
-        unbound_method = getattr(cls, method_name)
-        return unbound_method.__func__
-
-    def is_string(obj):
-        """
-        Return True if *obj* is a string, False otherwise.
-        """
-        return isinstance(obj, basestring)  # noqa
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index 048a06753..e9fab7973 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -1,10 +1,9 @@
 """Open Packaging Convention (OPC) objects related to package parts."""
 
-from docx.opc.compat import cls_method_fn
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
 from docx.opc.rel import Relationships
-from docx.opc.shared import lazyproperty
+from docx.opc.shared import cls_method_fn, lazyproperty
 from docx.oxml import parse_xml
 
 
diff --git a/src/docx/opc/phys_pkg.py b/src/docx/opc/phys_pkg.py
index 3d2f768ab..ae38a647b 100644
--- a/src/docx/opc/phys_pkg.py
+++ b/src/docx/opc/phys_pkg.py
@@ -3,7 +3,6 @@
 import os
 from zipfile import ZIP_DEFLATED, ZipFile, is_zipfile
 
-from docx.opc.compat import is_string
 from docx.opc.exceptions import PackageNotFoundError
 from docx.opc.packuri import CONTENT_TYPES_URI
 
@@ -15,7 +14,7 @@ class PhysPkgReader(object):
 
     def __new__(cls, pkg_file):
         # if *pkg_file* is a string, treat it as a path
-        if is_string(pkg_file):
+        if isinstance(pkg_file, str):
             if os.path.isdir(pkg_file):
                 reader_cls = _DirPkgReader
             elif is_zipfile(pkg_file):
diff --git a/src/docx/opc/shared.py b/src/docx/opc/shared.py
index 15eed35d9..370780e6b 100644
--- a/src/docx/opc/shared.py
+++ b/src/docx/opc/shared.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Objects shared by opc modules.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Objects shared by opc modules."""
 
 
 class CaseInsensitiveDict(dict):
@@ -26,6 +20,11 @@ def __setitem__(self, key, value):
         return super(CaseInsensitiveDict, self).__setitem__(key.lower(), value)
 
 
+def cls_method_fn(cls: type, method_name: str):
+    """Return method of `cls` having `method_name`."""
+    return getattr(cls, method_name)
+
+
 def lazyproperty(f):
     """
     @lazyprop decorator. Decorated method will be called only on first access
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 8c0dd414e..7c43995fb 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -3,7 +3,6 @@
 import re
 from datetime import datetime, timedelta
 
-from docx.compat import is_string
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
@@ -281,7 +280,7 @@ def _set_element_datetime(self, prop_name, value):
 
     def _set_element_text(self, prop_name, value):
         """Set string value of *name* property to *value*."""
-        if not is_string(value):
+        if not isinstance(value, str):
             value = str(value)
 
         if len(value) > 255:
diff --git a/src/docx/oxml/settings.py b/src/docx/oxml/settings.py
index 3fc72e27f..dc899cbc0 100644
--- a/src/docx/oxml/settings.py
+++ b/src/docx/oxml/settings.py
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Custom element classes related to document settings"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 4b994b773..11a47beae 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -4,7 +4,6 @@
 
 from lxml import etree
 
-from docx.compat import Unicode
 from docx.oxml import OxmlElement
 from docx.oxml.exceptions import InvalidXmlError
 from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
@@ -20,7 +19,7 @@ def serialize_for_reading(element):
     return XmlString(xml)
 
 
-class XmlString(Unicode):
+class XmlString(str):
     """
     Provides string comparison override suitable for serialized XML that is
     useful for tests.
diff --git a/src/docx/section.py b/src/docx/section.py
index c230eefd7..f69f547f2 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -1,11 +1,8 @@
-# encoding: utf-8
+"""The |Section| object and related proxy classes."""
 
-"""The |Section| object and related proxy classes"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+from collections.abc import Sequence
 
 from docx.blkcntnr import BlockItemContainer
-from docx.compat import Sequence
 from docx.enum.section import WD_HEADER_FOOTER
 from docx.shared import lazyproperty
 
diff --git a/tests/image/test_bmp.py b/tests/image/test_bmp.py
index bdd2ff4e7..ed49db386 100644
--- a/tests/image/test_bmp.py
+++ b/tests/image/test_bmp.py
@@ -1,8 +1,9 @@
 """Test suite for docx.image.bmp module."""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.bmp import Bmp
 from docx.image.constants import MIME_TYPE
 
@@ -16,7 +17,7 @@ def it_can_construct_from_a_bmp_stream(self, Bmp__init__):
             b"fillerfillerfiller\x1A\x00\x00\x00\x2B\x00\x00\x00"
             b"fillerfiller\xB8\x1E\x00\x00\x00\x00\x00\x00"
         )
-        stream = BytesIO(bytes_)
+        stream = io.BytesIO(bytes_)
 
         bmp = Bmp.from_stream(stream)
 
diff --git a/tests/image/test_gif.py b/tests/image/test_gif.py
index fd9eac2ea..3af8cfd9f 100644
--- a/tests/image/test_gif.py
+++ b/tests/image/test_gif.py
@@ -1,8 +1,9 @@
 """Unit test suite for docx.image.gif module."""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.constants import MIME_TYPE
 from docx.image.gif import Gif
 
@@ -13,7 +14,7 @@ class DescribeGif(object):
     def it_can_construct_from_a_gif_stream(self, Gif__init__):
         cx, cy = 42, 24
         bytes_ = b"filler\x2A\x00\x18\x00"
-        stream = BytesIO(bytes_)
+        stream = io.BytesIO(bytes_)
 
         gif = Gif.from_stream(stream)
 
diff --git a/tests/image/test_helpers.py b/tests/image/test_helpers.py
index e98ac6ca7..8d3db4760 100644
--- a/tests/image/test_helpers.py
+++ b/tests/image/test_helpers.py
@@ -1,8 +1,9 @@
 """Test suite for docx.image.helpers module."""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.exceptions import UnexpectedEndOfFileError
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 
@@ -33,13 +34,13 @@ def it_can_read_a_long(self, read_long_fixture):
     )
     def read_long_fixture(self, request):
         byte_order, bytes_, offset, expected_int = request.param
-        stream = BytesIO(bytes_)
+        stream = io.BytesIO(bytes_)
         stream_rdr = StreamReader(stream, byte_order)
         return stream_rdr, offset, expected_int
 
     @pytest.fixture
     def read_str_fixture(self):
-        stream = BytesIO(b"\x01\x02foobar\x03\x04")
+        stream = io.BytesIO(b"\x01\x02foobar\x03\x04")
         stream_rdr = StreamReader(stream, BIG_ENDIAN)
         expected_string = "foobar"
         return stream_rdr, expected_string
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index 791831077..addbe61fc 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -1,8 +1,9 @@
 """Unit test suite for docx.image package"""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.bmp import Bmp
 from docx.image.exceptions import UnrecognizedImageError
 from docx.image.gif import Gif
@@ -148,7 +149,7 @@ def from_filelike_fixture(self, _from_stream_, image_):
         image_path = test_file("python-icon.png")
         with open(image_path, "rb") as f:
             blob = f.read()
-        image_stream = BytesIO(blob)
+        image_stream = io.BytesIO(blob)
         return image_stream, _from_stream_, blob, image_
 
     @pytest.fixture
@@ -222,7 +223,7 @@ def blob_(self, request):
 
     @pytest.fixture
     def BytesIO_(self, request, stream_):
-        return class_mock(request, "docx.image.image.BytesIO", return_value=stream_)
+        return class_mock(request, "docx.image.image.io.BytesIO", return_value=stream_)
 
     @pytest.fixture
     def filename_(self, request):
@@ -258,7 +259,7 @@ def Image__init_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
     @pytest.fixture
     def width_prop_(self, request):
@@ -272,7 +273,7 @@ def it_constructs_the_right_class_for_a_given_image_stream(self, call_fixture):
         assert isinstance(image_header, expected_class)
 
     def it_raises_on_unrecognized_image_stream(self):
-        stream = BytesIO(b"foobar 666 not an image stream")
+        stream = io.BytesIO(b"foobar 666 not an image stream")
         with pytest.raises(UnrecognizedImageError):
             _ImageHeaderFactory(stream)
 
@@ -294,7 +295,7 @@ def call_fixture(self, request):
         image_path = test_file(image_filename)
         with open(image_path, "rb") as f:
             blob = f.read()
-        image_stream = BytesIO(blob)
+        image_stream = io.BytesIO(blob)
         image_stream.seek(666)
         return image_stream, expected_class
 
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index bd77bb3a1..d18fbc234 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -1,8 +1,9 @@
 """Unit test suite for docx.image.jpeg module"""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.jpeg import (
@@ -98,7 +99,7 @@ def jfif_markers_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_JfifMarkers(object):
@@ -224,7 +225,7 @@ def sos_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_Marker(object):
@@ -247,7 +248,7 @@ def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
     def from_stream_fixture(self, request, _Marker__init_):
         marker_code, offset, length = request.param
         bytes_ = b"\xFF\xD8\xFF\xE0\x00\x10"
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_reader = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         return stream_reader, marker_code, offset, _Marker__init_, length
 
     @pytest.fixture
@@ -260,7 +261,7 @@ def it_can_construct_from_a_stream_and_offset(self, _App0Marker__init_):
         bytes_ = b"\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.APP0, 0, 16
         density_units, x_density, y_density = 1, 42, 24
-        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
 
         app0_marker = _App0Marker.from_stream(stream, marker_code, offset)
 
@@ -300,7 +301,7 @@ def it_can_construct_from_a_stream_and_offset(
         bytes_ = b"\x00\x42Exif\x00\x00"
         marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
         horz_dpi, vert_dpi = 42, 24
-        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
 
         app1_marker = _App1Marker.from_stream(stream, marker_code, offset)
 
@@ -313,7 +314,7 @@ def it_can_construct_from_a_stream_and_offset(
     def it_can_construct_from_non_Exif_APP1_segment(self, _App1Marker__init_):
         bytes_ = b"\x00\x42Foobar"
         marker_code, offset, length = JPEG_MARKER_CODE.APP1, 0, 66
-        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
 
         app1_marker = _App1Marker.from_stream(stream, marker_code, offset)
 
@@ -344,13 +345,12 @@ def _App1Marker__init_(self, request):
         return initializer_mock(request, _App1Marker)
 
     @pytest.fixture
-    def BytesIO_(self, request, substream_):
-        return class_mock(request, "docx.image.jpeg.BytesIO", return_value=substream_)
-
-    @pytest.fixture
-    def get_tiff_fixture(self, request, BytesIO_, substream_, Tiff_, tiff_):
+    def get_tiff_fixture(self, request, substream_, Tiff_, tiff_):
         bytes_ = b"xfillerxMM\x00*\x00\x00\x00\x42"
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_reader = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
+        BytesIO_ = class_mock(
+            request, "docx.image.jpeg.io.BytesIO", return_value=substream_
+        )
         offset, segment_length, segment_bytes = 0, 16, bytes_[8:]
         return (
             stream_reader,
@@ -365,7 +365,7 @@ def get_tiff_fixture(self, request, BytesIO_, substream_, Tiff_, tiff_):
 
     @pytest.fixture
     def substream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
     @pytest.fixture
     def Tiff_(self, request, tiff_):
@@ -393,7 +393,7 @@ def it_can_construct_from_a_stream_and_offset(self, request, _SofMarker__init_):
         bytes_ = b"\x00\x11\x00\x00\x2A\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.SOF0, 0, 17
         px_width, px_height = 24, 42
-        stream = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
 
         sof_marker = _SofMarker.from_stream(stream, marker_code, offset)
 
@@ -475,7 +475,7 @@ def _SofMarker_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_MarkerFinder(object):
@@ -510,14 +510,14 @@ def _MarkerFinder__init_(self, request):
     def next_fixture(self, request):
         start, marker_code, segment_offset = request.param
         bytes_ = b"\xFF\xD8\xFF\xE0\x00\x01\xFF\x00\xFF\xFF\xFF\xD9"
-        stream_reader = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_reader = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         marker_finder = _MarkerFinder(stream_reader)
         expected_code_and_offset = (marker_code, segment_offset)
         return marker_finder, start, expected_code_and_offset
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_MarkerParser(object):
@@ -622,7 +622,7 @@ def soi_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
     @pytest.fixture
     def StreamReader_(self, request, stream_reader_):
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index 07b50eda0..dce3aec95 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -1,8 +1,9 @@
 """Unit test suite for docx.image.png module."""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.constants import MIME_TYPE, PNG_CHUNK_TYPE
 from docx.image.exceptions import InvalidImageStreamError
 from docx.image.helpers import BIG_ENDIAN, StreamReader
@@ -72,7 +73,7 @@ def png_parser_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_PngParser(object):
@@ -152,7 +153,7 @@ def _PngParser__init_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_Chunks(object):
@@ -230,7 +231,7 @@ def pHYs_fixture(self, request, IHDR_chunk_, pHYs_chunk_):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_ChunkParser(object):
@@ -304,7 +305,7 @@ def _iter_chunk_offsets_(self, request):
     @pytest.fixture
     def iter_offsets_fixture(self):
         bytes_ = b"-filler-\x00\x00\x00\x00IHDRxxxx\x00\x00\x00\x00IEND"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         chunk_parser = _ChunkParser(stream_rdr)
         expected_chunk_offsets = [
             (PNG_CHUNK_TYPE.IHDR, 16),
@@ -320,7 +321,7 @@ def StreamReader_(self, request, stream_rdr_):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
     @pytest.fixture
     def stream_rdr_(self, request):
@@ -409,7 +410,7 @@ def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
     @pytest.fixture
     def from_offset_fixture(self):
         bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x18"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset, px_width, px_height = 0, 42, 24
         return stream_rdr, offset, px_width, px_height
 
@@ -430,6 +431,6 @@ def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
     @pytest.fixture
     def from_offset_fixture(self):
         bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x18\x01"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset, horz_px_per_unit, vert_px_per_unit, units_specifier = (0, 42, 24, 1)
         return (stream_rdr, offset, horz_px_per_unit, vert_px_per_unit, units_specifier)
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index 6768f6bd9..08027ac1d 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -1,8 +1,9 @@
 """Unit test suite for docx.image.tiff module"""
 
+import io
+
 import pytest
 
-from docx.compat import BytesIO
 from docx.image.constants import MIME_TYPE, TIFF_TAG
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from docx.image.tiff import (
@@ -75,7 +76,7 @@ def tiff_parser_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_TiffParser(object):
@@ -176,12 +177,12 @@ def _make_stream_reader_(self, request, stream_rdr_):
     )
     def mk_stream_rdr_fixture(self, request, StreamReader_, stream_rdr_):
         bytes_, endian = request.param
-        stream = BytesIO(bytes_)
+        stream = io.BytesIO(bytes_)
         return stream, StreamReader_, endian, stream_rdr_
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
     @pytest.fixture
     def StreamReader_(self, request, stream_rdr_):
@@ -257,7 +258,7 @@ def offset_(self, request):
 
     @pytest.fixture
     def stream_(self, request):
-        return instance_mock(request, BytesIO)
+        return instance_mock(request, io.BytesIO)
 
 
 class Describe_IfdParser(object):
@@ -296,7 +297,7 @@ def _IfdEntryFactory_(self, request, ifd_entry_, ifd_entry_2_):
 
     @pytest.fixture
     def iter_fixture(self, _IfdEntryFactory_, ifd_entry_, ifd_entry_2_):
-        stream_rdr = StreamReader(BytesIO(b"\x00\x02"), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(b"\x00\x02"), BIG_ENDIAN)
         offsets = [2, 14]
         ifd_parser = _IfdParser(stream_rdr, offset=0)
         expected_entries = [ifd_entry_, ifd_entry_2_]
@@ -341,7 +342,7 @@ def fixture(
             "RATIONAL": _RationalIfdEntry_,
             "CUSTOM": _IfdEntry_,
         }[entry_type]
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset = 0
         return stream_rdr, offset, entry_cls_, ifd_entry_
 
@@ -389,7 +390,7 @@ def it_can_construct_from_a_stream_and_offset(
         self, _parse_value_, _IfdEntry__init_, value_
     ):
         bytes_ = b"\x00\x01\x66\x66\x00\x00\x00\x02\x00\x00\x00\x03"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset, tag_code, value_count, value_offset = 0, 1, 2, 3
         _parse_value_.return_value = value_
 
@@ -424,7 +425,7 @@ def value_(self, request):
 class Describe_AsciiIfdEntry(object):
     def it_can_parse_an_ascii_string_IFD_entry(self):
         bytes_ = b"foobar\x00"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _AsciiIfdEntry._parse_value(stream_rdr, None, 7, 0)
         assert val == "foobar"
 
@@ -432,7 +433,7 @@ def it_can_parse_an_ascii_string_IFD_entry(self):
 class Describe_ShortIfdEntry(object):
     def it_can_parse_a_short_int_IFD_entry(self):
         bytes_ = b"foobaroo\x00\x2A"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _ShortIfdEntry._parse_value(stream_rdr, 0, 1, None)
         assert val == 42
 
@@ -440,7 +441,7 @@ def it_can_parse_a_short_int_IFD_entry(self):
 class Describe_LongIfdEntry(object):
     def it_can_parse_a_long_int_IFD_entry(self):
         bytes_ = b"foobaroo\x00\x00\x00\x2A"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _LongIfdEntry._parse_value(stream_rdr, 0, 1, None)
         assert val == 42
 
@@ -448,6 +449,6 @@ def it_can_parse_a_long_int_IFD_entry(self):
 class Describe_RationalIfdEntry(object):
     def it_can_parse_a_rational_IFD_entry(self):
         bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x54"
-        stream_rdr = StreamReader(BytesIO(bytes_), BIG_ENDIAN)
+        stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _RationalIfdEntry._parse_value(stream_rdr, None, 1, 0)
         assert val == 0.5
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
index c81a8de52..0cb769551 100644
--- a/tests/oxml/test_xmlchemy.py
+++ b/tests/oxml/test_xmlchemy.py
@@ -2,7 +2,6 @@
 
 import pytest
 
-from docx.compat import Unicode
 from docx.oxml import parse_xml, register_element_cls
 from docx.oxml.exceptions import InvalidXmlError
 from docx.oxml.ns import qn
@@ -126,7 +125,7 @@ def it_pretty_prints_an_lxml_element(self, pretty_fixture):
     def it_returns_unicode_text(self, type_fixture):
         element = type_fixture
         xml_text = serialize_for_reading(element)
-        assert isinstance(xml_text, Unicode)
+        assert isinstance(xml_text, str)
 
     # fixtures ---------------------------------------------
 

From cbf940c66b6b7c1adaab08dec6606f52bf42a7f0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 26 Sep 2023 14:52:27 -0700
Subject: [PATCH 250/367] rfctr: bulk Python 2 formatting updates

* encoding header is no longer needed
* from __future__ imports no longer needed
* make module docstrings PEP 257 compliant.
---
 features/environment.py               |   7 +-
 src/docx/api.py                       |   6 +-
 src/docx/blkcntnr.py                  |   4 -
 src/docx/dml/color.py                 |   8 +-
 src/docx/enum/__init__.py             |   8 +-
 src/docx/enum/shape.py                |   8 +-
 src/docx/enum/text.py                 |  49 ++++-----
 src/docx/exceptions.py                |   5 +-
 src/docx/image/bmp.py                 |   4 -
 src/docx/image/constants.py           |   6 +-
 src/docx/image/exceptions.py          |   6 +-
 src/docx/image/gif.py                 |   4 -
 src/docx/opc/constants.py             | 144 +++++++++++--------------
 src/docx/opc/coreprops.py             |   8 +-
 src/docx/opc/exceptions.py            |   5 +-
 src/docx/opc/pkgreader.py             |  19 ++--
 src/docx/opc/rel.py                   |   8 +-
 src/docx/oxml/coreprops.py            |  50 ++++-----
 src/docx/oxml/exceptions.py           |   6 +-
 src/docx/oxml/numbering.py            |  14 +--
 src/docx/oxml/section.py              |   6 +-
 src/docx/oxml/shape.py                |  14 +--
 src/docx/oxml/shared.py               |  16 +--
 src/docx/oxml/simpletypes.py          |  11 +-
 src/docx/oxml/styles.py               |  12 +--
 src/docx/oxml/text/paragraph.py       |  38 ++-----
 src/docx/oxml/text/parfmt.py          |  10 +-
 src/docx/oxml/text/run.py             | 118 +++++++++-----------
 src/docx/oxml/xmlchemy.py             |  33 +++---
 src/docx/package.py                   |   6 +-
 src/docx/parts/document.py            |   6 +-
 src/docx/parts/hdrftr.py              |   6 +-
 src/docx/parts/image.py               |   8 +-
 src/docx/parts/numbering.py           |   8 +-
 src/docx/parts/settings.py            |  18 ++--
 src/docx/parts/story.py               |   6 +-
 src/docx/parts/styles.py              |  18 ++--
 src/docx/settings.py                  |   6 +-
 src/docx/shared.py                    |   8 +-
 src/docx/styles/styles.py             |   6 +-
 src/docx/text/font.py                 |   8 +-
 src/docx/text/paragraph.py            |  27 +++--
 tests/opc/unitdata/types.py           |   8 +-
 tests/oxml/parts/test_document.py     |   8 +-
 tests/oxml/parts/unitdata/document.py |   6 +-
 tests/oxml/text/test_run.py           |   8 +-
 tests/oxml/unitdata/dml.py            | 150 +-------------------------
 tests/oxml/unitdata/numbering.py      |   6 +-
 tests/oxml/unitdata/section.py        |   6 +-
 tests/oxml/unitdata/shared.py         |   6 +-
 tests/oxml/unitdata/styles.py         |   6 +-
 tests/oxml/unitdata/table.py          |   6 +-
 tests/oxml/unitdata/text.py           |   6 +-
 tests/unitdata.py                     |   8 +-
 tests/unitutil/cxml.py                |  13 +--
 tests/unitutil/mock.py                |   6 +-
 56 files changed, 273 insertions(+), 728 deletions(-)

diff --git a/features/environment.py b/features/environment.py
index f180da73c..dfd2028a3 100644
--- a/features/environment.py
+++ b/features/environment.py
@@ -1,9 +1,4 @@
-# encoding: utf-8
-
-"""
-Used by behave to set testing environment before and after running acceptance
-tests.
-"""
+"""Set testing environment before and after behave acceptance test runs."""
 
 import os
 
diff --git a/src/docx/api.py b/src/docx/api.py
index 4cf6acd1b..9b496c461 100644
--- a/src/docx/api.py
+++ b/src/docx/api.py
@@ -1,13 +1,9 @@
-# encoding: utf-8
+"""Directly exposed API functions and classes, :func:`Document` for now.
 
-"""
-Directly exposed API functions and classes, :func:`Document` for now.
 Provides a syntactically more convenient API for interacting with the
 OpcPackage graph.
 """
 
-from __future__ import absolute_import, division, print_function
-
 import os
 
 from docx.opc.constants import CONTENT_TYPE as CT
diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index b4d4d8b04..9c6c506a8 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -1,13 +1,9 @@
-# encoding: utf-8
-
 """Block item container, used by body, cell, header, etc.
 
 Block level items are things like paragraph and table, although there are a few other
 specialized ones like structured document tags.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.oxml.table import CT_Tbl
 from docx.shared import Parented
 from docx.text.paragraph import Paragraph
diff --git a/src/docx/dml/color.py b/src/docx/dml/color.py
index cfdf097a4..6f00b4f99 100644
--- a/src/docx/dml/color.py
+++ b/src/docx/dml/color.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-DrawingML objects related to color, ColorFormat being the most prominent.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""DrawingML objects related to color, ColorFormat being the most prominent."""
 
 from ..enum.dml import MSO_COLOR_TYPE
 from ..oxml.simpletypes import ST_HexColorAuto
diff --git a/src/docx/enum/__init__.py b/src/docx/enum/__init__.py
index e1bbd47f2..c0ba1a5a3 100644
--- a/src/docx/enum/__init__.py
+++ b/src/docx/enum/__init__.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Enumerations used in python-docx
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Enumerations used in python-docx."""
 
 
 class Enumeration(object):
diff --git a/src/docx/enum/shape.py b/src/docx/enum/shape.py
index b785ab9c1..64221dc73 100644
--- a/src/docx/enum/shape.py
+++ b/src/docx/enum/shape.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Enumerations related to DrawingML shapes in WordprocessingML files
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Enumerations related to DrawingML shapes in WordprocessingML files."""
 
 
 class WD_INLINE_SHAPE_TYPE(object):
diff --git a/src/docx/enum/text.py b/src/docx/enum/text.py
index 8015187e4..2ccbdc522 100644
--- a/src/docx/enum/text.py
+++ b/src/docx/enum/text.py
@@ -5,17 +5,15 @@
 
 @alias("WD_ALIGN_PARAGRAPH")
 class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
-    """
-    alias: **WD_ALIGN_PARAGRAPH**
+    """Alias: **WD_ALIGN_PARAGRAPH**
 
     Specifies paragraph justification type.
 
     Example::
 
-        from docx.enum.text import WD_ALIGN_PARAGRAPH
+    from docx.enum.text import WD_ALIGN_PARAGRAPH
 
-        paragraph = document.add_paragraph()
-        paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
+    paragraph = document.add_paragraph() paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
     """
 
     __ms_name__ = "WdParagraphAlignment"
@@ -38,34 +36,32 @@ class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
             "JUSTIFY_MED",
             5,
             "mediumKashida",
-            "Justified with a medium char" "acter compression ratio.",
+            "Justified with a medium character compression ratio.",
         ),
         XmlMappedEnumMember(
             "JUSTIFY_HI",
             7,
             "highKashida",
-            "Justified with a high character" " compression ratio.",
+            "Justified with a high character compression ratio.",
         ),
         XmlMappedEnumMember(
             "JUSTIFY_LOW",
             8,
             "lowKashida",
-            "Justified with a low character " "compression ratio.",
+            "Justified with a low character compression ratio.",
         ),
         XmlMappedEnumMember(
             "THAI_JUSTIFY",
             9,
             "thaiDistribute",
-            "Justified according to Tha" "i formatting layout.",
+            "Justified according to Thai formatting layout.",
         ),
     )
 
 
 class WD_BREAK_TYPE(object):
-    """
-    Corresponds to WdBreakType enumeration
-    http://msdn.microsoft.com/en-us/library/office/ff195905.aspx
-    """
+    """Corresponds to WdBreakType enumeration http://msdn.microsoft.com/en-
+    us/library/office/ff195905.aspx."""
 
     COLUMN = 8
     LINE = 6
@@ -85,9 +81,9 @@ class WD_BREAK_TYPE(object):
 
 @alias("WD_COLOR")
 class WD_COLOR_INDEX(XmlEnumeration):
-    """
-    Specifies a standard preset color to apply. Used for font highlighting and
-    perhaps other applications.
+    """Specifies a standard preset color to apply.
+
+    Used for font highlighting and perhaps other applications.
     """
 
     __ms_name__ = "WdColorIndex"
@@ -121,15 +117,14 @@ class WD_COLOR_INDEX(XmlEnumeration):
 
 
 class WD_LINE_SPACING(XmlEnumeration):
-    """
-    Specifies a line spacing format to be applied to a paragraph.
+    """Specifies a line spacing format to be applied to a paragraph.
 
     Example::
 
-        from docx.enum.text import WD_LINE_SPACING
+    from docx.enum.text import WD_LINE_SPACING
 
-        paragraph = document.add_paragraph()
-        paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
+    paragraph = document.add_paragraph() paragraph.line_spacing_rule =
+    WD_LINE_SPACING.EXACTLY
     """
 
     __ms_name__ = "WdLineSpacing"
@@ -166,9 +161,7 @@ class WD_LINE_SPACING(XmlEnumeration):
 
 
 class WD_TAB_ALIGNMENT(XmlEnumeration):
-    """
-    Specifies the tab stop alignment to apply.
-    """
+    """Specifies the tab stop alignment to apply."""
 
     __ms_name__ = "WdTabAlignment"
 
@@ -189,9 +182,7 @@ class WD_TAB_ALIGNMENT(XmlEnumeration):
 
 
 class WD_TAB_LEADER(XmlEnumeration):
-    """
-    Specifies the character to use as the leader with formatted tabs.
-    """
+    """Specifies the character to use as the leader with formatted tabs."""
 
     __ms_name__ = "WdTabLeader"
 
@@ -208,9 +199,7 @@ class WD_TAB_LEADER(XmlEnumeration):
 
 
 class WD_UNDERLINE(XmlEnumeration):
-    """
-    Specifies the style of underline applied to a run of characters.
-    """
+    """Specifies the style of underline applied to a run of characters."""
 
     __ms_name__ = "WdUnderline"
 
diff --git a/src/docx/exceptions.py b/src/docx/exceptions.py
index 7a8b99c81..8507a1ded 100644
--- a/src/docx/exceptions.py
+++ b/src/docx/exceptions.py
@@ -1,7 +1,4 @@
-# encoding: utf-8
-
-"""
-Exceptions used with python-docx.
+"""Exceptions used with python-docx.
 
 The base exception class is PythonDocxError.
 """
diff --git a/src/docx/image/bmp.py b/src/docx/image/bmp.py
index aebc6b9cc..e4332b637 100644
--- a/src/docx/image/bmp.py
+++ b/src/docx/image/bmp.py
@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from .constants import MIME_TYPE
 from .helpers import LITTLE_ENDIAN, StreamReader
 from .image import BaseImageHeader
diff --git a/src/docx/image/constants.py b/src/docx/image/constants.py
index e4fa17fb3..5caf64eb2 100644
--- a/src/docx/image/constants.py
+++ b/src/docx/image/constants.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Constants specific the the image sub-package
-"""
+"""Constants specific the the image sub-package."""
 
 
 class JPEG_MARKER_CODE(object):
diff --git a/src/docx/image/exceptions.py b/src/docx/image/exceptions.py
index f233edc4e..9e3fab6bf 100644
--- a/src/docx/image/exceptions.py
+++ b/src/docx/image/exceptions.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Exceptions specific the the image sub-package
-"""
+"""Exceptions specific the the image sub-package."""
 
 
 class InvalidImageStreamError(Exception):
diff --git a/src/docx/image/gif.py b/src/docx/image/gif.py
index 07f2b1c77..b6b396be4 100644
--- a/src/docx/image/gif.py
+++ b/src/docx/image/gif.py
@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from struct import Struct
 
 from .constants import MIME_TYPE
diff --git a/src/docx/opc/constants.py b/src/docx/opc/constants.py
index 425435d92..48e32e0ce 100644
--- a/src/docx/opc/constants.py
+++ b/src/docx/opc/constants.py
@@ -1,32 +1,28 @@
-# encoding: utf-8
+"""Constant values related to the Open Packaging Convention.
 
-"""
-Constant values related to the Open Packaging Convention, in particular,
-content types and relationship types.
+In particular it includes content types and relationship types.
 """
 
 
 class CONTENT_TYPE(object):
-    """
-    Content type URIs (like MIME-types) that specify a part's format
-    """
+    """Content type URIs (like MIME-types) that specify a part's format."""
 
     BMP = "image/bmp"
     DML_CHART = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"
     DML_CHARTSHAPES = (
-        "application/vnd.openxmlformats-officedocument.drawingml.chartshapes" "+xml"
+        "application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml"
     )
     DML_DIAGRAM_COLORS = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramColo" "rs+xml"
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml"
     )
     DML_DIAGRAM_DATA = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramData" "+xml"
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml"
     )
     DML_DIAGRAM_LAYOUT = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramLayo" "ut+xml"
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml"
     )
     DML_DIAGRAM_STYLE = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramStyl" "e+xml"
+        "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml"
     )
     GIF = "image/gif"
     JPEG = "image/jpeg"
@@ -35,11 +31,11 @@ class CONTENT_TYPE(object):
         "application/vnd.openxmlformats-officedocument.custom-properties+xml"
     )
     OFC_CUSTOM_XML_PROPERTIES = (
-        "application/vnd.openxmlformats-officedocument.customXmlProperties+x" "ml"
+        "application/vnd.openxmlformats-officedocument.customXmlProperties+xml"
     )
     OFC_DRAWING = "application/vnd.openxmlformats-officedocument.drawing+xml"
     OFC_EXTENDED_PROPERTIES = (
-        "application/vnd.openxmlformats-officedocument.extended-properties+x" "ml"
+        "application/vnd.openxmlformats-officedocument.extended-properties+xml"
     )
     OFC_OLE_OBJECT = "application/vnd.openxmlformats-officedocument.oleObject"
     OFC_PACKAGE = "application/vnd.openxmlformats-officedocument.package"
@@ -50,17 +46,17 @@ class CONTENT_TYPE(object):
     OFC_VML_DRAWING = "application/vnd.openxmlformats-officedocument.vmlDrawing"
     OPC_CORE_PROPERTIES = "application/vnd.openxmlformats-package.core-properties+xml"
     OPC_DIGITAL_SIGNATURE_CERTIFICATE = (
-        "application/vnd.openxmlformats-package.digital-signature-certificat" "e"
+        "application/vnd.openxmlformats-package.digital-signature-certificate"
     )
     OPC_DIGITAL_SIGNATURE_ORIGIN = (
         "application/vnd.openxmlformats-package.digital-signature-origin"
     )
     OPC_DIGITAL_SIGNATURE_XMLSIGNATURE = (
-        "application/vnd.openxmlformats-package.digital-signature-xmlsignatu" "re+xml"
+        "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"
     )
     OPC_RELATIONSHIPS = "application/vnd.openxmlformats-package.relationships+xml"
     PML_COMMENTS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.commen" "ts+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.comments+xml"
     )
     PML_COMMENT_AUTHORS = (
         "application/vnd.openxmlformats-officedocument.presentationml.commen"
@@ -75,22 +71,20 @@ class CONTENT_TYPE(object):
         "aster+xml"
     )
     PML_NOTES_SLIDE = (
-        "application/vnd.openxmlformats-officedocument.presentationml.notesS" "lide+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml"
     )
     PML_PRESENTATION_MAIN = (
         "application/vnd.openxmlformats-officedocument.presentationml.presen"
         "tation.main+xml"
     )
     PML_PRES_PROPS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.presPr" "ops+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.presProps+xml"
     )
     PML_PRINTER_SETTINGS = (
         "application/vnd.openxmlformats-officedocument.presentationml.printe"
         "rSettings"
     )
-    PML_SLIDE = (
-        "application/vnd.openxmlformats-officedocument.presentationml.slide+" "xml"
-    )
+    PML_SLIDE = "application/vnd.openxmlformats-officedocument.presentationml.slide+xml"
     PML_SLIDESHOW_MAIN = (
         "application/vnd.openxmlformats-officedocument.presentationml.slides"
         "how.main+xml"
@@ -111,34 +105,32 @@ class CONTENT_TYPE(object):
         "application/vnd.openxmlformats-officedocument.presentationml.tableS"
         "tyles+xml"
     )
-    PML_TAGS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.tags+x" "ml"
-    )
+    PML_TAGS = "application/vnd.openxmlformats-officedocument.presentationml.tags+xml"
     PML_TEMPLATE_MAIN = (
         "application/vnd.openxmlformats-officedocument.presentationml.templa"
         "te.main+xml"
     )
     PML_VIEW_PROPS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.viewPr" "ops+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml"
     )
     PNG = "image/png"
     SML_CALC_CHAIN = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.calcCha" "in+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml"
     )
     SML_CHARTSHEET = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsh" "eet+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml"
     )
     SML_COMMENTS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.comment" "s+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"
     )
     SML_CONNECTIONS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.connect" "ions+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml"
     )
     SML_CUSTOM_PROPERTY = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.customP" "roperty"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.customProperty"
     )
     SML_DIALOGSHEET = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.dialogs" "heet+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml"
     )
     SML_EXTERNAL_LINK = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.externa"
@@ -153,20 +145,20 @@ class CONTENT_TYPE(object):
         "cheRecords+xml"
     )
     SML_PIVOT_TABLE = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTa" "ble+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
     )
     SML_PRINTER_SETTINGS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.printer" "Settings"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings"
     )
     SML_QUERY_TABLE = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTa" "ble+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml"
     )
     SML_REVISION_HEADERS = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.revisio"
         "nHeaders+xml"
     )
     SML_REVISION_LOG = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisio" "nLog+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml"
     )
     SML_SHARED_STRINGS = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedS"
@@ -174,18 +166,16 @@ class CONTENT_TYPE(object):
     )
     SML_SHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     SML_SHEET_MAIN = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.m" "ain+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
     )
     SML_SHEET_METADATA = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMe"
         "tadata+xml"
     )
     SML_STYLES = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+" "xml"
-    )
-    SML_TABLE = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.table+x" "ml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"
     )
+    SML_TABLE = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"
     SML_TABLE_SINGLE_CELLS = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.tableSi"
         "ngleCells+xml"
@@ -195,21 +185,21 @@ class CONTENT_TYPE(object):
         "e.main+xml"
     )
     SML_USER_NAMES = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.userNam" "es+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml"
     )
     SML_VOLATILE_DEPENDENCIES = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.volatil"
         "eDependencies+xml"
     )
     SML_WORKSHEET = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.workshe" "et+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
     )
     TIFF = "image/tiff"
     WML_COMMENTS = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.comm" "ents+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"
     )
     WML_DOCUMENT = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.docu" "ment"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
     )
     WML_DOCUMENT_GLOSSARY = (
         "application/vnd.openxmlformats-officedocument.wordprocessingml.docu"
@@ -220,21 +210,21 @@ class CONTENT_TYPE(object):
         "ment.main+xml"
     )
     WML_ENDNOTES = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.endn" "otes+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"
     )
     WML_FONT_TABLE = (
         "application/vnd.openxmlformats-officedocument.wordprocessingml.font"
         "Table+xml"
     )
     WML_FOOTER = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.foot" "er+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"
     )
     WML_FOOTNOTES = (
         "application/vnd.openxmlformats-officedocument.wordprocessingml.foot"
         "notes+xml"
     )
     WML_HEADER = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.head" "er+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"
     )
     WML_NUMBERING = (
         "application/vnd.openxmlformats-officedocument.wordprocessingml.numb"
@@ -245,10 +235,10 @@ class CONTENT_TYPE(object):
         "terSettings"
     )
     WML_SETTINGS = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.sett" "ings+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"
     )
     WML_STYLES = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.styl" "es+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"
     )
     WML_WEB_SETTINGS = (
         "application/vnd.openxmlformats-officedocument.wordprocessingml.webS"
@@ -262,10 +252,10 @@ class CONTENT_TYPE(object):
 
 
 class NAMESPACE(object):
-    """Constant values for OPC XML namespaces"""
+    """Constant values for OPC XML namespaces."""
 
     DML_WORDPROCESSING_DRAWING = (
-        "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDraw" "ing"
+        "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
     )
     OFC_RELATIONSHIPS = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
@@ -276,18 +266,16 @@ class NAMESPACE(object):
 
 
 class RELATIONSHIP_TARGET_MODE(object):
-    """Open XML relationship target modes"""
+    """Open XML relationship target modes."""
 
     EXTERNAL = "External"
     INTERNAL = "Internal"
 
 
 class RELATIONSHIP_TYPE(object):
-    AUDIO = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/audio"
-    )
+    AUDIO = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio"
     A_F_CHUNK = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/aFChunk"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk"
     )
     CALC_CHAIN = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
@@ -297,9 +285,7 @@ class RELATIONSHIP_TYPE(object):
         "http://schemas.openxmlformats.org/package/2006/relationships/digita"
         "l-signature/certificate"
     )
-    CHART = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/chart"
-    )
+    CHART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
     CHARTSHEET = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/chartsheet"
@@ -321,7 +307,7 @@ class RELATIONSHIP_TYPE(object):
         "/connections"
     )
     CONTROL = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/control"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control"
     )
     CORE_PROPERTIES = (
         "http://schemas.openxmlformats.org/package/2006/relationships/metada"
@@ -364,7 +350,7 @@ class RELATIONSHIP_TYPE(object):
         "/dialogsheet"
     )
     DRAWING = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/drawing"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
     )
     ENDNOTES = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
@@ -378,13 +364,13 @@ class RELATIONSHIP_TYPE(object):
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/externalLink"
     )
-    FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/font"
+    FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font"
     FONT_TABLE = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/fontTable"
     )
     FOOTER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/footer"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
     )
     FOOTNOTES = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
@@ -399,15 +385,13 @@ class RELATIONSHIP_TYPE(object):
         "/handoutMaster"
     )
     HEADER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/header"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"
     )
     HYPERLINK = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/hyperlink"
     )
-    IMAGE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/image"
-    )
+    IMAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
     NOTES_MASTER = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/notesMaster"
@@ -433,7 +417,7 @@ class RELATIONSHIP_TYPE(object):
         "l-signature/origin"
     )
     PACKAGE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/package"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"
     )
     PIVOT_CACHE_DEFINITION = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
@@ -483,9 +467,7 @@ class RELATIONSHIP_TYPE(object):
         "http://schemas.openxmlformats.org/package/2006/relationships/digita"
         "l-signature/signature"
     )
-    SLIDE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/slide"
-    )
+    SLIDE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide"
     SLIDE_LAYOUT = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/slideLayout"
@@ -499,11 +481,9 @@ class RELATIONSHIP_TYPE(object):
         "/slideUpdateInfo"
     )
     STYLES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/styles"
-    )
-    TABLE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/table"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
     )
+    TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
     TABLE_SINGLE_CELLS = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/tableSingleCells"
@@ -512,10 +492,8 @@ class RELATIONSHIP_TYPE(object):
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/tableStyles"
     )
-    TAGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/tags"
-    THEME = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/theme"
-    )
+    TAGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags"
+    THEME = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"
     THEME_OVERRIDE = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/themeOverride"
@@ -528,9 +506,7 @@ class RELATIONSHIP_TYPE(object):
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/usernames"
     )
-    VIDEO = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/video"
-    )
+    VIDEO = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video"
     VIEW_PROPS = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/viewProps"
@@ -552,5 +528,5 @@ class RELATIONSHIP_TYPE(object):
         "/worksheetSource"
     )
     XML_MAPS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships" "/xmlMaps"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/xmlMaps"
     )
diff --git a/src/docx/opc/coreprops.py b/src/docx/opc/coreprops.py
index 186e851df..c0434730a 100644
--- a/src/docx/opc/coreprops.py
+++ b/src/docx/opc/coreprops.py
@@ -1,11 +1,7 @@
-# encoding: utf-8
+"""Provides CoreProperties, Dublin-Core attributes of the document.
 
+These are broadly-standardized attributes like author, last-modified, etc.
 """
-The :mod:`pptx.packaging` module coheres around the concerns of reading and
-writing presentations to and from a .pptx file.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 
 class CoreProperties(object):
diff --git a/src/docx/opc/exceptions.py b/src/docx/opc/exceptions.py
index b8e6de43f..3225d6943 100644
--- a/src/docx/opc/exceptions.py
+++ b/src/docx/opc/exceptions.py
@@ -1,7 +1,4 @@
-# encoding: utf-8
-
-"""
-Exceptions specific to python-opc
+"""Exceptions specific to python-opc.
 
 The base exception class is OpcError.
 """
diff --git a/src/docx/opc/pkgreader.py b/src/docx/opc/pkgreader.py
index b5180192e..ca6849e26 100644
--- a/src/docx/opc/pkgreader.py
+++ b/src/docx/opc/pkgreader.py
@@ -1,17 +1,10 @@
-# encoding: utf-8
+"""Low-level, read-only API to a serialized Open Packaging Convention (OPC) package."""
 
-"""
-Provides a low-level, read-only API to a serialized Open Packaging Convention
-(OPC) package.
-"""
-
-from __future__ import absolute_import
-
-from .constants import RELATIONSHIP_TARGET_MODE as RTM
-from .oxml import parse_xml
-from .packuri import PACKAGE_URI, PackURI
-from .phys_pkg import PhysPkgReader
-from .shared import CaseInsensitiveDict
+from docx.opc.constants import RELATIONSHIP_TARGET_MODE as RTM
+from docx.opc.oxml import parse_xml
+from docx.opc.packuri import PACKAGE_URI, PackURI
+from docx.opc.phys_pkg import PhysPkgReader
+from docx.opc.shared import CaseInsensitiveDict
 
 
 class PackageReader(object):
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index a57d02f79..97be3f6bf 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Relationship-related objects.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Relationship-related objects."""
 
 from .oxml import CT_Relationships
 
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 7c43995fb..854b83309 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -9,12 +9,11 @@
 
 
 class CT_CoreProperties(BaseOxmlElement):
-    """
-    ``<cp:coreProperties>`` element, the root element of the Core Properties
-    part stored as ``/docProps/core.xml``. Implements many of the Dublin Core
-    document metadata elements. String elements resolve to an empty string
-    ('') if the element is not present in the XML. String elements are
-    limited in length to 255 unicode characters.
+    """`<cp:coreProperties>` element, the root element of the Core Properties part.
+
+    Stored as `/docProps/core.xml`. Implements many of the Dublin Core document metadata
+    elements. String elements resolve to an empty string ("") if the element is not
+    present in the XML. String elements are limited in length to 255 unicode characters.
     """
 
     category = ZeroOrOne("cp:category", successors=())
@@ -37,9 +36,7 @@ class CT_CoreProperties(BaseOxmlElement):
 
     @classmethod
     def new(cls):
-        """
-        Return a new ``<cp:coreProperties>`` element
-        """
+        """Return a new `<cp:coreProperties>` element."""
         xml = cls._coreProperties_tmpl
         coreProperties = parse_xml(xml)
         return coreProperties
@@ -157,7 +154,7 @@ def revision_number(self):
     @revision_number.setter
     def revision_number(self, value):
         """
-        Set revision property to string value of integer *value*.
+        Set revision property to string value of integer `value`.
         """
         if not isinstance(value, int) or value < 1:
             tmpl = "revision property requires positive int, got '%s'"
@@ -202,7 +199,7 @@ def _datetime_of_element(self, property_name):
 
     def _get_or_add(self, prop_name):
         """
-        Return element returned by 'get_or_add_' method for *prop_name*.
+        Return element returned by "get_or_add_" method for `prop_name`.
         """
         get_or_add_method_name = "get_or_add_%s" % prop_name
         get_or_add_method = getattr(self, get_or_add_method_name)
@@ -211,10 +208,9 @@ def _get_or_add(self, prop_name):
 
     @classmethod
     def _offset_dt(cls, dt, offset_str):
-        """
-        Return a |datetime| instance that is offset from datetime *dt* by
-        the timezone offset specified in *offset_str*, a string like
-        ``'-07:00'``.
+        """A |datetime| instance offset from `dt` by timezone offset in `offset_str`.
+
+        `offset_str` is like `"-07:00"`.
         """
         match = cls._offset_pattern.match(offset_str)
         if match is None:
@@ -231,11 +227,11 @@ def _offset_dt(cls, dt, offset_str):
     @classmethod
     def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
         # valid W3CDTF date cases:
-        # yyyy e.g. '2003'
-        # yyyy-mm e.g. '2003-12'
-        # yyyy-mm-dd e.g. '2003-12-31'
-        # UTC timezone e.g. '2003-12-31T10:14:55Z'
-        # numeric timezone e.g. '2003-12-31T10:14:55-08:00'
+        # yyyy e.g. "2003"
+        # yyyy-mm e.g. "2003-12"
+        # yyyy-mm-dd e.g. "2003-12-31"
+        # UTC timezone e.g. "2003-12-31T10:14:55Z"
+        # numeric timezone e.g. "2003-12-31T10:14:55-08:00"
         templates = (
             "%Y-%m-%dT%H:%M:%S",
             "%Y-%m-%d",
@@ -243,7 +239,7 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
             "%Y",
         )
         # strptime isn't smart enough to parse literal timezone offsets like
-        # '-07:30', so we have to do it ourselves
+        # "-07:30", so we have to do it ourselves
         parseable_part = w3cdtf_str[:19]
         offset_str = w3cdtf_str[19:]
         dt = None
@@ -261,7 +257,7 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
 
     def _set_element_datetime(self, prop_name, value):
         """
-        Set date/time value of child element having *prop_name* to *value*.
+        Set date/time value of child element having `prop_name` to `value`.
         """
         if not isinstance(value, datetime):
             tmpl = "property requires <type 'datetime.datetime'> object, got %s"
@@ -270,7 +266,7 @@ def _set_element_datetime(self, prop_name, value):
         dt_str = value.strftime("%Y-%m-%dT%H:%M:%SZ")
         element.text = dt_str
         if prop_name in ("created", "modified"):
-            # These two require an explicit 'xsi:type="dcterms:W3CDTF"'
+            # These two require an explicit "xsi:type="dcterms:W3CDTF""
             # attribute. The first and last line are a hack required to add
             # the xsi namespace to the root element rather than each child
             # element in which it is referenced
@@ -279,7 +275,7 @@ def _set_element_datetime(self, prop_name, value):
             del self.attrib[qn("xsi:foo")]
 
     def _set_element_text(self, prop_name, value):
-        """Set string value of *name* property to *value*."""
+        """Set string value of `name` property to `value`."""
         if not isinstance(value, str):
             value = str(value)
 
@@ -290,9 +286,9 @@ def _set_element_text(self, prop_name, value):
         element.text = value
 
     def _text_of_element(self, property_name):
-        """
-        Return the text in the element matching *property_name*, or an empty
-        string if the element is not present or contains no text.
+        """The text in the element matching `property_name`.
+
+        The empty string if the element is not present or contains no text.
         """
         element = getattr(self, property_name)
         if element is None:
diff --git a/src/docx/oxml/exceptions.py b/src/docx/oxml/exceptions.py
index 4696f1e93..ee0cff832 100644
--- a/src/docx/oxml/exceptions.py
+++ b/src/docx/oxml/exceptions.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Exceptions for oxml sub-package
-"""
+"""Exceptions for oxml sub-package."""
 
 
 class XmlchemyError(Exception):
diff --git a/src/docx/oxml/numbering.py b/src/docx/oxml/numbering.py
index d5297b2a5..6fb7e1b01 100644
--- a/src/docx/oxml/numbering.py
+++ b/src/docx/oxml/numbering.py
@@ -1,13 +1,9 @@
-# encoding: utf-8
+"""Custom element classes related to the numbering part."""
 
-"""
-Custom element classes related to the numbering part
-"""
-
-from . import OxmlElement
-from .shared import CT_DecimalNumber
-from .simpletypes import ST_DecimalNumber
-from .xmlchemy import (
+from docx.oxml import OxmlElement
+from docx.oxml.shared import CT_DecimalNumber
+from docx.oxml.simpletypes import ST_DecimalNumber
+from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OneAndOnlyOne,
     RequiredAttribute,
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index e71936774..73a928e07 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Section-related custom element classes"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Section-related custom element classes."""
 
 from copy import deepcopy
 
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index 885535c71..a66d251bf 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -1,12 +1,8 @@
-# encoding: utf-8
+"""Custom element classes for shape-related elements like `<w:inline>`."""
 
-"""
-Custom element classes for shape-related elements like ``<w:inline>``
-"""
-
-from . import parse_xml
-from .ns import nsdecls
-from .simpletypes import (
+from docx.oxml import parse_xml
+from docx.oxml.ns import nsdecls
+from docx.oxml.simpletypes import (
     ST_Coordinate,
     ST_DrawingElementId,
     ST_PositiveCoordinate,
@@ -14,7 +10,7 @@
     XsdString,
     XsdToken,
 )
-from .xmlchemy import (
+from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OneAndOnlyOne,
     OptionalAttribute,
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index 4981e9200..9ef42a023 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -1,15 +1,9 @@
-# encoding: utf-8
+"""Objects shared by modules in the docx.oxml subpackage."""
 
-"""
-Objects shared by modules in the docx.oxml subpackage.
-"""
-
-from __future__ import absolute_import
-
-from . import OxmlElement
-from .ns import qn
-from .simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
-from .xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute
+from docx.oxml import OxmlElement
+from docx.oxml.ns import qn
+from docx.oxml.simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
+from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute
 
 
 class CT_DecimalNumber(BaseOxmlElement):
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index 8fb6cb89d..56226b6da 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -1,12 +1,9 @@
-# encoding: utf-8
+"""Simple-type classes, corresponding to ST_* schema items.
 
+These provide validation and format translation for values stored in XML element
+attributes. Naming generally corresponds to the simple type in the associated XML
+schema.
 """
-Simple type classes, providing validation and format translation for values
-stored in XML element attributes. Naming generally corresponds to the simple
-type in the associated XML schema.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 from ..exceptions import InvalidXmlError
 from ..shared import Emu, Pt, RGBColor, Twips
diff --git a/src/docx/oxml/styles.py b/src/docx/oxml/styles.py
index 96b390baf..3cbb005e1 100644
--- a/src/docx/oxml/styles.py
+++ b/src/docx/oxml/styles.py
@@ -1,12 +1,8 @@
-# encoding: utf-8
+"""Custom element classes related to the styles part."""
 
-"""
-Custom element classes related to the styles part
-"""
-
-from ..enum.style import WD_STYLE_TYPE
-from .simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
-from .xmlchemy import (
+from docx.enum.style import WD_STYLE_TYPE
+from docx.oxml.simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
+from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OptionalAttribute,
     RequiredAttribute,
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index 8386420f6..e50914c2c 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -1,17 +1,11 @@
-# encoding: utf-8
+"""Custom element classes related to paragraphs (CT_P)."""
 
-"""
-Custom element classes related to paragraphs (CT_P).
-"""
-
-from ..ns import qn
-from ..xmlchemy import BaseOxmlElement, OxmlElement, ZeroOrMore, ZeroOrOne
+from docx.oxml.ns import qn
+from docx.oxml.xmlchemy import BaseOxmlElement, OxmlElement, ZeroOrMore, ZeroOrOne
 
 
 class CT_P(BaseOxmlElement):
-    """
-    ``<w:p>`` element, containing the properties and text for a paragraph.
-    """
+    """`<w:p>` element, containing the properties and text for a paragraph."""
 
     pPr = ZeroOrOne("w:pPr")
     r = ZeroOrMore("w:r")
@@ -21,19 +15,14 @@ def _insert_pPr(self, pPr):
         return pPr
 
     def add_p_before(self):
-        """
-        Return a new ``<w:p>`` element inserted directly prior to this one.
-        """
+        """Return a new `<w:p>` element inserted directly prior to this one."""
         new_p = OxmlElement("w:p")
         self.addprevious(new_p)
         return new_p
 
     @property
     def alignment(self):
-        """
-        The value of the ``<w:jc>`` grandchild element or |None| if not
-        present.
-        """
+        """The value of the `<w:jc>` grandchild element or |None| if not present."""
         pPr = self.pPr
         if pPr is None:
             return None
@@ -45,28 +34,23 @@ def alignment(self, value):
         pPr.jc_val = value
 
     def clear_content(self):
-        """
-        Remove all child elements, except the ``<w:pPr>`` element if present.
-        """
+        """Remove all child elements, except the `<w:pPr>` element if present."""
         for child in self[:]:
             if child.tag == qn("w:pPr"):
                 continue
             self.remove(child)
 
     def set_sectPr(self, sectPr):
-        """
-        Unconditionally replace or add *sectPr* as a grandchild in the
-        correct sequence.
-        """
+        """Unconditionally replace or add `sectPr` as grandchild in correct sequence."""
         pPr = self.get_or_add_pPr()
         pPr._remove_sectPr()
         pPr._insert_sectPr(sectPr)
 
     @property
     def style(self):
-        """
-        String contained in w:val attribute of ./w:pPr/w:pStyle grandchild,
-        or |None| if not present.
+        """String contained in `w:val` attribute of `./w:pPr/w:pStyle` grandchild.
+
+        |None| if not present.
         """
         pPr = self.pPr
         if pPr is None:
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index cae729d57..90f879340 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Custom element classes related to paragraph properties (CT_PPr).
-"""
+"""Custom element classes related to paragraph properties (CT_PPr)."""
 
 from ...enum.text import (
     WD_ALIGN_PARAGRAPH,
@@ -355,9 +351,7 @@ class CT_Spacing(BaseOxmlElement):
 
 
 class CT_TabStop(BaseOxmlElement):
-    """
-    ``<w:tab>`` element, representing an individual tab stop.
-    """
+    """`<w:tab>` element, representing an individual tab stop."""
 
     val = RequiredAttribute("w:val", WD_TAB_ALIGNMENT)
     leader = OptionalAttribute("w:leader", WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES)
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 3d3d3cdf6..9d930aad0 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -1,27 +1,15 @@
-# encoding: utf-8
+"""Custom element classes related to text runs (CT_R)."""
 
-"""
-Custom element classes related to text runs (CT_R).
-"""
+from docx.oxml.ns import qn
+from docx.oxml.simpletypes import ST_BrClear, ST_BrType
+from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
 
-from ..ns import qn
-from ..simpletypes import ST_BrClear, ST_BrType
-from ..xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
-
-
-class CT_Br(BaseOxmlElement):
-    """
-    ``<w:br>`` element, indicating a line, page, or column break in a run.
-    """
-
-    type = OptionalAttribute("w:type", ST_BrType)
-    clear = OptionalAttribute("w:clear", ST_BrClear)
+# ------------------------------------------------------------------------------------
+# Run-level elements
 
 
 class CT_R(BaseOxmlElement):
-    """
-    ``<w:r>`` element, containing the properties and text for a run.
-    """
+    """`<w:r>` element, containing the properties and text for a run."""
 
     rPr = ZeroOrOne("w:rPr")
     t = ZeroOrMore("w:t")
@@ -30,40 +18,32 @@ class CT_R(BaseOxmlElement):
     tab = ZeroOrMore("w:tab")
     drawing = ZeroOrMore("w:drawing")
 
-    def _insert_rPr(self, rPr):
-        self.insert(0, rPr)
-        return rPr
-
     def add_t(self, text):
-        """
-        Return a newly added ``<w:t>`` element containing *text*.
-        """
+        """Return a newly added `<w:t>` element containing `text`."""
         t = self._add_t(text=text)
         if len(text.strip()) < len(text):
             t.set(qn("xml:space"), "preserve")
         return t
 
     def add_drawing(self, inline_or_anchor):
-        """
-        Return a newly appended ``CT_Drawing`` (``<w:drawing>``) child
-        element having *inline_or_anchor* as its child.
+        """Return newly appended `CT_Drawing` (`w:drawing`) child element.
+
+        The `w:drawing` element has `inline_or_anchor` as its child.
         """
         drawing = self._add_drawing()
         drawing.append(inline_or_anchor)
         return drawing
 
     def clear_content(self):
-        """
-        Remove all child elements except the ``<w:rPr>`` element if present.
-        """
+        """Remove all child elements except a `w:rPr` element if present."""
         content_child_elms = self[1:] if self.rPr is not None else self[:]
         for child in content_child_elms:
             self.remove(child)
 
     @property
     def style(self):
-        """
-        String contained in w:val attribute of <w:rStyle> grandchild, or
+        """String contained in `w:val` attribute of `w:rStyle` grandchild.
+
         |None| if that element is not present.
         """
         rPr = self.rPr
@@ -73,18 +53,18 @@ def style(self):
 
     @style.setter
     def style(self, style):
-        """
-        Set the character style of this <w:r> element to *style*. If *style*
-        is None, remove the style element.
+        """Set character style of this `w:r` element to `style`.
+
+        If `style` is None, remove the style element.
         """
         rPr = self.get_or_add_rPr()
         rPr.style = style
 
     @property
     def text(self):
-        """
-        A string representing the textual content of this run, with content
-        child elements like ``<w:tab/>`` translated to their Python
+        """The textual content of this run.
+
+        Inner-content child elements like `w:tab` are translated to their text
         equivalent.
         """
         text = ""
@@ -103,21 +83,37 @@ def text(self, text):
         self.clear_content()
         _RunContentAppender.append_to_run_from_text(self, text)
 
+    def _insert_rPr(self, rPr):
+        self.insert(0, rPr)
+        return rPr
+
+
+# ------------------------------------------------------------------------------------
+# Run inner-content elements
+
+
+class CT_Br(BaseOxmlElement):
+    """`<w:br>` element, indicating a line, page, or column break in a run."""
+
+    type = OptionalAttribute("w:type", ST_BrType)
+    clear = OptionalAttribute("w:clear", ST_BrClear)
+
 
 class CT_Text(BaseOxmlElement):
-    """
-    ``<w:t>`` element, containing a sequence of characters within a run.
-    """
+    """`<w:t>` element, containing a sequence of characters within a run."""
+
+
+# ------------------------------------------------------------------------------------
+# Utility
 
 
 class _RunContentAppender(object):
-    """
-    Service object that knows how to translate a Python string into run
-    content elements appended to a specified ``<w:r>`` element. Contiguous
-    sequences of regular characters are appended in a single ``<w:t>``
-    element. Each tab character ('\t') causes a ``<w:tab/>`` element to be
-    appended. Likewise a newline or carriage return character ('\n', '\r')
-    causes a ``<w:cr>`` element to be appended.
+    """Translates a Python string into run content elements appended in a `w:r` element.
+
+    Contiguous sequences of regular characters are appended in a single `<w:t>` element.
+    Each tab character ('\t') causes a `<w:tab/>` element to be appended. Likewise a
+    newline or carriage return character ('\n', '\r') causes a `<w:cr>` element to be
+    appended.
     """
 
     def __init__(self, r):
@@ -126,30 +122,22 @@ def __init__(self, r):
 
     @classmethod
     def append_to_run_from_text(cls, r, text):
-        """
-        Create a "one-shot" ``_RunContentAppender`` instance and use it to
-        append the run content elements corresponding to *text* to the
-        ``<w:r>`` element *r*.
-        """
+        """Append inner-content elements for `text` to `r` element."""
         appender = cls(r)
         appender.add_text(text)
 
     def add_text(self, text):
-        """
-        Append the run content elements corresponding to *text* to the
-        ``<w:r>`` element of this instance.
-        """
+        """Append inner-content elements for `text` to the `w:r` element."""
         for char in text:
             self.add_char(char)
         self.flush()
 
     def add_char(self, char):
-        """
-        Process the next character of input through the translation finite
-        state maching (FSM). There are two possible states, buffer pending
-        and not pending, but those are hidden behind the ``.flush()`` method
-        which must be called at the end of text to ensure any pending
-        ``<w:t>`` element is written.
+        """Process next character of input through finite state maching (FSM).
+
+        There are two possible states, buffer pending and not pending, but those are
+        hidden behind the `.flush()` method which must be called at the end of text to
+        ensure any pending `<w:t>` element is written.
         """
         if char == "\t":
             self.flush()
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 11a47beae..887ffda86 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -84,9 +84,7 @@ def _parse_line(cls, line):
 
 
 class MetaOxmlElement(type):
-    """
-    Metaclass for BaseOxmlElement
-    """
+    """Metaclass for BaseOxmlElement."""
 
     def __init__(cls, clsname, bases, clsdict):
         dispatchable = (
@@ -698,9 +696,9 @@ def _remove_choice_group_method_name(self):
 
 
 class _OxmlElementBase(etree.ElementBase):
-    """
-    Effective base class for all custom element classes, to add standardized
-    behavior to all classes in one place. Actual inheritance is from
+    """Effective base class for all custom element classes.
+
+    Adds standardized behavior to all classes in one place. Actual inheritance is from
     BaseOxmlElement below, needed to manage Python 2-3 metaclass declaration
     compatibility.
     """
@@ -715,10 +713,7 @@ def __repr__(self):
         )
 
     def first_child_found_in(self, *tagnames):
-        """
-        Return the first child found with tag in *tagnames*, or None if
-        not found.
-        """
+        """First child with tag in `tagnames`, or None if not found."""
         for tagname in tagnames:
             child = self.find(qn(tagname))
             if child is not None:
@@ -734,10 +729,7 @@ def insert_element_before(self, elm, *tagnames):
         return elm
 
     def remove_all(self, *tagnames):
-        """
-        Remove all child elements whose tagname (e.g. 'a:p') appears in
-        *tagnames*.
-        """
+        """Remove child elements with tagname (e.g. "a:p") in `tagnames`."""
         for tagname in tagnames:
             matching = self.findall(qn(tagname))
             for child in matching:
@@ -745,17 +737,16 @@ def remove_all(self, *tagnames):
 
     @property
     def xml(self):
-        """
-        Return XML string for this element, suitable for testing purposes.
-        Pretty printed for readability and without an XML declaration at the
-        top.
+        """XML string for this element, suitable for testing purposes.
+
+        Pretty printed for readability and without an XML declaration at the top.
         """
         return serialize_for_reading(self)
 
     def xpath(self, xpath_str):
-        """
-        Override of ``lxml`` _Element.xpath() method to provide standard Open
-        XML namespace mapping (``nsmap``) in centralized location.
+        """Override of `lxml` _Element.xpath() method.
+
+        Provides standard Open XML namespace mapping (`nsmap`) in centralized location.
         """
         return super(BaseOxmlElement, self).xpath(xpath_str, namespaces=nsmap)
 
diff --git a/src/docx/package.py b/src/docx/package.py
index 07f0718a2..8baa6f1f1 100644
--- a/src/docx/package.py
+++ b/src/docx/package.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""WordprocessingML Package class and related objects"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""WordprocessingML Package class and related objects."""
 
 from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 59d0b7a71..0631dc36a 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""|DocumentPart| and closely related objects"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""|DocumentPart| and closely related objects."""
 
 from docx.document import Document
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
diff --git a/src/docx/parts/hdrftr.py b/src/docx/parts/hdrftr.py
index 22ea874a0..1a4522dcf 100644
--- a/src/docx/parts/hdrftr.py
+++ b/src/docx/parts/hdrftr.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Header and footer part objects"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Header and footer part objects."""
 
 import os
 
diff --git a/src/docx/parts/image.py b/src/docx/parts/image.py
index a235b465f..919548a8a 100644
--- a/src/docx/parts/image.py
+++ b/src/docx/parts/image.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-The proxy class for an image part, and related objects.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""The proxy class for an image part, and related objects."""
 
 import hashlib
 
diff --git a/src/docx/parts/numbering.py b/src/docx/parts/numbering.py
index 8bcd271a3..3eae202ab 100644
--- a/src/docx/parts/numbering.py
+++ b/src/docx/parts/numbering.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-|NumberingPart| and closely related objects
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""|NumberingPart| and closely related objects."""
 
 from ..opc.part import XmlPart
 from ..shared import lazyproperty
diff --git a/src/docx/parts/settings.py b/src/docx/parts/settings.py
index e0f751b34..f23bf459a 100644
--- a/src/docx/parts/settings.py
+++ b/src/docx/parts/settings.py
@@ -1,18 +1,12 @@
-# encoding: utf-8
-
-"""
-|SettingsPart| and closely related objects
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""|SettingsPart| and closely related objects."""
 
 import os
 
-from ..opc.constants import CONTENT_TYPE as CT
-from ..opc.packuri import PackURI
-from ..opc.part import XmlPart
-from ..oxml import parse_xml
-from ..settings import Settings
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.packuri import PackURI
+from docx.opc.part import XmlPart
+from docx.oxml import parse_xml
+from docx.settings import Settings
 
 
 class SettingsPart(XmlPart):
diff --git a/src/docx/parts/story.py b/src/docx/parts/story.py
index 49cfa396b..11ac3c60a 100644
--- a/src/docx/parts/story.py
+++ b/src/docx/parts/story.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""|BaseStoryPart| and related objects"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""|BaseStoryPart| and related objects."""
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
diff --git a/src/docx/parts/styles.py b/src/docx/parts/styles.py
index a16b4188f..c23637e54 100644
--- a/src/docx/parts/styles.py
+++ b/src/docx/parts/styles.py
@@ -1,18 +1,12 @@
-# encoding: utf-8
-
-"""
-Provides StylesPart and related objects
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Provides StylesPart and related objects."""
 
 import os
 
-from ..opc.constants import CONTENT_TYPE as CT
-from ..opc.packuri import PackURI
-from ..opc.part import XmlPart
-from ..oxml import parse_xml
-from ..styles.styles import Styles
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.packuri import PackURI
+from docx.opc.part import XmlPart
+from docx.oxml import parse_xml
+from docx.styles.styles import Styles
 
 
 class StylesPart(XmlPart):
diff --git a/src/docx/settings.py b/src/docx/settings.py
index 502c9d4db..3485e76d3 100644
--- a/src/docx/settings.py
+++ b/src/docx/settings.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Settings object, providing access to document-level settings"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Settings object, providing access to document-level settings."""
 
 from docx.shared import ElementProxy
 
diff --git a/src/docx/shared.py b/src/docx/shared.py
index ea855a21c..61d21aee8 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Objects shared by docx modules.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Objects shared by docx modules."""
 
 
 class Length(int):
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index e19e97c1c..766645a83 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Styles object, container for all objects in the styles part"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Styles object, container for all objects in the styles part."""
 
 from warnings import warn
 
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index 5a88e8af5..ecb824151 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Font-related proxy objects.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Font-related proxy objects."""
 
 from ..dml.color import ColorFormat
 from ..shared import ElementProxy
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 59dab690c..a0ff17a93 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -7,9 +7,7 @@
 
 
 class Paragraph(Parented):
-    """
-    Proxy object wrapping ``<w:p>`` element.
-    """
+    """Proxy object wrapping a `<w:p>` element."""
 
     def __init__(self, p, parent):
         super(Paragraph, self).__init__(parent)
@@ -104,18 +102,17 @@ def style(self, style_or_name):
         self._p.style = style_id
 
     @property
-    def text(self):
-        """
-        String formed by concatenating the text of each run in the paragraph.
-        Tabs and line breaks in the XML are mapped to ``\\t`` and ``\\n``
-        characters respectively.
-
-        Assigning text to this property causes all existing paragraph content
-        to be replaced with a single run containing the assigned text.
-        A ``\\t`` character in the text is mapped to a ``<w:tab/>`` element
-        and each ``\\n`` or ``\\r`` character is mapped to a line break.
-        Paragraph-level formatting, such as style, is preserved. All
-        run-level formatting, such as bold or italic, is removed.
+    def text(self) -> str:
+        """String formed by concatenating the text of each run in the paragraph.
+
+        Tabs and line breaks in the XML are mapped to ``\\t`` and ``\\n`` characters
+        respectively.
+
+        Assigning text to this property causes all existing paragraph content to be
+        replaced with a single run containing the assigned text. A ``\\t`` character in
+        the text is mapped to a ``<w:tab/>`` element and each ``\\n`` or ``\\r``
+        character is mapped to a line break. Paragraph-level formatting, such as style,
+        is preserved. All run-level formatting, such as bold or italic, is removed.
         """
         text = ""
         for run in self.runs:
diff --git a/tests/opc/unitdata/types.py b/tests/opc/unitdata/types.py
index d5b742b10..206ba74a3 100644
--- a/tests/opc/unitdata/types.py
+++ b/tests/opc/unitdata/types.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-XML test data builders for [Content_Types].xml elements
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""XML test data builders for [Content_Types].xml elements."""
 
 from docx.opc.oxml import nsmap
 
diff --git a/tests/oxml/parts/test_document.py b/tests/oxml/parts/test_document.py
index 707a0dd71..ec275941c 100644
--- a/tests/oxml/parts/test_document.py
+++ b/tests/oxml/parts/test_document.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.oxml.parts module.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Test suite for the docx.oxml.parts module."""
 
 import pytest
 
diff --git a/tests/oxml/parts/unitdata/document.py b/tests/oxml/parts/unitdata/document.py
index 6dd8efe79..36d7738b8 100644
--- a/tests/oxml/parts/unitdata/document.py
+++ b/tests/oxml/parts/unitdata/document.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for parts XML.
-"""
+"""Test data builders for parts XML."""
 
 from ....unitdata import BaseBuilder
 
diff --git a/tests/oxml/text/test_run.py b/tests/oxml/text/test_run.py
index 0dc091b26..db5ae727a 100644
--- a/tests/oxml/text/test_run.py
+++ b/tests/oxml/text/test_run.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Test suite for the docx.oxml.text.run module.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Test suite for the docx.oxml.text.run module."""
 
 import pytest
 
diff --git a/tests/oxml/unitdata/dml.py b/tests/oxml/unitdata/dml.py
index d2ba72ed7..325a3f690 100644
--- a/tests/oxml/unitdata/dml.py
+++ b/tests/oxml/unitdata/dml.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for DrawingML XML elements
-"""
+"""Test data builders for DrawingML XML elements."""
 
 from ...unitdata import BaseBuilder
 
@@ -19,12 +15,6 @@ class CT_BlipFillPropertiesBuilder(BaseBuilder):
     __attrs__ = ()
 
 
-class CT_DrawingBuilder(BaseBuilder):
-    __tag__ = "w:drawing"
-    __nspfxs__ = ("w",)
-    __attrs__ = ()
-
-
 class CT_GraphicalObjectBuilder(BaseBuilder):
     __tag__ = "a:graphic"
     __nspfxs__ = ("a",)
@@ -37,96 +27,18 @@ class CT_GraphicalObjectDataBuilder(BaseBuilder):
     __attrs__ = ("uri",)
 
 
-class CT_GraphicalObjectFrameLockingBuilder(BaseBuilder):
-    __tag__ = "a:graphicFrameLocks"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("noChangeAspect",)
-
-
 class CT_InlineBuilder(BaseBuilder):
     __tag__ = "wp:inline"
     __nspfxs__ = ("wp",)
     __attrs__ = ("distT", "distB", "distL", "distR")
 
 
-class CT_NonVisualDrawingPropsBuilder(BaseBuilder):
-    __nspfxs__ = ("wp",)
-    __attrs__ = ("id", "name", "descr", "hidden", "title")
-
-    def __init__(self, tag):
-        self.__tag__ = tag
-        super(CT_NonVisualDrawingPropsBuilder, self).__init__()
-
-
-class CT_NonVisualGraphicFramePropertiesBuilder(BaseBuilder):
-    __tag__ = "wp:cNvGraphicFramePr"
-    __nspfxs__ = ("wp",)
-    __attrs__ = ()
-
-
-class CT_NonVisualPicturePropertiesBuilder(BaseBuilder):
-    __tag__ = "pic:cNvPicPr"
-    __nspfxs__ = ("pic",)
-    __attrs__ = "preferRelativeResize"
-
-
 class CT_PictureBuilder(BaseBuilder):
     __tag__ = "pic:pic"
     __nspfxs__ = ("pic",)
     __attrs__ = ()
 
 
-class CT_PictureNonVisualBuilder(BaseBuilder):
-    __tag__ = "pic:nvPicPr"
-    __nspfxs__ = ("pic",)
-    __attrs__ = ()
-
-
-class CT_Point2DBuilder(BaseBuilder):
-    __tag__ = "a:off"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("x", "y")
-
-
-class CT_PositiveSize2DBuilder(BaseBuilder):
-    __nspfxs__ = ()
-    __attrs__ = ("cx", "cy")
-
-    def __init__(self, tag):
-        self.__tag__ = tag
-        super(CT_PositiveSize2DBuilder, self).__init__()
-
-
-class CT_PresetGeometry2DBuilder(BaseBuilder):
-    __tag__ = "a:prstGeom"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("prst",)
-
-
-class CT_RelativeRectBuilder(BaseBuilder):
-    __tag__ = "a:fillRect"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("l", "t", "r", "b")
-
-
-class CT_ShapePropertiesBuilder(BaseBuilder):
-    __tag__ = "pic:spPr"
-    __nspfxs__ = ("pic", "a")
-    __attrs__ = ("bwMode",)
-
-
-class CT_StretchInfoPropertiesBuilder(BaseBuilder):
-    __tag__ = "a:stretch"
-    __nspfxs__ = ("a",)
-    __attrs__ = ()
-
-
-class CT_Transform2DBuilder(BaseBuilder):
-    __tag__ = "a:xfrm"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("rot", "flipH", "flipV")
-
-
 def a_blip():
     return CT_BlipBuilder()
 
@@ -135,30 +47,6 @@ def a_blipFill():
     return CT_BlipFillPropertiesBuilder()
 
 
-def a_cNvGraphicFramePr():
-    return CT_NonVisualGraphicFramePropertiesBuilder()
-
-
-def a_cNvPicPr():
-    return CT_NonVisualPicturePropertiesBuilder()
-
-
-def a_cNvPr():
-    return CT_NonVisualDrawingPropsBuilder("pic:cNvPr")
-
-
-def a_docPr():
-    return CT_NonVisualDrawingPropsBuilder("wp:docPr")
-
-
-def a_drawing():
-    return CT_DrawingBuilder()
-
-
-def a_fillRect():
-    return CT_RelativeRectBuilder()
-
-
 def a_graphic():
     return CT_GraphicalObjectBuilder()
 
@@ -167,45 +55,9 @@ def a_graphicData():
     return CT_GraphicalObjectDataBuilder()
 
 
-def a_graphicFrameLocks():
-    return CT_GraphicalObjectFrameLockingBuilder()
-
-
 def a_pic():
     return CT_PictureBuilder()
 
 
-def a_prstGeom():
-    return CT_PresetGeometry2DBuilder()
-
-
-def a_stretch():
-    return CT_StretchInfoPropertiesBuilder()
-
-
-def an_ext():
-    return CT_PositiveSize2DBuilder("a:ext")
-
-
-def an_extent():
-    return CT_PositiveSize2DBuilder("wp:extent")
-
-
 def an_inline():
     return CT_InlineBuilder()
-
-
-def an_nvPicPr():
-    return CT_PictureNonVisualBuilder()
-
-
-def an_off():
-    return CT_Point2DBuilder()
-
-
-def an_spPr():
-    return CT_ShapePropertiesBuilder()
-
-
-def an_xfrm():
-    return CT_Transform2DBuilder()
diff --git a/tests/oxml/unitdata/numbering.py b/tests/oxml/unitdata/numbering.py
index 92f943fdb..386ec6117 100644
--- a/tests/oxml/unitdata/numbering.py
+++ b/tests/oxml/unitdata/numbering.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for numbering part XML elements
-"""
+"""Test data builders for numbering part XML elements."""
 
 from ...unitdata import BaseBuilder
 
diff --git a/tests/oxml/unitdata/section.py b/tests/oxml/unitdata/section.py
index 13194f4c2..397ade7db 100644
--- a/tests/oxml/unitdata/section.py
+++ b/tests/oxml/unitdata/section.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for section-related XML elements
-"""
+"""Test data builders for section-related XML elements."""
 
 from ...unitdata import BaseBuilder
 
diff --git a/tests/oxml/unitdata/shared.py b/tests/oxml/unitdata/shared.py
index a7007862e..bf67463e0 100644
--- a/tests/oxml/unitdata/shared.py
+++ b/tests/oxml/unitdata/shared.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders shared by more than one other module
-"""
+"""Test data builders shared by more than one other module."""
 
 from ...unitdata import BaseBuilder
 
diff --git a/tests/oxml/unitdata/styles.py b/tests/oxml/unitdata/styles.py
index 0411c93e6..24acd5ed2 100644
--- a/tests/oxml/unitdata/styles.py
+++ b/tests/oxml/unitdata/styles.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for styles part XML elements
-"""
+"""Test data builders for styles part XML elements."""
 
 from ...unitdata import BaseBuilder
 
diff --git a/tests/oxml/unitdata/table.py b/tests/oxml/unitdata/table.py
index 45536d49a..4f760c1a8 100644
--- a/tests/oxml/unitdata/table.py
+++ b/tests/oxml/unitdata/table.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for text XML elements
-"""
+"""Test data builders for text XML elements."""
 
 from ...unitdata import BaseBuilder
 from .shared import CT_StringBuilder
diff --git a/tests/oxml/unitdata/text.py b/tests/oxml/unitdata/text.py
index de1d984d3..8bf60bbe3 100644
--- a/tests/oxml/unitdata/text.py
+++ b/tests/oxml/unitdata/text.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Test data builders for text XML elements
-"""
+"""Test data builders for text XML elements."""
 
 from ...unitdata import BaseBuilder
 from .shared import CT_OnOffBuilder, CT_StringBuilder
diff --git a/tests/unitdata.py b/tests/unitdata.py
index 7fe0a7c12..d5939899e 100644
--- a/tests/unitdata.py
+++ b/tests/unitdata.py
@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Shared code for unit test data builders
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Shared code for unit test data builders."""
 
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index f212a4c07..cc52ecdd1 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -29,17 +29,13 @@
 
 
 def element(cxel_str):
-    """
-    Return an oxml element parsed from the XML generated from *cxel_str*.
-    """
+    """Return an oxml element parsed from the XML generated from *cxel_str*."""
     _xml = xml(cxel_str)
     return parse_xml(_xml)
 
 
 def xml(cxel_str):
-    """
-    Return the XML generated from *cxel_str*.
-    """
+    """Return the XML generated from *cxel_str*."""
     root_token = root_node.parseString(cxel_str)
     xml = root_token.element.xml
     return xml
@@ -51,10 +47,7 @@ def xml(cxel_str):
 
 
 def nsdecls(*nspfxs):
-    """
-    Return a string containing a namespace declaration for each of *nspfxs*,
-    in the order they are specified.
-    """
+    """Namespace-declaration including each of *nspfxs*, in the order specified."""
     nsdecls = ""
     for nspfx in nspfxs:
         nsdecls += ' xmlns:%s="%s"' % (nspfx, nsmap[nspfx])
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
index 4bd1fdccd..c47c22890 100644
--- a/tests/unitutil/mock.py
+++ b/tests/unitutil/mock.py
@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""Utility functions wrapping the excellent *mock* library"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""Utility functions wrapping the excellent *mock* library."""
 
 import sys
 

From e88e1d549e092afeb50cfbc49fd0bcd09b9e836e Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 27 Sep 2023 20:18:28 -0700
Subject: [PATCH 251/367] rfctr: change param ref from asterisk to backticks

Sphinx handling is actually better, not only using italic but also a
mono-width font.
---
 docs/api/document.rst                         | 30 ++++++------
 docs/api/shared.rst                           |  2 +-
 docs/dev/analysis/features/header.rst         |  8 ++--
 docs/dev/analysis/features/sections.rst       |  2 +-
 docs/dev/analysis/features/shapes/index.rst   |  4 +-
 .../features/styles/character-style.rst       |  2 +-
 docs/dev/analysis/features/styles/index.rst   |  2 +-
 .../features/styles/latent-styles.rst         |  6 +--
 docs/dev/analysis/features/styles/style.rst   |  6 +--
 .../analysis/features/table/table-props.rst   |  2 +-
 docs/dev/analysis/features/text/font.rst      |  8 ++--
 .../features/text/paragraph-format.rst        |  4 +-
 docs/user/hdrftr.rst                          | 10 ++--
 docs/user/quickstart.rst                      |  6 +--
 docs/user/sections.rst                        |  4 +-
 docs/user/shapes.rst                          |  6 +--
 docs/user/styles-understanding.rst            |  6 +--
 docs/user/text.rst                            |  6 +--
 features/steps/helpers.py                     |  4 +-
 requirements-docs.txt                         |  3 ++
 src/docx/api.py                               | 17 +++----
 src/docx/blkcntnr.py                          |  8 ++--
 src/docx/document.py                          | 22 ++++-----
 src/docx/enum/base.py                         | 10 ++--
 src/docx/image/bmp.py                         |  6 +--
 src/docx/image/gif.py                         |  2 +-
 src/docx/image/helpers.py                     | 12 ++---
 src/docx/image/image.py                       | 16 +++----
 src/docx/image/jpeg.py                        | 48 +++++++++----------
 src/docx/image/png.py                         | 22 ++++-----
 src/docx/image/tiff.py                        | 36 +++++++-------
 src/docx/opc/oxml.py                          |  4 +-
 src/docx/opc/package.py                       | 30 ++++++------
 src/docx/opc/packuri.py                       |  6 +--
 src/docx/opc/part.py                          | 20 ++++----
 src/docx/opc/phys_pkg.py                      | 18 +++----
 src/docx/opc/pkgreader.py                     | 22 ++++-----
 src/docx/opc/pkgwriter.py                     | 16 +++----
 src/docx/opc/rel.py                           | 12 ++---
 src/docx/oxml/__init__.py                     | 20 ++++----
 src/docx/oxml/document.py                     |  2 +-
 src/docx/oxml/ns.py                           |  4 +-
 src/docx/oxml/numbering.py                    | 16 +++----
 src/docx/oxml/section.py                      | 12 ++---
 src/docx/oxml/shared.py                       |  8 ++--
 src/docx/oxml/styles.py                       | 22 ++++-----
 src/docx/oxml/table.py                        | 36 +++++++-------
 src/docx/oxml/text/font.py                    |  6 +--
 src/docx/oxml/text/parfmt.py                  |  6 +--
 src/docx/oxml/xmlchemy.py                     | 28 +++++------
 src/docx/package.py                           |  8 ++--
 src/docx/parts/document.py                    | 22 ++++-----
 src/docx/parts/image.py                       |  4 +-
 src/docx/parts/story.py                       | 22 ++++-----
 src/docx/section.py                           |  2 +-
 src/docx/shared.py                            |  2 +-
 src/docx/styles/__init__.py                   |  4 +-
 src/docx/styles/latent.py                     |  2 +-
 src/docx/styles/style.py                      |  4 +-
 src/docx/styles/styles.py                     | 40 ++++++++--------
 src/docx/table.py                             | 24 +++++-----
 src/docx/text/font.py                         |  4 +-
 src/docx/text/paragraph.py                    | 10 ++--
 src/docx/text/parfmt.py                       |  8 ++--
 src/docx/text/run.py                          | 10 ++--
 src/docx/text/tabstops.py                     | 10 ++--
 tests/opc/test_packuri.py                     |  2 +-
 tests/opc/test_pkgreader.py                   |  2 +-
 tests/opc/unitdata/rels.py                    | 18 +++----
 tests/oxml/test_table.py                      |  2 +-
 tests/unitdata.py                             |  4 +-
 tests/unitutil/cxml.py                        | 10 ++--
 tests/unitutil/file.py                        | 10 ++--
 tests/unitutil/mock.py                        | 24 +++++-----
 74 files changed, 428 insertions(+), 428 deletions(-)
 create mode 100644 requirements-docs.txt

diff --git a/docs/api/document.rst b/docs/api/document.rst
index 8ab9ecfe4..42ec0211f 100644
--- a/docs/api/document.rst
+++ b/docs/api/document.rst
@@ -50,68 +50,68 @@ if that behavior is desired.
 
    .. attribute:: author
 
-      *string* -- An entity primarily responsible for making the content of the
+      `string` -- An entity primarily responsible for making the content of the
       resource.
 
    .. attribute:: category
 
-      *string* -- A categorization of the content of this package. Example
+      `string` -- A categorization of the content of this package. Example
       values might include: Resume, Letter, Financial Forecast, Proposal,
       or Technical Presentation.
 
    .. attribute:: comments
 
-      *string* -- An account of the content of the resource.
+      `string` -- An account of the content of the resource.
 
    .. attribute:: content_status
 
-      *string* -- completion status of the document, e.g. 'draft'
+      `string` -- completion status of the document, e.g. 'draft'
 
    .. attribute:: created
 
-      *datetime* -- time of intial creation of the document
+      `datetime` -- time of intial creation of the document
 
    .. attribute:: identifier
 
-      *string* -- An unambiguous reference to the resource within a given
+      `string` -- An unambiguous reference to the resource within a given
       context, e.g. ISBN.
 
    .. attribute:: keywords
 
-      *string* -- descriptive words or short phrases likely to be used as
+      `string` -- descriptive words or short phrases likely to be used as
       search terms for this document
 
    .. attribute:: language
 
-      *string* -- language the document is written in
+      `string` -- language the document is written in
 
    .. attribute:: last_modified_by
 
-      *string* -- name or other identifier (such as email address) of person
+      `string` -- name or other identifier (such as email address) of person
       who last modified the document
 
    .. attribute:: last_printed
 
-      *datetime* -- time the document was last printed
+      `datetime` -- time the document was last printed
 
    .. attribute:: modified
 
-      *datetime* -- time the document was last modified
+      `datetime` -- time the document was last modified
 
    .. attribute:: revision
 
-      *int* -- number of this revision, incremented by Word each time the
+      `int` -- number of this revision, incremented by Word each time the
       document is saved. Note however |docx| does not automatically increment
       the revision number when it saves a document.
 
    .. attribute:: subject
 
-      *string* -- The topic of the content of the resource.
+      `string` -- The topic of the content of the resource.
 
    .. attribute:: title
 
-      *string* -- The name given to the resource.
+      `string` -- The name given to the resource.
 
    .. attribute:: version
 
-      *string* -- free-form version string
+      `string` -- free-form version string
diff --git a/docs/api/shared.rst b/docs/api/shared.rst
index 215e5338c..161b8bac4 100644
--- a/docs/api/shared.rst
+++ b/docs/api/shared.rst
@@ -52,7 +52,7 @@ allowing values to be expressed in the units most appropriate to the context.
    :members:
    :undoc-members:
 
-   *r*, *g*, and *b* are each an integer in the range 0-255 inclusive. Using
+   `r`, `g`, and `b` are each an integer in the range 0-255 inclusive. Using
    the hexidecimal integer notation, e.g. `0x42` may enhance readability
    where hex RGB values are in use::
 
diff --git a/docs/dev/analysis/features/header.rst b/docs/dev/analysis/features/header.rst
index e259a2d53..1fe75f316 100644
--- a/docs/dev/analysis/features/header.rst
+++ b/docs/dev/analysis/features/header.rst
@@ -10,15 +10,15 @@ a section title or page number. Such a header is also known as a running head.
 
 A page footer is analogous in every way to a page header except that it appears at the
 bottom of a page. It should not be confused with a footnote, which is not uniform
-between pages. For brevity's sake, the term *header* is often used here to refer to what
+between pages. For brevity's sake, the term `header` is often used here to refer to what
 may be either a header or footer object, trusting the reader to understand its
 applicability to both object types.
 
 In book-printed documents, where pages are printed on both sides, when opened, the front
-or *recto* side of each page appears to the right of the bound edge and the back or
-*verso* side of each page appears on the left. The first printed page receives the
+or `recto` side of each page appears to the right of the bound edge and the back or
+`verso` side of each page appears on the left. The first printed page receives the
 page-number "1", and is always a recto page. Because pages are numbered consecutively,
-each recto page receives an *odd* page number and each verso page receives an *even*
+each recto page receives an `odd` page number and each verso page receives an `even`
 page number.
 
 The header appearing on a recto page often differs from that on a verso page. Supporting
diff --git a/docs/dev/analysis/features/sections.rst b/docs/dev/analysis/features/sections.rst
index f57c0b4bf..7f9dce91f 100644
--- a/docs/dev/analysis/features/sections.rst
+++ b/docs/dev/analysis/features/sections.rst
@@ -2,7 +2,7 @@
 Sections
 ========
 
-Word supports the notion of a *section*, having distinct page layout settings.
+Word supports the notion of a `section`, having distinct page layout settings.
 This is how, for example, a document can contain some pages in portrait layout
 and others in landscape. Section breaks are implemented completely differently
 from line, page, and column breaks. The former adds a ``<w:pPr><w:sectPr>``
diff --git a/docs/dev/analysis/features/shapes/index.rst b/docs/dev/analysis/features/shapes/index.rst
index 37b4c49f4..19e42de0e 100644
--- a/docs/dev/analysis/features/shapes/index.rst
+++ b/docs/dev/analysis/features/shapes/index.rst
@@ -2,8 +2,8 @@
 Shapes (in general)
 ===================
 
-A graphical object that appears in a Word document is known as a *shape*.
-A shape can be *inline* or *floating*. An inline shape appears on a text
+A graphical object that appears in a Word document is known as a `shape`.
+A shape can be `inline` or `floating`. An inline shape appears on a text
 baseline as though it were a character glyph and affects the line height.
 A floating shape appears at an arbitrary location on the document and text may
 wrap around it. Several types of shape can be placed, including a picture, a
diff --git a/docs/dev/analysis/features/styles/character-style.rst b/docs/dev/analysis/features/styles/character-style.rst
index d06046daa..1779872fa 100644
--- a/docs/dev/analysis/features/styles/character-style.rst
+++ b/docs/dev/analysis/features/styles/character-style.rst
@@ -62,7 +62,7 @@ A baseline regular run::
     </w:r>
   </w:p>
 
-Adding *Emphasis* character style::
+Adding `Emphasis` character style::
 
   <w:p>
     <w:r>
diff --git a/docs/dev/analysis/features/styles/index.rst b/docs/dev/analysis/features/styles/index.rst
index 3cbfcbb27..ddcec1c1b 100644
--- a/docs/dev/analysis/features/styles/index.rst
+++ b/docs/dev/analysis/features/styles/index.rst
@@ -11,7 +11,7 @@ Styles
    character-style
    latent-styles
 
-Word supports the definition of *styles* to allow a group of formatting
+Word supports the definition of `styles` to allow a group of formatting
 properties to be easily and consistently applied to a paragraph, run, table,
 or numbering scheme, all at once. The mechanism is similar to how Cascading
 Style Sheets (CSS) works with HTML.
diff --git a/docs/dev/analysis/features/styles/latent-styles.rst b/docs/dev/analysis/features/styles/latent-styles.rst
index 1423e5303..497b0b9f9 100644
--- a/docs/dev/analysis/features/styles/latent-styles.rst
+++ b/docs/dev/analysis/features/styles/latent-styles.rst
@@ -132,7 +132,7 @@ The `w:latentStyles` element used in the default Word 2011 template::
 Latent style behavior
 ---------------------
 
-* A style has two categories of attribute, *behavioral* and *formatting*.
+* A style has two categories of attribute, `behavioral` and `formatting`.
   Behavioral attributes specify where and when the style should appear in the
   user interface. Behavioral attributes can be specified for latent styles
   using the ``<w:latentStyles>`` element and its ``<w:lsdException>`` child
@@ -157,14 +157,14 @@ Latent style behavior
   value is 0 if not specified.
 
 * **semiHidden**. The `semiHidden` attribute causes the style to be excluded
-  from the recommended list. The notion of *semi* in this context is that
+  from the recommended list. The notion of `semi` in this context is that
   while the style is hidden from the recommended list, it still appears in
   the "All Styles" list. This attribute is removed on first application of
   the style if an `unhideWhenUsed` attribute set |True| is also present.
 
 * **unhideWhenUsed**. The `unhideWhenUsed` attribute causes any `semiHidden`
   attribute to be removed when the style is first applied to content. Word
-  does *not* remove the `semiHidden` attribute just because there exists an
+  does `not` remove the `semiHidden` attribute just because there exists an
   object in the document having that style. The `unhideWhenUsed` attribute is
   not removed along with the `semiHidden` attribute when the style is
   applied.
diff --git a/docs/dev/analysis/features/styles/style.rst b/docs/dev/analysis/features/styles/style.rst
index e8e3ebf5b..a00ede05d 100644
--- a/docs/dev/analysis/features/styles/style.rst
+++ b/docs/dev/analysis/features/styles/style.rst
@@ -16,7 +16,7 @@ There are six behavior properties:
 
 hidden
     Style operates to assign formatting properties, but does not appear in
-    the UI under any circumstances. Used for *internal* styles assigned by an
+    the UI under any circumstances. Used for `internal` styles assigned by an
     application that should not be under the control of an end-user.
 
 priority
@@ -98,10 +98,10 @@ semi-hidden
 -----------
 
 The `w:semiHidden` element specifies visibility of the style in the so-called
-*main* user interface. For Word, this means the style gallery and the
+`main` user interface. For Word, this means the style gallery and the
 recommended, styles-in-use, and in-current-document lists. The all-styles
 list and current-style dropdown in the styles pane would then be considered
-part of an *advanced* user interface.
+part of an `advanced` user interface.
 
 Behavior
 ~~~~~~~~
diff --git a/docs/dev/analysis/features/table/table-props.rst b/docs/dev/analysis/features/table/table-props.rst
index 8485c7bc8..73e97449e 100644
--- a/docs/dev/analysis/features/table/table-props.rst
+++ b/docs/dev/analysis/features/table/table-props.rst
@@ -23,7 +23,7 @@ a table::
 Autofit
 -------
 
-Word has two algorithms for laying out a table, *fixed-width* or *autofit*.
+Word has two algorithms for laying out a table, *fixed-width* or `autofit`.
 The default is autofit. Word will adjust column widths in an autofit table
 based on cell contents. A fixed-width table retains its column widths
 regardless of the contents. Either algorithm will adjust column widths
diff --git a/docs/dev/analysis/features/text/font.rst b/docs/dev/analysis/features/text/font.rst
index 1682b5c76..626065006 100644
--- a/docs/dev/analysis/features/text/font.rst
+++ b/docs/dev/analysis/features/text/font.rst
@@ -138,16 +138,16 @@ The semantics of the three values are as follows:
 +-------+---------------------------------------------------------------+
 | value | meaning                                                       |
 +=======+===============================================================+
-| True  | The effective value of the property is unconditionally *on*.  |
+| True  | The effective value of the property is unconditionally `on`.  |
 |       | Contrary settings in the style hierarchy have no effect.      |
 +-------+---------------------------------------------------------------+
-| False | The effective value of the property is unconditionally *off*. |
+| False | The effective value of the property is unconditionally `off`. |
 |       | Contrary settings in the style hierarchy have no effect.      |
 +-------+---------------------------------------------------------------+
 | None  | The element is not present. The effective value is            |
 |       | inherited from the style hierarchy. If no value for this      |
 |       | property is present in the style hierarchy, the effective     |
-|       | value is *off*.                                               |
+|       | value is `off`.                                               |
 +-------+---------------------------------------------------------------+
 
 
@@ -155,7 +155,7 @@ Toggle properties
 -----------------
 
 Certain of the boolean run properties are *toggle properties*. A toggle
-property is one that behaves like a *toggle* at certain places in the style
+property is one that behaves like a `toggle` at certain places in the style
 hierarchy. Toggle here means that setting the property on has the effect of
 reversing the prior setting rather than unconditionally setting the property
 on.
diff --git a/docs/dev/analysis/features/text/paragraph-format.rst b/docs/dev/analysis/features/text/paragraph-format.rst
index febc9300a..6e5398a13 100644
--- a/docs/dev/analysis/features/text/paragraph-format.rst
+++ b/docs/dev/analysis/features/text/paragraph-format.rst
@@ -10,7 +10,7 @@ spacing, space before and after, and widow/orphan control.
 Alignment (justification)
 -------------------------
 
-In Word, each paragraph has an *alignment* attribute that specifies how to
+In Word, each paragraph has an `alignment` attribute that specifies how to
 justify the lines of the paragraph when the paragraph is laid out on the
 page. Common values are left, right, centered, and justified.
 
@@ -45,7 +45,7 @@ Paragraph spacing
 
 Spacing between subsequent paragraphs is controlled by the paragraph spacing
 attributes. Spacing can be applied either before the paragraph, after it, or
-both. The concept is similar to that of *padding* or *margin* in CSS.
+both. The concept is similar to that of `padding` or `margin` in CSS.
 WordprocessingML supports paragraph spacing specified as either a length
 value or as a multiple of the line height; however only a length value is
 supported via the Word UI. Inter-paragraph spacing "overlaps", such that the
diff --git a/docs/user/hdrftr.rst b/docs/user/hdrftr.rst
index 040da7ad3..ae378536b 100644
--- a/docs/user/hdrftr.rst
+++ b/docs/user/hdrftr.rst
@@ -12,7 +12,7 @@ header is also known as a *running head*.
 
 A *page footer* is analogous in every way to a page header except that it appears at the
 bottom of a page. It should not be confused with a footnote, which is not uniform
-between pages. For brevity's sake, the term *header* is often used here to refer to what
+between pages. For brevity's sake, the term `header` is often used here to refer to what
 may be either a header or footer object, trusting the reader to understand its
 applicability to both object types.
 
@@ -20,7 +20,7 @@ applicability to both object types.
 Accessing the header for a section
 ----------------------------------
 
-Headers and footers are linked to a *section*; this allows each section to have
+Headers and footers are linked to a `section`; this allows each section to have
 a distinct header and/or footer. For example, a landscape section might have a wider
 header than a portrait section.
 
@@ -33,7 +33,7 @@ for that section::
     >>> header
     <docx.section._Header object at 0x...>
 
-A |_Header| object is *always* present on ``Section.header``, even when no header is
+A |_Header| object is `always` present on ``Section.header``, even when no header is
 defined for that section. The presence of an actual header definition is indicated by
 ``_Header.is_linked_to_previous``::
 
@@ -129,7 +129,7 @@ Here they are in a nutshell:
    ``True`` in both those cases.
 
 4. The content of a ``_Header`` object is its own content if it has a header definition.
-   If not, its content is that of the first prior section that *does* have a header
+   If not, its content is that of the first prior section that `does` have a header
    definition. If no sections have a header definition, a new one is added on the first
    section and all other sections inherit that one. This adding of a header definition
    happens the first time header content is accessed, perhaps by referencing
@@ -159,7 +159,7 @@ definition does nothing.
 Inherited content is automatically located
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Editing the content of a header edits the content of the *source* header, taking into
+Editing the content of a header edits the content of the `source` header, taking into
 account any "inheritance". So for example, if the section 2 header inherits from section
 1 and you edit the section 2 header, you actually change the contents of the section
 1 header. A new header definition is not added for section 2 unless you first explicitly
diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst
index 604fe7a2d..0d6982ee0 100644
--- a/docs/user/quickstart.rst
+++ b/docs/user/quickstart.rst
@@ -189,7 +189,7 @@ or over a network and don't want to get the filesystem involved.
 Image size
 ~~~~~~~~~~
 
-By default, the added image appears at *native* size. This is often bigger than
+By default, the added image appears at `native` size. This is often bigger than
 you want. Native size is calculated as ``pixels / dpi``. So a 300x300 pixel
 image having 300 dpi resolution appears in a one inch square. The problem is
 most images don't contain a dpi property and it defaults to 72 dpi. This would
@@ -250,7 +250,7 @@ a little about what goes on inside a paragraph. The short version is this:
    height, tabs, and so forth.
 
 #. Character-level formatting, such as bold and italic, are applied at the
-   *run* level. All content within a paragraph must be within a run, but there
+   `run` level. All content within a paragraph must be within a run, but there
    can be more than one. So a paragraph with a bold word in the middle would
    need three runs, a normal one, a bold one containing the word, and another
    normal one for the text after.
@@ -310,7 +310,7 @@ settings. In general you can think of a character style as specifying a font,
 including its typeface, size, color, bold, italic, etc.
 
 Like paragraph styles, a character style must already be defined in the
-document you open with the ``Document()`` call (*see*
+document you open with the ``Document()`` call (`see`
 :ref:`understanding_styles`).
 
 A character style can be specified when adding a new run::
diff --git a/docs/user/sections.rst b/docs/user/sections.rst
index 3fe98acd0..502ea584a 100644
--- a/docs/user/sections.rst
+++ b/docs/user/sections.rst
@@ -3,14 +3,14 @@
 Working with Sections
 =====================
 
-Word supports the notion of a *section*, a division of a document having the
+Word supports the notion of a `section`, a division of a document having the
 same page layout settings, such as margins and page orientation. This is how,
 for example, a document can contain some pages in portrait layout and others in
 landscape.
 
 Most Word documents have only the single section that comes by default and
 further, most of those have no reason to change the default margins or other
-page layout. But when you *do* need to change the page layout, you'll need
+page layout. But when you `do` need to change the page layout, you'll need
 to understand sections to get it done.
 
 
diff --git a/docs/user/shapes.rst b/docs/user/shapes.rst
index ec5d22797..5dcefbf61 100644
--- a/docs/user/shapes.rst
+++ b/docs/user/shapes.rst
@@ -2,11 +2,11 @@
 Understanding pictures and other shapes
 =======================================
 
-Conceptually, Word documents have two *layers*, a *text layer* and a *drawing
+Conceptually, Word documents have two `layers`, a *text layer* and a *drawing
 layer*. In the text layer, text objects are flowed from left to right and from
 top to bottom, starting a new page when the prior one is filled. In the drawing
-layer, drawing objects, called *shapes*, are placed at arbitrary positions.
-These are sometimes referred to as *floating* shapes.
+layer, drawing objects, called `shapes`, are placed at arbitrary positions.
+These are sometimes referred to as `floating` shapes.
 
 A picture is a shape that can appear in either the text or drawing layer. When
 it appears in the text layer it is called an *inline shape*, or more
diff --git a/docs/user/styles-understanding.rst b/docs/user/styles-understanding.rst
index e49fdea83..114b7ad6a 100644
--- a/docs/user/styles-understanding.rst
+++ b/docs/user/styles-understanding.rst
@@ -125,7 +125,7 @@ access purposes.
 A style's :attr:`style_id` is used internally to key a content object such as
 a paragraph to its style. However this value is generated automatically by
 Word and is not guaranteed to be stable across saves. In general, the style
-id is formed simply by removing spaces from the *localized* style name,
+id is formed simply by removing spaces from the `localized` style name,
 however there are exceptions. Users of |docx| should generally avoid using
 the style id unless they are confident with the internals involved.
 
@@ -155,13 +155,13 @@ Style Behavior
 --------------
 
 In addition to collecting a set of formatting properties, a style has five
-properties that specify its *behavior*. This behavior is relatively simple,
+properties that specify its `behavior`. This behavior is relatively simple,
 basically amounting to when and where the style appears in the Word or
 LibreOffice UI.
 
 The key notion to understanding style behavior is the recommended list. In
 the style pane in Word, the user can select which list of styles they want to
-see. One of these is named *Recommended* and is known as the *recommended
+see. One of these is named `Recommended` and is known as the *recommended
 list*. All five behavior properties affect some aspect of the style’s
 appearance in this list and in the style gallery.
 
diff --git a/docs/user/text.rst b/docs/user/text.rst
index 1b28feaab..f2e54f3b4 100644
--- a/docs/user/text.rst
+++ b/docs/user/text.rst
@@ -22,7 +22,7 @@ A table is also a block-level object.
 
 An inline object is a portion of the content that occurs inside a block-level
 item. An example would be a word that appears in bold or a sentence in
-all-caps. The most common inline object is a *run*. All content within
+all-caps. The most common inline object is a `run`. All content within
 a block container is inside of an inline object. Typically, a paragraph
 contains one or more runs, each of which contain some part of the paragraph's
 text.
@@ -55,7 +55,7 @@ The formatting properties of a paragraph are accessed using the
 Horizontal alignment (justification)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Also known as *justification*, the horizontal alignment of a paragraph can be
+Also known as `justification`, the horizontal alignment of a paragraph can be
 set to left, centered, right, or fully justified (aligned on both the left
 and right sides) using values from the enumeration
 :ref:`WdParagraphAlignment`::
@@ -180,7 +180,7 @@ Paragraph spacing
 The :attr:`~.ParagraphFormat.space_before` and
 :attr:`~.ParagraphFormat.space_after` properties control the spacing between
 subsequent paragraphs, controlling the spacing before and after a paragraph,
-respectively. Inter-paragraph spacing is *collapsed* during page layout,
+respectively. Inter-paragraph spacing is `collapsed` during page layout,
 meaning the spacing between two paragraphs is the maximum of the
 `space_after` for the first paragraph and the `space_before` of the second
 paragraph. Paragraph spacing is specified as a |Length| value, often using
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
index 6b4300e94..59495681f 100644
--- a/features/steps/helpers.py
+++ b/features/steps/helpers.py
@@ -26,13 +26,13 @@ def absjoin(*paths):
 
 def test_docx(name):
     """
-    Return the absolute path to test .docx file with root name *name*.
+    Return the absolute path to test .docx file with root name `name`.
     """
     return absjoin(thisdir, "test_files", "%s.docx" % name)
 
 
 def test_file(name):
     """
-    Return the absolute path to file with *name* in test_files directory
+    Return the absolute path to file with `name` in test_files directory
     """
     return absjoin(thisdir, "test_files", "%s" % name)
diff --git a/requirements-docs.txt b/requirements-docs.txt
new file mode 100644
index 000000000..357592950
--- /dev/null
+++ b/requirements-docs.txt
@@ -0,0 +1,3 @@
+Sphinx==1.8.6
+Jinja2==2.11.3
+MarkupSafe==0.23
diff --git a/src/docx/api.py b/src/docx/api.py
index 9b496c461..ab37ed608 100644
--- a/src/docx/api.py
+++ b/src/docx/api.py
@@ -1,7 +1,6 @@
 """Directly exposed API functions and classes, :func:`Document` for now.
 
-Provides a syntactically more convenient API for interacting with the
-OpcPackage graph.
+Provides a syntactically more convenient API for interacting with the OpcPackage graph.
 """
 
 import os
@@ -11,11 +10,11 @@
 
 
 def Document(docx=None):
-    """
-    Return a |Document| object loaded from *docx*, where *docx* can be
-    either a path to a ``.docx`` file (a string) or a file-like object. If
-    *docx* is missing or ``None``, the built-in default document "template"
-    is loaded.
+    """Return a |Document| object loaded from `docx`, where `docx` can be either a path
+    to a ``.docx`` file (a string) or a file-like object.
+
+    If `docx` is missing or ``None``, the built-in default document "template" is
+    loaded.
     """
     docx = _default_docx_path() if docx is None else docx
     document_part = Package.open(docx).main_document_part
@@ -26,8 +25,6 @@ def Document(docx=None):
 
 
 def _default_docx_path():
-    """
-    Return the path to the built-in default .docx package.
-    """
+    """Return the path to the built-in default .docx package."""
     _thisdir = os.path.split(__file__)[0]
     return os.path.join(_thisdir, "templates", "default.docx")
diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index 9c6c506a8..f0000d226 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -24,8 +24,8 @@ def __init__(self, element, parent):
     def add_paragraph(self, text="", style=None):
         """
         Return a paragraph newly added to the end of the content in this
-        container, having *text* in a single run if present, and having
-        paragraph style *style*. If *style* is |None|, no paragraph style is
+        container, having `text` in a single run if present, and having
+        paragraph style `style`. If `style` is |None|, no paragraph style is
         applied, which has the same effect as applying the 'Normal' style.
         """
         paragraph = self._add_paragraph()
@@ -37,8 +37,8 @@ def add_paragraph(self, text="", style=None):
 
     def add_table(self, rows, cols, width):
         """
-        Return a table of *width* having *rows* rows and *cols* columns,
-        newly appended to the content in this container. *width* is evenly
+        Return a table of `width` having `rows` rows and `cols` columns,
+        newly appended to the content in this container. `width` is evenly
         distributed between the table columns.
         """
         from .table import Table
diff --git a/src/docx/document.py b/src/docx/document.py
index e47bfc816..327edbe25 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -24,10 +24,10 @@ def __init__(self, element, part):
     def add_heading(self, text="", level=1):
         """Return a heading paragraph newly added to the end of the document.
 
-        The heading paragraph will contain *text* and have its paragraph style
-        determined by *level*. If *level* is 0, the style is set to `Title`. If *level*
+        The heading paragraph will contain `text` and have its paragraph style
+        determined by `level`. If `level` is 0, the style is set to `Title`. If `level`
         is 1 (or omitted), `Heading 1` is used. Otherwise the style is set to `Heading
-        {level}`. Raises |ValueError| if *level* is outside the range 0-9.
+        {level}`. Raises |ValueError| if `level` is outside the range 0-9.
         """
         if not 0 <= level <= 9:
             raise ValueError("level must be in range 0-9, got %d" % level)
@@ -43,9 +43,9 @@ def add_page_break(self):
     def add_paragraph(self, text="", style=None):
         """
         Return a paragraph newly added to the end of the document, populated
-        with *text* and having paragraph style *style*. *text* can contain
+        with `text` and having paragraph style `style`. `text` can contain
         tab (``\\t``) characters, which are converted to the appropriate XML
-        form for a tab. *text* can also include newline (``\\n``) or carriage
+        form for a tab. `text` can also include newline (``\\n``) or carriage
         return (``\\r``) characters, each of which is converted to a line
         break.
         """
@@ -55,7 +55,7 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         """
         Return a new picture shape added in its own paragraph at the end of
         the document. The picture contains the image at
-        *image_path_or_stream*, scaled based on *width* and *height*. If
+        `image_path_or_stream`, scaled based on `width` and `height`. If
         neither width nor height is specified, the picture appears at its
         native size. If only one is specified, it is used to compute
         a scaling factor that is then applied to the unspecified dimension,
@@ -70,7 +70,7 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         """
         Return a |Section| object representing a new section added at the end
-        of the document. The optional *start_type* argument must be a member
+        of the document. The optional `start_type` argument must be a member
         of the :ref:`WdSectionStart` enumeration, and defaults to
         ``WD_SECTION.NEW_PAGE`` if not provided.
         """
@@ -80,9 +80,9 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
 
     def add_table(self, rows, cols, style=None):
         """
-        Add a table having row and column counts of *rows* and *cols*
-        respectively and table style of *style*. *style* may be a paragraph
-        style object or a paragraph style name. If *style* is |None|, the
+        Add a table having row and column counts of `rows` and `cols`
+        respectively and table style of `style`. `style` may be a paragraph
+        style object or a paragraph style name. If `style` is |None|, the
         table inherits the default table style of the document.
         """
         table = self._body.add_table(rows, cols, self._block_width)
@@ -125,7 +125,7 @@ def part(self):
 
     def save(self, path_or_stream):
         """
-        Save this document to *path_or_stream*, which can be either a path to
+        Save this document to `path_or_stream`, which can be either a path to
         a filesystem location (a string) or a file-like object.
         """
         self._part.save(path_or_stream)
diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index fae7c9aff..6192f3cb4 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -163,7 +163,7 @@ class EnumerationBase(object):
     @classmethod
     def validate(cls, value):
         """
-        Raise |ValueError| if *value* is not an assignable value.
+        Raise |ValueError| if `value` is not an assignable value.
         """
         if value not in cls._valid_settings:
             raise ValueError(
@@ -187,7 +187,7 @@ class XmlEnumeration(Enumeration):
     def from_xml(cls, xml_val):
         """
         Return the enumeration member corresponding to the XML value
-        *xml_val*.
+        `xml_val`.
         """
         if xml_val not in cls._xml_to_member:
             raise InvalidXmlError(
@@ -198,7 +198,7 @@ def from_xml(cls, xml_val):
     @classmethod
     def to_xml(cls, enum_val):
         """
-        Return the XML value of the enumeration value *enum_val*.
+        Return the XML value of the enumeration value `enum_val`.
         """
         if enum_val not in cls._member_to_xml:
             raise ValueError(
@@ -222,7 +222,7 @@ def __init__(self, name, value, docstring):
 
     def add_to_enum(self, clsdict):
         """
-        Add a name to *clsdict* for this member.
+        Add a name to `clsdict` for this member.
         """
         self.register_name(clsdict)
 
@@ -245,7 +245,7 @@ def name(self):
 
     def register_name(self, clsdict):
         """
-        Add a member name to the class dict *clsdict* containing the value of
+        Add a member name to the class dict `clsdict` containing the value of
         this member object. Where the name of this object is None, do
         nothing; this allows out-of-band values to be defined without adding
         a name to the class dict.
diff --git a/src/docx/image/bmp.py b/src/docx/image/bmp.py
index e4332b637..c420b1898 100644
--- a/src/docx/image/bmp.py
+++ b/src/docx/image/bmp.py
@@ -12,7 +12,7 @@ class Bmp(BaseImageHeader):
     def from_stream(cls, stream):
         """
         Return |Bmp| instance having header properties parsed from the BMP
-        image in *stream*.
+        image in `stream`.
         """
         stream_rdr = StreamReader(stream, LITTLE_ENDIAN)
 
@@ -45,8 +45,8 @@ def default_ext(self):
     @staticmethod
     def _dpi(px_per_meter):
         """
-        Return the integer pixels per inch from *px_per_meter*, defaulting to
-        96 if *px_per_meter* is zero.
+        Return the integer pixels per inch from `px_per_meter`, defaulting to
+        96 if `px_per_meter` is zero.
         """
         if px_per_meter == 0:
             return 96
diff --git a/src/docx/image/gif.py b/src/docx/image/gif.py
index b6b396be4..7ff53d306 100644
--- a/src/docx/image/gif.py
+++ b/src/docx/image/gif.py
@@ -15,7 +15,7 @@ class Gif(BaseImageHeader):
     def from_stream(cls, stream):
         """
         Return |Gif| instance having header properties parsed from GIF image
-        in *stream*.
+        in `stream`.
         """
         px_width, px_height = cls._dimensions_from_stream(stream)
         return cls(px_width, px_height, 72, 72)
diff --git a/src/docx/image/helpers.py b/src/docx/image/helpers.py
index c98795657..df0946d02 100644
--- a/src/docx/image/helpers.py
+++ b/src/docx/image/helpers.py
@@ -9,7 +9,7 @@
 class StreamReader(object):
     """
     Wraps a file-like object to provide access to structured data from a
-    binary file. Byte-order is configurable. *base_offset* is added to any
+    binary file. Byte-order is configurable. `base_offset` is added to any
     base value provided to calculate actual location for reads.
     """
 
@@ -28,7 +28,7 @@ def read(self, count):
     def read_byte(self, base, offset=0):
         """
         Return the int value of the byte at the file position defined by
-        self._base_offset + *base* + *offset*. If *base* is None, the byte is
+        self._base_offset + `base` + `offset`. If `base` is None, the byte is
         read from the current position in the stream.
         """
         fmt = "B"
@@ -37,7 +37,7 @@ def read_byte(self, base, offset=0):
     def read_long(self, base, offset=0):
         """
         Return the int value of the four bytes at the file position defined by
-        self._base_offset + *base* + *offset*. If *base* is None, the long is
+        self._base_offset + `base` + `offset`. If `base` is None, the long is
         read from the current position in the stream. The endian setting of
         this instance is used to interpret the byte layout of the long.
         """
@@ -47,15 +47,15 @@ def read_long(self, base, offset=0):
     def read_short(self, base, offset=0):
         """
         Return the int value of the two bytes at the file position determined
-        by *base* and *offset*, similarly to ``read_long()`` above.
+        by `base` and `offset`, similarly to ``read_long()`` above.
         """
         fmt = b"<H" if self._byte_order is LITTLE_ENDIAN else b">H"
         return self._read_int(fmt, base, offset)
 
     def read_str(self, char_count, base, offset=0):
         """
-        Return a string containing the *char_count* bytes at the file
-        position determined by self._base_offset + *base* + *offset*.
+        Return a string containing the `char_count` bytes at the file
+        position determined by self._base_offset + `base` + `offset`.
         """
 
         def str_struct(char_count):
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 530a90f8f..7f5911240 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -28,7 +28,7 @@ def __init__(self, blob, filename, image_header):
     def from_blob(cls, blob):
         """
         Return a new |Image| subclass instance parsed from the image binary
-        contained in *blob*.
+        contained in `blob`.
         """
         stream = io.BytesIO(blob)
         return cls._from_stream(stream, blob)
@@ -37,7 +37,7 @@ def from_blob(cls, blob):
     def from_file(cls, image_descriptor):
         """
         Return a new |Image| subclass instance loaded from the image file
-        identified by *image_descriptor*, a path or file-like object.
+        identified by `image_descriptor`, a path or file-like object.
         """
         if isinstance(image_descriptor, str):
             path = image_descriptor
@@ -134,12 +134,12 @@ def height(self):
     def scaled_dimensions(self, width=None, height=None):
         """
         Return a (cx, cy) 2-tuple representing the native dimensions of this
-        image scaled by applying the following rules to *width* and *height*.
-        If both *width* and *height* are specified, the return value is
-        (*width*, *height*); no scaling is performed. If only one is
+        image scaled by applying the following rules to `width` and `height`.
+        If both `width` and `height` are specified, the return value is
+        (`width`, `height`); no scaling is performed. If only one is
         specified, it is used to compute a scaling factor that is then
         applied to the unspecified dimension, preserving the aspect ratio of
-        the image. If both *width* and *height* are |None|, the native
+        the image. If both `width` and `height` are |None|, the native
         dimensions are returned. The native dimensions are calculated using
         the dots-per-inch (dpi) value embedded in the image, defaulting to 72
         dpi if no value is specified, as is often the case. The returned
@@ -169,7 +169,7 @@ def sha1(self):
     def _from_stream(cls, stream, blob, filename=None):
         """
         Return an instance of the |Image| subclass corresponding to the
-        format of the image in *stream*.
+        format of the image in `stream`.
         """
         image_header = _ImageHeaderFactory(stream)
         if filename is None:
@@ -180,7 +180,7 @@ def _from_stream(cls, stream, blob, filename=None):
 def _ImageHeaderFactory(stream):
     """
     Return a |BaseImageHeader| subclass instance that knows how to parse the
-    headers of the image in *stream*.
+    headers of the image in `stream`.
     """
     from docx.image import SIGNATURES
 
diff --git a/src/docx/image/jpeg.py b/src/docx/image/jpeg.py
index 6a9db9438..23f90c5bc 100644
--- a/src/docx/image/jpeg.py
+++ b/src/docx/image/jpeg.py
@@ -41,7 +41,7 @@ class Exif(Jpeg):
     def from_stream(cls, stream):
         """
         Return |Exif| instance having header properties parsed from Exif
-        image in *stream*.
+        image in `stream`.
         """
         markers = _JfifMarkers.from_stream(stream)
         # print('\n%s' % markers)
@@ -63,7 +63,7 @@ class Jfif(Jpeg):
     def from_stream(cls, stream):
         """
         Return a |Jfif| instance having header properties parsed from image
-        in *stream*.
+        in `stream`.
         """
         markers = _JfifMarkers.from_stream(stream)
 
@@ -110,7 +110,7 @@ def __str__(self):  # pragma: no cover
     def from_stream(cls, stream):
         """
         Return a |_JfifMarkers| instance containing a |_JfifMarker| subclass
-        instance for each marker in *stream*.
+        instance for each marker in `stream`.
         """
         marker_parser = _MarkerParser.from_stream(stream)
         markers = []
@@ -165,7 +165,7 @@ def __init__(self, stream_reader):
     def from_stream(cls, stream):
         """
         Return a |_MarkerParser| instance to parse JFIF markers from
-        *stream*.
+        `stream`.
         """
         stream_reader = StreamReader(stream, BIG_ENDIAN)
         return cls(stream_reader)
@@ -173,7 +173,7 @@ def from_stream(cls, stream):
     def iter_markers(self):
         """
         Generate a (marker_code, segment_offset) 2-tuple for each marker in
-        the JPEG *stream*, in the order they occur in the stream.
+        the JPEG `stream`, in the order they occur in the stream.
         """
         marker_finder = _MarkerFinder.from_stream(self._stream)
         start = 0
@@ -197,15 +197,15 @@ def __init__(self, stream):
     @classmethod
     def from_stream(cls, stream):
         """
-        Return a |_MarkerFinder| instance to find JFIF markers in *stream*.
+        Return a |_MarkerFinder| instance to find JFIF markers in `stream`.
         """
         return cls(stream)
 
     def next(self, start):
         """
         Return a (marker_code, segment_offset) 2-tuple identifying and
-        locating the first marker in *stream* occuring after offset *start*.
-        The returned *segment_offset* points to the position immediately
+        locating the first marker in `stream` occuring after offset `start`.
+        The returned `segment_offset` points to the position immediately
         following the 2-byte marker code, the start of the marker segment,
         for those markers that have a segment.
         """
@@ -225,9 +225,9 @@ def next(self, start):
 
     def _next_non_ff_byte(self, start):
         """
-        Return an offset, byte 2-tuple for the next byte in *stream* that is
-        not '\xFF', starting with the byte at offset *start*. If the byte at
-        offset *start* is not '\xFF', *start* and the returned *offset* will
+        Return an offset, byte 2-tuple for the next byte in `stream` that is
+        not '\xFF', starting with the byte at offset `start`. If the byte at
+        offset `start` is not '\xFF', `start` and the returned `offset` will
         be the same.
         """
         self._stream.seek(start)
@@ -239,8 +239,8 @@ def _next_non_ff_byte(self, start):
 
     def _offset_of_next_ff_byte(self, start):
         """
-        Return the offset of the next '\xFF' byte in *stream* starting with
-        the byte at offset *start*. Returns *start* if the byte at that
+        Return the offset of the next '\xFF' byte in `stream` starting with
+        the byte at offset `start`. Returns `start` if the byte at that
         offset is a hex 255; it does not necessarily advance in the stream.
         """
         self._stream.seek(start)
@@ -263,8 +263,8 @@ def _read_byte(self):
 
 def _MarkerFactory(marker_code, stream, offset):
     """
-    Return |_Marker| or subclass instance appropriate for marker at *offset*
-    in *stream* having *marker_code*.
+    Return |_Marker| or subclass instance appropriate for marker at `offset`
+    in `stream` having `marker_code`.
     """
     if marker_code == JPEG_MARKER_CODE.APP0:
         marker_cls = _App0Marker
@@ -292,8 +292,8 @@ def __init__(self, marker_code, offset, segment_length):
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
         """
-        Return a generic |_Marker| instance for the marker at *offset* in
-        *stream* having *marker_code*.
+        Return a generic |_Marker| instance for the marker at `offset` in
+        `stream` having `marker_code`.
         """
         if JPEG_MARKER_CODE.is_standalone(marker_code):
             segment_length = 0
@@ -356,7 +356,7 @@ def vert_dpi(self):
 
     def _dpi(self, density):
         """
-        Return dots per inch corresponding to *density* value.
+        Return dots per inch corresponding to `density` value.
         """
         if self._density_units == 1:
             dpi = density
@@ -369,8 +369,8 @@ def _dpi(self, density):
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
         """
-        Return an |_App0Marker| instance for the APP0 marker at *offset* in
-        *stream*.
+        Return an |_App0Marker| instance for the APP0 marker at `offset` in
+        `stream`.
         """
         # field               off  type   notes
         # ------------------  ---  -----  -------------------
@@ -405,7 +405,7 @@ def __init__(self, marker_code, offset, length, horz_dpi, vert_dpi):
     def from_stream(cls, stream, marker_code, offset):
         """
         Extract the horizontal and vertical dots-per-inch value from the APP1
-        header at *offset* in *stream*.
+        header at `offset` in `stream`.
         """
         # field                 off  len  type   notes
         # --------------------  ---  ---  -----  ----------------------------
@@ -440,7 +440,7 @@ def vert_dpi(self):
     @classmethod
     def _is_non_Exif_APP1_segment(cls, stream, offset):
         """
-        Return True if the APP1 segment at *offset* in *stream* is NOT an
+        Return True if the APP1 segment at `offset` in `stream` is NOT an
         Exif segment, as determined by the ``'Exif\x00\x00'`` signature at
         offset 2 in the segment.
         """
@@ -452,7 +452,7 @@ def _is_non_Exif_APP1_segment(cls, stream, offset):
     def _tiff_from_exif_segment(cls, stream, offset, segment_length):
         """
         Return a |Tiff| instance parsed from the Exif APP1 segment of
-        *segment_length* at *offset* in *stream*.
+        `segment_length` at `offset` in `stream`.
         """
         # wrap full segment in its own stream and feed to Tiff()
         stream.seek(offset + 8)
@@ -474,7 +474,7 @@ def __init__(self, marker_code, offset, segment_length, px_width, px_height):
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
         """
-        Return an |_SofMarker| instance for the SOFn marker at *offset* in
+        Return an |_SofMarker| instance for the SOFn marker at `offset` in
         stream.
         """
         # field                 off  type   notes
diff --git a/src/docx/image/png.py b/src/docx/image/png.py
index 72f2ec83a..842a0752f 100644
--- a/src/docx/image/png.py
+++ b/src/docx/image/png.py
@@ -28,7 +28,7 @@ def default_ext(self):
     def from_stream(cls, stream):
         """
         Return a |Png| instance having header properties parsed from image in
-        *stream*.
+        `stream`.
         """
         parser = _PngParser.parse(stream)
 
@@ -54,7 +54,7 @@ def __init__(self, chunks):
     def parse(cls, stream):
         """
         Return a |_PngParser| instance containing the header properties
-        parsed from the PNG image in *stream*.
+        parsed from the PNG image in `stream`.
         """
         chunks = _Chunks.from_stream(stream)
         return cls(chunks)
@@ -100,8 +100,8 @@ def vert_dpi(self):
     @staticmethod
     def _dpi(units_specifier, px_per_unit):
         """
-        Return dots per inch value calculated from *units_specifier* and
-        *px_per_unit*.
+        Return dots per inch value calculated from `units_specifier` and
+        `px_per_unit`.
         """
         if units_specifier == 1 and px_per_unit:
             return int(round(px_per_unit * 0.0254))
@@ -120,7 +120,7 @@ def __init__(self, chunk_iterable):
     @classmethod
     def from_stream(cls, stream):
         """
-        Return a |_Chunks| instance containing the PNG chunks in *stream*.
+        Return a |_Chunks| instance containing the PNG chunks in `stream`.
         """
         chunk_parser = _ChunkParser.from_stream(stream)
         chunks = list(chunk_parser.iter_chunks())
@@ -148,7 +148,7 @@ def pHYs(self):
     def _find_first(self, match):
         """
         Return first chunk in stream order returning True for function
-        *match*.
+        `match`.
         """
         for chunk in self._chunks:
             if match(chunk):
@@ -169,7 +169,7 @@ def __init__(self, stream_rdr):
     def from_stream(cls, stream):
         """
         Return a |_ChunkParser| instance that can extract the chunks from the
-        PNG image in *stream*.
+        PNG image in `stream`.
         """
         stream_rdr = StreamReader(stream, BIG_ENDIAN)
         return cls(stream_rdr)
@@ -203,8 +203,8 @@ def _iter_chunk_offsets(self):
 
 def _ChunkFactory(chunk_type, stream_rdr, offset):
     """
-    Return a |_Chunk| subclass instance appropriate to *chunk_type* parsed
-    from *stream_rdr* at *offset*.
+    Return a |_Chunk| subclass instance appropriate to `chunk_type` parsed
+    from `stream_rdr` at `offset`.
     """
     chunk_cls_map = {
         PNG_CHUNK_TYPE.IHDR: _IHDRChunk,
@@ -253,7 +253,7 @@ def __init__(self, chunk_type, px_width, px_height):
     def from_offset(cls, chunk_type, stream_rdr, offset):
         """
         Return an _IHDRChunk instance containing the image dimensions
-        extracted from the IHDR chunk in *stream* at *offset*.
+        extracted from the IHDR chunk in `stream` at `offset`.
         """
         px_width = stream_rdr.read_long(offset)
         px_height = stream_rdr.read_long(offset, 4)
@@ -283,7 +283,7 @@ def __init__(self, chunk_type, horz_px_per_unit, vert_px_per_unit, units_specifi
     def from_offset(cls, chunk_type, stream_rdr, offset):
         """
         Return a _pHYsChunk instance containing the image resolution
-        extracted from the pHYs chunk in *stream* at *offset*.
+        extracted from the pHYs chunk in `stream` at `offset`.
         """
         horz_px_per_unit = stream_rdr.read_long(offset)
         vert_px_per_unit = stream_rdr.read_long(offset, 4)
diff --git a/src/docx/image/tiff.py b/src/docx/image/tiff.py
index 1aca7a0e8..42d3fb11d 100644
--- a/src/docx/image/tiff.py
+++ b/src/docx/image/tiff.py
@@ -28,7 +28,7 @@ def default_ext(self):
     def from_stream(cls, stream):
         """
         Return a |Tiff| instance containing the properties of the TIFF image
-        in *stream*.
+        in `stream`.
         """
         parser = _TiffParser.parse(stream)
 
@@ -54,7 +54,7 @@ def __init__(self, ifd_entries):
     def parse(cls, stream):
         """
         Return an instance of |_TiffParser| containing the properties parsed
-        from the TIFF image in *stream*.
+        from the TIFF image in `stream`.
         """
         stream_rdr = cls._make_stream_reader(stream)
         ifd0_offset = stream_rdr.read_long(4)
@@ -101,7 +101,7 @@ def px_width(self):
     def _detect_endian(cls, stream):
         """
         Return either BIG_ENDIAN or LITTLE_ENDIAN depending on the endian
-        indicator found in the TIFF *stream* header, either 'MM' or 'II'.
+        indicator found in the TIFF `stream` header, either 'MM' or 'II'.
         """
         stream.seek(0)
         endian_str = stream.read(2)
@@ -109,7 +109,7 @@ def _detect_endian(cls, stream):
 
     def _dpi(self, resolution_tag):
         """
-        Return the dpi value calculated for *resolution_tag*, which can be
+        Return the dpi value calculated for `resolution_tag`, which can be
         either TIFF_TAG.X_RESOLUTION or TIFF_TAG.Y_RESOLUTION. The
         calculation is based on the values of both that tag and the
         TIFF_TAG.RESOLUTION_UNIT tag in this parser's |_IfdEntries| instance.
@@ -136,7 +136,7 @@ def _dpi(self, resolution_tag):
     @classmethod
     def _make_stream_reader(cls, stream):
         """
-        Return a |StreamReader| instance with wrapping *stream* and having
+        Return a |StreamReader| instance with wrapping `stream` and having
         "endian-ness" determined by the 'MM' or 'II' indicator in the TIFF
         stream header.
         """
@@ -169,8 +169,8 @@ def __getitem__(self, key):
     @classmethod
     def from_stream(cls, stream, offset):
         """
-        Return a new |_IfdEntries| instance parsed from *stream* starting at
-        *offset*.
+        Return a new |_IfdEntries| instance parsed from `stream` starting at
+        `offset`.
         """
         ifd_parser = _IfdParser(stream, offset)
         entries = {e.tag: e.value for e in ifd_parser.iter_entries()}
@@ -178,8 +178,8 @@ def from_stream(cls, stream, offset):
 
     def get(self, tag_code, default=None):
         """
-        Return value of IFD entry having tag matching *tag_code*, or
-        *default* if no matching tag found.
+        Return value of IFD entry having tag matching `tag_code`, or
+        `default` if no matching tag found.
         """
         return self._entries.get(tag_code, default)
 
@@ -216,7 +216,7 @@ def _entry_count(self):
 def _IfdEntryFactory(stream_rdr, offset):
     """
     Return an |_IfdEntry| subclass instance containing the value of the
-    directory entry at *offset* in *stream_rdr*.
+    directory entry at `offset` in `stream_rdr`.
     """
     ifd_entry_classes = {
         TIFF_FLD.ASCII: _AsciiIfdEntry,
@@ -244,7 +244,7 @@ def __init__(self, tag_code, value):
     def from_stream(cls, stream_rdr, offset):
         """
         Return an |_IfdEntry| subclass instance containing the tag and value
-        of the tag parsed from *stream_rdr* at *offset*. Note this method is
+        of the tag parsed from `stream_rdr` at `offset`. Note this method is
         common to all subclasses. Override the ``_parse_value()`` method to
         provide distinctive behavior based on field type.
         """
@@ -257,7 +257,7 @@ def from_stream(cls, stream_rdr, offset):
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
-        Return the value of this field parsed from *stream_rdr* at *offset*.
+        Return the value of this field parsed from `stream_rdr` at `offset`.
         Intended to be overridden by subclasses.
         """
         return "UNIMPLEMENTED FIELD TYPE"  # pragma: no cover
@@ -285,9 +285,9 @@ class _AsciiIfdEntry(_IfdEntry):
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
-        Return the ASCII string parsed from *stream_rdr* at *value_offset*.
+        Return the ASCII string parsed from `stream_rdr` at `value_offset`.
         The length of the string, including a terminating '\x00' (NUL)
-        character, is in *value_count*.
+        character, is in `value_count`.
         """
         return stream_rdr.read_str(value_count - 1, value_offset)
 
@@ -300,7 +300,7 @@ class _ShortIfdEntry(_IfdEntry):
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
-        Return the short int value contained in the *value_offset* field of
+        Return the short int value contained in the `value_offset` field of
         this entry. Only supports single values at present.
         """
         if value_count == 1:
@@ -317,7 +317,7 @@ class _LongIfdEntry(_IfdEntry):
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
-        Return the long int value contained in the *value_offset* field of
+        Return the long int value contained in the `value_offset` field of
         this entry. Only supports single values at present.
         """
         if value_count == 1:
@@ -334,8 +334,8 @@ class _RationalIfdEntry(_IfdEntry):
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
         """
-        Return the rational (numerator / denominator) value at *value_offset*
-        in *stream_rdr* as a floating-point number. Only supports single
+        Return the rational (numerator / denominator) value at `value_offset`
+        in `stream_rdr` as a floating-point number. Only supports single
         values at present.
         """
         if value_count == 1:
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index b09a6d7a4..408fe5af6 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -47,7 +47,7 @@ def qn(tag):
 
 def serialize_part_xml(part_elm):
     """
-    Serialize *part_elm* etree element to XML suitable for storage as an XML
+    Serialize `part_elm` etree element to XML suitable for storage as an XML
     part. That is to say, no insignificant whitespace added for readability,
     and an appropriate XML declaration added with UTF-8 encoding specified.
     """
@@ -56,7 +56,7 @@ def serialize_part_xml(part_elm):
 
 def serialize_for_reading(element):
     """
-    Serialize *element* to human-readable XML suitable for tests. No XML
+    Serialize `element` to human-readable XML suitable for tests. No XML
     declaration.
     """
     return etree.tostring(element, encoding="unicode", pretty_print=True)
diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index 014c11f10..d4882c8ce 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -84,9 +84,9 @@ def walk_parts(source, visited=[]):
 
     def load_rel(self, reltype, target, rId, is_external=False):
         """
-        Return newly added |_Relationship| instance of *reltype* between this
-        part and *target* with key *rId*. Target mode is set to
-        ``RTM.EXTERNAL`` if *is_external* is |True|. Intended for use during
+        Return newly added |_Relationship| instance of `reltype` between this
+        part and `target` with key `rId`. Target mode is set to
+        ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for use during
         load from a serialized package, where the rId is well known. Other
         methods exist for adding a new relationship to the package during
         processing.
@@ -104,10 +104,10 @@ def main_document_part(self):
         return self.part_related_by(RT.OFFICE_DOCUMENT)
 
     def next_partname(self, template):
-        """Return a |PackURI| instance representing partname matching *template*.
+        """Return a |PackURI| instance representing partname matching `template`.
 
         The returned part-name has the next available numeric suffix to distinguish it
-        from other parts of its type. *template* is a printf (%)-style template string
+        from other parts of its type. `template` is a printf (%)-style template string
         containing a single replacement item, a '%d' to be used to insert the integer
         portion of the partname. Example: "/word/header%d.xml"
         """
@@ -121,7 +121,7 @@ def next_partname(self, template):
     def open(cls, pkg_file):
         """
         Return an |OpcPackage| instance loaded with the contents of
-        *pkg_file*.
+        `pkg_file`.
         """
         pkg_reader = PackageReader.from_file(pkg_file)
         package = cls()
@@ -130,7 +130,7 @@ def open(cls, pkg_file):
 
     def part_related_by(self, reltype):
         """
-        Return part to which this package has a relationship of *reltype*.
+        Return part to which this package has a relationship of `reltype`.
         Raises |KeyError| if no such relationship is found and |ValueError|
         if more than one such relationship is found.
         """
@@ -146,7 +146,7 @@ def parts(self):
 
     def relate_to(self, part, reltype):
         """
-        Return rId key of relationship to *part*, from the existing
+        Return rId key of relationship to `part`, from the existing
         relationship if there is one, otherwise a newly created one.
         """
         rel = self.rels.get_or_add(reltype, part)
@@ -162,7 +162,7 @@ def rels(self):
 
     def save(self, pkg_file):
         """
-        Save this package to *pkg_file*, where *file* can be either a path to
+        Save this package to `pkg_file`, where `file` can be either a path to
         a file (a string) or a file-like object.
         """
         for part in self.parts:
@@ -190,8 +190,8 @@ class Unmarshaller(object):
     def unmarshal(pkg_reader, package, part_factory):
         """
         Construct graph of parts and realized relationships based on the
-        contents of *pkg_reader*, delegating construction of each part to
-        *part_factory*. Package relationships are added to *pkg*.
+        contents of `pkg_reader`, delegating construction of each part to
+        `part_factory`. Package relationships are added to `pkg`.
         """
         parts = Unmarshaller._unmarshal_parts(pkg_reader, package, part_factory)
         Unmarshaller._unmarshal_relationships(pkg_reader, package, parts)
@@ -203,8 +203,8 @@ def unmarshal(pkg_reader, package, part_factory):
     def _unmarshal_parts(pkg_reader, package, part_factory):
         """
         Return a dictionary of |Part| instances unmarshalled from
-        *pkg_reader*, keyed by partname. Side-effect is that each part in
-        *pkg_reader* is constructed using *part_factory*.
+        `pkg_reader`, keyed by partname. Side-effect is that each part in
+        `pkg_reader` is constructed using `part_factory`.
         """
         parts = {}
         for partname, content_type, reltype, blob in pkg_reader.iter_sparts():
@@ -217,8 +217,8 @@ def _unmarshal_parts(pkg_reader, package, part_factory):
     def _unmarshal_relationships(pkg_reader, package, parts):
         """
         Add a relationship to the source object corresponding to each of the
-        relationships in *pkg_reader* with its target_part set to the actual
-        target part in *parts*.
+        relationships in `pkg_reader` with its target_part set to the actual
+        target part in `parts`.
         """
         for source_uri, srel in pkg_reader.iter_srels():
             source = package if source_uri == "/" else parts[source_uri]
diff --git a/src/docx/opc/packuri.py b/src/docx/opc/packuri.py
index 50fa6e214..f86e83635 100644
--- a/src/docx/opc/packuri.py
+++ b/src/docx/opc/packuri.py
@@ -25,7 +25,7 @@ def __new__(cls, pack_uri_str):
     def from_rel_ref(baseURI, relative_ref):
         """
         Return a |PackURI| instance containing the absolute pack URI formed by
-        translating *relative_ref* onto *baseURI*.
+        translating `relative_ref` onto `baseURI`.
         """
         joined_uri = posixpath.join(baseURI, relative_ref)
         abs_uri = posixpath.abspath(joined_uri)
@@ -89,11 +89,11 @@ def membername(self):
     def relative_ref(self, baseURI):
         """
         Return string containing relative reference to package item from
-        *baseURI*. E.g. PackURI('/ppt/slideLayouts/slideLayout1.xml') would
+        `baseURI`. E.g. PackURI('/ppt/slideLayouts/slideLayout1.xml') would
         return '../slideLayouts/slideLayout1.xml' for baseURI '/ppt/slides'.
         """
         # workaround for posixpath bug in 2.6, doesn't generate correct
-        # relative path when *start* (second) parameter is root ('/')
+        # relative path when `start` (second) parameter is root ('/')
         return self[1:] if baseURI == "/" else posixpath.relpath(self, baseURI)
 
     @property
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index e9fab7973..874fed21f 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -59,7 +59,7 @@ def content_type(self):
 
     def drop_rel(self, rId):
         """
-        Remove the relationship identified by *rId* if its reference count
+        Remove the relationship identified by `rId` if its reference count
         is less than 2. Relationships with a reference count of 0 are
         implicit relationships.
         """
@@ -72,9 +72,9 @@ def load(cls, partname, content_type, blob, package):
 
     def load_rel(self, reltype, target, rId, is_external=False):
         """
-        Return newly added |_Relationship| instance of *reltype* between this
-        part and *target* with key *rId*. Target mode is set to
-        ``RTM.EXTERNAL`` if *is_external* is |True|. Intended for use during
+        Return newly added |_Relationship| instance of `reltype` between this
+        part and `target` with key `rId`. Target mode is set to
+        ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for use during
         load from a serialized package, where the rId is well-known. Other
         methods exist for adding a new relationship to a part when
         manipulating a part.
@@ -105,7 +105,7 @@ def partname(self, partname):
 
     def part_related_by(self, reltype):
         """
-        Return part to which this part has a relationship of *reltype*.
+        Return part to which this part has a relationship of `reltype`.
         Raises |KeyError| if no such relationship is found and |ValueError|
         if more than one such relationship is found. Provides ability to
         resolve implicitly related part, such as Slide -> SlideLayout.
@@ -114,7 +114,7 @@ def part_related_by(self, reltype):
 
     def relate_to(self, target, reltype, is_external=False):
         """
-        Return rId key of relationship of *reltype* to *target*, from an
+        Return rId key of relationship of `reltype` to `target`, from an
         existing relationship if there is one, otherwise a newly created one.
         """
         if is_external:
@@ -142,7 +142,7 @@ def rels(self):
     def target_ref(self, rId):
         """
         Return URL contained in target ref of relationship identified by
-        *rId*.
+        `rId`.
         """
         rel = self.rels[rId]
         return rel.target_ref
@@ -150,7 +150,7 @@ def target_ref(self, rId):
     def _rel_ref_count(self, rId):
         """
         Return the count of references in this part's XML to the relationship
-        identified by *rId*.
+        identified by `rId`.
         """
         rIds = self._element.xpath("//@r:id")
         return len([_rId for _rId in rIds if _rId == rId])
@@ -186,9 +186,9 @@ def __new__(cls, partname, content_type, reltype, blob, package):
     @classmethod
     def _part_cls_for(cls, content_type):
         """
-        Return the custom part class registered for *content_type*, or the
+        Return the custom part class registered for `content_type`, or the
         default part class if no custom class is registered for
-        *content_type*.
+        `content_type`.
         """
         if content_type in cls.part_type_for:
             return cls.part_type_for[content_type]
diff --git a/src/docx/opc/phys_pkg.py b/src/docx/opc/phys_pkg.py
index ae38a647b..9c8a18993 100644
--- a/src/docx/opc/phys_pkg.py
+++ b/src/docx/opc/phys_pkg.py
@@ -1,4 +1,4 @@
-"""Provides a general interface to a *physical* OPC package, such as a zip file."""
+"""Provides a general interface to a `physical` OPC package, such as a zip file."""
 
 import os
 from zipfile import ZIP_DEFLATED, ZipFile, is_zipfile
@@ -13,7 +13,7 @@ class PhysPkgReader(object):
     """
 
     def __new__(cls, pkg_file):
-        # if *pkg_file* is a string, treat it as a path
+        # if `pkg_file` is a string, treat it as a path
         if isinstance(pkg_file, str):
             if os.path.isdir(pkg_file):
                 reader_cls = _DirPkgReader
@@ -44,14 +44,14 @@ class _DirPkgReader(PhysPkgReader):
 
     def __init__(self, path):
         """
-        *path* is the path to a directory containing an expanded package.
+        `path` is the path to a directory containing an expanded package.
         """
         super(_DirPkgReader, self).__init__()
         self._path = os.path.abspath(path)
 
     def blob_for(self, pack_uri):
         """
-        Return contents of file corresponding to *pack_uri* in package
+        Return contents of file corresponding to `pack_uri` in package
         directory.
         """
         path = os.path.join(self._path, pack_uri.membername)
@@ -75,7 +75,7 @@ def content_types_xml(self):
 
     def rels_xml_for(self, source_uri):
         """
-        Return rels item XML for source with *source_uri*, or None if the
+        Return rels item XML for source with `source_uri`, or None if the
         item has no rels item.
         """
         try:
@@ -96,7 +96,7 @@ def __init__(self, pkg_file):
 
     def blob_for(self, pack_uri):
         """
-        Return blob corresponding to *pack_uri*. Raises |ValueError| if no
+        Return blob corresponding to `pack_uri`. Raises |ValueError| if no
         matching member is present in zip archive.
         """
         return self._zipf.read(pack_uri.membername)
@@ -116,7 +116,7 @@ def content_types_xml(self):
 
     def rels_xml_for(self, source_uri):
         """
-        Return rels item XML for source with *source_uri* or None if no rels
+        Return rels item XML for source with `source_uri` or None if no rels
         item is present.
         """
         try:
@@ -144,7 +144,7 @@ def close(self):
 
     def write(self, pack_uri, blob):
         """
-        Write *blob* to this zip package with the membername corresponding to
-        *pack_uri*.
+        Write `blob` to this zip package with the membername corresponding to
+        `pack_uri`.
         """
         self._zipf.writestr(pack_uri.membername, blob)
diff --git a/src/docx/opc/pkgreader.py b/src/docx/opc/pkgreader.py
index ca6849e26..defa60ec6 100644
--- a/src/docx/opc/pkgreader.py
+++ b/src/docx/opc/pkgreader.py
@@ -21,7 +21,7 @@ def __init__(self, content_types, pkg_srels, sparts):
     @staticmethod
     def from_file(pkg_file):
         """
-        Return a |PackageReader| instance loaded with contents of *pkg_file*.
+        Return a |PackageReader| instance loaded with contents of `pkg_file`.
         """
         phys_reader = PhysPkgReader(pkg_file)
         content_types = _ContentTypeMap.from_xml(phys_reader.content_types_xml)
@@ -55,8 +55,8 @@ def iter_srels(self):
     def _load_serialized_parts(phys_reader, pkg_srels, content_types):
         """
         Return a list of |_SerializedPart| instances corresponding to the
-        parts in *phys_reader* accessible by walking the relationship graph
-        starting with *pkg_srels*.
+        parts in `phys_reader` accessible by walking the relationship graph
+        starting with `pkg_srels`.
         """
         sparts = []
         part_walker = PackageReader._walk_phys_parts(phys_reader, pkg_srels)
@@ -70,7 +70,7 @@ def _load_serialized_parts(phys_reader, pkg_srels, content_types):
     def _srels_for(phys_reader, source_uri):
         """
         Return |_SerializedRelationships| instance populated with
-        relationships for source identified by *source_uri*.
+        relationships for source identified by `source_uri`.
         """
         rels_xml = phys_reader.rels_xml_for(source_uri)
         return _SerializedRelationships.load_from_xml(source_uri.baseURI, rels_xml)
@@ -79,7 +79,7 @@ def _srels_for(phys_reader, source_uri):
     def _walk_phys_parts(phys_reader, srels, visited_partnames=None):
         """
         Generate a 4-tuple `(partname, blob, reltype, srels)` for each of the
-        parts in *phys_reader* by walking the relationship graph rooted at
+        parts in `phys_reader` by walking the relationship graph rooted at
         srels.
         """
         if visited_partnames is None:
@@ -115,7 +115,7 @@ def __init__(self):
 
     def __getitem__(self, partname):
         """
-        Return content type for part identified by *partname*.
+        Return content type for part identified by `partname`.
         """
         if not isinstance(partname, PackURI):
             tmpl = "_ContentTypeMap key must be <type 'PackURI'>, got %s"
@@ -131,7 +131,7 @@ def __getitem__(self, partname):
     def from_xml(content_types_xml):
         """
         Return a new |_ContentTypeMap| instance populated with the contents
-        of *content_types_xml*.
+        of `content_types_xml`.
         """
         types_elm = parse_xml(content_types_xml)
         ct_map = _ContentTypeMap()
@@ -143,14 +143,14 @@ def from_xml(content_types_xml):
 
     def _add_default(self, extension, content_type):
         """
-        Add the default mapping of *extension* to *content_type* to this
+        Add the default mapping of `extension` to `content_type` to this
         content type mapping.
         """
         self._defaults[extension] = content_type
 
     def _add_override(self, partname, content_type):
         """
-        Add the default mapping of *partname* to *content_type* to this
+        Add the default mapping of `partname` to `content_type` to this
         content type mapping.
         """
         self._overrides[partname] = content_type
@@ -283,8 +283,8 @@ def __iter__(self):
     def load_from_xml(baseURI, rels_item_xml):
         """
         Return |_SerializedRelationships| instance loaded with the
-        relationships contained in *rels_item_xml*. Returns an empty
-        collection if *rels_item_xml* is |None|.
+        relationships contained in `rels_item_xml`. Returns an empty
+        collection if `rels_item_xml` is |None|.
         """
         srels = _SerializedRelationships()
         if rels_item_xml is not None:
diff --git a/src/docx/opc/pkgwriter.py b/src/docx/opc/pkgwriter.py
index 1f8901eea..9a3e56fdb 100644
--- a/src/docx/opc/pkgwriter.py
+++ b/src/docx/opc/pkgwriter.py
@@ -14,7 +14,7 @@
 
 class PackageWriter(object):
     """
-    Writes a zip-format OPC package to *pkg_file*, where *pkg_file* can be
+    Writes a zip-format OPC package to `pkg_file`, where `pkg_file` can be
     either a path to a zip file (a string) or a file-like object. Its single
     API method, :meth:`write`, is static, so this class is not intended to
     be instantiated.
@@ -23,8 +23,8 @@ class PackageWriter(object):
     @staticmethod
     def write(pkg_file, pkg_rels, parts):
         """
-        Write a physical package (.pptx file) to *pkg_file* containing
-        *pkg_rels* and *parts* and a content types stream based on the
+        Write a physical package (.pptx file) to `pkg_file` containing
+        `pkg_rels` and `parts` and a content types stream based on the
         content types of the parts.
         """
         phys_writer = PhysPkgWriter(pkg_file)
@@ -37,7 +37,7 @@ def write(pkg_file, pkg_rels, parts):
     def _write_content_types_stream(phys_writer, parts):
         """
         Write ``[Content_Types].xml`` part to the physical package with an
-        appropriate content type lookup target for each part in *parts*.
+        appropriate content type lookup target for each part in `parts`.
         """
         cti = _ContentTypesItem.from_parts(parts)
         phys_writer.write(CONTENT_TYPES_URI, cti.blob)
@@ -45,7 +45,7 @@ def _write_content_types_stream(phys_writer, parts):
     @staticmethod
     def _write_parts(phys_writer, parts):
         """
-        Write the blob of each part in *parts* to the package, along with a
+        Write the blob of each part in `parts` to the package, along with a
         rels item for its relationships if and only if it has any.
         """
         for part in parts:
@@ -56,7 +56,7 @@ def _write_parts(phys_writer, parts):
     @staticmethod
     def _write_pkg_rels(phys_writer, pkg_rels):
         """
-        Write the XML rels item for *pkg_rels* ('/_rels/.rels') to the
+        Write the XML rels item for `pkg_rels` ('/_rels/.rels') to the
         package.
         """
         phys_writer.write(PACKAGE_URI.rels_uri, pkg_rels.xml)
@@ -85,7 +85,7 @@ def blob(self):
     @classmethod
     def from_parts(cls, parts):
         """
-        Return content types XML mapping each part in *parts* to the
+        Return content types XML mapping each part in `parts` to the
         appropriate content type and suitable for storage as
         ``[Content_Types].xml`` in an OPC package.
         """
@@ -98,7 +98,7 @@ def from_parts(cls, parts):
 
     def _add_content_type(self, partname, content_type):
         """
-        Add a content type for the part with *partname* and *content_type*,
+        Add a content type for the part with `partname` and `content_type`,
         using a default or override as appropriate.
         """
         ext = partname.ext
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index 97be3f6bf..a137d4590 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -25,7 +25,7 @@ def add_relationship(self, reltype, target, rId, is_external=False):
 
     def get_or_add(self, reltype, target_part):
         """
-        Return relationship of *reltype* to *target_part*, newly added if not
+        Return relationship of `reltype` to `target_part`, newly added if not
         already present in collection.
         """
         rel = self._get_matching(reltype, target_part)
@@ -36,7 +36,7 @@ def get_or_add(self, reltype, target_part):
 
     def get_or_add_ext_rel(self, reltype, target_ref):
         """
-        Return rId of external relationship of *reltype* to *target_ref*,
+        Return rId of external relationship of `reltype` to `target_ref`,
         newly added if not already present in collection.
         """
         rel = self._get_matching(reltype, target_ref, is_external=True)
@@ -47,7 +47,7 @@ def get_or_add_ext_rel(self, reltype, target_ref):
 
     def part_with_reltype(self, reltype):
         """
-        Return target part of rel with matching *reltype*, raising |KeyError|
+        Return target part of rel with matching `reltype`, raising |KeyError|
         if not found and |ValueError| if more than one matching relationship
         is found.
         """
@@ -75,8 +75,8 @@ def xml(self):
 
     def _get_matching(self, reltype, target, is_external=False):
         """
-        Return relationship of matching *reltype*, *target*, and
-        *is_external* from collection, or None if not found.
+        Return relationship of matching `reltype`, `target`, and
+        `is_external` from collection, or None if not found.
         """
 
         def matches(rel, reltype, target, is_external):
@@ -96,7 +96,7 @@ def matches(rel, reltype, target, is_external):
 
     def _get_rel_of_type(self, reltype):
         """
-        Return single relationship of type *reltype* from the collection.
+        Return single relationship of type `reltype` from the collection.
         Raises |KeyError| if no matching relationship is found. Raises
         |ValueError| if more than one matching relationship is found.
         """
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 80327205c..ab3995105 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -16,9 +16,9 @@
 def parse_xml(xml):
     """
     Return root lxml element obtained by parsing XML character string in
-    *xml*, which can be either a Python 2.x string or unicode. The custom
+    `xml`, which can be either a Python 2.x string or unicode. The custom
     parser is used, so custom element classes are produced for elements in
-    *xml* that have them.
+    `xml` that have them.
     """
     root_element = etree.fromstring(xml, oxml_parser)
     return root_element
@@ -26,8 +26,8 @@ def parse_xml(xml):
 
 def register_element_cls(tag, cls):
     """
-    Register *cls* to be constructed when the oxml parser encounters an
-    element with matching *tag*. *tag* is a string of the form
+    Register `cls` to be constructed when the oxml parser encounters an
+    element with matching `tag`. `tag` is a string of the form
     ``nspfx:tagroot``, e.g. ``'w:document'``.
     """
     nspfx, tagroot = tag.split(":")
@@ -37,15 +37,15 @@ def register_element_cls(tag, cls):
 
 def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
     """
-    Return a 'loose' lxml element having the tag specified by *nsptag_str*.
-    *nsptag_str* must contain the standard namespace prefix, e.g. 'a:tbl'.
+    Return a 'loose' lxml element having the tag specified by `nsptag_str`.
+    `nsptag_str` must contain the standard namespace prefix, e.g. 'a:tbl'.
     The resulting element is an instance of the custom element class for this
     tag name if one is defined. A dictionary of attribute values may be
-    provided as *attrs*; they are set if present. All namespaces defined in
-    the dict *nsdecls* are declared in the element using the key as the
-    prefix and the value as the namespace name. If *nsdecls* is not provided,
+    provided as `attrs`; they are set if present. All namespaces defined in
+    the dict `nsdecls` are declared in the element using the key as the
+    prefix and the value as the namespace name. If `nsdecls` is not provided,
     a single namespace declaration is added based on the prefix on
-    *nsptag_str*.
+    `nsptag_str`.
     """
     nsptag = NamespacePrefixedTag(nsptag_str)
     if nsdecls is None:
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index a97f31990..22ee9e187 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -38,7 +38,7 @@ def add_section_break(self):
 
         A copy of the previously-last `w:sectPr` will now appear in a new `w:p` at the
         end of the document. The returned `w:sectPr` is the sentinel `w:sectPr` for the
-        document (and as implemented, *is* the prior sentinel `w:sectPr` with headers
+        document (and as implemented, `is` the prior sentinel `w:sectPr` with headers
         and footers removed).
         """
         # ---get the sectPr at file-end, which controls last section (sections[-1])---
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index 868a1356e..d3558cbf1 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -83,7 +83,7 @@ def nsuri(self):
 def nsdecls(*prefixes):
     """
     Return a string containing a namespace declaration for each of the
-    namespace prefix strings, e.g. 'p', 'ct', passed as *prefixes*.
+    namespace prefix strings, e.g. 'p', 'ct', passed as `prefixes`.
     """
     return " ".join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
 
@@ -91,7 +91,7 @@ def nsdecls(*prefixes):
 def nspfxmap(*nspfxs):
     """
     Return a dict containing the subset namespace prefix mappings specified by
-    *nspfxs*. Any number of namespace prefixes can be supplied, e.g.
+    `nspfxs`. Any number of namespace prefixes can be supplied, e.g.
     namespaces('a', 'r', 'p').
     """
     return {pfx: nsmap[pfx] for pfx in nspfxs}
diff --git a/src/docx/oxml/numbering.py b/src/docx/oxml/numbering.py
index 6fb7e1b01..c386e8c3a 100644
--- a/src/docx/oxml/numbering.py
+++ b/src/docx/oxml/numbering.py
@@ -26,16 +26,16 @@ class CT_Num(BaseOxmlElement):
     def add_lvlOverride(self, ilvl):
         """
         Return a newly added CT_NumLvl (<w:lvlOverride>) element having its
-        ``ilvl`` attribute set to *ilvl*.
+        ``ilvl`` attribute set to `ilvl`.
         """
         return self._add_lvlOverride(ilvl=ilvl)
 
     @classmethod
     def new(cls, num_id, abstractNum_id):
         """
-        Return a new ``<w:num>`` element having numId of *num_id* and having
+        Return a new ``<w:num>`` element having numId of `num_id` and having
         a ``<w:abstractNumId>`` child with val attribute set to
-        *abstractNum_id*.
+        `abstractNum_id`.
         """
         num = OxmlElement("w:num")
         num.numId = num_id
@@ -56,7 +56,7 @@ class CT_NumLvl(BaseOxmlElement):
     def add_startOverride(self, val):
         """
         Return a newly added CT_DecimalNumber element having tagname
-        ``w:startOverride`` and ``val`` attribute set to *val*.
+        ``w:startOverride`` and ``val`` attribute set to `val`.
         """
         return self._add_startOverride(val=val)
 
@@ -73,7 +73,7 @@ class CT_NumPr(BaseOxmlElement):
     # @ilvl.setter
     # def _set_ilvl(self, val):
     #     """
-    #     Get or add a <w:ilvl> child and set its ``w:val`` attribute to *val*.
+    #     Get or add a <w:ilvl> child and set its ``w:val`` attribute to `val`.
     #     """
     #     ilvl = self.get_or_add_ilvl()
     #     ilvl.val = val
@@ -82,7 +82,7 @@ class CT_NumPr(BaseOxmlElement):
     # def numId(self, val):
     #     """
     #     Get or add a <w:numId> child and set its ``w:val`` attribute to
-    #     *val*.
+    #     `val`.
     #     """
     #     numId = self.get_or_add_numId()
     #     numId.val = val
@@ -99,7 +99,7 @@ class CT_Numbering(BaseOxmlElement):
     def add_num(self, abstractNum_id):
         """
         Return a newly added CT_Num (<w:num>) element referencing the
-        abstract numbering definition identified by *abstractNum_id*.
+        abstract numbering definition identified by `abstractNum_id`.
         """
         next_num_id = self._next_numId
         num = CT_Num.new(next_num_id, abstractNum_id)
@@ -108,7 +108,7 @@ def add_num(self, abstractNum_id):
     def num_having_numId(self, numId):
         """
         Return the ``<w:num>`` child element having ``numId`` attribute
-        matching *numId*.
+        matching `numId`.
         """
         xpath = './w:num[@w:numId="%d"]' % numId
         try:
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index 73a928e07..72ab5c6f4 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -87,7 +87,7 @@ class CT_SectPr(BaseOxmlElement):
     del _tag_seq
 
     def add_footerReference(self, type_, rId):
-        """Return newly added CT_HdrFtrRef element of *type_* with *rId*.
+        """Return newly added CT_HdrFtrRef element of `type_` with `rId`.
 
         The element tag is `w:footerReference`.
         """
@@ -97,7 +97,7 @@ def add_footerReference(self, type_, rId):
         return footerReference
 
     def add_headerReference(self, type_, rId):
-        """Return newly added CT_HdrFtrRef element of *type_* with *rId*.
+        """Return newly added CT_HdrFtrRef element of `type_` with `rId`.
 
         The element tag is `w:headerReference`.
         """
@@ -151,7 +151,7 @@ def footer(self, value):
         pgMar.footer = value
 
     def get_footerReference(self, type_):
-        """Return footerReference element of *type_* or None if not present."""
+        """Return footerReference element of `type_` or None if not present."""
         path = "./w:footerReference[@w:type='%s']" % WD_HEADER_FOOTER.to_xml(type_)
         footerReferences = self.xpath(path)
         if not footerReferences:
@@ -159,7 +159,7 @@ def get_footerReference(self, type_):
         return footerReferences[0]
 
     def get_headerReference(self, type_):
-        """Return headerReference element of *type_* or None if not present."""
+        """Return headerReference element of `type_` or None if not present."""
         matching_headerReferences = self.xpath(
             "./w:headerReference[@w:type='%s']" % WD_HEADER_FOOTER.to_xml(type_)
         )
@@ -275,14 +275,14 @@ def preceding_sectPr(self):
         return preceding_sectPrs[0] if len(preceding_sectPrs) > 0 else None
 
     def remove_footerReference(self, type_):
-        """Return rId of w:footerReference child of *type_* after removing it."""
+        """Return rId of w:footerReference child of `type_` after removing it."""
         footerReference = self.get_footerReference(type_)
         rId = footerReference.rId
         self.remove(footerReference)
         return rId
 
     def remove_headerReference(self, type_):
-        """Return rId of w:headerReference child of *type_* after removing it."""
+        """Return rId of w:headerReference child of `type_` after removing it."""
         headerReference = self.get_headerReference(type_)
         rId = headerReference.rId
         self.remove(headerReference)
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index 9ef42a023..eb939291d 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -18,8 +18,8 @@ class CT_DecimalNumber(BaseOxmlElement):
     @classmethod
     def new(cls, nsptagname, val):
         """
-        Return a new ``CT_DecimalNumber`` element having tagname *nsptagname*
-        and ``val`` attribute set to *val*.
+        Return a new ``CT_DecimalNumber`` element having tagname `nsptagname`
+        and ``val`` attribute set to `val`.
         """
         return OxmlElement(nsptagname, attrs={qn("w:val"): str(val)})
 
@@ -44,8 +44,8 @@ class CT_String(BaseOxmlElement):
     @classmethod
     def new(cls, nsptagname, val):
         """
-        Return a new ``CT_String`` element with tagname *nsptagname* and
-        ``val`` attribute set to *val*.
+        Return a new ``CT_String`` element with tagname `nsptagname` and
+        ``val`` attribute set to `val`.
         """
         elm = OxmlElement(nsptagname)
         elm.val = val
diff --git a/src/docx/oxml/styles.py b/src/docx/oxml/styles.py
index 3cbb005e1..8de7a2290 100644
--- a/src/docx/oxml/styles.py
+++ b/src/docx/oxml/styles.py
@@ -13,7 +13,7 @@
 
 def styleId_from_name(name):
     """
-    Return the style id corresponding to *name*, taking into account
+    Return the style id corresponding to `name`, taking into account
     special-case names such as 'Heading 1'.
     """
     return {
@@ -48,7 +48,7 @@ class CT_LatentStyles(BaseOxmlElement):
 
     def bool_prop(self, attr_name):
         """
-        Return the boolean value of the attribute having *attr_name*, or
+        Return the boolean value of the attribute having `attr_name`, or
         |False| if not present.
         """
         value = getattr(self, attr_name)
@@ -58,7 +58,7 @@ def bool_prop(self, attr_name):
 
     def get_by_name(self, name):
         """
-        Return the `w:lsdException` child having *name*, or |None| if not
+        Return the `w:lsdException` child having `name`, or |None| if not
         found.
         """
         found = self.xpath('w:lsdException[@w:name="%s"]' % name)
@@ -68,7 +68,7 @@ def get_by_name(self, name):
 
     def set_bool_prop(self, attr_name, value):
         """
-        Set the on/off attribute having *attr_name* to *value*.
+        Set the on/off attribute having `attr_name` to `value`.
         """
         setattr(self, attr_name, bool(value))
 
@@ -94,14 +94,14 @@ def delete(self):
 
     def on_off_prop(self, attr_name):
         """
-        Return the boolean value of the attribute having *attr_name*, or
+        Return the boolean value of the attribute having `attr_name`, or
         |None| if not present.
         """
         return getattr(self, attr_name)
 
     def set_on_off_prop(self, attr_name, value):
         """
-        Set the on/off attribute having *attr_name* to *value*.
+        Set the on/off attribute having `attr_name` to `value`.
         """
         setattr(self, attr_name, value)
 
@@ -318,9 +318,9 @@ class CT_Styles(BaseOxmlElement):
 
     def add_style_of_type(self, name, style_type, builtin):
         """
-        Return a newly added `w:style` element having *name* and
-        *style_type*. `w:style/@customStyle` is set based on the value of
-        *builtin*.
+        Return a newly added `w:style` element having `name` and
+        `style_type`. `w:style/@customStyle` is set based on the value of
+        `builtin`.
         """
         style = self.add_style()
         style.type = style_type
@@ -344,7 +344,7 @@ def default_for(self, style_type):
     def get_by_id(self, styleId):
         """
         Return the ``<w:style>`` child element having ``styleId`` attribute
-        matching *styleId*, or |None| if not found.
+        matching `styleId`, or |None| if not found.
         """
         xpath = 'w:style[@w:styleId="%s"]' % styleId
         try:
@@ -355,7 +355,7 @@ def get_by_id(self, styleId):
     def get_by_name(self, name):
         """
         Return the ``<w:style>`` child element having ``<w:name>`` child
-        element with value *name*, or |None| if not found.
+        element with value `name`, or |None| if not found.
         """
         xpath = 'w:style[w:name/@w:val="%s"]' % name
         try:
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index fc131f88e..ef5e44702 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -43,7 +43,7 @@ class CT_Row(BaseOxmlElement):
 
     def tc_at_grid_col(self, idx):
         """
-        The ``<w:tc>`` element appearing at grid column *idx*. Raises
+        The ``<w:tc>`` element appearing at grid column `idx`. Raises
         |ValueError| if no ``w:tc`` element begins at that grid column.
         """
         grid_col = 0
@@ -158,8 +158,8 @@ def iter_tcs(self):
     @classmethod
     def new_tbl(cls, rows, cols, width):
         """
-        Return a new `w:tbl` element having *rows* rows and *cols* columns
-        with *width* distributed evenly between the columns.
+        Return a new `w:tbl` element having `rows` rows and `cols` columns
+        with `width` distributed evenly between the columns.
         """
         return parse_xml(cls._tbl_xml(rows, cols, width))
 
@@ -178,7 +178,7 @@ def tblStyle_val(self):
     def tblStyle_val(self, styleId):
         """
         Set the value of `w:tblPr/w:tblStyle/@w:val` (a table style id) to
-        *styleId*. If *styleId* is None, remove the `w:tblStyle` element.
+        `styleId`. If `styleId` is None, remove the `w:tblStyle` element.
         """
         tblPr = self.tblPr
         tblPr._remove_tblStyle()
@@ -458,7 +458,7 @@ def merge(self, other_tc):
         """
         Return the top-left ``<w:tc>`` element of a new span formed by
         merging the rectangular region defined by using this tc element and
-        *other_tc* as diagonal corners.
+        `other_tc` as diagonal corners.
         """
         top, left, height, width = self._span_dimensions(other_tc)
         top_tc = self._tbl.tr_lst[top].tc_at_grid_col(left)
@@ -526,8 +526,8 @@ def width(self, value):
 
     def _add_width_of(self, other_tc):
         """
-        Add the width of *other_tc* to this cell. Does nothing if either this
-        tc or *other_tc* does not have a specified width.
+        Add the width of `other_tc` to this cell. Does nothing if either this
+        tc or `other_tc` does not have a specified width.
         """
         if self.width and other_tc.width:
             self.width += other_tc.width
@@ -544,7 +544,7 @@ def _grid_col(self):
 
     def _grow_to(self, width, height, top_tc=None):
         """
-        Grow this cell to *width* grid columns and *height* rows by expanding
+        Grow this cell to `width` grid columns and `height` rows by expanding
         horizontal spans and creating continuation cells to form vertical
         spans.
         """
@@ -585,7 +585,7 @@ def _is_empty(self):
 
     def _move_content_to(self, other_tc):
         """
-        Append the content of this cell to *other_tc*, leaving this cell with
+        Append the content of this cell to `other_tc`, leaving this cell with
         a single empty ``<w:p>`` element.
         """
         if other_tc is self:
@@ -634,7 +634,7 @@ def _remove_trailing_empty_p(self):
     def _span_dimensions(self, other_tc):
         """
         Return a (top, left, height, width) 4-tuple specifying the extents of
-        the merged cell formed by using this tc and *other_tc* as opposite
+        the merged cell formed by using this tc and `other_tc` as opposite
         corner extents.
         """
 
@@ -666,13 +666,13 @@ def raise_on_tee_shaped(a, b):
     def _span_to_width(self, grid_width, top_tc, vMerge):
         """
         Incorporate and then remove `w:tc` elements to the right of this one
-        until this cell spans *grid_width*. Raises |ValueError| if
-        *grid_width* cannot be exactly achieved, such as when a merged cell
-        would drive the span width greater than *grid_width* or if not enough
+        until this cell spans `grid_width`. Raises |ValueError| if
+        `grid_width` cannot be exactly achieved, such as when a merged cell
+        would drive the span width greater than `grid_width` or if not enough
         grid columns are available to make this cell that wide. All content
-        from incorporated cells is appended to *top_tc*. The val attribute of
-        the vMerge element on the single remaining cell is set to *vMerge*.
-        If *vMerge* is |None|, the vMerge element is removed if present.
+        from incorporated cells is appended to `top_tc`. The val attribute of
+        the vMerge element on the single remaining cell is set to `vMerge`.
+        If `vMerge` is |None|, the vMerge element is removed if present.
         """
         self._move_content_to(top_tc)
         while self.grid_span < grid_width:
@@ -684,10 +684,10 @@ def _swallow_next_tc(self, grid_width, top_tc):
         Extend the horizontal span of this `w:tc` element to incorporate the
         following `w:tc` element in the row and then delete that following
         `w:tc` element. Any content in the following `w:tc` element is
-        appended to the content of *top_tc*. The width of the following
+        appended to the content of `top_tc`. The width of the following
         `w:tc` element is added to this one, if present. Raises
         |InvalidSpanError| if the width of the resulting cell is greater than
-        *grid_width* or if there is no next `<w:tc>` element in the row.
+        `grid_width` or if there is no next `<w:tc>` element in the row.
         """
 
         def raise_on_invalid_swallow(next_tc):
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 1c8ddd986..75c7f1b71 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -208,8 +208,8 @@ def style(self):
     @style.setter
     def style(self, style):
         """
-        Set val attribute of <w:rStyle> child element to *style*, adding a
-        new element if necessary. If *style* is |None|, remove the <w:rStyle>
+        Set val attribute of <w:rStyle> child element to `style`, adding a
+        new element if necessary. If `style` is |None|, remove the <w:rStyle>
         element if present.
         """
         if style is None:
@@ -305,7 +305,7 @@ def u_val(self, value):
 
     def _get_bool_val(self, name):
         """
-        Return the value of the boolean child element having *name*, e.g.
+        Return the value of the boolean child element having `name`, e.g.
         'b', 'i', and 'smallCaps'.
         """
         element = getattr(self, name)
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index 90f879340..e459d4dfa 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -310,8 +310,8 @@ def style(self):
     @style.setter
     def style(self, style):
         """
-        Set val attribute of <w:pStyle> child element to *style*, adding a
-        new element if necessary. If *style* is |None|, remove the <w:pStyle>
+        Set val attribute of <w:pStyle> child element to `style`, adding a
+        new element if necessary. If `style` is |None|, remove the <w:pStyle>
         element if present.
         """
         if style is None:
@@ -367,7 +367,7 @@ class CT_TabStops(BaseOxmlElement):
 
     def insert_tab_in_order(self, pos, align, leader):
         """
-        Insert a newly created `w:tab` child element in *pos* order.
+        Insert a newly created `w:tab` child element in `pos` order.
         """
         new_tab = self._new_tab()
         new_tab.pos, new_tab.val, new_tab.leader = pos, align, leader
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 887ffda86..f4504a1cd 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -12,7 +12,7 @@
 
 def serialize_for_reading(element):
     """
-    Serialize *element* to human-readable XML suitable for tests. No XML
+    Serialize `element` to human-readable XML suitable for tests. No XML
     declaration.
     """
     xml = etree.tostring(element, encoding="unicode", pretty_print=True)
@@ -48,7 +48,7 @@ def __ne__(self, other):
 
     def _attr_seq(self, attrs):
         """
-        Return a sequence of attribute strings parsed from *attrs*. Each
+        Return a sequence of attribute strings parsed from `attrs`. Each
         attribute string is stripped of whitespace on both ends.
         """
         attrs = attrs.strip()
@@ -57,8 +57,8 @@ def _attr_seq(self, attrs):
 
     def _eq_elm_strs(self, line, line_2):
         """
-        Return True if the element in *line_2* is XML equivalent to the
-        element in *line*.
+        Return True if the element in `line_2` is XML equivalent to the
+        element in `line`.
         """
         front, attrs, close, text = self._parse_line(line)
         front_2, attrs_2, close_2, text_2 = self._parse_line(line_2)
@@ -76,7 +76,7 @@ def _eq_elm_strs(self, line, line_2):
     def _parse_line(cls, line):
         """
         Return front, attrs, close, text 4-tuple result of parsing XML element
-        string *line*.
+        string `line`.
         """
         match = cls._xml_elm_line_patt.match(line)
         front, attrs, close, text = [match.group(n) for n in range(1, 5)]
@@ -114,7 +114,7 @@ def __init__(self, attr_name, simple_type):
 
     def populate_class_members(self, element_cls, prop_name):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         self._element_cls = element_cls
         self._prop_name = prop_name
@@ -264,7 +264,7 @@ def __init__(self, nsptagname, successors=()):
     def populate_class_members(self, element_cls, prop_name):
         """
         Baseline behavior for adding the appropriate methods to
-        *element_cls*.
+        `element_cls`.
         """
         self._element_cls = element_cls
         self._prop_name = prop_name
@@ -358,7 +358,7 @@ def add_child(obj):
 
     def _add_to_class(self, name, method):
         """
-        Add *method* to the target class as *name*, unless *name* is already
+        Add `method` to the target class as `name`, unless `name` is already
         defined on the class.
         """
         if hasattr(self._element_cls, name):
@@ -444,7 +444,7 @@ def nsptagname(self):
 
     def populate_class_members(self, element_cls, group_prop_name, successors):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         self._element_cls = element_cls
         self._group_prop_name = group_prop_name
@@ -502,7 +502,7 @@ def __init__(self, nsptagname):
 
     def populate_class_members(self, element_cls, prop_name):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         super(OneAndOnlyOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
@@ -536,7 +536,7 @@ class OneOrMore(_BaseChildElement):
 
     def populate_class_members(self, element_cls, prop_name):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         super(OneOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
@@ -554,7 +554,7 @@ class ZeroOrMore(_BaseChildElement):
 
     def populate_class_members(self, element_cls, prop_name):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         super(ZeroOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
@@ -572,7 +572,7 @@ class ZeroOrOne(_BaseChildElement):
 
     def populate_class_members(self, element_cls, prop_name):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         super(ZeroOrOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
@@ -631,7 +631,7 @@ def __init__(self, choices, successors=()):
 
     def populate_class_members(self, element_cls, prop_name):
         """
-        Add the appropriate methods to *element_cls*.
+        Add the appropriate methods to `element_cls`.
         """
         super(ZeroOrOneChoice, self).populate_class_members(element_cls, prop_name)
         self._add_choice_getter()
diff --git a/src/docx/package.py b/src/docx/package.py
index 8baa6f1f1..e4e9433e9 100644
--- a/src/docx/package.py
+++ b/src/docx/package.py
@@ -19,7 +19,7 @@ def after_unmarshal(self):
         self._gather_image_parts()
 
     def get_or_add_image_part(self, image_descriptor):
-        """Return |ImagePart| containing image specified by *image_descriptor*.
+        """Return |ImagePart| containing image specified by `image_descriptor`.
 
         The image-part is newly created if a matching one is not already present in the
         collection.
@@ -62,7 +62,7 @@ def append(self, item):
         self._image_parts.append(item)
 
     def get_or_add_image_part(self, image_descriptor):
-        """Return |ImagePart| object containing image identified by *image_descriptor*.
+        """Return |ImagePart| object containing image identified by `image_descriptor`.
 
         The image-part is newly created if a matching one is not present in the
         collection.
@@ -86,7 +86,7 @@ def _add_image_part(self, image):
     def _get_by_sha1(self, sha1):
         """
         Return the image part in this collection having a SHA1 hash matching
-        *sha1*, or |None| if not found.
+        `sha1`, or |None| if not found.
         """
         for image_part in self._image_parts:
             if image_part.sha1 == sha1:
@@ -97,7 +97,7 @@ def _next_image_partname(self, ext):
         """
         The next available image partname, starting from
         ``/word/media/image1.{ext}`` where unused numbers are reused. The
-        partname is unique by number, without regard to the extension. *ext*
+        partname is unique by number, without regard to the extension. `ext`
         does not include the leading period.
         """
 
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 0631dc36a..1d02033f1 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -48,33 +48,33 @@ def document(self):
         return Document(self._element, self)
 
     def drop_header_part(self, rId):
-        """Remove related header part identified by *rId*."""
+        """Remove related header part identified by `rId`."""
         self.drop_rel(rId)
 
     def footer_part(self, rId):
-        """Return |FooterPart| related by *rId*."""
+        """Return |FooterPart| related by `rId`."""
         return self.related_parts[rId]
 
     def get_style(self, style_id, style_type):
         """
-        Return the style in this document matching *style_id*. Returns the
-        default style for *style_type* if *style_id* is |None| or does not
-        match a defined style of *style_type*.
+        Return the style in this document matching `style_id`. Returns the
+        default style for `style_type` if `style_id` is |None| or does not
+        match a defined style of `style_type`.
         """
         return self.styles.get_by_id(style_id, style_type)
 
     def get_style_id(self, style_or_name, style_type):
         """
-        Return the style_id (|str|) of the style of *style_type* matching
-        *style_or_name*. Returns |None| if the style resolves to the default
-        style for *style_type* or if *style_or_name* is itself |None|. Raises
-        if *style_or_name* is a style of the wrong type or names a style not
+        Return the style_id (|str|) of the style of `style_type` matching
+        `style_or_name`. Returns |None| if the style resolves to the default
+        style for `style_type` or if `style_or_name` is itself |None|. Raises
+        if `style_or_name` is a style of the wrong type or names a style not
         present in the document.
         """
         return self.styles.get_style_id(style_or_name, style_type)
 
     def header_part(self, rId):
-        """Return |HeaderPart| related by *rId*."""
+        """Return |HeaderPart| related by `rId`."""
         return self.related_parts[rId]
 
     @lazyproperty
@@ -101,7 +101,7 @@ def numbering_part(self):
 
     def save(self, path_or_stream):
         """
-        Save this document to *path_or_stream*, which can be either a path to
+        Save this document to `path_or_stream`, which can be either a path to
         a filesystem location (a string) or a file-like object.
         """
         self.package.save(path_or_stream)
diff --git a/src/docx/parts/image.py b/src/docx/parts/image.py
index 919548a8a..deb099289 100644
--- a/src/docx/parts/image.py
+++ b/src/docx/parts/image.py
@@ -55,8 +55,8 @@ def filename(self):
     @classmethod
     def from_image(cls, image, partname):
         """
-        Return an |ImagePart| instance newly created from *image* and
-        assigned *partname*.
+        Return an |ImagePart| instance newly created from `image` and
+        assigned `partname`.
         """
         return ImagePart(partname, image.content_type, image.blob, image)
 
diff --git a/src/docx/parts/story.py b/src/docx/parts/story.py
index 11ac3c60a..fa3cacf0a 100644
--- a/src/docx/parts/story.py
+++ b/src/docx/parts/story.py
@@ -15,11 +15,11 @@ class BaseStoryPart(XmlPart):
     """
 
     def get_or_add_image(self, image_descriptor):
-        """Return (rId, image) pair for image identified by *image_descriptor*.
+        """Return (rId, image) pair for image identified by `image_descriptor`.
 
-        *rId* is the str key (often like "rId7") for the relationship between this story
+        `rId` is the str key (often like "rId7") for the relationship between this story
         part and the image part, reused if already present, newly created if not.
-        *image* is an |Image| instance providing access to the properties of the image,
+        `image` is an |Image| instance providing access to the properties of the image,
         such as dimensions and image type.
         """
         image_part = self._package.get_or_add_image_part(image_descriptor)
@@ -27,18 +27,18 @@ def get_or_add_image(self, image_descriptor):
         return rId, image_part.image
 
     def get_style(self, style_id, style_type):
-        """Return the style in this document matching *style_id*.
+        """Return the style in this document matching `style_id`.
 
-        Returns the default style for *style_type* if *style_id* is |None| or does not
-        match a defined style of *style_type*.
+        Returns the default style for `style_type` if `style_id` is |None| or does not
+        match a defined style of `style_type`.
         """
         return self._document_part.get_style(style_id, style_type)
 
     def get_style_id(self, style_or_name, style_type):
-        """Return str style_id for *style_or_name* of *style_type*.
+        """Return str style_id for `style_or_name` of `style_type`.
 
-        Returns |None| if the style resolves to the default style for *style_type* or if
-        *style_or_name* is itself |None|. Raises if *style_or_name* is a style of the
+        Returns |None| if the style resolves to the default style for `style_type` or if
+        `style_or_name` is itself |None|. Raises if `style_or_name` is a style of the
         wrong type or names a style not present in the document.
         """
         return self._document_part.get_style_id(style_or_name, style_type)
@@ -46,8 +46,8 @@ def get_style_id(self, style_or_name, style_type):
     def new_pic_inline(self, image_descriptor, width, height):
         """Return a newly-created `w:inline` element.
 
-        The element contains the image specified by *image_descriptor* and is scaled
-        based on the values of *width* and *height*.
+        The element contains the image specified by `image_descriptor` and is scaled
+        based on the values of `width` and `height`.
         """
         rId, image = self.get_or_add_image(image_descriptor)
         cx, cy = image.scaled_dimensions(width, height)
diff --git a/src/docx/section.py b/src/docx/section.py
index f69f547f2..4b81b368d 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -133,7 +133,7 @@ def gutter(self):
         """
         |Length| object representing the page gutter size in English Metric
         Units for all pages in this section. The page gutter is extra spacing
-        added to the *inner* margin to ensure even margins after page
+        added to the `inner` margin to ensure even margins after page
         binding.
         """
         return self._sectPr.gutter
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 61d21aee8..63f3969fa 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -204,7 +204,7 @@ def __init__(self, element, parent=None):
     def __eq__(self, other):
         """
         Return |True| if this proxy object refers to the same oxml element as
-        does *other*. ElementProxy objects are value objects and should
+        does `other`. ElementProxy objects are value objects and should
         maintain no mutable local state. Equality for proxy objects is
         defined as referring to the same XML element, whether or not they are
         the same proxy object instance.
diff --git a/src/docx/styles/__init__.py b/src/docx/styles/__init__.py
index ff2e71ce7..bcd84ac9b 100644
--- a/src/docx/styles/__init__.py
+++ b/src/docx/styles/__init__.py
@@ -28,7 +28,7 @@ class BabelFish(object):
     @classmethod
     def ui2internal(cls, ui_style_name):
         """
-        Return the internal style name corresponding to *ui_style_name*, such
+        Return the internal style name corresponding to `ui_style_name`, such
         as 'heading 1' for 'Heading 1'.
         """
         return cls.internal_style_names.get(ui_style_name, ui_style_name)
@@ -37,6 +37,6 @@ def ui2internal(cls, ui_style_name):
     def internal2ui(cls, internal_style_name):
         """
         Return the user interface style name corresponding to
-        *internal_style_name*, such as 'Heading 1' for 'heading 1'.
+        `internal_style_name`, such as 'Heading 1' for 'heading 1'.
         """
         return cls.ui_style_names.get(internal_style_name, internal_style_name)
diff --git a/src/docx/styles/latent.py b/src/docx/styles/latent.py
index f790fdb3c..0b9121332 100644
--- a/src/docx/styles/latent.py
+++ b/src/docx/styles/latent.py
@@ -33,7 +33,7 @@ def add_latent_style(self, name):
         """
         Return a newly added |_LatentStyle| object to override the inherited
         defaults defined in this latent styles object for the built-in style
-        having *name*.
+        having `name`.
         """
         lsdException = self._element.add_lsdException()
         lsdException.name = BabelFish.ui2internal(name)
diff --git a/src/docx/styles/style.py b/src/docx/styles/style.py
index 89096a592..8d5917b23 100644
--- a/src/docx/styles/style.py
+++ b/src/docx/styles/style.py
@@ -10,7 +10,7 @@
 def StyleFactory(style_elm):
     """
     Return a style object of the appropriate |BaseStyle| subclass, according
-    to the type of *style_elm*.
+    to the type of `style_elm`.
     """
     style_cls = {
         WD_STYLE_TYPE.PARAGRAPH: _ParagraphStyle,
@@ -211,7 +211,7 @@ def next_paragraph_style(self):
         |_ParagraphStyle| object representing the style to be applied
         automatically to a new paragraph inserted after a paragraph of this
         style. Returns self if no next paragraph style is defined. Assigning
-        |None| or *self* removes the setting such that new paragraphs are
+        |None| or `self` removes the setting such that new paragraphs are
         created using this same style.
         """
         next_style_elm = self._element.next_style
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index 766645a83..8e9cffffb 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -53,9 +53,9 @@ def __len__(self):
 
     def add_style(self, name, style_type, builtin=False):
         """
-        Return a newly added style object of *style_type* and identified
-        by *name*. A builtin style can be defined by passing True for the
-        optional *builtin* argument.
+        Return a newly added style object of `style_type` and identified
+        by `name`. A builtin style can be defined by passing True for the
+        optional `builtin` argument.
         """
         style_name = BabelFish.ui2internal(name)
         if style_name in self:
@@ -65,7 +65,7 @@ def add_style(self, name, style_type, builtin=False):
 
     def default(self, style_type):
         """
-        Return the default style for *style_type* or |None| if no default is
+        Return the default style for `style_type` or |None| if no default is
         defined for that type (not common).
         """
         style = self._element.default_for(style_type)
@@ -74,10 +74,10 @@ def default(self, style_type):
         return StyleFactory(style)
 
     def get_by_id(self, style_id, style_type):
-        """Return the style of *style_type* matching *style_id*.
+        """Return the style of `style_type` matching `style_id`.
 
-        Returns the default for *style_type* if *style_id* is not found or is |None|, or
-        if the style having *style_id* is not of *style_type*.
+        Returns the default for `style_type` if `style_id` is not found or is |None|, or
+        if the style having `style_id` is not of `style_type`.
         """
         if style_id is None:
             return self.default(style_type)
@@ -85,12 +85,12 @@ def get_by_id(self, style_id, style_type):
 
     def get_style_id(self, style_or_name, style_type):
         """
-        Return the id of the style corresponding to *style_or_name*, or
-        |None| if *style_or_name* is |None|. If *style_or_name* is not
-        a style object, the style is looked up using *style_or_name* as
+        Return the id of the style corresponding to `style_or_name`, or
+        |None| if `style_or_name` is |None|. If `style_or_name` is not
+        a style object, the style is looked up using `style_or_name` as
         a style name, raising |ValueError| if no style with that name is
         defined. Raises |ValueError| if the target style is not of
-        *style_type*.
+        `style_type`.
         """
         if style_or_name is None:
             return None
@@ -111,9 +111,9 @@ def latent_styles(self):
 
     def _get_by_id(self, style_id, style_type):
         """
-        Return the style of *style_type* matching *style_id*. Returns the
-        default for *style_type* if *style_id* is not found or if the style
-        having *style_id* is not of *style_type*.
+        Return the style of `style_type` matching `style_id`. Returns the
+        default for `style_type` if `style_id` is not found or if the style
+        having `style_id` is not of `style_type`.
         """
         style = self._element.get_by_id(style_id)
         if style is None or style.type != style_type:
@@ -122,17 +122,17 @@ def _get_by_id(self, style_id, style_type):
 
     def _get_style_id_from_name(self, style_name, style_type):
         """
-        Return the id of the style of *style_type* corresponding to
-        *style_name*. Returns |None| if that style is the default style for
-        *style_type*. Raises |ValueError| if the named style is not found in
-        the document or does not match *style_type*.
+        Return the id of the style of `style_type` corresponding to
+        `style_name`. Returns |None| if that style is the default style for
+        `style_type`. Raises |ValueError| if the named style is not found in
+        the document or does not match `style_type`.
         """
         return self._get_style_id_from_style(self[style_name], style_type)
 
     def _get_style_id_from_style(self, style, style_type):
         """
-        Return the id of *style*, or |None| if it is the default style of
-        *style_type*. Raises |ValueError| if style is not of *style_type*.
+        Return the id of `style`, or |None| if it is the default style of
+        `style_type`. Raises |ValueError| if style is not of `style_type`.
         """
         if style.type != style_type:
             raise ValueError(
diff --git a/src/docx/table.py b/src/docx/table.py
index 3191ec1ea..43482ae96 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -17,7 +17,7 @@ def __init__(self, tbl, parent):
 
     def add_column(self, width):
         """
-        Return a |_Column| object of *width*, newly added rightmost to the
+        Return a |_Column| object of `width`, newly added rightmost to the
         table.
         """
         tblGrid = self._tbl.tblGrid
@@ -69,15 +69,15 @@ def autofit(self, value):
 
     def cell(self, row_idx, col_idx):
         """
-        Return |_Cell| instance correponding to table cell at *row_idx*,
-        *col_idx* intersection, where (0, 0) is the top, left-most cell.
+        Return |_Cell| instance correponding to table cell at `row_idx`,
+        `col_idx` intersection, where (0, 0) is the top, left-most cell.
         """
         cell_idx = col_idx + (row_idx * self._column_count)
         return self._cells[cell_idx]
 
     def column_cells(self, column_idx):
         """
-        Sequence of cells in the column at *column_idx* in this table.
+        Sequence of cells in the column at `column_idx` in this table.
         """
         cells = self._cells
         idxs = range(column_idx, len(cells), self._column_count)
@@ -93,7 +93,7 @@ def columns(self):
 
     def row_cells(self, row_idx):
         """
-        Sequence of cells in the row at *row_idx* in this table.
+        Sequence of cells in the row at `row_idx` in this table.
         """
         column_count = self._column_count
         start = row_idx * column_count
@@ -192,13 +192,13 @@ def __init__(self, tc, parent):
     def add_paragraph(self, text="", style=None):
         """
         Return a paragraph newly added to the end of the content in this
-        cell. If present, *text* is added to the paragraph in a single run.
-        If specified, the paragraph style *style* is applied. If *style* is
+        cell. If present, `text` is added to the paragraph in a single run.
+        If specified, the paragraph style `style` is applied. If `style` is
         not specified or is |None|, the result is as though the 'Normal'
         style was applied. Note that the formatting of text in a cell can be
-        influenced by the table style. *text* can contain tab (``\\t``)
+        influenced by the table style. `text` can contain tab (``\\t``)
         characters, which are converted to the appropriate XML form for
-        a tab. *text* can also include newline (``\\n``) or carriage return
+        a tab. `text` can also include newline (``\\n``) or carriage return
         (``\\r``) characters, each of which is converted to a line break.
         """
         return super(_Cell, self).add_paragraph(text, style)
@@ -206,7 +206,7 @@ def add_paragraph(self, text="", style=None):
     def add_table(self, rows, cols):
         """
         Return a table newly added to this cell after any existing cell
-        content, having *rows* rows and *cols* columns. An empty paragraph is
+        content, having `rows` rows and `cols` columns. An empty paragraph is
         added after the table because Word requires a paragraph element as
         the last element in every cell.
         """
@@ -218,7 +218,7 @@ def add_table(self, rows, cols):
     def merge(self, other_cell):
         """
         Return a merged cell created by spanning the rectangular region
-        having this cell and *other_cell* as diagonal corners. Raises
+        having this cell and `other_cell` as diagonal corners. Raises
         |InvalidSpanError| if the cells do not define a rectangular region.
         """
         tc, tc_2 = self._tc, other_cell._tc
@@ -253,7 +253,7 @@ def text(self):
     @text.setter
     def text(self, text):
         """
-        Write-only. Set entire contents of cell to the string *text*. Any
+        Write-only. Set entire contents of cell to the string `text`. Any
         existing content or revisions are replaced.
         """
         tc = self._tc
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index ecb824151..80d0b7dad 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -388,7 +388,7 @@ def web_hidden(self, value):
 
     def _get_bool_prop(self, name):
         """
-        Return the value of boolean child of `w:rPr` having *name*.
+        Return the value of boolean child of `w:rPr` having `name`.
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -397,7 +397,7 @@ def _get_bool_prop(self, name):
 
     def _set_bool_prop(self, name, value):
         """
-        Assign *value* to the boolean child *name* of `w:rPr`.
+        Assign `value` to the boolean child `name` of `w:rPr`.
         """
         rPr = self._element.get_or_add_rPr()
         rPr._set_bool_val(name, value)
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index a0ff17a93..c397bb328 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -15,10 +15,10 @@ def __init__(self, p, parent):
 
     def add_run(self, text=None, style=None):
         """
-        Append a run to this paragraph containing *text* and having character
-        style identified by style ID *style*. *text* can contain tab
+        Append a run to this paragraph containing `text` and having character
+        style identified by style ID `style`. `text` can contain tab
         (``\\t``) characters, which are converted to the appropriate XML form
-        for a tab. *text* can also include newline (``\\n``) or carriage
+        for a tab. `text` can also include newline (``\\n``) or carriage
         return (``\\r``) characters, each of which is converted to a line
         break.
         """
@@ -56,8 +56,8 @@ def clear(self):
     def insert_paragraph_before(self, text=None, style=None):
         """
         Return a newly created paragraph, inserted directly before this
-        paragraph. If *text* is supplied, the new paragraph contains that
-        text in a single run. If *style* is provided, that style is assigned
+        paragraph. If `text` is supplied, the new paragraph contains that
+        text in a single run. If `style` is provided, that style is assigned
         to the new paragraph.
         """
         paragraph = self._insert_paragraph_before()
diff --git a/src/docx/text/parfmt.py b/src/docx/text/parfmt.py
index 4a99b0b59..328eb7def 100644
--- a/src/docx/text/parfmt.py
+++ b/src/docx/text/parfmt.py
@@ -264,10 +264,10 @@ def widow_control(self, value):
     def _line_spacing(spacing_line, spacing_lineRule):
         """
         Return the line spacing value calculated from the combination of
-        *spacing_line* and *spacing_lineRule*. Returns a |float| number of
-        lines when *spacing_lineRule* is ``WD_LINE_SPACING.MULTIPLE``,
+        `spacing_line` and `spacing_lineRule`. Returns a |float| number of
+        lines when `spacing_lineRule` is ``WD_LINE_SPACING.MULTIPLE``,
         otherwise a |Length| object of absolute line height is returned.
-        Returns |None| when *spacing_line* is |None|.
+        Returns |None| when `spacing_line` is |None|.
         """
         if spacing_line is None:
             return None
@@ -279,7 +279,7 @@ def _line_spacing(spacing_line, spacing_lineRule):
     def _line_spacing_rule(line, lineRule):
         """
         Return the line spacing rule value calculated from the combination of
-        *line* and *lineRule*. Returns special members of the
+        `line` and `lineRule`. Returns special members of the
         :ref:`WdLineSpacing` enumeration when line spacing is single, double,
         or 1.5 lines.
         """
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 09d95f206..72f49a069 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -22,10 +22,10 @@ def __init__(self, r, parent):
 
     def add_break(self, break_type=WD_BREAK.LINE):
         """
-        Add a break element of *break_type* to this run. *break_type* can
+        Add a break element of `break_type` to this run. `break_type` can
         take the values `WD_BREAK.LINE`, `WD_BREAK.PAGE`, and
         `WD_BREAK.COLUMN` where `WD_BREAK` is imported from `docx.enum.text`.
-        *break_type* defaults to `WD_BREAK.LINE`.
+        `break_type` defaults to `WD_BREAK.LINE`.
         """
         type_, clear = {
             WD_BREAK.LINE: (None, None),
@@ -44,8 +44,8 @@ def add_break(self, break_type=WD_BREAK.LINE):
     def add_picture(self, image_path_or_stream, width=None, height=None):
         """
         Return an |InlineShape| instance containing the image identified by
-        *image_path_or_stream*, added to the end of this run.
-        *image_path_or_stream* can be a path (a string) or a file-like object
+        `image_path_or_stream`, added to the end of this run.
+        `image_path_or_stream` can be a path (a string) or a file-like object
         containing a binary image. If neither width nor height is specified,
         the picture appears at its native size. If only one is specified, it
         is used to compute a scaling factor that is then applied to the
@@ -68,7 +68,7 @@ def add_tab(self):
     def add_text(self, text):
         """
         Returns a newly appended |_Text| object (corresponding to a new
-        ``<w:t>`` child element) to the run, containing *text*. Compare with
+        ``<w:t>`` child element) to the run, containing `text`. Compare with
         the possibly more friendly approach of assigning text to the
         :attr:`Run.text` property.
         """
diff --git a/src/docx/text/tabstops.py b/src/docx/text/tabstops.py
index c6b899c05..96cf44751 100644
--- a/src/docx/text/tabstops.py
+++ b/src/docx/text/tabstops.py
@@ -21,7 +21,7 @@ def __init__(self, element):
 
     def __delitem__(self, idx):
         """
-        Remove the tab at offset *idx* in this sequence.
+        Remove the tab at offset `idx` in this sequence.
         """
         tabs = self._pPr.tabs
         try:
@@ -62,13 +62,13 @@ def add_tab_stop(
         self, position, alignment=WD_TAB_ALIGNMENT.LEFT, leader=WD_TAB_LEADER.SPACES
     ):
         """
-        Add a new tab stop at *position*, a |Length| object specifying the
+        Add a new tab stop at `position`, a |Length| object specifying the
         location of the tab stop relative to the paragraph edge. A negative
-        *position* value is valid and appears in hanging indentation. Tab
+        `position` value is valid and appears in hanging indentation. Tab
         alignment defaults to left, but may be specified by passing a member
-        of the :ref:`WdTabAlignment` enumeration as *alignment*. An optional
+        of the :ref:`WdTabAlignment` enumeration as `alignment`. An optional
         leader character can be specified by passing a member of the
-        :ref:`WdTabLeader` enumeration as *leader*.
+        :ref:`WdTabLeader` enumeration as `leader`.
         """
         tabs = self._pPr.get_or_add_tabs()
         tab = tabs.insert_tab_in_order(position, alignment, leader)
diff --git a/tests/opc/test_packuri.py b/tests/opc/test_packuri.py
index 1d5732a85..272175795 100644
--- a/tests/opc/test_packuri.py
+++ b/tests/opc/test_packuri.py
@@ -9,7 +9,7 @@ class DescribePackURI(object):
     def cases(self, expected_values):
         """
         Return list of tuples zipped from uri_str cases and
-        *expected_values*. Raise if lengths don't match.
+        `expected_values`. Raise if lengths don't match.
         """
         uri_str_cases = [
             "/",
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index cd010e396..10f3cf0b1 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -361,7 +361,7 @@ def match_override_fixture(self, request):
 
     def _xml_from(self, entries):
         """
-        Return XML for a [Content_Types].xml based on items in *entries*.
+        Return XML for a [Content_Types].xml based on items in `entries`.
         """
         types_bldr = a_Types().with_nsdecls()
         for entry in entries:
diff --git a/tests/opc/unitdata/rels.py b/tests/opc/unitdata/rels.py
index c0b6024fa..3b4e8fa4d 100644
--- a/tests/opc/unitdata/rels.py
+++ b/tests/opc/unitdata/rels.py
@@ -17,7 +17,7 @@ def element(self):
         return parse_xml(self.xml)
 
     def with_indent(self, indent):
-        """Add integer *indent* spaces at beginning of element XML"""
+        """Add integer `indent` spaces at beginning of element XML"""
         self._indent = indent
         return self
 
@@ -74,12 +74,12 @@ def __init__(self):
         self._namespace = ' xmlns="%s"' % NS.OPC_CONTENT_TYPES
 
     def with_content_type(self, content_type):
-        """Set ContentType attribute to *content_type*"""
+        """Set ContentType attribute to `content_type`"""
         self._content_type = content_type
         return self
 
     def with_extension(self, extension):
-        """Set Extension attribute to *extension*"""
+        """Set Extension attribute to `extension`"""
         self._extension = extension
         return self
 
@@ -110,12 +110,12 @@ def __init__(self):
         self._partname = "/part/name.xml"
 
     def with_content_type(self, content_type):
-        """Set ContentType attribute to *content_type*"""
+        """Set ContentType attribute to `content_type`"""
         self._content_type = content_type
         return self
 
     def with_partname(self, partname):
-        """Set PartName attribute to *partname*"""
+        """Set PartName attribute to `partname`"""
         self._partname = partname
         return self
 
@@ -148,22 +148,22 @@ def __init__(self):
         self._namespace = ' xmlns="%s"' % NS.OPC_RELATIONSHIPS
 
     def with_rId(self, rId):
-        """Set Id attribute to *rId*"""
+        """Set Id attribute to `rId`"""
         self._rId = rId
         return self
 
     def with_reltype(self, reltype):
-        """Set Type attribute to *reltype*"""
+        """Set Type attribute to `reltype`"""
         self._reltype = reltype
         return self
 
     def with_target(self, target):
-        """Set XXX attribute to *target*"""
+        """Set XXX attribute to `target`"""
         self._target = target
         return self
 
     def with_target_mode(self, target_mode):
-        """Set TargetMode attribute to *target_mode*"""
+        """Set TargetMode attribute to `target_mode`"""
         self._target_mode = None if target_mode == "Internal" else target_mode
         return self
 
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index b24c4abf3..519151be4 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -365,7 +365,7 @@ def _span_to_width_(self, request):
 
     def _snippet_tbl(self, idx):
         """
-        Return a <w:tbl> element for snippet at *idx* in 'tbl-cells' snippet
+        Return a <w:tbl> element for snippet at `idx` in 'tbl-cells' snippet
         file.
         """
         return parse_xml(snippet_seq("tbl-cells")[idx])
diff --git a/tests/unitdata.py b/tests/unitdata.py
index d5939899e..057b54490 100644
--- a/tests/unitdata.py
+++ b/tests/unitdata.py
@@ -56,7 +56,7 @@ def element(self):
 
     def with_child(self, child_bldr):
         """
-        Cause new child element specified by *child_bldr* to be appended to
+        Cause new child element specified by `child_bldr` to be appended to
         the children of this element.
         """
         self._child_bldrs.append(child_bldr)
@@ -64,7 +64,7 @@ def with_child(self, child_bldr):
 
     def with_text(self, text):
         """
-        Cause *text* to be placed between the start and end tags of this
+        Cause `text` to be placed between the start and end tags of this
         element. Not robust enough for mixed elements, intended only for
         elements having no child elements.
         """
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index cc52ecdd1..9c687df67 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -29,13 +29,13 @@
 
 
 def element(cxel_str):
-    """Return an oxml element parsed from the XML generated from *cxel_str*."""
+    """Return an oxml element parsed from the XML generated from `cxel_str`."""
     _xml = xml(cxel_str)
     return parse_xml(_xml)
 
 
 def xml(cxel_str):
-    """Return the XML generated from *cxel_str*."""
+    """Return the XML generated from `cxel_str`."""
     root_token = root_node.parseString(cxel_str)
     xml = root_token.element.xml
     return xml
@@ -47,7 +47,7 @@ def xml(cxel_str):
 
 
 def nsdecls(*nspfxs):
-    """Namespace-declaration including each of *nspfxs*, in the order specified."""
+    """Namespace-declaration including each of `nspfxs`, in the order specified."""
     nsdecls = ""
     for nspfx in nspfxs:
         nsdecls += ' xmlns:%s="%s"' % (nspfx, nsmap[nspfx])
@@ -76,7 +76,7 @@ def __repr__(self):
 
     def connect_children(self, child_node_list):
         """
-        Make each of the elements appearing in *child_node_list* a child of
+        Make each of the elements appearing in `child_node_list` a child of
         this element.
         """
         for node in child_node_list:
@@ -158,7 +158,7 @@ def xml(self):
     def _xml(self, indent):
         """
         Return a string containing the XML of this element and all its
-        children with a starting indent of *indent* spaces.
+        children with a starting indent of `indent` spaces.
         """
         self._indent_str = " " * indent
         xml = self._start_tag
diff --git a/tests/unitutil/file.py b/tests/unitutil/file.py
index 0d1562942..432c8635e 100644
--- a/tests/unitutil/file.py
+++ b/tests/unitutil/file.py
@@ -17,7 +17,7 @@ def absjoin(*paths):
 
 def docx_path(name):
     """
-    Return the absolute path to test .docx file with root name *name*.
+    Return the absolute path to test .docx file with root name `name`.
     """
     return absjoin(test_file_dir, "%s.docx" % name)
 
@@ -25,8 +25,8 @@ def docx_path(name):
 def snippet_seq(name, offset=0, count=1024):
     """
     Return a tuple containing the unicode text snippets read from the snippet
-    file having *name*. Snippets are delimited by a blank line. If specified,
-    *count* snippets starting at *offset* are returned.
+    file having `name`. Snippets are delimited by a blank line. If specified,
+    `count` snippets starting at `offset` are returned.
     """
     path = os.path.join(test_file_dir, "snippets", "%s.txt" % name)
     with open(path, "rb") as f:
@@ -39,7 +39,7 @@ def snippet_seq(name, offset=0, count=1024):
 def snippet_text(snippet_file_name):
     """
     Return the unicode text read from the test snippet file having
-    *snippet_file_name*.
+    `snippet_file_name`.
     """
     snippet_file_path = os.path.join(
         test_file_dir, "snippets", "%s.txt" % snippet_file_name
@@ -51,6 +51,6 @@ def snippet_text(snippet_file_name):
 
 def test_file(name):
     """
-    Return the absolute path to test file having *name*.
+    Return the absolute path to test file having `name`.
     """
     return absjoin(test_file_dir, name)
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
index c47c22890..c2c15bd62 100644
--- a/tests/unitutil/mock.py
+++ b/tests/unitutil/mock.py
@@ -1,4 +1,4 @@
-"""Utility functions wrapping the excellent *mock* library."""
+"""Utility functions wrapping the excellent `mock` library."""
 
 import sys
 
@@ -13,10 +13,10 @@
 
 
 def class_mock(request, q_class_name, autospec=True, **kwargs):
-    """Return mock patching class with qualified name *q_class_name*.
+    """Return mock patching class with qualified name `q_class_name`.
 
     The mock is autospec'ed based on the patched class unless the optional
-    argument *autospec* is set to False. Any other keyword arguments are
+    argument `autospec` is set to False. Any other keyword arguments are
     passed through to Mock(). Patch is reversed after calling test returns.
     """
     _patch = patch(q_class_name, autospec=autospec, **kwargs)
@@ -26,7 +26,7 @@ def class_mock(request, q_class_name, autospec=True, **kwargs):
 
 def cls_attr_mock(request, cls, attr_name, name=None, **kwargs):
     """
-    Return a mock for attribute *attr_name* on *cls* where the patch is
+    Return a mock for attribute `attr_name` on `cls` where the patch is
     reversed after pytest uses it.
     """
     name = request.fixturename if name is None else name
@@ -36,7 +36,7 @@ def cls_attr_mock(request, cls, attr_name, name=None, **kwargs):
 
 
 def function_mock(request, q_function_name, autospec=True, **kwargs):
-    """Return mock patching function with qualified name *q_function_name*.
+    """Return mock patching function with qualified name `q_function_name`.
 
     Patch is reversed after calling test returns.
     """
@@ -46,7 +46,7 @@ def function_mock(request, q_function_name, autospec=True, **kwargs):
 
 
 def initializer_mock(request, cls, autospec=True, **kwargs):
-    """Return mock for __init__() method on *cls*.
+    """Return mock for __init__() method on `cls`.
 
     The patch is reversed after pytest uses it.
     """
@@ -59,8 +59,8 @@ def initializer_mock(request, cls, autospec=True, **kwargs):
 
 def instance_mock(request, cls, name=None, spec_set=True, **kwargs):
     """
-    Return a mock for an instance of *cls* that draws its spec from the class
-    and does not allow new attributes to be set on the instance. If *name* is
+    Return a mock for an instance of `cls` that draws its spec from the class
+    and does not allow new attributes to be set on the instance. If `name` is
     missing or |None|, the name of the returned |Mock| instance is set to
     *request.fixturename*. Additional keyword arguments are passed through to
     the Mock() call that creates the mock.
@@ -81,7 +81,7 @@ def loose_mock(request, name=None, **kwargs):
 
 
 def method_mock(request, cls, method_name, autospec=True, **kwargs):
-    """Return mock for method *method_name* on *cls*.
+    """Return mock for method `method_name` on `cls`.
 
     The patch is reversed after pytest uses it.
     """
@@ -92,7 +92,7 @@ def method_mock(request, cls, method_name, autospec=True, **kwargs):
 
 def open_mock(request, module_name, **kwargs):
     """
-    Return a mock for the builtin `open()` method in *module_name*.
+    Return a mock for the builtin `open()` method in `module_name`.
     """
     target = "%s.open" % module_name
     _patch = patch(target, mock_open(), create=True, **kwargs)
@@ -102,7 +102,7 @@ def open_mock(request, module_name, **kwargs):
 
 def property_mock(request, cls, prop_name, **kwargs):
     """
-    Return a mock for property *prop_name* on class *cls* where the patch is
+    Return a mock for property `prop_name` on class `cls` where the patch is
     reversed after pytest uses it.
     """
     _patch = patch.object(cls, prop_name, new_callable=PropertyMock, **kwargs)
@@ -112,7 +112,7 @@ def property_mock(request, cls, prop_name, **kwargs):
 
 def var_mock(request, q_var_name, **kwargs):
     """
-    Return a mock patching the variable with qualified name *q_var_name*.
+    Return a mock patching the variable with qualified name `q_var_name`.
     Patch is reversed after calling test returns.
     """
     _patch = patch(q_var_name, **kwargs)

From 1c5bb2817e5354771f3609c62496179708451de3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 27 Sep 2023 21:02:16 -0700
Subject: [PATCH 252/367] rfctr: bulk best-efforts PEP 257 docstrings

Done by `docformatter`, it can't get the summary line right if it's too
long, but adjusts the description block width and gets the shorter
docstrings right, so a lot better than doing them all by hand. The rest
will have to wait for hand curation as we go.
---
 src/docx/blkcntnr.py            |  42 ++--
 src/docx/dml/color.py           |  76 +++----
 src/docx/document.py            | 133 +++++-------
 src/docx/enum/base.py           | 188 ++++++----------
 src/docx/enum/dml.py            |  16 +-
 src/docx/enum/section.py        |  19 +-
 src/docx/enum/shape.py          |   6 +-
 src/docx/enum/style.py          |  20 +-
 src/docx/enum/table.py          |  36 ++--
 src/docx/exceptions.py          |  16 +-
 src/docx/image/bmp.py           |  26 +--
 src/docx/image/constants.py     |  20 +-
 src/docx/image/exceptions.py    |  12 +-
 src/docx/image/gif.py           |  24 +--
 src/docx/image/helpers.py       |  47 ++--
 src/docx/image/image.py         | 148 +++++--------
 src/docx/image/jpeg.py          | 233 +++++++-------------
 src/docx/image/png.py           | 142 ++++--------
 src/docx/image/tiff.py          | 207 +++++++-----------
 src/docx/opc/coreprops.py       |   6 +-
 src/docx/opc/exceptions.py      |   8 +-
 src/docx/opc/oxml.py            | 161 +++++---------
 src/docx/opc/package.py         | 114 ++++------
 src/docx/opc/packuri.py         |  68 +++---
 src/docx/opc/part.py            | 155 ++++++-------
 src/docx/opc/parts/coreprops.py |  18 +-
 src/docx/opc/phys_pkg.py        |  79 +++----
 src/docx/opc/pkgreader.py       | 138 +++++-------
 src/docx/opc/pkgwriter.py       |  74 +++----
 src/docx/opc/rel.py             |  63 ++----
 src/docx/opc/shared.py          |  20 +-
 src/docx/oxml/__init__.py       |  33 ++-
 src/docx/oxml/coreprops.py      |  20 +-
 src/docx/oxml/document.py       |  16 +-
 src/docx/oxml/exceptions.py     |   6 +-
 src/docx/oxml/ns.py             |  53 ++---
 src/docx/oxml/numbering.py      |  64 ++----
 src/docx/oxml/section.py        | 114 ++++------
 src/docx/oxml/settings.py       |   6 +-
 src/docx/oxml/shape.py          | 107 +++------
 src/docx/oxml/shared.py         |  32 +--
 src/docx/oxml/simpletypes.py    |  44 ++--
 src/docx/oxml/styles.py         | 130 ++++-------
 src/docx/oxml/table.py          | 370 ++++++++++++--------------------
 src/docx/oxml/text/font.py      | 101 +++------
 src/docx/oxml/text/parfmt.py    | 101 +++------
 src/docx/oxml/xmlchemy.py       | 288 +++++++++----------------
 src/docx/package.py             |  26 +--
 src/docx/parts/document.py      |  73 +++----
 src/docx/parts/image.py         |  45 ++--
 src/docx/parts/numbering.py     |  24 +--
 src/docx/parts/settings.py      |  20 +-
 src/docx/parts/styles.py        |  21 +-
 src/docx/section.py             |  87 ++++----
 src/docx/shape.py               |  32 ++-
 src/docx/shared.py              | 134 +++++-------
 src/docx/styles/__init__.py     |  18 +-
 src/docx/styles/latent.py       | 140 ++++++------
 src/docx/styles/style.py        | 159 +++++++-------
 src/docx/styles/styles.py       |  71 +++---
 src/docx/table.py               | 260 +++++++++-------------
 src/docx/text/font.py           | 235 ++++++++++----------
 src/docx/text/paragraph.py      |  66 +++---
 src/docx/text/parfmt.py         | 171 +++++++--------
 src/docx/text/run.py            | 133 ++++++------
 src/docx/text/tabstops.py       |  75 +++----
 66 files changed, 2166 insertions(+), 3424 deletions(-)

diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index f0000d226..81166556a 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -13,8 +13,8 @@ class BlockItemContainer(Parented):
     """Base class for proxy objects that can contain block items.
 
     These containers include _Body, _Cell, header, footer, footnote, endnote, comment,
-    and text box objects. Provides the shared functionality to add a block item like
-    a paragraph or table.
+    and text box objects. Provides the shared functionality to add a block item like a
+    paragraph or table.
     """
 
     def __init__(self, element, parent):
@@ -22,11 +22,13 @@ def __init__(self, element, parent):
         self._element = element
 
     def add_paragraph(self, text="", style=None):
-        """
-        Return a paragraph newly added to the end of the content in this
-        container, having `text` in a single run if present, and having
-        paragraph style `style`. If `style` is |None|, no paragraph style is
-        applied, which has the same effect as applying the 'Normal' style.
+        """Return paragraph newly added to the end of the content in this container.
+
+        The paragraph has `text` in a single run if present, and is given paragraph
+        style `style`.
+
+        If `style` is |None|, no paragraph style is applied, which has the same effect
+        as applying the 'Normal' style.
         """
         paragraph = self._add_paragraph()
         if text:
@@ -36,12 +38,13 @@ def add_paragraph(self, text="", style=None):
         return paragraph
 
     def add_table(self, rows, cols, width):
+        """Return table of `width` having `rows` rows and `cols` columns.
+
+        The table is appended appended at the end of the content in this container.
+
+        `width` is evenly distributed between the table columns.
         """
-        Return a table of `width` having `rows` rows and `cols` columns,
-        newly appended to the content in this container. `width` is evenly
-        distributed between the table columns.
-        """
-        from .table import Table
+        from docx.table import Table
 
         tbl = CT_Tbl.new_tbl(rows, cols, width)
         self._element._insert_tbl(tbl)
@@ -49,16 +52,16 @@ def add_table(self, rows, cols, width):
 
     @property
     def paragraphs(self):
-        """
-        A list containing the paragraphs in this container, in document
-        order. Read-only.
+        """A list containing the paragraphs in this container, in document order.
+
+        Read-only.
         """
         return [Paragraph(p, self) for p in self._element.p_lst]
 
     @property
     def tables(self):
-        """
-        A list containing the tables in this container, in document order.
+        """A list containing the tables in this container, in document order.
+
         Read-only.
         """
         from .table import Table
@@ -66,8 +69,5 @@ def tables(self):
         return [Table(tbl, self) for tbl in self._element.tbl_lst]
 
     def _add_paragraph(self):
-        """
-        Return a paragraph newly added to the end of the content in this
-        container.
-        """
+        """Return paragraph newly added to the end of the content in this container."""
         return Paragraph(self._element.add_p(), self)
diff --git a/src/docx/dml/color.py b/src/docx/dml/color.py
index 6f00b4f99..ec0a0f3e0 100644
--- a/src/docx/dml/color.py
+++ b/src/docx/dml/color.py
@@ -6,10 +6,8 @@
 
 
 class ColorFormat(ElementProxy):
-    """
-    Provides access to color settings such as RGB color, theme color, and
-    luminance adjustments.
-    """
+    """Provides access to color settings such as RGB color, theme color, and luminance
+    adjustments."""
 
     __slots__ = ()
 
@@ -18,22 +16,19 @@ def __init__(self, rPr_parent):
 
     @property
     def rgb(self):
-        """
-        An |RGBColor| value or |None| if no RGB color is specified.
-
-        When :attr:`type` is `MSO_COLOR_TYPE.RGB`, the value of this property
-        will always be an |RGBColor| value. It may also be an |RGBColor|
-        value if :attr:`type` is `MSO_COLOR_TYPE.THEME`, as Word writes the
-        current value of a theme color when one is assigned. In that case,
-        the RGB value should be interpreted as no more than a good guess
-        however, as the theme color takes precedence at rendering time. Its
-        value is |None| whenever :attr:`type` is either |None| or
-        `MSO_COLOR_TYPE.AUTO`.
-
-        Assigning an |RGBColor| value causes :attr:`type` to become
-        `MSO_COLOR_TYPE.RGB` and any theme color is removed. Assigning |None|
-        causes any color to be removed such that the effective color is
-        inherited from the style hierarchy.
+        """An |RGBColor| value or |None| if no RGB color is specified.
+
+        When :attr:`type` is `MSO_COLOR_TYPE.RGB`, the value of this property will
+        always be an |RGBColor| value. It may also be an |RGBColor| value if
+        :attr:`type` is `MSO_COLOR_TYPE.THEME`, as Word writes the current value of a
+        theme color when one is assigned. In that case, the RGB value should be
+        interpreted as no more than a good guess however, as the theme color takes
+        precedence at rendering time. Its value is |None| whenever :attr:`type` is
+        either |None| or `MSO_COLOR_TYPE.AUTO`.
+
+        Assigning an |RGBColor| value causes :attr:`type` to become `MSO_COLOR_TYPE.RGB`
+        and any theme color is removed. Assigning |None| causes any color to be removed
+        such that the effective color is inherited from the style hierarchy.
         """
         color = self._color
         if color is None:
@@ -53,18 +48,16 @@ def rgb(self, value):
 
     @property
     def theme_color(self):
-        """
-        A member of :ref:`MsoThemeColorIndex` or |None| if no theme color is
-        specified. When :attr:`type` is `MSO_COLOR_TYPE.THEME`, the value of
-        this property will always be a member of :ref:`MsoThemeColorIndex`.
-        When :attr:`type` has any other value, the value of this property is
-        |None|.
-
-        Assigning a member of :ref:`MsoThemeColorIndex` causes :attr:`type`
-        to become `MSO_COLOR_TYPE.THEME`. Any existing RGB value is retained
-        but ignored by Word. Assigning |None| causes any color specification
-        to be removed such that the effective color is inherited from the
-        style hierarchy.
+        """Member of :ref:`MsoThemeColorIndex` or |None| if no theme color is specified.
+
+        When :attr:`type` is `MSO_COLOR_TYPE.THEME`, the value of this property will
+        always be a member of :ref:`MsoThemeColorIndex`. When :attr:`type` has any other
+        value, the value of this property is |None|.
+
+        Assigning a member of :ref:`MsoThemeColorIndex` causes :attr:`type` to become
+        `MSO_COLOR_TYPE.THEME`. Any existing RGB value is retained but ignored by Word.
+        Assigning |None| causes any color specification to be removed such that the
+        effective color is inherited from the style hierarchy.
         """
         color = self._color
         if color is None or color.themeColor is None:
@@ -80,12 +73,13 @@ def theme_color(self, value):
         self._element.get_or_add_rPr().get_or_add_color().themeColor = value
 
     @property
-    def type(self):
-        """
-        Read-only. A member of :ref:`MsoColorType`, one of RGB, THEME, or
-        AUTO, corresponding to the way this color is defined. Its value is
-        |None| if no color is applied at this level, which causes the
-        effective color to be inherited from the style hierarchy.
+    def type(self) -> MSO_COLOR_TYPE:
+        """Read-only.
+
+        A member of :ref:`MsoColorType`, one of RGB, THEME, or AUTO, corresponding to
+        the way this color is defined. Its value is |None| if no color is applied at
+        this level, which causes the effective color to be inherited from the style
+        hierarchy.
         """
         color = self._color
         if color is None:
@@ -98,9 +92,9 @@ def type(self):
 
     @property
     def _color(self):
-        """
-        Return `w:rPr/w:color` or |None| if not present. Helper to factor out
-        repetitive element access.
+        """Return `w:rPr/w:color` or |None| if not present.
+
+        Helper to factor out repetitive element access.
         """
         rPr = self._element.rPr
         if rPr is None:
diff --git a/src/docx/document.py b/src/docx/document.py
index 327edbe25..1baca5643 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -1,10 +1,11 @@
-"""|Document| and closely related objects"""
+"""|Document| and closely related objects."""
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.section import Section, Sections
 from docx.shared import ElementProxy, Emu
+from docx.text.paragraph import Paragraph
 
 
 class Document(ElementProxy):
@@ -40,50 +41,47 @@ def add_page_break(self):
         paragraph.add_run().add_break(WD_BREAK.PAGE)
         return paragraph
 
-    def add_paragraph(self, text="", style=None):
-        """
-        Return a paragraph newly added to the end of the document, populated
-        with `text` and having paragraph style `style`. `text` can contain
-        tab (``\\t``) characters, which are converted to the appropriate XML
-        form for a tab. `text` can also include newline (``\\n``) or carriage
-        return (``\\r``) characters, each of which is converted to a line
+    def add_paragraph(self, text: str = "", style=None) -> Paragraph:
+        """Return paragraph newly added to the end of the document.
+
+        The paragraph is populated with `text` and having paragraph style `style`.
+
+        `text` can contain tab (``\\t``) characters, which are converted to the
+        appropriate XML form for a tab. `text` can also include newline (``\\n``) or
+        carriage return (``\\r``) characters, each of which is converted to a line
         break.
         """
         return self._body.add_paragraph(text, style)
 
     def add_picture(self, image_path_or_stream, width=None, height=None):
-        """
-        Return a new picture shape added in its own paragraph at the end of
-        the document. The picture contains the image at
-        `image_path_or_stream`, scaled based on `width` and `height`. If
-        neither width nor height is specified, the picture appears at its
-        native size. If only one is specified, it is used to compute
-        a scaling factor that is then applied to the unspecified dimension,
-        preserving the aspect ratio of the image. The native size of the
-        picture is calculated using the dots-per-inch (dpi) value specified
-        in the image file, defaulting to 72 dpi if no value is specified, as
-        is often the case.
+        """Return new picture shape added in its own paragraph at end of the document.
+
+        The picture contains the image at `image_path_or_stream`, scaled based on
+        `width` and `height`. If neither width nor height is specified, the picture
+        appears at its native size. If only one is specified, it is used to compute a
+        scaling factor that is then applied to the unspecified dimension, preserving the
+        aspect ratio of the image. The native size of the picture is calculated using
+        the dots-per-inch (dpi) value specified in the image file, defaulting to 72 dpi
+        if no value is specified, as is often the case.
         """
         run = self.add_paragraph().add_run()
         return run.add_picture(image_path_or_stream, width, height)
 
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
-        """
-        Return a |Section| object representing a new section added at the end
-        of the document. The optional `start_type` argument must be a member
-        of the :ref:`WdSectionStart` enumeration, and defaults to
-        ``WD_SECTION.NEW_PAGE`` if not provided.
+        """Return a |Section| object newly added at the end of the document.
+
+        The optional `start_type` argument must be a member of the :ref:`WdSectionStart`
+        enumeration, and defaults to ``WD_SECTION.NEW_PAGE`` if not provided.
         """
         new_sectPr = self._element.body.add_section_break()
         new_sectPr.start_type = start_type
         return Section(new_sectPr, self._part)
 
     def add_table(self, rows, cols, style=None):
-        """
-        Add a table having row and column counts of `rows` and `cols`
-        respectively and table style of `style`. `style` may be a paragraph
-        style object or a paragraph style name. If `style` is |None|, the
-        table inherits the default table style of the document.
+        """Add a table having row and column counts of `rows` and `cols` respectively.
+
+        `style` may be a table style object or a table style name. If `style` is |None|,
+        the table inherits the default table style of the document.
         """
         table = self._body.add_table(rows, cols, self._block_width)
         table.style = style
@@ -91,42 +89,38 @@ def add_table(self, rows, cols, style=None):
 
     @property
     def core_properties(self):
-        """
-        A |CoreProperties| object providing read/write access to the core
-        properties of this document.
-        """
+        """A |CoreProperties| object providing Dublin Core properties of document."""
         return self._part.core_properties
 
     @property
     def inline_shapes(self):
-        """
-        An |InlineShapes| object providing access to the inline shapes in
-        this document. An inline shape is a graphical object, such as
-        a picture, contained in a run of text and behaving like a character
-        glyph, being flowed like other text in a paragraph.
+        """The |InlineShapes| collectoin for this document.
+
+        An inline shape is a graphical object, such as a picture, contained in a run of
+        text and behaving like a character glyph, being flowed like other text in a
+        paragraph.
         """
         return self._part.inline_shapes
 
     @property
     def paragraphs(self):
-        """
-        A list of |Paragraph| instances corresponding to the paragraphs in
-        the document, in document order. Note that paragraphs within revision
-        marks such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
+        """The |Paragraph| instances in the document, in document order.
+
+        Note that paragraphs within revision marks such as ``<w:ins>`` or ``<w:del>`` do
+        not appear in this list.
         """
         return self._body.paragraphs
 
     @property
     def part(self):
-        """
-        The |DocumentPart| object of this document.
-        """
+        """The |DocumentPart| object of this document."""
         return self._part
 
     def save(self, path_or_stream):
-        """
-        Save this document to `path_or_stream`, which can be either a path to
-        a filesystem location (a string) or a file-like object.
+        """Save this document to `path_or_stream`.
+
+        `path_or_stream` can be either a path to a filesystem location (a string) or a
+        file-like object.
         """
         self._part.save(path_or_stream)
 
@@ -137,53 +131,43 @@ def sections(self):
 
     @property
     def settings(self):
-        """
-        A |Settings| object providing access to the document-level settings
-        for this document.
-        """
+        """A |Settings| object providing access to the document-level settings."""
         return self._part.settings
 
     @property
     def styles(self):
-        """
-        A |Styles| object providing access to the styles in this document.
-        """
+        """A |Styles| object providing access to the styles in this document."""
         return self._part.styles
 
     @property
     def tables(self):
-        """
-        A list of |Table| instances corresponding to the tables in the
-        document, in document order. Note that only tables appearing at the
-        top level of the document appear in this list; a table nested inside
-        a table cell does not appear. A table within revision marks such as
-        ``<w:ins>`` or ``<w:del>`` will also not appear in the list.
+        """All |Table| instances in the document, in document order.
+
+        Note that only tables appearing at the top level of the document appear in this
+        list; a table nested inside a table cell does not appear. A table within
+        revision marks such as ``<w:ins>`` or ``<w:del>`` will also not appear in the
+        list.
         """
         return self._body.tables
 
     @property
     def _block_width(self):
-        """
-        Return a |Length| object specifying the width of available "writing"
-        space between the margins of the last section of this document.
-        """
+        """A |Length| object specifying the space between margins in last section."""
         section = self.sections[-1]
         return Emu(section.page_width - section.left_margin - section.right_margin)
 
     @property
     def _body(self):
-        """
-        The |_Body| instance containing the content for this document.
-        """
+        """The |_Body| instance containing the content for this document."""
         if self.__body is None:
             self.__body = _Body(self._element.body, self)
         return self.__body
 
 
 class _Body(BlockItemContainer):
-    """
-    Proxy for ``<w:body>`` element in this document, having primarily a
-    container role.
+    """Proxy for `<w:body>` element in this document.
+
+    It's primary role is a container for document content.
     """
 
     def __init__(self, body_elm, parent):
@@ -191,10 +175,9 @@ def __init__(self, body_elm, parent):
         self._body = body_elm
 
     def clear_content(self):
-        """
-        Return this |_Body| instance after clearing it of all content.
-        Section properties for the main document story, if present, are
-        preserved.
+        """Return this |_Body| instance after clearing it of all content.
+
+        Section properties for the main document story, if present, are preserved.
         """
         self._body.clear_content()
         return self
diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index 6192f3cb4..054e1e3b4 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -7,10 +7,8 @@
 
 
 def alias(*aliases):
-    """
-    Decorating a class with @alias('FOO', 'BAR', ..) allows the class to
-    be referenced by each of the names provided as arguments.
-    """
+    """Decorating a class with @alias('FOO', 'BAR', ..) allows the class to be
+    referenced by each of the names provided as arguments."""
 
     def decorator(cls):
         # alias must be set in globals from caller's frame
@@ -26,9 +24,8 @@ def decorator(cls):
 class _DocsPageFormatter(object):
     """Generate an .rst doc page for an enumeration.
 
-    Formats a RestructuredText documention page (string) for the enumeration
-    class parts passed to the constructor. An immutable one-shot service
-    object.
+    Formats a RestructuredText documention page (string) for the enumeration class parts
+    passed to the constructor. An immutable one-shot service object.
     """
 
     def __init__(self, clsname, clsdict):
@@ -37,9 +34,9 @@ def __init__(self, clsname, clsdict):
 
     @property
     def page_str(self):
-        """
-        The RestructuredText documentation page for the enumeration. This is
-        the only API member for the class.
+        """The RestructuredText documentation page for the enumeration.
+
+        This is the only API member for the class.
         """
         tmpl = ".. _%s:\n\n%s\n\n%s\n\n----\n\n%s"
         components = (
@@ -64,10 +61,8 @@ def _intro_text(self):
         return textwrap.dedent(cls_docstring).strip()
 
     def _member_def(self, member):
-        """
-        Return an individual member definition formatted as an RST glossary
-        entry, wrapped to fit within 78 columns.
-        """
+        """Return an individual member definition formatted as an RST glossary entry,
+        wrapped to fit within 78 columns."""
         member_docstring = textwrap.dedent(member.docstring).strip()
         member_docstring = textwrap.fill(
             member_docstring,
@@ -79,10 +74,8 @@ def _member_def(self, member):
 
     @property
     def _member_defs(self):
-        """
-        A single string containing the aggregated member definitions section
-        of the documentation page
-        """
+        """A single string containing the aggregated member definitions section of the
+        documentation page."""
         members = self._clsdict["__members__"]
         member_defs = [
             self._member_def(member) for member in members if member.name is not None
@@ -91,26 +84,22 @@ def _member_defs(self):
 
     @property
     def _ms_name(self):
-        """
-        The Microsoft API name for this enumeration
-        """
+        """The Microsoft API name for this enumeration."""
         return self._clsdict["__ms_name__"]
 
     @property
     def _page_title(self):
-        """
-        The title for the documentation page, formatted as code (surrounded
-        in double-backtics) and underlined with '=' characters
-        """
+        """The title for the documentation page, formatted as code (surrounded in
+        double-backtics) and underlined with '=' characters."""
         title_underscore = "=" * (len(self._clsname) + 4)
         return "``%s``\n%s" % (self._clsname, title_underscore)
 
 
 class MetaEnumeration(type):
-    """
-    The metaclass for Enumeration and its subclasses. Adds a name for each
-    named member and compiles state needed by the enumeration class to
-    respond to other attribute gets
+    """The metaclass for Enumeration and its subclasses.
+
+    Adds a name for each named member and compiles state needed by the enumeration class
+    to respond to other attribute gets
     """
 
     def __new__(meta, clsname, bases, clsdict):
@@ -121,10 +110,10 @@ def __new__(meta, clsname, bases, clsdict):
 
     @classmethod
     def _add_enum_members(meta, clsdict):
-        """
-        Dispatch ``.add_to_enum()`` call to each member so it can do its
-        thing to properly add itself to the enumeration class. This
-        delegation allows member sub-classes to add specialized behaviors.
+        """Dispatch ``.add_to_enum()`` call to each member so it can do its thing to
+        properly add itself to the enumeration class.
+
+        This delegation allows member sub-classes to add specialized behaviors.
         """
         enum_members = clsdict["__members__"]
         for member in enum_members:
@@ -132,9 +121,10 @@ def _add_enum_members(meta, clsdict):
 
     @classmethod
     def _collect_valid_settings(meta, clsdict):
-        """
-        Return a sequence containing the enumeration values that are valid
-        assignment values. Return-only values are excluded.
+        """Return a sequence containing the enumeration values that are valid assignment
+        values.
+
+        Return-only values are excluded.
         """
         enum_members = clsdict["__members__"]
         valid_settings = []
@@ -144,17 +134,15 @@ def _collect_valid_settings(meta, clsdict):
 
     @classmethod
     def _generate_docs_page(meta, clsname, clsdict):
-        """
-        Return the RST documentation page for the enumeration.
-        """
+        """Return the RST documentation page for the enumeration."""
         clsdict["__docs_rst__"] = _DocsPageFormatter(clsname, clsdict).page_str
 
 
 class EnumerationBase(object):
-    """
-    Base class for all enumerations, used directly for enumerations requiring
-    only basic behavior. It's __dict__ is used below in the Python 2+3
-    compatible metaclass definition.
+    """Base class for all enumerations, used directly for enumerations requiring only
+    basic behavior.
+
+    It's __dict__ is used below in the Python 2+3 compatible metaclass definition.
     """
 
     __members__ = ()
@@ -162,9 +150,7 @@ class EnumerationBase(object):
 
     @classmethod
     def validate(cls, value):
-        """
-        Raise |ValueError| if `value` is not an assignable value.
-        """
+        """Raise |ValueError| if `value` is not an assignable value."""
         if value not in cls._valid_settings:
             raise ValueError(
                 "%s not a member of %s enumeration" % (value, cls.__name__)
@@ -175,20 +161,15 @@ def validate(cls, value):
 
 
 class XmlEnumeration(Enumeration):
-    """
-    Provides ``to_xml()`` and ``from_xml()`` methods in addition to base
-    enumeration features
-    """
+    """Provides ``to_xml()`` and ``from_xml()`` methods in addition to base enumeration
+    features."""
 
     __members__ = ()
     __ms_name__ = ""
 
     @classmethod
     def from_xml(cls, xml_val):
-        """
-        Return the enumeration member corresponding to the XML value
-        `xml_val`.
-        """
+        """Return the enumeration member corresponding to the XML value `xml_val`."""
         if xml_val not in cls._xml_to_member:
             raise InvalidXmlError(
                 "attribute value '%s' not valid for this type" % xml_val
@@ -197,9 +178,7 @@ def from_xml(cls, xml_val):
 
     @classmethod
     def to_xml(cls, enum_val):
-        """
-        Return the XML value of the enumeration value `enum_val`.
-        """
+        """Return the XML value of the enumeration value `enum_val`."""
         if enum_val not in cls._member_to_xml:
             raise ValueError(
                 "value '%s' not in enumeration %s" % (enum_val, cls.__name__)
@@ -208,10 +187,8 @@ def to_xml(cls, enum_val):
 
 
 class EnumMember(object):
-    """
-    Used in the enumeration class definition to define a member value and its
-    mappings
-    """
+    """Used in the enumeration class definition to define a member value and its
+    mappings."""
 
     def __init__(self, name, value, docstring):
         self._name = name
@@ -221,34 +198,29 @@ def __init__(self, name, value, docstring):
         self._docstring = docstring
 
     def add_to_enum(self, clsdict):
-        """
-        Add a name to `clsdict` for this member.
-        """
+        """Add a name to `clsdict` for this member."""
         self.register_name(clsdict)
 
     @property
     def docstring(self):
-        """
-        The description of this member
-        """
+        """The description of this member."""
         return self._docstring
 
     @property
     def name(self):
-        """
-        The distinguishing name of this member within the enumeration class,
-        e.g. 'MIDDLE' for MSO_VERTICAL_ANCHOR.MIDDLE, if this is a named
-        member. Otherwise the primitive value such as |None|, |True| or
-        |False|.
+        """The distinguishing name of this member within the enumeration class, e.g.
+        'MIDDLE' for MSO_VERTICAL_ANCHOR.MIDDLE, if this is a named member.
+
+        Otherwise the primitive value such as |None|, |True| or |False|.
         """
         return self._name
 
     def register_name(self, clsdict):
-        """
-        Add a member name to the class dict `clsdict` containing the value of
-        this member object. Where the name of this object is None, do
-        nothing; this allows out-of-band values to be defined without adding
-        a name to the class dict.
+        """Add a member name to the class dict `clsdict` containing the value of this
+        member object.
+
+        Where the name of this object is None, do nothing; this allows out-of-band
+        values to be defined without adding a name to the class dict.
         """
         if self.name is None:
             return
@@ -256,26 +228,24 @@ def register_name(self, clsdict):
 
     @property
     def valid_settings(self):
-        """
-        A sequence containing the values valid for assignment for this
-        member. May be zero, one, or more in number.
+        """A sequence containing the values valid for assignment for this member.
+
+        May be zero, one, or more in number.
         """
         return (self._value,)
 
     @property
     def value(self):
-        """
-        The enumeration value for this member, often an instance of
-        EnumValue, but may be a primitive value such as |None|.
-        """
+        """The enumeration value for this member, often an instance of EnumValue, but
+        may be a primitive value such as |None|."""
         return self._value
 
 
 class EnumValue(int):
-    """
-    A named enumeration value, providing __str__ and __doc__ string values
-    for its symbolic name and description, respectively. Subclasses int, so
-    behaves as a regular int unless the strings are asked for.
+    """A named enumeration value, providing __str__ and __doc__ string values for its
+    symbolic name and description, respectively.
+
+    Subclasses int, so behaves as a regular int unless the strings are asked for.
     """
 
     def __new__(cls, member_name, int_value, docstring):
@@ -288,52 +258,38 @@ def __init__(self, member_name, int_value, docstring):
 
     @property
     def __doc__(self):
-        """
-        The description of this enumeration member
-        """
+        """The description of this enumeration member."""
         return self._docstring.strip()
 
     def __str__(self):
-        """
-        The symbolic name and string value of this member, e.g. 'MIDDLE (3)'
-        """
+        """The symbolic name and string value of this member, e.g. 'MIDDLE (3)'."""
         return "%s (%d)" % (self._member_name, int(self))
 
 
 class ReturnValueOnlyEnumMember(EnumMember):
-    """
-    Used to define a member of an enumeration that is only valid as a query
-    result and is not valid as a setting, e.g. MSO_VERTICAL_ANCHOR.MIXED (-2)
-    """
+    """Used to define a member of an enumeration that is only valid as a query result
+    and is not valid as a setting, e.g. MSO_VERTICAL_ANCHOR.MIXED (-2)"""
 
     @property
     def valid_settings(self):
-        """
-        No settings are valid for a return-only value.
-        """
+        """No settings are valid for a return-only value."""
         return ()
 
 
 class XmlMappedEnumMember(EnumMember):
-    """
-    Used to define a member whose value maps to an XML attribute value.
-    """
+    """Used to define a member whose value maps to an XML attribute value."""
 
     def __init__(self, name, value, xml_value, docstring):
         super(XmlMappedEnumMember, self).__init__(name, value, docstring)
         self._xml_value = xml_value
 
     def add_to_enum(self, clsdict):
-        """
-        Compile XML mappings in addition to base add behavior.
-        """
+        """Compile XML mappings in addition to base add behavior."""
         super(XmlMappedEnumMember, self).add_to_enum(clsdict)
         self.register_xml_mapping(clsdict)
 
     def register_xml_mapping(self, clsdict):
-        """
-        Add XML mappings to the enumeration class state for this member.
-        """
+        """Add XML mappings to the enumeration class state for this member."""
         member_to_xml = self._get_or_add_member_to_xml(clsdict)
         member_to_xml[self.value] = self.xml_value
         xml_to_member = self._get_or_add_xml_to_member(clsdict)
@@ -341,25 +297,19 @@ def register_xml_mapping(self, clsdict):
 
     @property
     def xml_value(self):
-        """
-        The XML attribute value that corresponds to this enumeration value
-        """
+        """The XML attribute value that corresponds to this enumeration value."""
         return self._xml_value
 
     @staticmethod
     def _get_or_add_member_to_xml(clsdict):
-        """
-        Add the enum -> xml value mapping to the enumeration class state
-        """
+        """Add the enum -> xml value mapping to the enumeration class state."""
         if "_member_to_xml" not in clsdict:
             clsdict["_member_to_xml"] = {}
         return clsdict["_member_to_xml"]
 
     @staticmethod
     def _get_or_add_xml_to_member(clsdict):
-        """
-        Add the xml -> enum value mapping to the enumeration class state
-        """
+        """Add the xml -> enum value mapping to the enumeration class state."""
         if "_xml_to_member" not in clsdict:
             clsdict["_xml_to_member"] = {}
         return clsdict["_xml_to_member"]
diff --git a/src/docx/enum/dml.py b/src/docx/enum/dml.py
index f85923182..16237e70b 100644
--- a/src/docx/enum/dml.py
+++ b/src/docx/enum/dml.py
@@ -4,14 +4,13 @@
 
 
 class MSO_COLOR_TYPE(Enumeration):
-    """
-    Specifies the color specification scheme
+    """Specifies the color specification scheme.
 
     Example::
 
-        from docx.enum.dml import MSO_COLOR_TYPE
+    from docx.enum.dml import MSO_COLOR_TYPE
 
-        assert font.color.type == MSO_COLOR_TYPE.SCHEME
+    assert font.color.type == MSO_COLOR_TYPE.SCHEME
     """
 
     __ms_name__ = "MsoColorType"
@@ -31,17 +30,16 @@ class MSO_COLOR_TYPE(Enumeration):
 
 @alias("MSO_THEME_COLOR")
 class MSO_THEME_COLOR_INDEX(XmlEnumeration):
-    """
-    Indicates the Office theme color, one of those shown in the color gallery
-    on the formatting ribbon.
+    """Indicates the Office theme color, one of those shown in the color gallery on the
+    formatting ribbon.
 
     Alias: ``MSO_THEME_COLOR``
 
     Example::
 
-        from docx.enum.dml import MSO_THEME_COLOR
+    from docx.enum.dml import MSO_THEME_COLOR
 
-        font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
+    font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
     """
 
     __ms_name__ = "MsoThemeColorIndex"
diff --git a/src/docx/enum/section.py b/src/docx/enum/section.py
index df0cd5414..583ceb999 100644
--- a/src/docx/enum/section.py
+++ b/src/docx/enum/section.py
@@ -5,8 +5,7 @@
 
 @alias("WD_HEADER_FOOTER")
 class WD_HEADER_FOOTER_INDEX(XmlEnumeration):
-    """
-    alias: **WD_HEADER_FOOTER**
+    """Alias: **WD_HEADER_FOOTER**
 
     Specifies one of the three possible header/footer definitions for a section.
 
@@ -32,17 +31,15 @@ class WD_HEADER_FOOTER_INDEX(XmlEnumeration):
 
 @alias("WD_ORIENT")
 class WD_ORIENTATION(XmlEnumeration):
-    """
-    alias: **WD_ORIENT**
+    """Alias: **WD_ORIENT**
 
     Specifies the page layout orientation.
 
     Example::
 
-        from docx.enum.section import WD_ORIENT
+    from docx.enum.section import WD_ORIENT
 
-        section = document.sections[-1]
-        section.orientation = WD_ORIENT.LANDSCAPE
+    section = document.sections[-1] section.orientation = WD_ORIENT.LANDSCAPE
     """
 
     __ms_name__ = "WdOrientation"
@@ -57,17 +54,15 @@ class WD_ORIENTATION(XmlEnumeration):
 
 @alias("WD_SECTION")
 class WD_SECTION_START(XmlEnumeration):
-    """
-    alias: **WD_SECTION**
+    """Alias: **WD_SECTION**
 
     Specifies the start type of a section break.
 
     Example::
 
-        from docx.enum.section import WD_SECTION
+    from docx.enum.section import WD_SECTION
 
-        section = document.sections[0]
-        section.start_type = WD_SECTION.NEW_PAGE
+    section = document.sections[0] section.start_type = WD_SECTION.NEW_PAGE
     """
 
     __ms_name__ = "WdSectionStart"
diff --git a/src/docx/enum/shape.py b/src/docx/enum/shape.py
index 64221dc73..6b49ee8f0 100644
--- a/src/docx/enum/shape.py
+++ b/src/docx/enum/shape.py
@@ -2,10 +2,8 @@
 
 
 class WD_INLINE_SHAPE_TYPE(object):
-    """
-    Corresponds to WdInlineShapeType enumeration
-    http://msdn.microsoft.com/en-us/library/office/ff192587.aspx
-    """
+    """Corresponds to WdInlineShapeType enumeration http://msdn.microsoft.com/en-
+    us/library/office/ff192587.aspx."""
 
     CHART = 12
     LINKED_PICTURE = 4
diff --git a/src/docx/enum/style.py b/src/docx/enum/style.py
index 3330f0a0e..f7a8a16e0 100644
--- a/src/docx/enum/style.py
+++ b/src/docx/enum/style.py
@@ -5,19 +5,15 @@
 
 @alias("WD_STYLE")
 class WD_BUILTIN_STYLE(XmlEnumeration):
-    """
-    alias: **WD_STYLE**
+    """Alias: **WD_STYLE**
 
     Specifies a built-in Microsoft Word style.
 
     Example::
 
-        from docx import Document
-        from docx.enum.style import WD_STYLE
+    from docx import Document from docx.enum.style import WD_STYLE
 
-        document = Document()
-        styles = document.styles
-        style = styles[WD_STYLE.BODY_TEXT]
+    document = Document() styles = document.styles style = styles[WD_STYLE.BODY_TEXT]
     """
 
     __ms_name__ = "WdBuiltinStyle"
@@ -165,17 +161,13 @@ class WD_BUILTIN_STYLE(XmlEnumeration):
 
 
 class WD_STYLE_TYPE(XmlEnumeration):
-    """
-    Specifies one of the four style types: paragraph, character, list, or
-    table.
+    """Specifies one of the four style types: paragraph, character, list, or table.
 
     Example::
 
-        from docx import Document
-        from docx.enum.style import WD_STYLE_TYPE
+    from docx import Document from docx.enum.style import WD_STYLE_TYPE
 
-        styles = Document().styles
-        assert styles[0].type == WD_STYLE_TYPE.PARAGRAPH
+    styles = Document().styles assert styles[0].type == WD_STYLE_TYPE.PARAGRAPH
     """
 
     __ms_name__ = "WdStyleType"
diff --git a/src/docx/enum/table.py b/src/docx/enum/table.py
index 30982a83c..be8fe7050 100644
--- a/src/docx/enum/table.py
+++ b/src/docx/enum/table.py
@@ -5,17 +5,16 @@
 
 @alias("WD_ALIGN_VERTICAL")
 class WD_CELL_VERTICAL_ALIGNMENT(XmlEnumeration):
-    """
-    alias: **WD_ALIGN_VERTICAL**
+    """Alias: **WD_ALIGN_VERTICAL**
 
     Specifies the vertical alignment of text in one or more cells of a table.
 
     Example::
 
-        from docx.enum.table import WD_ALIGN_VERTICAL
+    from docx.enum.table import WD_ALIGN_VERTICAL
 
-        table = document.add_table(3, 3)
-        table.cell(0, 0).vertical_alignment = WD_ALIGN_VERTICAL.BOTTOM
+    table = document.add_table(3, 3) table.cell(0, 0).vertical_alignment =
+    WD_ALIGN_VERTICAL.BOTTOM
     """
 
     __ms_name__ = "WdCellVerticalAlignment"
@@ -50,17 +49,16 @@ class WD_CELL_VERTICAL_ALIGNMENT(XmlEnumeration):
 
 @alias("WD_ROW_HEIGHT")
 class WD_ROW_HEIGHT_RULE(XmlEnumeration):
-    """
-    alias: **WD_ROW_HEIGHT**
+    """Alias: **WD_ROW_HEIGHT**
 
     Specifies the rule for determining the height of a table row
 
     Example::
 
-        from docx.enum.table import WD_ROW_HEIGHT_RULE
+    from docx.enum.table import WD_ROW_HEIGHT_RULE
 
-        table = document.add_table(3, 3)
-        table.rows[0].height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+    table = document.add_table(3, 3) table.rows[0].height_rule =
+    WD_ROW_HEIGHT_RULE.EXACTLY
     """
 
     __ms_name__ = "WdRowHeightRule"
@@ -86,15 +84,13 @@ class WD_ROW_HEIGHT_RULE(XmlEnumeration):
 
 
 class WD_TABLE_ALIGNMENT(XmlEnumeration):
-    """
-    Specifies table justification type.
+    """Specifies table justification type.
 
     Example::
 
-        from docx.enum.table import WD_TABLE_ALIGNMENT
+    from docx.enum.table import WD_TABLE_ALIGNMENT
 
-        table = document.add_table(3, 3)
-        table.alignment = WD_TABLE_ALIGNMENT.CENTER
+    table = document.add_table(3, 3) table.alignment = WD_TABLE_ALIGNMENT.CENTER
     """
 
     __ms_name__ = "WdRowAlignment"
@@ -109,16 +105,14 @@ class WD_TABLE_ALIGNMENT(XmlEnumeration):
 
 
 class WD_TABLE_DIRECTION(Enumeration):
-    """
-    Specifies the direction in which an application orders cells in the
-    specified table or row.
+    """Specifies the direction in which an application orders cells in the specified
+    table or row.
 
     Example::
 
-        from docx.enum.table import WD_TABLE_DIRECTION
+    from docx.enum.table import WD_TABLE_DIRECTION
 
-        table = document.add_table(3, 3)
-        table.direction = WD_TABLE_DIRECTION.RTL
+    table = document.add_table(3, 3) table.direction = WD_TABLE_DIRECTION.RTL
     """
 
     __ms_name__ = "WdTableDirection"
diff --git a/src/docx/exceptions.py b/src/docx/exceptions.py
index 8507a1ded..e26f4c3bf 100644
--- a/src/docx/exceptions.py
+++ b/src/docx/exceptions.py
@@ -5,20 +5,14 @@
 
 
 class PythonDocxError(Exception):
-    """
-    Generic error class.
-    """
+    """Generic error class."""
 
 
 class InvalidSpanError(PythonDocxError):
-    """
-    Raised when an invalid merge region is specified in a request to merge
-    table cells.
-    """
+    """Raised when an invalid merge region is specified in a request to merge table
+    cells."""
 
 
 class InvalidXmlError(PythonDocxError):
-    """
-    Raised when invalid XML is encountered, such as on attempt to access a
-    missing required child element
-    """
+    """Raised when invalid XML is encountered, such as on attempt to access a missing
+    required child element."""
diff --git a/src/docx/image/bmp.py b/src/docx/image/bmp.py
index c420b1898..115b01d51 100644
--- a/src/docx/image/bmp.py
+++ b/src/docx/image/bmp.py
@@ -4,16 +4,12 @@
 
 
 class Bmp(BaseImageHeader):
-    """
-    Image header parser for BMP images
-    """
+    """Image header parser for BMP images."""
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return |Bmp| instance having header properties parsed from the BMP
-        image in `stream`.
-        """
+        """Return |Bmp| instance having header properties parsed from the BMP image in
+        `stream`."""
         stream_rdr = StreamReader(stream, LITTLE_ENDIAN)
 
         px_width = stream_rdr.read_long(0x12)
@@ -29,25 +25,19 @@ def from_stream(cls, stream):
 
     @property
     def content_type(self):
-        """
-        MIME content type for this image, unconditionally `image/bmp` for
-        BMP images.
-        """
+        """MIME content type for this image, unconditionally `image/bmp` for BMP
+        images."""
         return MIME_TYPE.BMP
 
     @property
     def default_ext(self):
-        """
-        Default filename extension, always 'bmp' for BMP images.
-        """
+        """Default filename extension, always 'bmp' for BMP images."""
         return "bmp"
 
     @staticmethod
     def _dpi(px_per_meter):
-        """
-        Return the integer pixels per inch from `px_per_meter`, defaulting to
-        96 if `px_per_meter` is zero.
-        """
+        """Return the integer pixels per inch from `px_per_meter`, defaulting to 96 if
+        `px_per_meter` is zero."""
         if px_per_meter == 0:
             return 96
         return int(round(px_per_meter * 0.0254))
diff --git a/src/docx/image/constants.py b/src/docx/image/constants.py
index 5caf64eb2..65286c647 100644
--- a/src/docx/image/constants.py
+++ b/src/docx/image/constants.py
@@ -2,9 +2,7 @@
 
 
 class JPEG_MARKER_CODE(object):
-    """
-    JPEG marker codes
-    """
+    """JPEG marker codes."""
 
     TEM = b"\x01"
     DHT = b"\xC4"
@@ -100,9 +98,7 @@ def is_standalone(cls, marker_code):
 
 
 class MIME_TYPE(object):
-    """
-    Image content types
-    """
+    """Image content types."""
 
     BMP = "image/bmp"
     GIF = "image/gif"
@@ -112,9 +108,7 @@ class MIME_TYPE(object):
 
 
 class PNG_CHUNK_TYPE(object):
-    """
-    PNG chunk type names
-    """
+    """PNG chunk type names."""
 
     IHDR = "IHDR"
     pHYs = "pHYs"
@@ -122,9 +116,7 @@ class PNG_CHUNK_TYPE(object):
 
 
 class TIFF_FLD_TYPE(object):
-    """
-    Tag codes for TIFF Image File Directory (IFD) entries.
-    """
+    """Tag codes for TIFF Image File Directory (IFD) entries."""
 
     BYTE = 1
     ASCII = 2
@@ -145,9 +137,7 @@ class TIFF_FLD_TYPE(object):
 
 
 class TIFF_TAG(object):
-    """
-    Tag codes for TIFF Image File Directory (IFD) entries.
-    """
+    """Tag codes for TIFF Image File Directory (IFD) entries."""
 
     IMAGE_WIDTH = 0x0100
     IMAGE_LENGTH = 0x0101
diff --git a/src/docx/image/exceptions.py b/src/docx/image/exceptions.py
index 9e3fab6bf..2b35187d1 100644
--- a/src/docx/image/exceptions.py
+++ b/src/docx/image/exceptions.py
@@ -2,18 +2,12 @@
 
 
 class InvalidImageStreamError(Exception):
-    """
-    The recognized image stream appears to be corrupted
-    """
+    """The recognized image stream appears to be corrupted."""
 
 
 class UnexpectedEndOfFileError(Exception):
-    """
-    EOF was unexpectedly encountered while reading an image stream.
-    """
+    """EOF was unexpectedly encountered while reading an image stream."""
 
 
 class UnrecognizedImageError(Exception):
-    """
-    The provided image stream could not be recognized.
-    """
+    """The provided image stream could not be recognized."""
diff --git a/src/docx/image/gif.py b/src/docx/image/gif.py
index 7ff53d306..e16487264 100644
--- a/src/docx/image/gif.py
+++ b/src/docx/image/gif.py
@@ -5,34 +5,28 @@
 
 
 class Gif(BaseImageHeader):
-    """
-    Image header parser for GIF images. Note that the GIF format does not
-    support resolution (DPI) information. Both horizontal and vertical DPI
-    default to 72.
+    """Image header parser for GIF images.
+
+    Note that the GIF format does not support resolution (DPI) information. Both
+    horizontal and vertical DPI default to 72.
     """
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return |Gif| instance having header properties parsed from GIF image
-        in `stream`.
-        """
+        """Return |Gif| instance having header properties parsed from GIF image in
+        `stream`."""
         px_width, px_height = cls._dimensions_from_stream(stream)
         return cls(px_width, px_height, 72, 72)
 
     @property
     def content_type(self):
-        """
-        MIME content type for this image, unconditionally `image/gif` for
-        GIF images.
-        """
+        """MIME content type for this image, unconditionally `image/gif` for GIF
+        images."""
         return MIME_TYPE.GIF
 
     @property
     def default_ext(self):
-        """
-        Default filename extension, always 'gif' for GIF images.
-        """
+        """Default filename extension, always 'gif' for GIF images."""
         return "gif"
 
     @classmethod
diff --git a/src/docx/image/helpers.py b/src/docx/image/helpers.py
index df0946d02..8532a2e58 100644
--- a/src/docx/image/helpers.py
+++ b/src/docx/image/helpers.py
@@ -7,10 +7,10 @@
 
 
 class StreamReader(object):
-    """
-    Wraps a file-like object to provide access to structured data from a
-    binary file. Byte-order is configurable. `base_offset` is added to any
-    base value provided to calculate actual location for reads.
+    """Wraps a file-like object to provide access to structured data from a binary file.
+
+    Byte-order is configurable. `base_offset` is added to any base value provided to
+    calculate actual location for reads.
     """
 
     def __init__(self, stream, byte_order, base_offset=0):
@@ -20,43 +20,38 @@ def __init__(self, stream, byte_order, base_offset=0):
         self._base_offset = base_offset
 
     def read(self, count):
-        """
-        Allow pass-through read() call
-        """
+        """Allow pass-through read() call."""
         return self._stream.read(count)
 
     def read_byte(self, base, offset=0):
-        """
-        Return the int value of the byte at the file position defined by
-        self._base_offset + `base` + `offset`. If `base` is None, the byte is
-        read from the current position in the stream.
+        """Return the int value of the byte at the file position defined by
+        self._base_offset + `base` + `offset`.
+
+        If `base` is None, the byte is read from the current position in the stream.
         """
         fmt = "B"
         return self._read_int(fmt, base, offset)
 
     def read_long(self, base, offset=0):
-        """
-        Return the int value of the four bytes at the file position defined by
-        self._base_offset + `base` + `offset`. If `base` is None, the long is
-        read from the current position in the stream. The endian setting of
-        this instance is used to interpret the byte layout of the long.
+        """Return the int value of the four bytes at the file position defined by
+        self._base_offset + `base` + `offset`.
+
+        If `base` is None, the long is read from the current position in the stream. The
+        endian setting of this instance is used to interpret the byte layout of the
+        long.
         """
         fmt = "<L" if self._byte_order is LITTLE_ENDIAN else ">L"
         return self._read_int(fmt, base, offset)
 
     def read_short(self, base, offset=0):
-        """
-        Return the int value of the two bytes at the file position determined
-        by `base` and `offset`, similarly to ``read_long()`` above.
-        """
+        """Return the int value of the two bytes at the file position determined by
+        `base` and `offset`, similarly to ``read_long()`` above."""
         fmt = b"<H" if self._byte_order is LITTLE_ENDIAN else b">H"
         return self._read_int(fmt, base, offset)
 
     def read_str(self, char_count, base, offset=0):
-        """
-        Return a string containing the `char_count` bytes at the file
-        position determined by self._base_offset + `base` + `offset`.
-        """
+        """Return a string containing the `char_count` bytes at the file position
+        determined by self._base_offset + `base` + `offset`."""
 
         def str_struct(char_count):
             format_ = "%ds" % char_count
@@ -72,9 +67,7 @@ def seek(self, base, offset=0):
         self._stream.seek(location)
 
     def tell(self):
-        """
-        Allow pass-through tell() call
-        """
+        """Allow pass-through tell() call."""
         return self._stream.tell()
 
     def _read_bytes(self, byte_count, base, offset):
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 7f5911240..2e5286f6f 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -13,10 +13,8 @@
 
 
 class Image(object):
-    """
-    Graphical image stream such as JPEG, PNG, or GIF with properties and
-    methods required by ImagePart.
-    """
+    """Graphical image stream such as JPEG, PNG, or GIF with properties and methods
+    required by ImagePart."""
 
     def __init__(self, blob, filename, image_header):
         super(Image, self).__init__()
@@ -26,19 +24,15 @@ def __init__(self, blob, filename, image_header):
 
     @classmethod
     def from_blob(cls, blob):
-        """
-        Return a new |Image| subclass instance parsed from the image binary
-        contained in `blob`.
-        """
+        """Return a new |Image| subclass instance parsed from the image binary contained
+        in `blob`."""
         stream = io.BytesIO(blob)
         return cls._from_stream(stream, blob)
 
     @classmethod
     def from_file(cls, image_descriptor):
-        """
-        Return a new |Image| subclass instance loaded from the image file
-        identified by `image_descriptor`, a path or file-like object.
-        """
+        """Return a new |Image| subclass instance loaded from the image file identified
+        by `image_descriptor`, a path or file-like object."""
         if isinstance(image_descriptor, str):
             path = image_descriptor
             with open(path, "rb") as f:
@@ -54,96 +48,80 @@ def from_file(cls, image_descriptor):
 
     @property
     def blob(self):
-        """
-        The bytes of the image 'file'
-        """
+        """The bytes of the image 'file'."""
         return self._blob
 
     @property
     def content_type(self):
-        """
-        MIME content type for this image, e.g. ``'image/jpeg'`` for a JPEG
-        image
-        """
+        """MIME content type for this image, e.g. ``'image/jpeg'`` for a JPEG image."""
         return self._image_header.content_type
 
     @lazyproperty
     def ext(self):
-        """
-        The file extension for the image. If an actual one is available from
-        a load filename it is used. Otherwise a canonical extension is
-        assigned based on the content type. Does not contain the leading
-        period, e.g. 'jpg', not '.jpg'.
+        """The file extension for the image.
+
+        If an actual one is available from a load filename it is used. Otherwise a
+        canonical extension is assigned based on the content type. Does not contain the
+        leading period, e.g. 'jpg', not '.jpg'.
         """
         return os.path.splitext(self._filename)[1][1:]
 
     @property
     def filename(self):
-        """
-        Original image file name, if loaded from disk, or a generic filename
-        if loaded from an anonymous stream.
-        """
+        """Original image file name, if loaded from disk, or a generic filename if
+        loaded from an anonymous stream."""
         return self._filename
 
     @property
     def px_width(self):
-        """
-        The horizontal pixel dimension of the image
-        """
+        """The horizontal pixel dimension of the image."""
         return self._image_header.px_width
 
     @property
     def px_height(self):
-        """
-        The vertical pixel dimension of the image
-        """
+        """The vertical pixel dimension of the image."""
         return self._image_header.px_height
 
     @property
     def horz_dpi(self):
-        """
-        Integer dots per inch for the width of this image. Defaults to 72
-        when not present in the file, as is often the case.
+        """Integer dots per inch for the width of this image.
+
+        Defaults to 72 when not present in the file, as is often the case.
         """
         return self._image_header.horz_dpi
 
     @property
     def vert_dpi(self):
-        """
-        Integer dots per inch for the height of this image. Defaults to 72
-        when not present in the file, as is often the case.
+        """Integer dots per inch for the height of this image.
+
+        Defaults to 72 when not present in the file, as is often the case.
         """
         return self._image_header.vert_dpi
 
     @property
     def width(self):
-        """
-        A |Length| value representing the native width of the image,
-        calculated from the values of `px_width` and `horz_dpi`.
-        """
+        """A |Length| value representing the native width of the image, calculated from
+        the values of `px_width` and `horz_dpi`."""
         return Inches(self.px_width / self.horz_dpi)
 
     @property
     def height(self):
-        """
-        A |Length| value representing the native height of the image,
-        calculated from the values of `px_height` and `vert_dpi`.
-        """
+        """A |Length| value representing the native height of the image, calculated from
+        the values of `px_height` and `vert_dpi`."""
         return Inches(self.px_height / self.vert_dpi)
 
     def scaled_dimensions(self, width=None, height=None):
-        """
-        Return a (cx, cy) 2-tuple representing the native dimensions of this
-        image scaled by applying the following rules to `width` and `height`.
-        If both `width` and `height` are specified, the return value is
-        (`width`, `height`); no scaling is performed. If only one is
-        specified, it is used to compute a scaling factor that is then
-        applied to the unspecified dimension, preserving the aspect ratio of
-        the image. If both `width` and `height` are |None|, the native
-        dimensions are returned. The native dimensions are calculated using
-        the dots-per-inch (dpi) value embedded in the image, defaulting to 72
-        dpi if no value is specified, as is often the case. The returned
-        values are both |Length| objects.
+        """Return a (cx, cy) 2-tuple representing the native dimensions of this image
+        scaled by applying the following rules to `width` and `height`.
+
+        If both `width` and `height` are specified, the return value is (`width`,
+        `height`); no scaling is performed. If only one is specified, it is used to
+        compute a scaling factor that is then applied to the unspecified dimension,
+        preserving the aspect ratio of the image. If both `width` and `height` are
+        |None|, the native dimensions are returned. The native dimensions are calculated
+        using the dots-per-inch (dpi) value embedded in the image, defaulting to 72 dpi
+        if no value is specified, as is often the case. The returned values are both
+        |Length| objects.
         """
         if width is None and height is None:
             return self.width, self.height
@@ -160,17 +138,13 @@ def scaled_dimensions(self, width=None, height=None):
 
     @lazyproperty
     def sha1(self):
-        """
-        SHA1 hash digest of the image blob
-        """
+        """SHA1 hash digest of the image blob."""
         return hashlib.sha1(self._blob).hexdigest()
 
     @classmethod
     def _from_stream(cls, stream, blob, filename=None):
-        """
-        Return an instance of the |Image| subclass corresponding to the
-        format of the image in `stream`.
-        """
+        """Return an instance of the |Image| subclass corresponding to the format of the
+        image in `stream`."""
         image_header = _ImageHeaderFactory(stream)
         if filename is None:
             filename = "image.%s" % image_header.default_ext
@@ -178,10 +152,8 @@ def _from_stream(cls, stream, blob, filename=None):
 
 
 def _ImageHeaderFactory(stream):
-    """
-    Return a |BaseImageHeader| subclass instance that knows how to parse the
-    headers of the image in `stream`.
-    """
+    """Return a |BaseImageHeader| subclass instance that knows how to parse the headers
+    of the image in `stream`."""
     from docx.image import SIGNATURES
 
     def read_32(stream):
@@ -198,9 +170,7 @@ def read_32(stream):
 
 
 class BaseImageHeader(object):
-    """
-    Base class for image header subclasses like |Jpeg| and |Tiff|.
-    """
+    """Base class for image header subclasses like |Jpeg| and |Tiff|."""
 
     def __init__(self, px_width, px_height, horz_dpi, vert_dpi):
         self._px_width = px_width
@@ -210,9 +180,7 @@ def __init__(self, px_width, px_height, horz_dpi, vert_dpi):
 
     @property
     def content_type(self):
-        """
-        Abstract property definition, must be implemented by all subclasses.
-        """
+        """Abstract property definition, must be implemented by all subclasses."""
         msg = (
             "content_type property must be implemented by all subclasses of "
             "BaseImageHeader"
@@ -221,9 +189,9 @@ def content_type(self):
 
     @property
     def default_ext(self):
-        """
-        Default filename extension for images of this type. An abstract
-        property definition, must be implemented by all subclasses.
+        """Default filename extension for images of this type.
+
+        An abstract property definition, must be implemented by all subclasses.
         """
         msg = (
             "default_ext property must be implemented by all subclasses of "
@@ -233,30 +201,26 @@ def default_ext(self):
 
     @property
     def px_width(self):
-        """
-        The horizontal pixel dimension of the image
-        """
+        """The horizontal pixel dimension of the image."""
         return self._px_width
 
     @property
     def px_height(self):
-        """
-        The vertical pixel dimension of the image
-        """
+        """The vertical pixel dimension of the image."""
         return self._px_height
 
     @property
     def horz_dpi(self):
-        """
-        Integer dots per inch for the width of this image. Defaults to 72
-        when not present in the file, as is often the case.
+        """Integer dots per inch for the width of this image.
+
+        Defaults to 72 when not present in the file, as is often the case.
         """
         return self._horz_dpi
 
     @property
     def vert_dpi(self):
-        """
-        Integer dots per inch for the height of this image. Defaults to 72
-        when not present in the file, as is often the case.
+        """Integer dots per inch for the height of this image.
+
+        Defaults to 72 when not present in the file, as is often the case.
         """
         return self._vert_dpi
diff --git a/src/docx/image/jpeg.py b/src/docx/image/jpeg.py
index 23f90c5bc..92770e948 100644
--- a/src/docx/image/jpeg.py
+++ b/src/docx/image/jpeg.py
@@ -12,37 +12,27 @@
 
 
 class Jpeg(BaseImageHeader):
-    """
-    Base class for JFIF and EXIF subclasses.
-    """
+    """Base class for JFIF and EXIF subclasses."""
 
     @property
     def content_type(self):
-        """
-        MIME content type for this image, unconditionally `image/jpeg` for
-        JPEG images.
-        """
+        """MIME content type for this image, unconditionally `image/jpeg` for JPEG
+        images."""
         return MIME_TYPE.JPEG
 
     @property
     def default_ext(self):
-        """
-        Default filename extension, always 'jpg' for JPG images.
-        """
+        """Default filename extension, always 'jpg' for JPG images."""
         return "jpg"
 
 
 class Exif(Jpeg):
-    """
-    Image header parser for Exif image format
-    """
+    """Image header parser for Exif image format."""
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return |Exif| instance having header properties parsed from Exif
-        image in `stream`.
-        """
+        """Return |Exif| instance having header properties parsed from Exif image in
+        `stream`."""
         markers = _JfifMarkers.from_stream(stream)
         # print('\n%s' % markers)
 
@@ -55,16 +45,12 @@ def from_stream(cls, stream):
 
 
 class Jfif(Jpeg):
-    """
-    Image header parser for JFIF image format
-    """
+    """Image header parser for JFIF image format."""
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |Jfif| instance having header properties parsed from image
-        in `stream`.
-        """
+        """Return a |Jfif| instance having header properties parsed from image in
+        `stream`."""
         markers = _JfifMarkers.from_stream(stream)
 
         px_width = markers.sof.px_width
@@ -76,20 +62,16 @@ def from_stream(cls, stream):
 
 
 class _JfifMarkers(object):
-    """
-    Sequence of markers in a JPEG file, perhaps truncated at first SOS marker
-    for performance reasons.
-    """
+    """Sequence of markers in a JPEG file, perhaps truncated at first SOS marker for
+    performance reasons."""
 
     def __init__(self, markers):
         super(_JfifMarkers, self).__init__()
         self._markers = list(markers)
 
     def __str__(self):  # pragma: no cover
-        """
-        Returns a tabular listing of the markers in this instance, which can
-        be handy for debugging and perhaps other uses.
-        """
+        """Returns a tabular listing of the markers in this instance, which can be handy
+        for debugging and perhaps other uses."""
         header = " offset  seglen  mc  name\n=======  ======  ==  ====="
         tmpl = "%7d  %6d  %02X  %s"
         rows = []
@@ -108,10 +90,8 @@ def __str__(self):  # pragma: no cover
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |_JfifMarkers| instance containing a |_JfifMarker| subclass
-        instance for each marker in `stream`.
-        """
+        """Return a |_JfifMarkers| instance containing a |_JfifMarker| subclass instance
+        for each marker in `stream`."""
         marker_parser = _MarkerParser.from_stream(stream)
         markers = []
         for marker in marker_parser.iter_markers():
@@ -122,9 +102,7 @@ def from_stream(cls, stream):
 
     @property
     def app0(self):
-        """
-        First APP0 marker in image markers.
-        """
+        """First APP0 marker in image markers."""
         for m in self._markers:
             if m.marker_code == JPEG_MARKER_CODE.APP0:
                 return m
@@ -132,9 +110,7 @@ def app0(self):
 
     @property
     def app1(self):
-        """
-        First APP1 marker in image markers.
-        """
+        """First APP1 marker in image markers."""
         for m in self._markers:
             if m.marker_code == JPEG_MARKER_CODE.APP1:
                 return m
@@ -142,9 +118,7 @@ def app1(self):
 
     @property
     def sof(self):
-        """
-        First start of frame (SOFn) marker in this sequence.
-        """
+        """First start of frame (SOFn) marker in this sequence."""
         for m in self._markers:
             if m.marker_code in JPEG_MARKER_CODE.SOF_MARKER_CODES:
                 return m
@@ -152,10 +126,8 @@ def sof(self):
 
 
 class _MarkerParser(object):
-    """
-    Service class that knows how to parse a JFIF stream and iterate over its
-    markers.
-    """
+    """Service class that knows how to parse a JFIF stream and iterate over its
+    markers."""
 
     def __init__(self, stream_reader):
         super(_MarkerParser, self).__init__()
@@ -163,18 +135,13 @@ def __init__(self, stream_reader):
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |_MarkerParser| instance to parse JFIF markers from
-        `stream`.
-        """
+        """Return a |_MarkerParser| instance to parse JFIF markers from `stream`."""
         stream_reader = StreamReader(stream, BIG_ENDIAN)
         return cls(stream_reader)
 
     def iter_markers(self):
-        """
-        Generate a (marker_code, segment_offset) 2-tuple for each marker in
-        the JPEG `stream`, in the order they occur in the stream.
-        """
+        """Generate a (marker_code, segment_offset) 2-tuple for each marker in the JPEG
+        `stream`, in the order they occur in the stream."""
         marker_finder = _MarkerFinder.from_stream(self._stream)
         start = 0
         marker_code = None
@@ -186,9 +153,7 @@ def iter_markers(self):
 
 
 class _MarkerFinder(object):
-    """
-    Service class that knows how to find the next JFIF marker in a stream.
-    """
+    """Service class that knows how to find the next JFIF marker in a stream."""
 
     def __init__(self, stream):
         super(_MarkerFinder, self).__init__()
@@ -196,18 +161,16 @@ def __init__(self, stream):
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |_MarkerFinder| instance to find JFIF markers in `stream`.
-        """
+        """Return a |_MarkerFinder| instance to find JFIF markers in `stream`."""
         return cls(stream)
 
     def next(self, start):
-        """
-        Return a (marker_code, segment_offset) 2-tuple identifying and
-        locating the first marker in `stream` occuring after offset `start`.
-        The returned `segment_offset` points to the position immediately
-        following the 2-byte marker code, the start of the marker segment,
-        for those markers that have a segment.
+        """Return a (marker_code, segment_offset) 2-tuple identifying and locating the
+        first marker in `stream` occuring after offset `start`.
+
+        The returned `segment_offset` points to the position immediately following the
+        2-byte marker code, the start of the marker segment, for those markers that have
+        a segment.
         """
         position = start
         while True:
@@ -224,11 +187,11 @@ def next(self, start):
         return marker_code, segment_offset
 
     def _next_non_ff_byte(self, start):
-        """
-        Return an offset, byte 2-tuple for the next byte in `stream` that is
-        not '\xFF', starting with the byte at offset `start`. If the byte at
-        offset `start` is not '\xFF', `start` and the returned `offset` will
-        be the same.
+        """Return an offset, byte 2-tuple for the next byte in `stream` that is not
+        '\xFF', starting with the byte at offset `start`.
+
+        If the byte at offset `start` is not '\xFF', `start` and the returned `offset`
+        will be the same.
         """
         self._stream.seek(start)
         byte_ = self._read_byte()
@@ -238,10 +201,11 @@ def _next_non_ff_byte(self, start):
         return offset_of_non_ff_byte, byte_
 
     def _offset_of_next_ff_byte(self, start):
-        """
-        Return the offset of the next '\xFF' byte in `stream` starting with
-        the byte at offset `start`. Returns `start` if the byte at that
-        offset is a hex 255; it does not necessarily advance in the stream.
+        """Return the offset of the next '\xFF' byte in `stream` starting with the byte
+        at offset `start`.
+
+        Returns `start` if the byte at that offset is a hex 255; it does not necessarily
+        advance in the stream.
         """
         self._stream.seek(start)
         byte_ = self._read_byte()
@@ -251,9 +215,9 @@ def _offset_of_next_ff_byte(self, start):
         return offset_of_ff_byte
 
     def _read_byte(self):
-        """
-        Return the next byte read from stream. Raise Exception if stream is
-        at end of file.
+        """Return the next byte read from stream.
+
+        Raise Exception if stream is at end of file.
         """
         byte_ = self._stream.read(1)
         if not byte_:  # pragma: no cover
@@ -262,10 +226,8 @@ def _read_byte(self):
 
 
 def _MarkerFactory(marker_code, stream, offset):
-    """
-    Return |_Marker| or subclass instance appropriate for marker at `offset`
-    in `stream` having `marker_code`.
-    """
+    """Return |_Marker| or subclass instance appropriate for marker at `offset` in
+    `stream` having `marker_code`."""
     if marker_code == JPEG_MARKER_CODE.APP0:
         marker_cls = _App0Marker
     elif marker_code == JPEG_MARKER_CODE.APP1:
@@ -278,9 +240,9 @@ def _MarkerFactory(marker_code, stream, offset):
 
 
 class _Marker(object):
-    """
-    Base class for JFIF marker classes. Represents a marker and its segment
-    occuring in a JPEG byte stream.
+    """Base class for JFIF marker classes.
+
+    Represents a marker and its segment occuring in a JPEG byte stream.
     """
 
     def __init__(self, marker_code, offset, segment_length):
@@ -291,10 +253,8 @@ def __init__(self, marker_code, offset, segment_length):
 
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
-        """
-        Return a generic |_Marker| instance for the marker at `offset` in
-        `stream` having `marker_code`.
-        """
+        """Return a generic |_Marker| instance for the marker at `offset` in `stream`
+        having `marker_code`."""
         if JPEG_MARKER_CODE.is_standalone(marker_code):
             segment_length = 0
         else:
@@ -303,10 +263,8 @@ def from_stream(cls, stream, marker_code, offset):
 
     @property
     def marker_code(self):
-        """
-        The single-byte code that identifies the type of this marker, e.g.
-        ``'\xE0'`` for start of image (SOI).
-        """
+        """The single-byte code that identifies the type of this marker, e.g. ``'\xE0'``
+        for start of image (SOI)."""
         return self._marker_code
 
     @property
@@ -319,16 +277,12 @@ def offset(self):  # pragma: no cover
 
     @property
     def segment_length(self):
-        """
-        The length in bytes of this marker's segment
-        """
+        """The length in bytes of this marker's segment."""
         return self._segment_length
 
 
 class _App0Marker(_Marker):
-    """
-    Represents a JFIF APP0 marker segment.
-    """
+    """Represents a JFIF APP0 marker segment."""
 
     def __init__(
         self, marker_code, offset, length, density_units, x_density, y_density
@@ -340,24 +294,18 @@ def __init__(
 
     @property
     def horz_dpi(self):
-        """
-        Horizontal dots per inch specified in this marker, defaults to 72 if
-        not specified.
-        """
+        """Horizontal dots per inch specified in this marker, defaults to 72 if not
+        specified."""
         return self._dpi(self._x_density)
 
     @property
     def vert_dpi(self):
-        """
-        Vertical dots per inch specified in this marker, defaults to 72 if
-        not specified.
-        """
+        """Vertical dots per inch specified in this marker, defaults to 72 if not
+        specified."""
         return self._dpi(self._y_density)
 
     def _dpi(self, density):
-        """
-        Return dots per inch corresponding to `density` value.
-        """
+        """Return dots per inch corresponding to `density` value."""
         if self._density_units == 1:
             dpi = density
         elif self._density_units == 2:
@@ -368,10 +316,8 @@ def _dpi(self, density):
 
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
-        """
-        Return an |_App0Marker| instance for the APP0 marker at `offset` in
-        `stream`.
-        """
+        """Return an |_App0Marker| instance for the APP0 marker at `offset` in
+        `stream`."""
         # field               off  type   notes
         # ------------------  ---  -----  -------------------
         # segment length       0   short
@@ -392,9 +338,7 @@ def from_stream(cls, stream, marker_code, offset):
 
 
 class _App1Marker(_Marker):
-    """
-    Represents a JFIF APP1 (Exif) marker segment.
-    """
+    """Represents a JFIF APP1 (Exif) marker segment."""
 
     def __init__(self, marker_code, offset, length, horz_dpi, vert_dpi):
         super(_App1Marker, self).__init__(marker_code, offset, length)
@@ -403,10 +347,8 @@ def __init__(self, marker_code, offset, length, horz_dpi, vert_dpi):
 
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
-        """
-        Extract the horizontal and vertical dots-per-inch value from the APP1
-        header at `offset` in `stream`.
-        """
+        """Extract the horizontal and vertical dots-per-inch value from the APP1 header
+        at `offset` in `stream`."""
         # field                 off  len  type   notes
         # --------------------  ---  ---  -----  ----------------------------
         # segment length         0    2   short
@@ -423,37 +365,29 @@ def from_stream(cls, stream, marker_code, offset):
 
     @property
     def horz_dpi(self):
-        """
-        Horizontal dots per inch specified in this marker, defaults to 72 if
-        not specified.
-        """
+        """Horizontal dots per inch specified in this marker, defaults to 72 if not
+        specified."""
         return self._horz_dpi
 
     @property
     def vert_dpi(self):
-        """
-        Vertical dots per inch specified in this marker, defaults to 72 if
-        not specified.
-        """
+        """Vertical dots per inch specified in this marker, defaults to 72 if not
+        specified."""
         return self._vert_dpi
 
     @classmethod
     def _is_non_Exif_APP1_segment(cls, stream, offset):
-        """
-        Return True if the APP1 segment at `offset` in `stream` is NOT an
-        Exif segment, as determined by the ``'Exif\x00\x00'`` signature at
-        offset 2 in the segment.
-        """
+        """Return True if the APP1 segment at `offset` in `stream` is NOT an Exif
+        segment, as determined by the ``'Exif\x00\x00'`` signature at offset 2 in the
+        segment."""
         stream.seek(offset + 2)
         exif_signature = stream.read(6)
         return exif_signature != b"Exif\x00\x00"
 
     @classmethod
     def _tiff_from_exif_segment(cls, stream, offset, segment_length):
-        """
-        Return a |Tiff| instance parsed from the Exif APP1 segment of
-        `segment_length` at `offset` in `stream`.
-        """
+        """Return a |Tiff| instance parsed from the Exif APP1 segment of
+        `segment_length` at `offset` in `stream`."""
         # wrap full segment in its own stream and feed to Tiff()
         stream.seek(offset + 8)
         segment_bytes = stream.read(segment_length - 8)
@@ -462,9 +396,7 @@ def _tiff_from_exif_segment(cls, stream, offset, segment_length):
 
 
 class _SofMarker(_Marker):
-    """
-    Represents a JFIF start of frame (SOFx) marker segment.
-    """
+    """Represents a JFIF start of frame (SOFx) marker segment."""
 
     def __init__(self, marker_code, offset, segment_length, px_width, px_height):
         super(_SofMarker, self).__init__(marker_code, offset, segment_length)
@@ -473,10 +405,7 @@ def __init__(self, marker_code, offset, segment_length, px_width, px_height):
 
     @classmethod
     def from_stream(cls, stream, marker_code, offset):
-        """
-        Return an |_SofMarker| instance for the SOFn marker at `offset` in
-        stream.
-        """
+        """Return an |_SofMarker| instance for the SOFn marker at `offset` in stream."""
         # field                 off  type   notes
         # ------------------  ---  -----  ----------------------------
         # segment length       0   short
@@ -491,14 +420,10 @@ def from_stream(cls, stream, marker_code, offset):
 
     @property
     def px_height(self):
-        """
-        Image height in pixels
-        """
+        """Image height in pixels."""
         return self._px_height
 
     @property
     def px_width(self):
-        """
-        Image width in pixels
-        """
+        """Image width in pixels."""
         return self._px_width
diff --git a/src/docx/image/png.py b/src/docx/image/png.py
index 842a0752f..bfbbaf30d 100644
--- a/src/docx/image/png.py
+++ b/src/docx/image/png.py
@@ -5,31 +5,23 @@
 
 
 class Png(BaseImageHeader):
-    """
-    Image header parser for PNG images
-    """
+    """Image header parser for PNG images."""
 
     @property
     def content_type(self):
-        """
-        MIME content type for this image, unconditionally `image/png` for
-        PNG images.
-        """
+        """MIME content type for this image, unconditionally `image/png` for PNG
+        images."""
         return MIME_TYPE.PNG
 
     @property
     def default_ext(self):
-        """
-        Default filename extension, always 'png' for PNG images.
-        """
+        """Default filename extension, always 'png' for PNG images."""
         return "png"
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |Png| instance having header properties parsed from image in
-        `stream`.
-        """
+        """Return a |Png| instance having header properties parsed from image in
+        `stream`."""
         parser = _PngParser.parse(stream)
 
         px_width = parser.px_width
@@ -41,10 +33,7 @@ def from_stream(cls, stream):
 
 
 class _PngParser(object):
-    """
-    Parses a PNG image stream to extract the image properties found in its
-    chunks.
-    """
+    """Parses a PNG image stream to extract the image properties found in its chunks."""
 
     def __init__(self, chunks):
         super(_PngParser, self).__init__()
@@ -52,34 +41,28 @@ def __init__(self, chunks):
 
     @classmethod
     def parse(cls, stream):
-        """
-        Return a |_PngParser| instance containing the header properties
-        parsed from the PNG image in `stream`.
-        """
+        """Return a |_PngParser| instance containing the header properties parsed from
+        the PNG image in `stream`."""
         chunks = _Chunks.from_stream(stream)
         return cls(chunks)
 
     @property
     def px_width(self):
-        """
-        The number of pixels in each row of the image.
-        """
+        """The number of pixels in each row of the image."""
         IHDR = self._chunks.IHDR
         return IHDR.px_width
 
     @property
     def px_height(self):
-        """
-        The number of stacked rows of pixels in the image.
-        """
+        """The number of stacked rows of pixels in the image."""
         IHDR = self._chunks.IHDR
         return IHDR.px_height
 
     @property
     def horz_dpi(self):
-        """
-        Integer dots per inch for the width of this image. Defaults to 72
-        when not present in the file, as is often the case.
+        """Integer dots per inch for the width of this image.
+
+        Defaults to 72 when not present in the file, as is often the case.
         """
         pHYs = self._chunks.pHYs
         if pHYs is None:
@@ -88,9 +71,9 @@ def horz_dpi(self):
 
     @property
     def vert_dpi(self):
-        """
-        Integer dots per inch for the height of this image. Defaults to 72
-        when not present in the file, as is often the case.
+        """Integer dots per inch for the height of this image.
+
+        Defaults to 72 when not present in the file, as is often the case.
         """
         pHYs = self._chunks.pHYs
         if pHYs is None:
@@ -99,19 +82,15 @@ def vert_dpi(self):
 
     @staticmethod
     def _dpi(units_specifier, px_per_unit):
-        """
-        Return dots per inch value calculated from `units_specifier` and
-        `px_per_unit`.
-        """
+        """Return dots per inch value calculated from `units_specifier` and
+        `px_per_unit`."""
         if units_specifier == 1 and px_per_unit:
             return int(round(px_per_unit * 0.0254))
         return 72
 
 
 class _Chunks(object):
-    """
-    Collection of the chunks parsed from a PNG image stream
-    """
+    """Collection of the chunks parsed from a PNG image stream."""
 
     def __init__(self, chunk_iterable):
         super(_Chunks, self).__init__()
@@ -119,18 +98,14 @@ def __init__(self, chunk_iterable):
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |_Chunks| instance containing the PNG chunks in `stream`.
-        """
+        """Return a |_Chunks| instance containing the PNG chunks in `stream`."""
         chunk_parser = _ChunkParser.from_stream(stream)
         chunks = list(chunk_parser.iter_chunks())
         return cls(chunks)
 
     @property
     def IHDR(self):
-        """
-        IHDR chunk in PNG image
-        """
+        """IHDR chunk in PNG image."""
         match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.IHDR  # noqa
         IHDR = self._find_first(match)
         if IHDR is None:
@@ -139,17 +114,12 @@ def IHDR(self):
 
     @property
     def pHYs(self):
-        """
-        pHYs chunk in PNG image, or |None| if not present
-        """
+        """PHYs chunk in PNG image, or |None| if not present."""
         match = lambda chunk: chunk.type_name == PNG_CHUNK_TYPE.pHYs  # noqa
         return self._find_first(match)
 
     def _find_first(self, match):
-        """
-        Return first chunk in stream order returning True for function
-        `match`.
-        """
+        """Return first chunk in stream order returning True for function `match`."""
         for chunk in self._chunks:
             if match(chunk):
                 return chunk
@@ -157,9 +127,7 @@ def _find_first(self, match):
 
 
 class _ChunkParser(object):
-    """
-    Extracts chunks from a PNG image stream
-    """
+    """Extracts chunks from a PNG image stream."""
 
     def __init__(self, stream_rdr):
         super(_ChunkParser, self).__init__()
@@ -167,27 +135,23 @@ def __init__(self, stream_rdr):
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |_ChunkParser| instance that can extract the chunks from the
-        PNG image in `stream`.
-        """
+        """Return a |_ChunkParser| instance that can extract the chunks from the PNG
+        image in `stream`."""
         stream_rdr = StreamReader(stream, BIG_ENDIAN)
         return cls(stream_rdr)
 
     def iter_chunks(self):
-        """
-        Generate a |_Chunk| subclass instance for each chunk in this parser's
-        PNG stream, in the order encountered in the stream.
-        """
+        """Generate a |_Chunk| subclass instance for each chunk in this parser's PNG
+        stream, in the order encountered in the stream."""
         for chunk_type, offset in self._iter_chunk_offsets():
             chunk = _ChunkFactory(chunk_type, self._stream_rdr, offset)
             yield chunk
 
     def _iter_chunk_offsets(self):
-        """
-        Generate a (chunk_type, chunk_offset) 2-tuple for each of the chunks
-        in the PNG image stream. Iteration stops after the IEND chunk is
-        returned.
+        """Generate a (chunk_type, chunk_offset) 2-tuple for each of the chunks in the
+        PNG image stream.
+
+        Iteration stops after the IEND chunk is returned.
         """
         chunk_offset = 8
         while True:
@@ -202,10 +166,8 @@ def _iter_chunk_offsets(self):
 
 
 def _ChunkFactory(chunk_type, stream_rdr, offset):
-    """
-    Return a |_Chunk| subclass instance appropriate to `chunk_type` parsed
-    from `stream_rdr` at `offset`.
-    """
+    """Return a |_Chunk| subclass instance appropriate to `chunk_type` parsed from
+    `stream_rdr` at `offset`."""
     chunk_cls_map = {
         PNG_CHUNK_TYPE.IHDR: _IHDRChunk,
         PNG_CHUNK_TYPE.pHYs: _pHYsChunk,
@@ -215,9 +177,9 @@ def _ChunkFactory(chunk_type, stream_rdr, offset):
 
 
 class _Chunk(object):
-    """
-    Base class for specific chunk types. Also serves as the default chunk
-    type.
+    """Base class for specific chunk types.
+
+    Also serves as the default chunk type.
     """
 
     def __init__(self, chunk_type):
@@ -226,23 +188,17 @@ def __init__(self, chunk_type):
 
     @classmethod
     def from_offset(cls, chunk_type, stream_rdr, offset):
-        """
-        Return a default _Chunk instance that only knows its chunk type.
-        """
+        """Return a default _Chunk instance that only knows its chunk type."""
         return cls(chunk_type)
 
     @property
     def type_name(self):
-        """
-        The chunk type name, e.g. 'IHDR', 'pHYs', etc.
-        """
+        """The chunk type name, e.g. 'IHDR', 'pHYs', etc."""
         return self._chunk_type
 
 
 class _IHDRChunk(_Chunk):
-    """
-    IHDR chunk, contains the image dimensions
-    """
+    """IHDR chunk, contains the image dimensions."""
 
     def __init__(self, chunk_type, px_width, px_height):
         super(_IHDRChunk, self).__init__(chunk_type)
@@ -251,10 +207,8 @@ def __init__(self, chunk_type, px_width, px_height):
 
     @classmethod
     def from_offset(cls, chunk_type, stream_rdr, offset):
-        """
-        Return an _IHDRChunk instance containing the image dimensions
-        extracted from the IHDR chunk in `stream` at `offset`.
-        """
+        """Return an _IHDRChunk instance containing the image dimensions extracted from
+        the IHDR chunk in `stream` at `offset`."""
         px_width = stream_rdr.read_long(offset)
         px_height = stream_rdr.read_long(offset, 4)
         return cls(chunk_type, px_width, px_height)
@@ -269,9 +223,7 @@ def px_height(self):
 
 
 class _pHYsChunk(_Chunk):
-    """
-    pYHs chunk, contains the image dpi information
-    """
+    """PYHs chunk, contains the image dpi information."""
 
     def __init__(self, chunk_type, horz_px_per_unit, vert_px_per_unit, units_specifier):
         super(_pHYsChunk, self).__init__(chunk_type)
@@ -281,10 +233,8 @@ def __init__(self, chunk_type, horz_px_per_unit, vert_px_per_unit, units_specifi
 
     @classmethod
     def from_offset(cls, chunk_type, stream_rdr, offset):
-        """
-        Return a _pHYsChunk instance containing the image resolution
-        extracted from the pHYs chunk in `stream` at `offset`.
-        """
+        """Return a _pHYsChunk instance containing the image resolution extracted from
+        the pHYs chunk in `stream` at `offset`."""
         horz_px_per_unit = stream_rdr.read_long(offset)
         vert_px_per_unit = stream_rdr.read_long(offset, 4)
         units_specifier = stream_rdr.read_byte(offset, 8)
diff --git a/src/docx/image/tiff.py b/src/docx/image/tiff.py
index 42d3fb11d..4e09db15d 100644
--- a/src/docx/image/tiff.py
+++ b/src/docx/image/tiff.py
@@ -4,32 +4,26 @@
 
 
 class Tiff(BaseImageHeader):
-    """
-    Image header parser for TIFF images. Handles both big and little endian
-    byte ordering.
+    """Image header parser for TIFF images.
+
+    Handles both big and little endian byte ordering.
     """
 
     @property
     def content_type(self):
-        """
-        Return the MIME type of this TIFF image, unconditionally the string
-        ``image/tiff``.
-        """
+        """Return the MIME type of this TIFF image, unconditionally the string
+        ``image/tiff``."""
         return MIME_TYPE.TIFF
 
     @property
     def default_ext(self):
-        """
-        Default filename extension, always 'tiff' for TIFF images.
-        """
+        """Default filename extension, always 'tiff' for TIFF images."""
         return "tiff"
 
     @classmethod
     def from_stream(cls, stream):
-        """
-        Return a |Tiff| instance containing the properties of the TIFF image
-        in `stream`.
-        """
+        """Return a |Tiff| instance containing the properties of the TIFF image in
+        `stream`."""
         parser = _TiffParser.parse(stream)
 
         px_width = parser.px_width
@@ -41,10 +35,8 @@ def from_stream(cls, stream):
 
 
 class _TiffParser(object):
-    """
-    Parses a TIFF image stream to extract the image properties found in its
-    main image file directory (IFD)
-    """
+    """Parses a TIFF image stream to extract the image properties found in its main
+    image file directory (IFD)"""
 
     def __init__(self, ifd_entries):
         super(_TiffParser, self).__init__()
@@ -52,10 +44,8 @@ def __init__(self, ifd_entries):
 
     @classmethod
     def parse(cls, stream):
-        """
-        Return an instance of |_TiffParser| containing the properties parsed
-        from the TIFF image in `stream`.
-        """
+        """Return an instance of |_TiffParser| containing the properties parsed from the
+        TIFF image in `stream`."""
         stream_rdr = cls._make_stream_reader(stream)
         ifd0_offset = stream_rdr.read_long(4)
         ifd_entries = _IfdEntries.from_stream(stream_rdr, ifd0_offset)
@@ -63,55 +53,43 @@ def parse(cls, stream):
 
     @property
     def horz_dpi(self):
-        """
-        The horizontal dots per inch value calculated from the XResolution
-        and ResolutionUnit tags of the IFD; defaults to 72 if those tags are
-        not present.
-        """
+        """The horizontal dots per inch value calculated from the XResolution and
+        ResolutionUnit tags of the IFD; defaults to 72 if those tags are not present."""
         return self._dpi(TIFF_TAG.X_RESOLUTION)
 
     @property
     def vert_dpi(self):
-        """
-        The vertical dots per inch value calculated from the XResolution and
-        ResolutionUnit tags of the IFD; defaults to 72 if those tags are not
-        present.
-        """
+        """The vertical dots per inch value calculated from the XResolution and
+        ResolutionUnit tags of the IFD; defaults to 72 if those tags are not present."""
         return self._dpi(TIFF_TAG.Y_RESOLUTION)
 
     @property
     def px_height(self):
-        """
-        The number of stacked rows of pixels in the image, |None| if the IFD
-        contains no ``ImageLength`` tag, the expected case when the TIFF is
-        embeded in an Exif image.
-        """
+        """The number of stacked rows of pixels in the image, |None| if the IFD contains
+        no ``ImageLength`` tag, the expected case when the TIFF is embeded in an Exif
+        image."""
         return self._ifd_entries.get(TIFF_TAG.IMAGE_LENGTH)
 
     @property
     def px_width(self):
-        """
-        The number of pixels in each row in the image, |None| if the IFD
-        contains no ``ImageWidth`` tag, the expected case when the TIFF is
-        embeded in an Exif image.
-        """
+        """The number of pixels in each row in the image, |None| if the IFD contains no
+        ``ImageWidth`` tag, the expected case when the TIFF is embeded in an Exif
+        image."""
         return self._ifd_entries.get(TIFF_TAG.IMAGE_WIDTH)
 
     @classmethod
     def _detect_endian(cls, stream):
-        """
-        Return either BIG_ENDIAN or LITTLE_ENDIAN depending on the endian
-        indicator found in the TIFF `stream` header, either 'MM' or 'II'.
-        """
+        """Return either BIG_ENDIAN or LITTLE_ENDIAN depending on the endian indicator
+        found in the TIFF `stream` header, either 'MM' or 'II'."""
         stream.seek(0)
         endian_str = stream.read(2)
         return BIG_ENDIAN if endian_str == b"MM" else LITTLE_ENDIAN
 
     def _dpi(self, resolution_tag):
-        """
-        Return the dpi value calculated for `resolution_tag`, which can be
-        either TIFF_TAG.X_RESOLUTION or TIFF_TAG.Y_RESOLUTION. The
-        calculation is based on the values of both that tag and the
+        """Return the dpi value calculated for `resolution_tag`, which can be either
+        TIFF_TAG.X_RESOLUTION or TIFF_TAG.Y_RESOLUTION.
+
+        The calculation is based on the values of both that tag and the
         TIFF_TAG.RESOLUTION_UNIT tag in this parser's |_IfdEntries| instance.
         """
         ifd_entries = self._ifd_entries
@@ -135,60 +113,45 @@ def _dpi(self, resolution_tag):
 
     @classmethod
     def _make_stream_reader(cls, stream):
-        """
-        Return a |StreamReader| instance with wrapping `stream` and having
-        "endian-ness" determined by the 'MM' or 'II' indicator in the TIFF
-        stream header.
-        """
+        """Return a |StreamReader| instance with wrapping `stream` and having "endian-
+        ness" determined by the 'MM' or 'II' indicator in the TIFF stream header."""
         endian = cls._detect_endian(stream)
         return StreamReader(stream, endian)
 
 
 class _IfdEntries(object):
-    """
-    Image File Directory for a TIFF image, having mapping (dict) semantics
-    allowing "tag" values to be retrieved by tag code.
-    """
+    """Image File Directory for a TIFF image, having mapping (dict) semantics allowing
+    "tag" values to be retrieved by tag code."""
 
     def __init__(self, entries):
         super(_IfdEntries, self).__init__()
         self._entries = entries
 
     def __contains__(self, key):
-        """
-        Provides ``in`` operator, e.g. ``tag in ifd_entries``
-        """
+        """Provides ``in`` operator, e.g. ``tag in ifd_entries``"""
         return self._entries.__contains__(key)
 
     def __getitem__(self, key):
-        """
-        Provides indexed access, e.g. ``tag_value = ifd_entries[tag_code]``
-        """
+        """Provides indexed access, e.g. ``tag_value = ifd_entries[tag_code]``"""
         return self._entries.__getitem__(key)
 
     @classmethod
     def from_stream(cls, stream, offset):
-        """
-        Return a new |_IfdEntries| instance parsed from `stream` starting at
-        `offset`.
-        """
+        """Return a new |_IfdEntries| instance parsed from `stream` starting at
+        `offset`."""
         ifd_parser = _IfdParser(stream, offset)
         entries = {e.tag: e.value for e in ifd_parser.iter_entries()}
         return cls(entries)
 
     def get(self, tag_code, default=None):
-        """
-        Return value of IFD entry having tag matching `tag_code`, or
-        `default` if no matching tag found.
-        """
+        """Return value of IFD entry having tag matching `tag_code`, or `default` if no
+        matching tag found."""
         return self._entries.get(tag_code, default)
 
 
 class _IfdParser(object):
-    """
-    Service object that knows how to extract directory entries from an Image
-    File Directory (IFD)
-    """
+    """Service object that knows how to extract directory entries from an Image File
+    Directory (IFD)"""
 
     def __init__(self, stream_rdr, offset):
         super(_IfdParser, self).__init__()
@@ -196,10 +159,8 @@ def __init__(self, stream_rdr, offset):
         self._offset = offset
 
     def iter_entries(self):
-        """
-        Generate an |_IfdEntry| instance corresponding to each entry in the
-        directory.
-        """
+        """Generate an |_IfdEntry| instance corresponding to each entry in the
+        directory."""
         for idx in range(self._entry_count):
             dir_entry_offset = self._offset + 2 + (idx * 12)
             ifd_entry = _IfdEntryFactory(self._stream_rdr, dir_entry_offset)
@@ -207,17 +168,13 @@ def iter_entries(self):
 
     @property
     def _entry_count(self):
-        """
-        The count of directory entries, read from the top of the IFD header
-        """
+        """The count of directory entries, read from the top of the IFD header."""
         return self._stream_rdr.read_short(self._offset)
 
 
 def _IfdEntryFactory(stream_rdr, offset):
-    """
-    Return an |_IfdEntry| subclass instance containing the value of the
-    directory entry at `offset` in `stream_rdr`.
-    """
+    """Return an |_IfdEntry| subclass instance containing the value of the directory
+    entry at `offset` in `stream_rdr`."""
     ifd_entry_classes = {
         TIFF_FLD.ASCII: _AsciiIfdEntry,
         TIFF_FLD.SHORT: _ShortIfdEntry,
@@ -230,9 +187,9 @@ def _IfdEntryFactory(stream_rdr, offset):
 
 
 class _IfdEntry(object):
-    """
-    Base class for IFD entry classes. Subclasses are differentiated by value
-    type, e.g. ASCII, long int, etc.
+    """Base class for IFD entry classes.
+
+    Subclasses are differentiated by value type, e.g. ASCII, long int, etc.
     """
 
     def __init__(self, tag_code, value):
@@ -242,11 +199,11 @@ def __init__(self, tag_code, value):
 
     @classmethod
     def from_stream(cls, stream_rdr, offset):
-        """
-        Return an |_IfdEntry| subclass instance containing the tag and value
-        of the tag parsed from `stream_rdr` at `offset`. Note this method is
-        common to all subclasses. Override the ``_parse_value()`` method to
-        provide distinctive behavior based on field type.
+        """Return an |_IfdEntry| subclass instance containing the tag and value of the
+        tag parsed from `stream_rdr` at `offset`.
+
+        Note this method is common to all subclasses. Override the ``_parse_value()``
+        method to provide distinctive behavior based on field type.
         """
         tag_code = stream_rdr.read_short(offset, 0)
         value_count = stream_rdr.read_long(offset, 4)
@@ -256,52 +213,45 @@ def from_stream(cls, stream_rdr, offset):
 
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
-        """
-        Return the value of this field parsed from `stream_rdr` at `offset`.
+        """Return the value of this field parsed from `stream_rdr` at `offset`.
+
         Intended to be overridden by subclasses.
         """
         return "UNIMPLEMENTED FIELD TYPE"  # pragma: no cover
 
     @property
     def tag(self):
-        """
-        Short int code that identifies this IFD entry
-        """
+        """Short int code that identifies this IFD entry."""
         return self._tag_code
 
     @property
     def value(self):
-        """
-        Value of this tag, its type being dependent on the tag.
-        """
+        """Value of this tag, its type being dependent on the tag."""
         return self._value
 
 
 class _AsciiIfdEntry(_IfdEntry):
-    """
-    IFD entry having the form of a NULL-terminated ASCII string
-    """
+    """IFD entry having the form of a NULL-terminated ASCII string."""
 
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
-        """
-        Return the ASCII string parsed from `stream_rdr` at `value_offset`.
-        The length of the string, including a terminating '\x00' (NUL)
-        character, is in `value_count`.
+        """Return the ASCII string parsed from `stream_rdr` at `value_offset`.
+
+        The length of the string, including a terminating '\x00' (NUL) character, is in
+        `value_count`.
         """
         return stream_rdr.read_str(value_count - 1, value_offset)
 
 
 class _ShortIfdEntry(_IfdEntry):
-    """
-    IFD entry expressed as a short (2-byte) integer
-    """
+    """IFD entry expressed as a short (2-byte) integer."""
 
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
-        """
-        Return the short int value contained in the `value_offset` field of
-        this entry. Only supports single values at present.
+        """Return the short int value contained in the `value_offset` field of this
+        entry.
+
+        Only supports single values at present.
         """
         if value_count == 1:
             return stream_rdr.read_short(offset, 8)
@@ -310,15 +260,14 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
 
 
 class _LongIfdEntry(_IfdEntry):
-    """
-    IFD entry expressed as a long (4-byte) integer
-    """
+    """IFD entry expressed as a long (4-byte) integer."""
 
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
-        """
-        Return the long int value contained in the `value_offset` field of
-        this entry. Only supports single values at present.
+        """Return the long int value contained in the `value_offset` field of this
+        entry.
+
+        Only supports single values at present.
         """
         if value_count == 1:
             return stream_rdr.read_long(offset, 8)
@@ -327,16 +276,14 @@ def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
 
 
 class _RationalIfdEntry(_IfdEntry):
-    """
-    IFD entry expressed as a numerator, denominator pair
-    """
+    """IFD entry expressed as a numerator, denominator pair."""
 
     @classmethod
     def _parse_value(cls, stream_rdr, offset, value_count, value_offset):
-        """
-        Return the rational (numerator / denominator) value at `value_offset`
-        in `stream_rdr` as a floating-point number. Only supports single
-        values at present.
+        """Return the rational (numerator / denominator) value at `value_offset` in
+        `stream_rdr` as a floating-point number.
+
+        Only supports single values at present.
         """
         if value_count == 1:
             numerator = stream_rdr.read_long(value_offset)
diff --git a/src/docx/opc/coreprops.py b/src/docx/opc/coreprops.py
index c0434730a..26e73fef6 100644
--- a/src/docx/opc/coreprops.py
+++ b/src/docx/opc/coreprops.py
@@ -5,10 +5,8 @@
 
 
 class CoreProperties(object):
-    """
-    Corresponds to part named ``/docProps/core.xml``, containing the core
-    document properties for this document package.
-    """
+    """Corresponds to part named ``/docProps/core.xml``, containing the core document
+    properties for this document package."""
 
     def __init__(self, element):
         self._element = element
diff --git a/src/docx/opc/exceptions.py b/src/docx/opc/exceptions.py
index 3225d6943..c5583d301 100644
--- a/src/docx/opc/exceptions.py
+++ b/src/docx/opc/exceptions.py
@@ -5,12 +5,8 @@
 
 
 class OpcError(Exception):
-    """
-    Base error class for python-opc
-    """
+    """Base error class for python-opc."""
 
 
 class PackageNotFoundError(OpcError):
-    """
-    Raised when a package cannot be found at the specified path.
-    """
+    """Raised when a package cannot be found at the specified path."""
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index 408fe5af6..dfbad8d06 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -28,16 +28,15 @@
 
 
 def parse_xml(text):
-    """
-    ``etree.fromstring()`` replacement that uses oxml parser
-    """
+    """``etree.fromstring()`` replacement that uses oxml parser."""
     return etree.fromstring(text, oxml_parser)
 
 
 def qn(tag):
-    """
-    Stands for "qualified name", a utility function to turn a namespace
-    prefixed tag name into a Clark-notation qualified tag name for lxml. For
+    """Stands for "qualified name", a utility function to turn a namespace prefixed tag
+    name into a Clark-notation qualified tag name for lxml.
+
+    For
     example, ``qn('p:cSld')`` returns ``'{http://schemas.../main}cSld'``.
     """
     prefix, tagroot = tag.split(":")
@@ -46,18 +45,18 @@ def qn(tag):
 
 
 def serialize_part_xml(part_elm):
-    """
-    Serialize `part_elm` etree element to XML suitable for storage as an XML
-    part. That is to say, no insignificant whitespace added for readability,
-    and an appropriate XML declaration added with UTF-8 encoding specified.
+    """Serialize `part_elm` etree element to XML suitable for storage as an XML part.
+
+    That is to say, no insignificant whitespace added for readability, and an
+    appropriate XML declaration added with UTF-8 encoding specified.
     """
     return etree.tostring(part_elm, encoding="UTF-8", standalone=True)
 
 
 def serialize_for_reading(element):
-    """
-    Serialize `element` to human-readable XML suitable for tests. No XML
-    declaration.
+    """Serialize `element` to human-readable XML suitable for tests.
+
+    No XML declaration.
     """
     return etree.tostring(element, encoding="unicode", pretty_print=True)
 
@@ -68,49 +67,37 @@ def serialize_for_reading(element):
 
 
 class BaseOxmlElement(etree.ElementBase):
-    """
-    Base class for all custom element classes, to add standardized behavior
-    to all classes in one place.
-    """
+    """Base class for all custom element classes, to add standardized behavior to all
+    classes in one place."""
 
     @property
     def xml(self):
-        """
-        Return XML string for this element, suitable for testing purposes.
-        Pretty printed for readability and without an XML declaration at the
-        top.
+        """Return XML string for this element, suitable for testing purposes.
+
+        Pretty printed for readability and without an XML declaration at the top.
         """
         return serialize_for_reading(self)
 
 
 class CT_Default(BaseOxmlElement):
-    """
-    ``<Default>`` element, specifying the default content type to be applied
-    to a part with the specified extension.
-    """
+    """``<Default>`` element, specifying the default content type to be applied to a
+    part with the specified extension."""
 
     @property
     def content_type(self):
-        """
-        String held in the ``ContentType`` attribute of this ``<Default>``
-        element.
-        """
+        """String held in the ``ContentType`` attribute of this ``<Default>``
+        element."""
         return self.get("ContentType")
 
     @property
     def extension(self):
-        """
-        String held in the ``Extension`` attribute of this ``<Default>``
-        element.
-        """
+        """String held in the ``Extension`` attribute of this ``<Default>`` element."""
         return self.get("Extension")
 
     @staticmethod
     def new(ext, content_type):
-        """
-        Return a new ``<Default>`` element with attributes set to parameter
-        values.
-        """
+        """Return a new ``<Default>`` element with attributes set to parameter
+        values."""
         xml = '<Default xmlns="%s"/>' % nsmap["ct"]
         default = parse_xml(xml)
         default.set("Extension", ext)
@@ -119,25 +106,19 @@ def new(ext, content_type):
 
 
 class CT_Override(BaseOxmlElement):
-    """
-    ``<Override>`` element, specifying the content type to be applied for a
-    part with the specified partname.
-    """
+    """``<Override>`` element, specifying the content type to be applied for a part with
+    the specified partname."""
 
     @property
     def content_type(self):
-        """
-        String held in the ``ContentType`` attribute of this ``<Override>``
-        element.
-        """
+        """String held in the ``ContentType`` attribute of this ``<Override>``
+        element."""
         return self.get("ContentType")
 
     @staticmethod
     def new(partname, content_type):
-        """
-        Return a new ``<Override>`` element with attributes set to parameter
-        values.
-        """
+        """Return a new ``<Override>`` element with attributes set to parameter
+        values."""
         xml = '<Override xmlns="%s"/>' % nsmap["ct"]
         override = parse_xml(xml)
         override.set("PartName", partname)
@@ -146,24 +127,17 @@ def new(partname, content_type):
 
     @property
     def partname(self):
-        """
-        String held in the ``PartName`` attribute of this ``<Override>``
-        element.
-        """
+        """String held in the ``PartName`` attribute of this ``<Override>`` element."""
         return self.get("PartName")
 
 
 class CT_Relationship(BaseOxmlElement):
-    """
-    ``<Relationship>`` element, representing a single relationship from a
-    source to a target part.
-    """
+    """``<Relationship>`` element, representing a single relationship from a source to a
+    target part."""
 
     @staticmethod
     def new(rId, reltype, target, target_mode=RTM.INTERNAL):
-        """
-        Return a new ``<Relationship>`` element.
-        """
+        """Return a new ``<Relationship>`` element."""
         xml = '<Relationship xmlns="%s"/>' % nsmap["pr"]
         relationship = parse_xml(xml)
         relationship.set("Id", rId)
@@ -175,96 +149,71 @@ def new(rId, reltype, target, target_mode=RTM.INTERNAL):
 
     @property
     def rId(self):
-        """
-        String held in the ``Id`` attribute of this ``<Relationship>``
-        element.
-        """
+        """String held in the ``Id`` attribute of this ``<Relationship>`` element."""
         return self.get("Id")
 
     @property
     def reltype(self):
-        """
-        String held in the ``Type`` attribute of this ``<Relationship>``
-        element.
-        """
+        """String held in the ``Type`` attribute of this ``<Relationship>`` element."""
         return self.get("Type")
 
     @property
     def target_ref(self):
-        """
-        String held in the ``Target`` attribute of this ``<Relationship>``
-        element.
-        """
+        """String held in the ``Target`` attribute of this ``<Relationship>``
+        element."""
         return self.get("Target")
 
     @property
     def target_mode(self):
-        """
-        String held in the ``TargetMode`` attribute of this
-        ``<Relationship>`` element, either ``Internal`` or ``External``.
+        """String held in the ``TargetMode`` attribute of this ``<Relationship>``
+        element, either ``Internal`` or ``External``.
+
         Defaults to ``Internal``.
         """
         return self.get("TargetMode", RTM.INTERNAL)
 
 
 class CT_Relationships(BaseOxmlElement):
-    """
-    ``<Relationships>`` element, the root element in a .rels file.
-    """
+    """``<Relationships>`` element, the root element in a .rels file."""
 
     def add_rel(self, rId, reltype, target, is_external=False):
-        """
-        Add a child ``<Relationship>`` element with attributes set according
-        to parameter values.
-        """
+        """Add a child ``<Relationship>`` element with attributes set according to
+        parameter values."""
         target_mode = RTM.EXTERNAL if is_external else RTM.INTERNAL
         relationship = CT_Relationship.new(rId, reltype, target, target_mode)
         self.append(relationship)
 
     @staticmethod
     def new():
-        """
-        Return a new ``<Relationships>`` element.
-        """
+        """Return a new ``<Relationships>`` element."""
         xml = '<Relationships xmlns="%s"/>' % nsmap["pr"]
         relationships = parse_xml(xml)
         return relationships
 
     @property
     def Relationship_lst(self):
-        """
-        Return a list containing all the ``<Relationship>`` child elements.
-        """
+        """Return a list containing all the ``<Relationship>`` child elements."""
         return self.findall(qn("pr:Relationship"))
 
     @property
     def xml(self):
-        """
-        Return XML string for this element, suitable for saving in a .rels
-        stream, not pretty printed and with an XML declaration at the top.
-        """
+        """Return XML string for this element, suitable for saving in a .rels stream,
+        not pretty printed and with an XML declaration at the top."""
         return serialize_part_xml(self)
 
 
 class CT_Types(BaseOxmlElement):
-    """
-    ``<Types>`` element, the container element for Default and Override
-    elements in [Content_Types].xml.
-    """
+    """``<Types>`` element, the container element for Default and Override elements in
+    [Content_Types].xml."""
 
     def add_default(self, ext, content_type):
-        """
-        Add a child ``<Default>`` element with attributes set to parameter
-        values.
-        """
+        """Add a child ``<Default>`` element with attributes set to parameter values."""
         default = CT_Default.new(ext, content_type)
         self.append(default)
 
     def add_override(self, partname, content_type):
-        """
-        Add a child ``<Override>`` element with attributes set to parameter
-        values.
-        """
+        """Add a child ``<Override>`` element with attributes set to parameter
+        values."""
         override = CT_Override.new(partname, content_type)
         self.append(override)
 
@@ -274,9 +223,7 @@ def defaults(self):
 
     @staticmethod
     def new():
-        """
-        Return a new ``<Types>`` element.
-        """
+        """Return a new ``<Types>`` element."""
         xml = '<Types xmlns="%s"/>' % nsmap["ct"]
         types = parse_xml(xml)
         return types
diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index d4882c8ce..671c585de 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -21,9 +21,9 @@ def __init__(self):
         super(OpcPackage, self).__init__()
 
     def after_unmarshal(self):
-        """
-        Entry point for any post-unmarshaling processing. May be overridden
-        by subclasses without forwarding call to super.
+        """Entry point for any post-unmarshaling processing.
+
+        May be overridden by subclasses without forwarding call to super.
         """
         # don't place any code here, just catch call if not overridden by
         # subclass
@@ -31,17 +31,13 @@ def after_unmarshal(self):
 
     @property
     def core_properties(self):
-        """
-        |CoreProperties| object providing read/write access to the Dublin
-        Core properties for this document.
-        """
+        """|CoreProperties| object providing read/write access to the Dublin Core
+        properties for this document."""
         return self._core_properties_part.core_properties
 
     def iter_rels(self):
-        """
-        Generate exactly one reference to each relationship in the package by
-        performing a depth-first traversal of the rels graph.
-        """
+        """Generate exactly one reference to each relationship in the package by
+        performing a depth-first traversal of the rels graph."""
 
         def walk_rels(source, visited=None):
             visited = [] if visited is None else visited
@@ -61,10 +57,8 @@ def walk_rels(source, visited=None):
             yield rel
 
     def iter_parts(self):
-        """
-        Generate exactly one reference to each of the parts in the package by
-        performing a depth-first traversal of the rels graph.
-        """
+        """Generate exactly one reference to each of the parts in the package by
+        performing a depth-first traversal of the rels graph."""
 
         def walk_parts(source, visited=[]):
             for rel in source.rels.values():
@@ -83,23 +77,22 @@ def walk_parts(source, visited=[]):
             yield part
 
     def load_rel(self, reltype, target, rId, is_external=False):
-        """
-        Return newly added |_Relationship| instance of `reltype` between this
-        part and `target` with key `rId`. Target mode is set to
-        ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for use during
-        load from a serialized package, where the rId is well known. Other
-        methods exist for adding a new relationship to the package during
-        processing.
+        """Return newly added |_Relationship| instance of `reltype` between this part
+        and `target` with key `rId`.
+
+        Target mode is set to ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for
+        use during load from a serialized package, where the rId is well known. Other
+        methods exist for adding a new relationship to the package during processing.
         """
         return self.rels.add_relationship(reltype, target, rId, is_external)
 
     @property
     def main_document_part(self):
-        """
-        Return a reference to the main document part for this package.
-        Examples include a document part for a WordprocessingML package, a
-        presentation part for a PresentationML package, or a workbook part
-        for a SpreadsheetML package.
+        """Return a reference to the main document part for this package.
+
+        Examples include a document part for a WordprocessingML package, a presentation
+        part for a PresentationML package, or a workbook part for a SpreadsheetML
+        package.
         """
         return self.part_related_by(RT.OFFICE_DOCUMENT)
 
@@ -119,61 +112,49 @@ def next_partname(self, template):
 
     @classmethod
     def open(cls, pkg_file):
-        """
-        Return an |OpcPackage| instance loaded with the contents of
-        `pkg_file`.
-        """
+        """Return an |OpcPackage| instance loaded with the contents of `pkg_file`."""
         pkg_reader = PackageReader.from_file(pkg_file)
         package = cls()
         Unmarshaller.unmarshal(pkg_reader, package, PartFactory)
         return package
 
     def part_related_by(self, reltype):
-        """
-        Return part to which this package has a relationship of `reltype`.
-        Raises |KeyError| if no such relationship is found and |ValueError|
-        if more than one such relationship is found.
+        """Return part to which this package has a relationship of `reltype`.
+
+        Raises |KeyError| if no such relationship is found and |ValueError| if more than
+        one such relationship is found.
         """
         return self.rels.part_with_reltype(reltype)
 
     @property
     def parts(self):
-        """
-        Return a list containing a reference to each of the parts in this
-        package.
-        """
+        """Return a list containing a reference to each of the parts in this package."""
         return list(self.iter_parts())
 
     def relate_to(self, part, reltype):
-        """
-        Return rId key of relationship to `part`, from the existing
-        relationship if there is one, otherwise a newly created one.
-        """
+        """Return rId key of relationship to `part`, from the existing relationship if
+        there is one, otherwise a newly created one."""
         rel = self.rels.get_or_add(reltype, part)
         return rel.rId
 
     @lazyproperty
     def rels(self):
-        """
-        Return a reference to the |Relationships| instance holding the
-        collection of relationships for this package.
-        """
+        """Return a reference to the |Relationships| instance holding the collection of
+        relationships for this package."""
         return Relationships(PACKAGE_URI.baseURI)
 
     def save(self, pkg_file):
-        """
-        Save this package to `pkg_file`, where `file` can be either a path to
-        a file (a string) or a file-like object.
-        """
+        """Save this package to `pkg_file`, where `file` can be either a path to a file
+        (a string) or a file-like object."""
         for part in self.parts:
             part.before_marshal()
         PackageWriter.write(pkg_file, self.rels, self.parts)
 
     @property
     def _core_properties_part(self):
-        """
-        |CorePropertiesPart| object related to this package. Creates
-        a default core properties part if one is not present (not common).
+        """|CorePropertiesPart| object related to this package.
+
+        Creates a default core properties part if one is not present (not common).
         """
         try:
             return self.part_related_by(RT.CORE_PROPERTIES)
@@ -188,10 +169,10 @@ class Unmarshaller(object):
 
     @staticmethod
     def unmarshal(pkg_reader, package, part_factory):
-        """
-        Construct graph of parts and realized relationships based on the
-        contents of `pkg_reader`, delegating construction of each part to
-        `part_factory`. Package relationships are added to `pkg`.
+        """Construct graph of parts and realized relationships based on the contents of
+        `pkg_reader`, delegating construction of each part to `part_factory`.
+
+        Package relationships are added to `pkg`.
         """
         parts = Unmarshaller._unmarshal_parts(pkg_reader, package, part_factory)
         Unmarshaller._unmarshal_relationships(pkg_reader, package, parts)
@@ -201,10 +182,11 @@ def unmarshal(pkg_reader, package, part_factory):
 
     @staticmethod
     def _unmarshal_parts(pkg_reader, package, part_factory):
-        """
-        Return a dictionary of |Part| instances unmarshalled from
-        `pkg_reader`, keyed by partname. Side-effect is that each part in
-        `pkg_reader` is constructed using `part_factory`.
+        """Return a dictionary of |Part| instances unmarshalled from `pkg_reader`, keyed
+        by partname.
+
+        Side-effect is that each part in `pkg_reader` is constructed using
+        `part_factory`.
         """
         parts = {}
         for partname, content_type, reltype, blob in pkg_reader.iter_sparts():
@@ -215,11 +197,9 @@ def _unmarshal_parts(pkg_reader, package, part_factory):
 
     @staticmethod
     def _unmarshal_relationships(pkg_reader, package, parts):
-        """
-        Add a relationship to the source object corresponding to each of the
-        relationships in `pkg_reader` with its target_part set to the actual
-        target part in `parts`.
-        """
+        """Add a relationship to the source object corresponding to each of the
+        relationships in `pkg_reader` with its target_part set to the actual target part
+        in `parts`."""
         for source_uri, srel in pkg_reader.iter_srels():
             source = package if source_uri == "/" else parts[source_uri]
             target = (
diff --git a/src/docx/opc/packuri.py b/src/docx/opc/packuri.py
index f86e83635..fe330d89b 100644
--- a/src/docx/opc/packuri.py
+++ b/src/docx/opc/packuri.py
@@ -8,9 +8,10 @@
 
 
 class PackURI(str):
-    """
-    Provides access to pack URI components such as the baseURI and the
-    filename slice. Behaves as |str| otherwise.
+    """Provides access to pack URI components such as the baseURI and the filename
+    slice.
+
+    Behaves as |str| otherwise.
     """
 
     _filename_re = re.compile("([a-zA-Z]+)([1-9][0-9]*)?")
@@ -23,28 +24,27 @@ def __new__(cls, pack_uri_str):
 
     @staticmethod
     def from_rel_ref(baseURI, relative_ref):
-        """
-        Return a |PackURI| instance containing the absolute pack URI formed by
-        translating `relative_ref` onto `baseURI`.
-        """
+        """Return a |PackURI| instance containing the absolute pack URI formed by
+        translating `relative_ref` onto `baseURI`."""
         joined_uri = posixpath.join(baseURI, relative_ref)
         abs_uri = posixpath.abspath(joined_uri)
         return PackURI(abs_uri)
 
     @property
     def baseURI(self):
-        """
-        The base URI of this pack URI, the directory portion, roughly
-        speaking. E.g. ``'/ppt/slides'`` for ``'/ppt/slides/slide1.xml'``.
-        For the package pseudo-partname '/', baseURI is '/'.
+        """The base URI of this pack URI, the directory portion, roughly speaking.
+
+        E.g. ``'/ppt/slides'`` for ``'/ppt/slides/slide1.xml'``. For the package pseudo-
+        partname '/', baseURI is '/'.
         """
         return posixpath.split(self)[0]
 
     @property
     def ext(self):
-        """
-        The extension portion of this pack URI, e.g. ``'xml'`` for
-        ``'/word/document.xml'``. Note the period is not included.
+        """The extension portion of this pack URI, e.g. ``'xml'`` for
+        ``'/word/document.xml'``.
+
+        Note the period is not included.
         """
         # raw_ext is either empty string or starts with period, e.g. '.xml'
         raw_ext = posixpath.splitext(self)[1]
@@ -52,20 +52,18 @@ def ext(self):
 
     @property
     def filename(self):
-        """
-        The "filename" portion of this pack URI, e.g. ``'slide1.xml'`` for
-        ``'/ppt/slides/slide1.xml'``. For the package pseudo-partname '/',
-        filename is ''.
+        """The "filename" portion of this pack URI, e.g. ``'slide1.xml'`` for
+        ``'/ppt/slides/slide1.xml'``.
+
+        For the package pseudo-partname '/', filename is ''.
         """
         return posixpath.split(self)[1]
 
     @property
     def idx(self):
-        """
-        Return partname index as integer for tuple partname or None for
-        singleton partname, e.g. ``21`` for ``'/ppt/slides/slide21.xml'`` and
-        |None| for ``'/ppt/presentation.xml'``.
-        """
+        """Return partname index as integer for tuple partname or None for singleton
+        partname, e.g. ``21`` for ``'/ppt/slides/slide21.xml'`` and |None| for
+        ``'/ppt/presentation.xml'``."""
         filename = self.filename
         if not filename:
             return None
@@ -79,18 +77,18 @@ def idx(self):
 
     @property
     def membername(self):
-        """
-        The pack URI with the leading slash stripped off, the form used as
-        the Zip file membername for the package item. Returns '' for the
-        package pseudo-partname '/'.
+        """The pack URI with the leading slash stripped off, the form used as the Zip
+        file membername for the package item.
+
+        Returns '' for the package pseudo-partname '/'.
         """
         return self[1:]
 
     def relative_ref(self, baseURI):
-        """
-        Return string containing relative reference to package item from
-        `baseURI`. E.g. PackURI('/ppt/slideLayouts/slideLayout1.xml') would
-        return '../slideLayouts/slideLayout1.xml' for baseURI '/ppt/slides'.
+        """Return string containing relative reference to package item from `baseURI`.
+
+        E.g. PackURI('/ppt/slideLayouts/slideLayout1.xml') would return
+        '../slideLayouts/slideLayout1.xml' for baseURI '/ppt/slides'.
         """
         # workaround for posixpath bug in 2.6, doesn't generate correct
         # relative path when `start` (second) parameter is root ('/')
@@ -98,10 +96,10 @@ def relative_ref(self, baseURI):
 
     @property
     def rels_uri(self):
-        """
-        The pack URI of the .rels part corresponding to the current pack URI.
-        Only produces sensible output if the pack URI is a partname or the
-        package pseudo-partname '/'.
+        """The pack URI of the .rels part corresponding to the current pack URI.
+
+        Only produces sensible output if the pack URI is a partname or the package
+        pseudo-partname '/'.
         """
         rels_filename = "%s.rels" % self.filename
         rels_uri_str = posixpath.join(self.baseURI, "_rels", rels_filename)
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index 874fed21f..1dd2c4b29 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -8,10 +8,10 @@
 
 
 class Part(object):
-    """
-    Base class for package parts. Provides common properties and methods, but
-    intended to be subclassed in client code to implement specific part
-    behaviors.
+    """Base class for package parts.
+
+    Provides common properties and methods, but intended to be subclassed in client code
+    to implement specific part behaviors.
     """
 
     def __init__(self, partname, content_type, blob=None, package=None):
@@ -22,20 +22,20 @@ def __init__(self, partname, content_type, blob=None, package=None):
         self._package = package
 
     def after_unmarshal(self):
-        """
-        Entry point for post-unmarshaling processing, for example to parse
-        the part XML. May be overridden by subclasses without forwarding call
-        to super.
+        """Entry point for post-unmarshaling processing, for example to parse the part
+        XML.
+
+        May be overridden by subclasses without forwarding call to super.
         """
         # don't place any code here, just catch call if not overridden by
         # subclass
         pass
 
     def before_marshal(self):
-        """
-        Entry point for pre-serialization processing, for example to finalize
-        part naming if necessary. May be overridden by subclasses without
-        forwarding call to super.
+        """Entry point for pre-serialization processing, for example to finalize part
+        naming if necessary.
+
+        May be overridden by subclasses without forwarding call to super.
         """
         # don't place any code here, just catch call if not overridden by
         # subclass
@@ -43,25 +43,23 @@ def before_marshal(self):
 
     @property
     def blob(self):
-        """
-        Contents of this package part as a sequence of bytes. May be text or
-        binary. Intended to be overridden by subclasses. Default behavior is
-        to return load blob.
+        """Contents of this package part as a sequence of bytes.
+
+        May be text or binary. Intended to be overridden by subclasses. Default behavior
+        is to return load blob.
         """
         return self._blob
 
     @property
     def content_type(self):
-        """
-        Content type of this part.
-        """
+        """Content type of this part."""
         return self._content_type
 
     def drop_rel(self, rId):
-        """
-        Remove the relationship identified by `rId` if its reference count
-        is less than 2. Relationships with a reference count of 0 are
-        implicit relationships.
+        """Remove the relationship identified by `rId` if its reference count is less
+        than 2.
+
+        Relationships with a reference count of 0 are implicit relationships.
         """
         if self._rel_ref_count(rId) < 2:
             del self.rels[rId]
@@ -71,29 +69,24 @@ def load(cls, partname, content_type, blob, package):
         return cls(partname, content_type, blob, package)
 
     def load_rel(self, reltype, target, rId, is_external=False):
-        """
-        Return newly added |_Relationship| instance of `reltype` between this
-        part and `target` with key `rId`. Target mode is set to
-        ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for use during
-        load from a serialized package, where the rId is well-known. Other
-        methods exist for adding a new relationship to a part when
-        manipulating a part.
+        """Return newly added |_Relationship| instance of `reltype` between this part
+        and `target` with key `rId`.
+
+        Target mode is set to ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for
+        use during load from a serialized package, where the rId is well-known. Other
+        methods exist for adding a new relationship to a part when manipulating a part.
         """
         return self.rels.add_relationship(reltype, target, rId, is_external)
 
     @property
     def package(self):
-        """
-        |OpcPackage| instance this part belongs to.
-        """
+        """|OpcPackage| instance this part belongs to."""
         return self._package
 
     @property
     def partname(self):
-        """
-        |PackURI| instance holding partname of this part, e.g.
-        '/ppt/slides/slide1.xml'
-        """
+        """|PackURI| instance holding partname of this part, e.g.
+        '/ppt/slides/slide1.xml'."""
         return self._partname
 
     @partname.setter
@@ -104,19 +97,17 @@ def partname(self, partname):
         self._partname = partname
 
     def part_related_by(self, reltype):
-        """
-        Return part to which this part has a relationship of `reltype`.
-        Raises |KeyError| if no such relationship is found and |ValueError|
-        if more than one such relationship is found. Provides ability to
-        resolve implicitly related part, such as Slide -> SlideLayout.
+        """Return part to which this part has a relationship of `reltype`.
+
+        Raises |KeyError| if no such relationship is found and |ValueError| if more than
+        one such relationship is found. Provides ability to resolve implicitly related
+        part, such as Slide -> SlideLayout.
         """
         return self.rels.part_with_reltype(reltype)
 
     def relate_to(self, target, reltype, is_external=False):
-        """
-        Return rId key of relationship of `reltype` to `target`, from an
-        existing relationship if there is one, otherwise a newly created one.
-        """
+        """Return rId key of relationship of `reltype` to `target`, from an existing
+        relationship if there is one, otherwise a newly created one."""
         if is_external:
             return self.rels.get_or_add_ext_rel(reltype, target)
         else:
@@ -125,49 +116,39 @@ def relate_to(self, target, reltype, is_external=False):
 
     @property
     def related_parts(self):
-        """
-        Dictionary mapping related parts by rId, so child objects can resolve
-        explicit relationships present in the part XML, e.g. sldIdLst to a
-        specific |Slide| instance.
-        """
+        """Dictionary mapping related parts by rId, so child objects can resolve
+        explicit relationships present in the part XML, e.g. sldIdLst to a specific
+        |Slide| instance."""
         return self.rels.related_parts
 
     @lazyproperty
     def rels(self):
-        """
-        |Relationships| instance holding the relationships for this part.
-        """
+        """|Relationships| instance holding the relationships for this part."""
         return Relationships(self._partname.baseURI)
 
     def target_ref(self, rId):
-        """
-        Return URL contained in target ref of relationship identified by
-        `rId`.
-        """
+        """Return URL contained in target ref of relationship identified by `rId`."""
         rel = self.rels[rId]
         return rel.target_ref
 
     def _rel_ref_count(self, rId):
-        """
-        Return the count of references in this part's XML to the relationship
-        identified by `rId`.
-        """
+        """Return the count of references in this part's XML to the relationship
+        identified by `rId`."""
         rIds = self._element.xpath("//@r:id")
         return len([_rId for _rId in rIds if _rId == rId])
 
 
 class PartFactory(object):
-    """
-    Provides a way for client code to specify a subclass of |Part| to be
-    constructed by |Unmarshaller| based on its content type and/or a custom
-    callable. Setting ``PartFactory.part_class_selector`` to a callable
-    object will cause that object to be called with the parameters
-    ``content_type, reltype``, once for each part in the package. If the
-    callable returns an object, it is used as the class for that part. If it
-    returns |None|, part class selection falls back to the content type map
-    defined in ``PartFactory.part_type_for``. If no class is returned from
-    either of these, the class contained in ``PartFactory.default_part_type``
-    is used to construct the part, which is by default ``opc.package.Part``.
+    """Provides a way for client code to specify a subclass of |Part| to be constructed
+    by |Unmarshaller| based on its content type and/or a custom callable.
+
+    Setting ``PartFactory.part_class_selector`` to a callable object will cause that
+    object to be called with the parameters ``content_type, reltype``, once for each
+    part in the package. If the callable returns an object, it is used as the class for
+    that part. If it returns |None|, part class selection falls back to the content type
+    map defined in ``PartFactory.part_type_for``. If no class is returned from either of
+    these, the class contained in ``PartFactory.default_part_type`` is used to construct
+    the part, which is by default ``opc.package.Part``.
     """
 
     part_class_selector = None
@@ -185,22 +166,18 @@ def __new__(cls, partname, content_type, reltype, blob, package):
 
     @classmethod
     def _part_cls_for(cls, content_type):
-        """
-        Return the custom part class registered for `content_type`, or the
-        default part class if no custom class is registered for
-        `content_type`.
-        """
+        """Return the custom part class registered for `content_type`, or the default
+        part class if no custom class is registered for `content_type`."""
         if content_type in cls.part_type_for:
             return cls.part_type_for[content_type]
         return cls.default_part_type
 
 
 class XmlPart(Part):
-    """
-    Base class for package parts containing an XML payload, which is most of
-    them. Provides additional methods to the |Part| base class that take care
-    of parsing and reserializing the XML payload and managing relationships
-    to other parts.
+    """Base class for package parts containing an XML payload, which is most of them.
+
+    Provides additional methods to the |Part| base class that take care of parsing and
+    reserializing the XML payload and managing relationships to other parts.
     """
 
     def __init__(self, partname, content_type, element, package):
@@ -213,9 +190,7 @@ def blob(self):
 
     @property
     def element(self):
-        """
-        The root XML element of this XML part.
-        """
+        """The root XML element of this XML part."""
         return self._element
 
     @classmethod
@@ -225,9 +200,9 @@ def load(cls, partname, content_type, blob, package):
 
     @property
     def part(self):
-        """
-        Part of the parent protocol, "children" of the document will not know
-        the part that contains them so must ask their parent object. That
-        chain of delegation ends here for child objects.
+        """Part of the parent protocol, "children" of the document will not know the
+        part that contains them so must ask their parent object.
+
+        That chain of delegation ends here for child objects.
         """
         return self
diff --git a/src/docx/opc/parts/coreprops.py b/src/docx/opc/parts/coreprops.py
index 2bb43c9ce..6e26e1d05 100644
--- a/src/docx/opc/parts/coreprops.py
+++ b/src/docx/opc/parts/coreprops.py
@@ -10,17 +10,13 @@
 
 
 class CorePropertiesPart(XmlPart):
-    """
-    Corresponds to part named ``/docProps/core.xml``, containing the core
-    document properties for this document package.
-    """
+    """Corresponds to part named ``/docProps/core.xml``, containing the core document
+    properties for this document package."""
 
     @classmethod
     def default(cls, package):
-        """
-        Return a new |CorePropertiesPart| object initialized with default
-        values for its base properties.
-        """
+        """Return a new |CorePropertiesPart| object initialized with default values for
+        its base properties."""
         core_properties_part = cls._new(package)
         core_properties = core_properties_part.core_properties
         core_properties.title = "Word Document"
@@ -31,10 +27,8 @@ def default(cls, package):
 
     @property
     def core_properties(self):
-        """
-        A |CoreProperties| object providing read/write access to the core
-        properties contained in this core properties part.
-        """
+        """A |CoreProperties| object providing read/write access to the core properties
+        contained in this core properties part."""
         return CoreProperties(self.element)
 
     @classmethod
diff --git a/src/docx/opc/phys_pkg.py b/src/docx/opc/phys_pkg.py
index 9c8a18993..71c096278 100644
--- a/src/docx/opc/phys_pkg.py
+++ b/src/docx/opc/phys_pkg.py
@@ -8,9 +8,7 @@
 
 
 class PhysPkgReader(object):
-    """
-    Factory for physical package reader objects.
-    """
+    """Factory for physical package reader objects."""
 
     def __new__(cls, pkg_file):
         # if `pkg_file` is a string, treat it as a path
@@ -28,56 +26,41 @@ def __new__(cls, pkg_file):
 
 
 class PhysPkgWriter(object):
-    """
-    Factory for physical package writer objects.
-    """
+    """Factory for physical package writer objects."""
 
     def __new__(cls, pkg_file):
         return super(PhysPkgWriter, cls).__new__(_ZipPkgWriter)
 
 
 class _DirPkgReader(PhysPkgReader):
-    """
-    Implements |PhysPkgReader| interface for an OPC package extracted into a
-    directory.
-    """
+    """Implements |PhysPkgReader| interface for an OPC package extracted into a
+    directory."""
 
     def __init__(self, path):
-        """
-        `path` is the path to a directory containing an expanded package.
-        """
+        """`path` is the path to a directory containing an expanded package."""
         super(_DirPkgReader, self).__init__()
         self._path = os.path.abspath(path)
 
     def blob_for(self, pack_uri):
-        """
-        Return contents of file corresponding to `pack_uri` in package
-        directory.
-        """
+        """Return contents of file corresponding to `pack_uri` in package directory."""
         path = os.path.join(self._path, pack_uri.membername)
         with open(path, "rb") as f:
             blob = f.read()
         return blob
 
     def close(self):
-        """
-        Provides interface consistency with |ZipFileSystem|, but does
-        nothing, a directory file system doesn't need closing.
-        """
+        """Provides interface consistency with |ZipFileSystem|, but does nothing, a
+        directory file system doesn't need closing."""
         pass
 
     @property
     def content_types_xml(self):
-        """
-        Return the `[Content_Types].xml` blob from the package.
-        """
+        """Return the `[Content_Types].xml` blob from the package."""
         return self.blob_for(CONTENT_TYPES_URI)
 
     def rels_xml_for(self, source_uri):
-        """
-        Return rels item XML for source with `source_uri`, or None if the
-        item has no rels item.
-        """
+        """Return rels item XML for source with `source_uri`, or None if the item has no
+        rels item."""
         try:
             rels_xml = self.blob_for(source_uri.rels_uri)
         except IOError:
@@ -86,39 +69,31 @@ def rels_xml_for(self, source_uri):
 
 
 class _ZipPkgReader(PhysPkgReader):
-    """
-    Implements |PhysPkgReader| interface for a zip file OPC package.
-    """
+    """Implements |PhysPkgReader| interface for a zip file OPC package."""
 
     def __init__(self, pkg_file):
         super(_ZipPkgReader, self).__init__()
         self._zipf = ZipFile(pkg_file, "r")
 
     def blob_for(self, pack_uri):
-        """
-        Return blob corresponding to `pack_uri`. Raises |ValueError| if no
-        matching member is present in zip archive.
+        """Return blob corresponding to `pack_uri`.
+
+        Raises |ValueError| if no matching member is present in zip archive.
         """
         return self._zipf.read(pack_uri.membername)
 
     def close(self):
-        """
-        Close the zip archive, releasing any resources it is using.
-        """
+        """Close the zip archive, releasing any resources it is using."""
         self._zipf.close()
 
     @property
     def content_types_xml(self):
-        """
-        Return the `[Content_Types].xml` blob from the zip package.
-        """
+        """Return the `[Content_Types].xml` blob from the zip package."""
         return self.blob_for(CONTENT_TYPES_URI)
 
     def rels_xml_for(self, source_uri):
-        """
-        Return rels item XML for source with `source_uri` or None if no rels
-        item is present.
-        """
+        """Return rels item XML for source with `source_uri` or None if no rels item is
+        present."""
         try:
             rels_xml = self.blob_for(source_uri.rels_uri)
         except KeyError:
@@ -127,24 +102,18 @@ def rels_xml_for(self, source_uri):
 
 
 class _ZipPkgWriter(PhysPkgWriter):
-    """
-    Implements |PhysPkgWriter| interface for a zip file OPC package.
-    """
+    """Implements |PhysPkgWriter| interface for a zip file OPC package."""
 
     def __init__(self, pkg_file):
         super(_ZipPkgWriter, self).__init__()
         self._zipf = ZipFile(pkg_file, "w", compression=ZIP_DEFLATED)
 
     def close(self):
-        """
-        Close the zip archive, flushing any pending physical writes and
-        releasing any resources it's using.
-        """
+        """Close the zip archive, flushing any pending physical writes and releasing any
+        resources it's using."""
         self._zipf.close()
 
     def write(self, pack_uri, blob):
-        """
-        Write `blob` to this zip package with the membername corresponding to
-        `pack_uri`.
-        """
+        """Write `blob` to this zip package with the membername corresponding to
+        `pack_uri`."""
         self._zipf.writestr(pack_uri.membername, blob)
diff --git a/src/docx/opc/pkgreader.py b/src/docx/opc/pkgreader.py
index defa60ec6..b5459a61e 100644
--- a/src/docx/opc/pkgreader.py
+++ b/src/docx/opc/pkgreader.py
@@ -8,10 +8,8 @@
 
 
 class PackageReader(object):
-    """
-    Provides access to the contents of a zip-format OPC package via its
-    :attr:`serialized_parts` and :attr:`pkg_srels` attributes.
-    """
+    """Provides access to the contents of a zip-format OPC package via its
+    :attr:`serialized_parts` and :attr:`pkg_srels` attributes."""
 
     def __init__(self, content_types, pkg_srels, sparts):
         super(PackageReader, self).__init__()
@@ -20,9 +18,7 @@ def __init__(self, content_types, pkg_srels, sparts):
 
     @staticmethod
     def from_file(pkg_file):
-        """
-        Return a |PackageReader| instance loaded with contents of `pkg_file`.
-        """
+        """Return a |PackageReader| instance loaded with contents of `pkg_file`."""
         phys_reader = PhysPkgReader(pkg_file)
         content_types = _ContentTypeMap.from_xml(phys_reader.content_types_xml)
         pkg_srels = PackageReader._srels_for(phys_reader, PACKAGE_URI)
@@ -33,18 +29,14 @@ def from_file(pkg_file):
         return PackageReader(content_types, pkg_srels, sparts)
 
     def iter_sparts(self):
-        """
-        Generate a 4-tuple `(partname, content_type, reltype, blob)` for each
-        of the serialized parts in the package.
-        """
+        """Generate a 4-tuple `(partname, content_type, reltype, blob)` for each of the
+        serialized parts in the package."""
         for s in self._sparts:
             yield (s.partname, s.content_type, s.reltype, s.blob)
 
     def iter_srels(self):
-        """
-        Generate a 2-tuple `(source_uri, srel)` for each of the relationships
-        in the package.
-        """
+        """Generate a 2-tuple `(source_uri, srel)` for each of the relationships in the
+        package."""
         for srel in self._pkg_srels:
             yield (PACKAGE_URI, srel)
         for spart in self._sparts:
@@ -53,11 +45,9 @@ def iter_srels(self):
 
     @staticmethod
     def _load_serialized_parts(phys_reader, pkg_srels, content_types):
-        """
-        Return a list of |_SerializedPart| instances corresponding to the
-        parts in `phys_reader` accessible by walking the relationship graph
-        starting with `pkg_srels`.
-        """
+        """Return a list of |_SerializedPart| instances corresponding to the parts in
+        `phys_reader` accessible by walking the relationship graph starting with
+        `pkg_srels`."""
         sparts = []
         part_walker = PackageReader._walk_phys_parts(phys_reader, pkg_srels)
         for partname, blob, reltype, srels in part_walker:
@@ -68,20 +58,15 @@ def _load_serialized_parts(phys_reader, pkg_srels, content_types):
 
     @staticmethod
     def _srels_for(phys_reader, source_uri):
-        """
-        Return |_SerializedRelationships| instance populated with
-        relationships for source identified by `source_uri`.
-        """
+        """Return |_SerializedRelationships| instance populated with relationships for
+        source identified by `source_uri`."""
         rels_xml = phys_reader.rels_xml_for(source_uri)
         return _SerializedRelationships.load_from_xml(source_uri.baseURI, rels_xml)
 
     @staticmethod
     def _walk_phys_parts(phys_reader, srels, visited_partnames=None):
-        """
-        Generate a 4-tuple `(partname, blob, reltype, srels)` for each of the
-        parts in `phys_reader` by walking the relationship graph rooted at
-        srels.
-        """
+        """Generate a 4-tuple `(partname, blob, reltype, srels)` for each of the parts
+        in `phys_reader` by walking the relationship graph rooted at srels."""
         if visited_partnames is None:
             visited_partnames = []
         for srel in srels:
@@ -103,10 +88,8 @@ def _walk_phys_parts(phys_reader, srels, visited_partnames=None):
 
 
 class _ContentTypeMap(object):
-    """
-    Value type providing dictionary semantics for looking up content type by
-    part name, e.g. ``content_type = cti['/ppt/presentation.xml']``.
-    """
+    """Value type providing dictionary semantics for looking up content type by part
+    name, e.g. ``content_type = cti['/ppt/presentation.xml']``."""
 
     def __init__(self):
         super(_ContentTypeMap, self).__init__()
@@ -114,9 +97,7 @@ def __init__(self):
         self._defaults = CaseInsensitiveDict()
 
     def __getitem__(self, partname):
-        """
-        Return content type for part identified by `partname`.
-        """
+        """Return content type for part identified by `partname`."""
         if not isinstance(partname, PackURI):
             tmpl = "_ContentTypeMap key must be <type 'PackURI'>, got %s"
             raise KeyError(tmpl % type(partname))
@@ -129,10 +110,8 @@ def __getitem__(self, partname):
 
     @staticmethod
     def from_xml(content_types_xml):
-        """
-        Return a new |_ContentTypeMap| instance populated with the contents
-        of `content_types_xml`.
-        """
+        """Return a new |_ContentTypeMap| instance populated with the contents of
+        `content_types_xml`."""
         types_elm = parse_xml(content_types_xml)
         ct_map = _ContentTypeMap()
         for o in types_elm.overrides:
@@ -142,24 +121,21 @@ def from_xml(content_types_xml):
         return ct_map
 
     def _add_default(self, extension, content_type):
-        """
-        Add the default mapping of `extension` to `content_type` to this
-        content type mapping.
-        """
+        """Add the default mapping of `extension` to `content_type` to this content type
+        mapping."""
         self._defaults[extension] = content_type
 
     def _add_override(self, partname, content_type):
-        """
-        Add the default mapping of `partname` to `content_type` to this
-        content type mapping.
-        """
+        """Add the default mapping of `partname` to `content_type` to this content type
+        mapping."""
         self._overrides[partname] = content_type
 
 
 class _SerializedPart(object):
-    """
-    Value object for an OPC package part. Provides access to the partname,
-    content type, blob, and serialized relationships for the part.
+    """Value object for an OPC package part.
+
+    Provides access to the partname, content type, blob, and serialized relationships
+    for the part.
     """
 
     def __init__(self, partname, content_type, reltype, blob, srels):
@@ -184,9 +160,7 @@ def blob(self):
 
     @property
     def reltype(self):
-        """
-        The referring relationship type of this part.
-        """
+        """The referring relationship type of this part."""
         return self._reltype
 
     @property
@@ -195,10 +169,10 @@ def srels(self):
 
 
 class _SerializedRelationship(object):
-    """
-    Value object representing a serialized relationship in an OPC package.
-    Serialized, in this case, means any target part is referred to via its
-    partname rather than a direct link to an in-memory |Part| object.
+    """Value object representing a serialized relationship in an OPC package.
+
+    Serialized, in this case, means any target part is referred to via its partname
+    rather than a direct link to an in-memory |Part| object.
     """
 
     def __init__(self, baseURI, rel_elm):
@@ -211,9 +185,7 @@ def __init__(self, baseURI, rel_elm):
 
     @property
     def is_external(self):
-        """
-        True if target_mode is ``RTM.EXTERNAL``
-        """
+        """True if target_mode is ``RTM.EXTERNAL``"""
         return self._target_mode == RTM.EXTERNAL
 
     @property
@@ -223,35 +195,29 @@ def reltype(self):
 
     @property
     def rId(self):
-        """
-        Relationship id, like 'rId9', corresponds to the ``Id`` attribute on
-        the ``CT_Relationship`` element.
-        """
+        """Relationship id, like 'rId9', corresponds to the ``Id`` attribute on the
+        ``CT_Relationship`` element."""
         return self._rId
 
     @property
     def target_mode(self):
-        """
-        String in ``TargetMode`` attribute of ``CT_Relationship`` element,
-        one of ``RTM.INTERNAL`` or ``RTM.EXTERNAL``.
-        """
+        """String in ``TargetMode`` attribute of ``CT_Relationship`` element, one of
+        ``RTM.INTERNAL`` or ``RTM.EXTERNAL``."""
         return self._target_mode
 
     @property
     def target_ref(self):
-        """
-        String in ``Target`` attribute of ``CT_Relationship`` element, a
-        relative part reference for internal target mode or an arbitrary URI,
-        e.g. an HTTP URL, for external target mode.
-        """
+        """String in ``Target`` attribute of ``CT_Relationship`` element, a relative
+        part reference for internal target mode or an arbitrary URI, e.g. an HTTP URL,
+        for external target mode."""
         return self._target_ref
 
     @property
     def target_partname(self):
-        """
-        |PackURI| instance containing partname targeted by this relationship.
-        Raises ``ValueError`` on reference if target_mode is ``'External'``.
-        Use :attr:`target_mode` to check before referencing.
+        """|PackURI| instance containing partname targeted by this relationship.
+
+        Raises ``ValueError`` on reference if target_mode is ``'External'``. Use
+        :attr:`target_mode` to check before referencing.
         """
         if self.is_external:
             msg = (
@@ -266,25 +232,23 @@ def target_partname(self):
 
 
 class _SerializedRelationships(object):
-    """
-    Read-only sequence of |_SerializedRelationship| instances corresponding
-    to the relationships item XML passed to constructor.
-    """
+    """Read-only sequence of |_SerializedRelationship| instances corresponding to the
+    relationships item XML passed to constructor."""
 
     def __init__(self):
         super(_SerializedRelationships, self).__init__()
         self._srels = []
 
     def __iter__(self):
-        """Support iteration, e.g. 'for x in srels:'"""
+        """Support iteration, e.g. 'for x in srels:'."""
         return self._srels.__iter__()
 
     @staticmethod
     def load_from_xml(baseURI, rels_item_xml):
-        """
-        Return |_SerializedRelationships| instance loaded with the
-        relationships contained in `rels_item_xml`. Returns an empty
-        collection if `rels_item_xml` is |None|.
+        """Return |_SerializedRelationships| instance loaded with the relationships
+        contained in `rels_item_xml`.
+
+        Returns an empty collection if `rels_item_xml` is |None|.
         """
         srels = _SerializedRelationships()
         if rels_item_xml is not None:
diff --git a/src/docx/opc/pkgwriter.py b/src/docx/opc/pkgwriter.py
index 9a3e56fdb..5506373be 100644
--- a/src/docx/opc/pkgwriter.py
+++ b/src/docx/opc/pkgwriter.py
@@ -13,20 +13,17 @@
 
 
 class PackageWriter(object):
-    """
-    Writes a zip-format OPC package to `pkg_file`, where `pkg_file` can be
-    either a path to a zip file (a string) or a file-like object. Its single
-    API method, :meth:`write`, is static, so this class is not intended to
-    be instantiated.
+    """Writes a zip-format OPC package to `pkg_file`, where `pkg_file` can be either a
+    path to a zip file (a string) or a file-like object.
+
+    Its single API method, :meth:`write`, is static, so this class is not intended to be
+    instantiated.
     """
 
     @staticmethod
     def write(pkg_file, pkg_rels, parts):
-        """
-        Write a physical package (.pptx file) to `pkg_file` containing
-        `pkg_rels` and `parts` and a content types stream based on the
-        content types of the parts.
-        """
+        """Write a physical package (.pptx file) to `pkg_file` containing `pkg_rels` and
+        `parts` and a content types stream based on the content types of the parts."""
         phys_writer = PhysPkgWriter(pkg_file)
         PackageWriter._write_content_types_stream(phys_writer, parts)
         PackageWriter._write_pkg_rels(phys_writer, pkg_rels)
@@ -35,19 +32,15 @@ def write(pkg_file, pkg_rels, parts):
 
     @staticmethod
     def _write_content_types_stream(phys_writer, parts):
-        """
-        Write ``[Content_Types].xml`` part to the physical package with an
-        appropriate content type lookup target for each part in `parts`.
-        """
+        """Write ``[Content_Types].xml`` part to the physical package with an
+        appropriate content type lookup target for each part in `parts`."""
         cti = _ContentTypesItem.from_parts(parts)
         phys_writer.write(CONTENT_TYPES_URI, cti.blob)
 
     @staticmethod
     def _write_parts(phys_writer, parts):
-        """
-        Write the blob of each part in `parts` to the package, along with a
-        rels item for its relationships if and only if it has any.
-        """
+        """Write the blob of each part in `parts` to the package, along with a rels item
+        for its relationships if and only if it has any."""
         for part in parts:
             phys_writer.write(part.partname, part.blob)
             if len(part._rels):
@@ -55,19 +48,16 @@ def _write_parts(phys_writer, parts):
 
     @staticmethod
     def _write_pkg_rels(phys_writer, pkg_rels):
-        """
-        Write the XML rels item for `pkg_rels` ('/_rels/.rels') to the
-        package.
-        """
+        """Write the XML rels item for `pkg_rels` ('/_rels/.rels') to the package."""
         phys_writer.write(PACKAGE_URI.rels_uri, pkg_rels.xml)
 
 
 class _ContentTypesItem(object):
-    """
-    Service class that composes a content types item ([Content_Types].xml)
-    based on a list of parts. Not meant to be instantiated directly, its
-    single interface method is xml_for(), e.g.
-    ``_ContentTypesItem.xml_for(parts)``.
+    """Service class that composes a content types item ([Content_Types].xml) based on a
+    list of parts.
+
+    Not meant to be instantiated directly, its single interface method is xml_for(),
+    e.g. ``_ContentTypesItem.xml_for(parts)``.
     """
 
     def __init__(self):
@@ -76,19 +66,15 @@ def __init__(self):
 
     @property
     def blob(self):
-        """
-        Return XML form of this content types item, suitable for storage as
-        ``[Content_Types].xml`` in an OPC package.
-        """
+        """Return XML form of this content types item, suitable for storage as
+        ``[Content_Types].xml`` in an OPC package."""
         return serialize_part_xml(self._element)
 
     @classmethod
     def from_parts(cls, parts):
-        """
-        Return content types XML mapping each part in `parts` to the
-        appropriate content type and suitable for storage as
-        ``[Content_Types].xml`` in an OPC package.
-        """
+        """Return content types XML mapping each part in `parts` to the appropriate
+        content type and suitable for storage as ``[Content_Types].xml`` in an OPC
+        package."""
         cti = cls()
         cti._defaults["rels"] = CT.OPC_RELATIONSHIPS
         cti._defaults["xml"] = CT.XML
@@ -97,10 +83,8 @@ def from_parts(cls, parts):
         return cti
 
     def _add_content_type(self, partname, content_type):
-        """
-        Add a content type for the part with `partname` and `content_type`,
-        using a default or override as appropriate.
-        """
+        """Add a content type for the part with `partname` and `content_type`, using a
+        default or override as appropriate."""
         ext = partname.ext
         if (ext.lower(), content_type) in default_content_types:
             self._defaults[ext] = content_type
@@ -109,11 +93,11 @@ def _add_content_type(self, partname, content_type):
 
     @property
     def _element(self):
-        """
-        Return XML form of this content types item, suitable for storage as
-        ``[Content_Types].xml`` in an OPC package. Although the sequence of
-        elements is not strictly significant, as an aid to testing and
-        readability Default elements are sorted by extension and Override
+        """Return XML form of this content types item, suitable for storage as
+        ``[Content_Types].xml`` in an OPC package.
+
+        Although the sequence of elements is not strictly significant, as an aid to
+        testing and readability Default elements are sorted by extension and Override
         elements are sorted by partname.
         """
         _types_elm = CT_Types.new()
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index a137d4590..58acfc6e3 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -4,9 +4,7 @@
 
 
 class Relationships(dict):
-    """
-    Collection object for |_Relationship| instances, having list semantics.
-    """
+    """Collection object for |_Relationship| instances, having list semantics."""
 
     def __init__(self, baseURI):
         super(Relationships, self).__init__()
@@ -14,9 +12,7 @@ def __init__(self, baseURI):
         self._target_parts_by_rId = {}
 
     def add_relationship(self, reltype, target, rId, is_external=False):
-        """
-        Return a newly added |_Relationship| instance.
-        """
+        """Return a newly added |_Relationship| instance."""
         rel = _Relationship(rId, reltype, target, self._baseURI, is_external)
         self[rId] = rel
         if not is_external:
@@ -24,10 +20,8 @@ def add_relationship(self, reltype, target, rId, is_external=False):
         return rel
 
     def get_or_add(self, reltype, target_part):
-        """
-        Return relationship of `reltype` to `target_part`, newly added if not
-        already present in collection.
-        """
+        """Return relationship of `reltype` to `target_part`, newly added if not already
+        present in collection."""
         rel = self._get_matching(reltype, target_part)
         if rel is None:
             rId = self._next_rId
@@ -35,10 +29,8 @@ def get_or_add(self, reltype, target_part):
         return rel
 
     def get_or_add_ext_rel(self, reltype, target_ref):
-        """
-        Return rId of external relationship of `reltype` to `target_ref`,
-        newly added if not already present in collection.
-        """
+        """Return rId of external relationship of `reltype` to `target_ref`, newly added
+        if not already present in collection."""
         rel = self._get_matching(reltype, target_ref, is_external=True)
         if rel is None:
             rId = self._next_rId
@@ -46,38 +38,29 @@ def get_or_add_ext_rel(self, reltype, target_ref):
         return rel.rId
 
     def part_with_reltype(self, reltype):
-        """
-        Return target part of rel with matching `reltype`, raising |KeyError|
-        if not found and |ValueError| if more than one matching relationship
-        is found.
-        """
+        """Return target part of rel with matching `reltype`, raising |KeyError| if not
+        found and |ValueError| if more than one matching relationship is found."""
         rel = self._get_rel_of_type(reltype)
         return rel.target_part
 
     @property
     def related_parts(self):
-        """
-        dict mapping rIds to target parts for all the internal relationships
-        in the collection.
-        """
+        """Dict mapping rIds to target parts for all the internal relationships in the
+        collection."""
         return self._target_parts_by_rId
 
     @property
     def xml(self):
-        """
-        Serialize this relationship collection into XML suitable for storage
-        as a .rels file in an OPC package.
-        """
+        """Serialize this relationship collection into XML suitable for storage as a
+        .rels file in an OPC package."""
         rels_elm = CT_Relationships.new()
         for rel in self.values():
             rels_elm.add_rel(rel.rId, rel.reltype, rel.target_ref, rel.is_external)
         return rels_elm.xml
 
     def _get_matching(self, reltype, target, is_external=False):
-        """
-        Return relationship of matching `reltype`, `target`, and
-        `is_external` from collection, or None if not found.
-        """
+        """Return relationship of matching `reltype`, `target`, and `is_external` from
+        collection, or None if not found."""
 
         def matches(rel, reltype, target, is_external):
             if rel.reltype != reltype:
@@ -95,10 +78,10 @@ def matches(rel, reltype, target, is_external):
         return None
 
     def _get_rel_of_type(self, reltype):
-        """
-        Return single relationship of type `reltype` from the collection.
-        Raises |KeyError| if no matching relationship is found. Raises
-        |ValueError| if more than one matching relationship is found.
+        """Return single relationship of type `reltype` from the collection.
+
+        Raises |KeyError| if no matching relationship is found. Raises |ValueError| if
+        more than one matching relationship is found.
         """
         matching = [rel for rel in self.values() if rel.reltype == reltype]
         if len(matching) == 0:
@@ -111,10 +94,8 @@ def _get_rel_of_type(self, reltype):
 
     @property
     def _next_rId(self):
-        """
-        Next available rId in collection, starting from 'rId1' and making use
-        of any gaps in numbering, e.g. 'rId2' for rIds ['rId1', 'rId3'].
-        """
+        """Next available rId in collection, starting from 'rId1' and making use of any
+        gaps in numbering, e.g. 'rId2' for rIds ['rId1', 'rId3']."""
         for n in range(1, len(self) + 2):
             rId_candidate = "rId%d" % n  # like 'rId19'
             if rId_candidate not in self:
@@ -122,9 +103,7 @@ def _next_rId(self):
 
 
 class _Relationship(object):
-    """
-    Value object for relationship to part.
-    """
+    """Value object for relationship to part."""
 
     def __init__(self, rId, reltype, target, baseURI, external=False):
         super(_Relationship, self).__init__()
diff --git a/src/docx/opc/shared.py b/src/docx/opc/shared.py
index 370780e6b..1862f66db 100644
--- a/src/docx/opc/shared.py
+++ b/src/docx/opc/shared.py
@@ -2,12 +2,12 @@
 
 
 class CaseInsensitiveDict(dict):
-    """
-    Mapping type that behaves like dict except that it matches without respect
-    to the case of the key. E.g. cid['A'] == cid['a']. Note this is not
-    general-purpose, just complete enough to satisfy opc package needs. It
-    assumes str keys, and that it is created empty; keys passed in constructor
-    are not accounted for
+    """Mapping type that behaves like dict except that it matches without respect to the
+    case of the key.
+
+    E.g. cid['A'] == cid['a']. Note this is not general-purpose, just complete enough to
+    satisfy opc package needs. It assumes str keys, and that it is created empty; keys
+    passed in constructor are not accounted for
     """
 
     def __contains__(self, key):
@@ -26,10 +26,10 @@ def cls_method_fn(cls: type, method_name: str):
 
 
 def lazyproperty(f):
-    """
-    @lazyprop decorator. Decorated method will be called only on first access
-    to calculate a cached property value. After that, the cached value is
-    returned.
+    """@lazyprop decorator.
+
+    Decorated method will be called only on first access to calculate a cached property
+    value. After that, the cached value is returned.
     """
     cache_attr_name = "_%s" % f.__name__  # like '_foobar' for prop 'foobar'
     docstring = f.__doc__
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index ab3995105..b8278b3e4 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -14,10 +14,10 @@
 
 
 def parse_xml(xml):
-    """
-    Return root lxml element obtained by parsing XML character string in
-    `xml`, which can be either a Python 2.x string or unicode. The custom
-    parser is used, so custom element classes are produced for elements in
+    """Return root lxml element obtained by parsing XML character string in `xml`, which
+    can be either a Python 2.x string or unicode.
+
+    The custom parser is used, so custom element classes are produced for elements in
     `xml` that have them.
     """
     root_element = etree.fromstring(xml, oxml_parser)
@@ -25,10 +25,10 @@ def parse_xml(xml):
 
 
 def register_element_cls(tag, cls):
-    """
-    Register `cls` to be constructed when the oxml parser encounters an
-    element with matching `tag`. `tag` is a string of the form
-    ``nspfx:tagroot``, e.g. ``'w:document'``.
+    """Register `cls` to be constructed when the oxml parser encounters an element with
+    matching `tag`.
+
+    `tag` is a string of the form ``nspfx:tagroot``, e.g. ``'w:document'``.
     """
     nspfx, tagroot = tag.split(":")
     namespace = element_class_lookup.get_namespace(nsmap[nspfx])
@@ -36,15 +36,14 @@ def register_element_cls(tag, cls):
 
 
 def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
-    """
-    Return a 'loose' lxml element having the tag specified by `nsptag_str`.
-    `nsptag_str` must contain the standard namespace prefix, e.g. 'a:tbl'.
-    The resulting element is an instance of the custom element class for this
-    tag name if one is defined. A dictionary of attribute values may be
-    provided as `attrs`; they are set if present. All namespaces defined in
-    the dict `nsdecls` are declared in the element using the key as the
-    prefix and the value as the namespace name. If `nsdecls` is not provided,
-    a single namespace declaration is added based on the prefix on
+    """Return a 'loose' lxml element having the tag specified by `nsptag_str`.
+
+    `nsptag_str` must contain the standard namespace prefix, e.g. 'a:tbl'. The resulting
+    element is an instance of the custom element class for this tag name if one is
+    defined. A dictionary of attribute values may be provided as `attrs`; they are set
+    if present. All namespaces defined in the dict `nsdecls` are declared in the element
+    using the key as the prefix and the value as the namespace name. If `nsdecls` is not
+    provided, a single namespace declaration is added based on the prefix on
     `nsptag_str`.
     """
     nsptag = NamespacePrefixedTag(nsptag_str)
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 854b83309..ddb9f703c 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -43,9 +43,7 @@ def new(cls):
 
     @property
     def author_text(self):
-        """
-        The text in the `dc:creator` child element.
-        """
+        """The text in the `dc:creator` child element."""
         return self._text_of_element("creator")
 
     @author_text.setter
@@ -134,9 +132,7 @@ def modified_datetime(self, value):
 
     @property
     def revision_number(self):
-        """
-        Integer value of revision property.
-        """
+        """Integer value of revision property."""
         revision = self.revision
         if revision is None:
             return 0
@@ -153,9 +149,7 @@ def revision_number(self):
 
     @revision_number.setter
     def revision_number(self, value):
-        """
-        Set revision property to string value of integer `value`.
-        """
+        """Set revision property to string value of integer `value`."""
         if not isinstance(value, int) or value < 1:
             tmpl = "revision property requires positive int, got '%s'"
             raise ValueError(tmpl % value)
@@ -198,9 +192,7 @@ def _datetime_of_element(self, property_name):
             return None
 
     def _get_or_add(self, prop_name):
-        """
-        Return element returned by "get_or_add_" method for `prop_name`.
-        """
+        """Return element returned by "get_or_add_" method for `prop_name`."""
         get_or_add_method_name = "get_or_add_%s" % prop_name
         get_or_add_method = getattr(self, get_or_add_method_name)
         element = get_or_add_method()
@@ -256,9 +248,7 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
         return dt
 
     def _set_element_datetime(self, prop_name, value):
-        """
-        Set date/time value of child element having `prop_name` to `value`.
-        """
+        """Set date/time value of child element having `prop_name` to `value`."""
         if not isinstance(value, datetime):
             tmpl = "property requires <type 'datetime.datetime'> object, got %s"
             raise ValueError(tmpl % type(value))
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index 22ee9e187..f84c0f7cc 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -4,26 +4,20 @@
 
 
 class CT_Document(BaseOxmlElement):
-    """
-    ``<w:document>`` element, the root element of a document.xml file.
-    """
+    """``<w:document>`` element, the root element of a document.xml file."""
 
     body = ZeroOrOne("w:body")
 
     @property
     def sectPr_lst(self):
-        """
-        Return a list containing a reference to each ``<w:sectPr>`` element
-        in the document, in the order encountered.
-        """
+        """Return a list containing a reference to each ``<w:sectPr>`` element in the
+        document, in the order encountered."""
         return self.xpath(".//w:sectPr")
 
 
 class CT_Body(BaseOxmlElement):
-    """
-    ``<w:body>``, the container element for the main document story in
-    ``document.xml``.
-    """
+    """``<w:body>``, the container element for the main document story in
+    ``document.xml``."""
 
     p = ZeroOrMore("w:p", successors=("w:sectPr",))
     tbl = ZeroOrMore("w:tbl", successors=("w:sectPr",))
diff --git a/src/docx/oxml/exceptions.py b/src/docx/oxml/exceptions.py
index ee0cff832..8919239a2 100644
--- a/src/docx/oxml/exceptions.py
+++ b/src/docx/oxml/exceptions.py
@@ -6,7 +6,5 @@ class XmlchemyError(Exception):
 
 
 class InvalidXmlError(XmlchemyError):
-    """
-    Raised when invalid XML is encountered, such as on attempt to access a
-    missing required child element
-    """
+    """Raised when invalid XML is encountered, such as on attempt to access a missing
+    required child element."""
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index d3558cbf1..dd8745634 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -23,10 +23,7 @@
 
 
 class NamespacePrefixedTag(str):
-    """
-    Value object that knows the semantics of an XML tag having a namespace
-    prefix.
-    """
+    """Value object that knows the semantics of an XML tag having a namespace prefix."""
 
     def __new__(cls, nstag, *args):
         return super(NamespacePrefixedTag, cls).__new__(cls, nstag)
@@ -47,60 +44,54 @@ def from_clark_name(cls, clark_name):
 
     @property
     def local_part(self):
-        """
-        Return the local part of the tag as a string. E.g. 'foobar' is
-        returned for tag 'f:foobar'.
+        """Return the local part of the tag as a string.
+
+        E.g. 'foobar' is returned for tag 'f:foobar'.
         """
         return self._local_part
 
     @property
     def nsmap(self):
-        """
-        Return a dict having a single member, mapping the namespace prefix of
-        this tag to it's namespace name (e.g. {'f': 'http://foo/bar'}). This
-        is handy for passing to xpath calls and other uses.
+        """Return a dict having a single member, mapping the namespace prefix of this
+        tag to it's namespace name (e.g. {'f': 'http://foo/bar'}).
+
+        This is handy for passing to xpath calls and other uses.
         """
         return {self._pfx: self._ns_uri}
 
     @property
     def nspfx(self):
-        """
-        Return the string namespace prefix for the tag, e.g. 'f' is returned
-        for tag 'f:foobar'.
-        """
+        """Return the string namespace prefix for the tag, e.g. 'f' is returned for tag
+        'f:foobar'."""
         return self._pfx
 
     @property
     def nsuri(self):
-        """
-        Return the namespace URI for the tag, e.g. 'http://foo/bar' would be
-        returned for tag 'f:foobar' if the 'f' prefix maps to
-        'http://foo/bar' in nsmap.
-        """
+        """Return the namespace URI for the tag, e.g. 'http://foo/bar' would be returned
+        for tag 'f:foobar' if the 'f' prefix maps to 'http://foo/bar' in nsmap."""
         return self._ns_uri
 
 
 def nsdecls(*prefixes):
-    """
-    Return a string containing a namespace declaration for each of the
-    namespace prefix strings, e.g. 'p', 'ct', passed as `prefixes`.
-    """
+    """Return a string containing a namespace declaration for each of the namespace
+    prefix strings, e.g. 'p', 'ct', passed as `prefixes`."""
     return " ".join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
 
 
 def nspfxmap(*nspfxs):
-    """
-    Return a dict containing the subset namespace prefix mappings specified by
-    `nspfxs`. Any number of namespace prefixes can be supplied, e.g.
-    namespaces('a', 'r', 'p').
+    """Return a dict containing the subset namespace prefix mappings specified by
+    `nspfxs`.
+
+    Any number of namespace prefixes can be supplied, e.g. namespaces('a', 'r', 'p').
     """
     return {pfx: nsmap[pfx] for pfx in nspfxs}
 
 
 def qn(tag):
-    """
-    Stands for "qualified name", a utility function to turn a namespace
-    prefixed tag name into a Clark-notation qualified tag name for lxml. For
+    """Stands for "qualified name", a utility function to turn a namespace prefixed tag
+    name into a Clark-notation qualified tag name for lxml.
+
+    For
     example, ``qn('p:cSld')`` returns ``'{http://schemas.../main}cSld'``.
     """
     prefix, tagroot = tag.split(":")
diff --git a/src/docx/oxml/numbering.py b/src/docx/oxml/numbering.py
index c386e8c3a..99ca7a74d 100644
--- a/src/docx/oxml/numbering.py
+++ b/src/docx/oxml/numbering.py
@@ -13,30 +13,23 @@
 
 
 class CT_Num(BaseOxmlElement):
-    """
-    ``<w:num>`` element, which represents a concrete list definition
-    instance, having a required child <w:abstractNumId> that references an
-    abstract numbering definition that defines most of the formatting details.
-    """
+    """``<w:num>`` element, which represents a concrete list definition instance, having
+    a required child <w:abstractNumId> that references an abstract numbering definition
+    that defines most of the formatting details."""
 
     abstractNumId = OneAndOnlyOne("w:abstractNumId")
     lvlOverride = ZeroOrMore("w:lvlOverride")
     numId = RequiredAttribute("w:numId", ST_DecimalNumber)
 
     def add_lvlOverride(self, ilvl):
-        """
-        Return a newly added CT_NumLvl (<w:lvlOverride>) element having its
-        ``ilvl`` attribute set to `ilvl`.
-        """
+        """Return a newly added CT_NumLvl (<w:lvlOverride>) element having its ``ilvl``
+        attribute set to `ilvl`."""
         return self._add_lvlOverride(ilvl=ilvl)
 
     @classmethod
     def new(cls, num_id, abstractNum_id):
-        """
-        Return a new ``<w:num>`` element having numId of `num_id` and having
-        a ``<w:abstractNumId>`` child with val attribute set to
-        `abstractNum_id`.
-        """
+        """Return a new ``<w:num>`` element having numId of `num_id` and having a
+        ``<w:abstractNumId>`` child with val attribute set to `abstractNum_id`."""
         num = OxmlElement("w:num")
         num.numId = num_id
         abstractNumId = CT_DecimalNumber.new("w:abstractNumId", abstractNum_id)
@@ -45,27 +38,21 @@ def new(cls, num_id, abstractNum_id):
 
 
 class CT_NumLvl(BaseOxmlElement):
-    """
-    ``<w:lvlOverride>`` element, which identifies a level in a list
-    definition to override with settings it contains.
-    """
+    """``<w:lvlOverride>`` element, which identifies a level in a list definition to
+    override with settings it contains."""
 
     startOverride = ZeroOrOne("w:startOverride", successors=("w:lvl",))
     ilvl = RequiredAttribute("w:ilvl", ST_DecimalNumber)
 
     def add_startOverride(self, val):
-        """
-        Return a newly added CT_DecimalNumber element having tagname
-        ``w:startOverride`` and ``val`` attribute set to `val`.
-        """
+        """Return a newly added CT_DecimalNumber element having tagname
+        ``w:startOverride`` and ``val`` attribute set to `val`."""
         return self._add_startOverride(val=val)
 
 
 class CT_NumPr(BaseOxmlElement):
-    """
-    A ``<w:numPr>`` element, a container for numbering properties applied to
-    a paragraph.
-    """
+    """A ``<w:numPr>`` element, a container for numbering properties applied to a
+    paragraph."""
 
     ilvl = ZeroOrOne("w:ilvl", successors=("w:numId", "w:numberingChange", "w:ins"))
     numId = ZeroOrOne("w:numId", successors=("w:numberingChange", "w:ins"))
@@ -89,27 +76,21 @@ class CT_NumPr(BaseOxmlElement):
 
 
 class CT_Numbering(BaseOxmlElement):
-    """
-    ``<w:numbering>`` element, the root element of a numbering part, i.e.
-    numbering.xml
-    """
+    """``<w:numbering>`` element, the root element of a numbering part, i.e.
+    numbering.xml."""
 
     num = ZeroOrMore("w:num", successors=("w:numIdMacAtCleanup",))
 
     def add_num(self, abstractNum_id):
-        """
-        Return a newly added CT_Num (<w:num>) element referencing the
-        abstract numbering definition identified by `abstractNum_id`.
-        """
+        """Return a newly added CT_Num (<w:num>) element referencing the abstract
+        numbering definition identified by `abstractNum_id`."""
         next_num_id = self._next_numId
         num = CT_Num.new(next_num_id, abstractNum_id)
         return self._insert_num(num)
 
     def num_having_numId(self, numId):
-        """
-        Return the ``<w:num>`` child element having ``numId`` attribute
-        matching `numId`.
-        """
+        """Return the ``<w:num>`` child element having ``numId`` attribute matching
+        `numId`."""
         xpath = './w:num[@w:numId="%d"]' % numId
         try:
             return self.xpath(xpath)[0]
@@ -118,11 +99,8 @@ def num_having_numId(self, numId):
 
     @property
     def _next_numId(self):
-        """
-        The first ``numId`` unused by a ``<w:num>`` element, starting at
-        1 and filling any gaps in numbering between existing ``<w:num>``
-        elements.
-        """
+        """The first ``numId`` unused by a ``<w:num>`` element, starting at 1 and
+        filling any gaps in numbering between existing ``<w:num>`` elements."""
         numId_strs = self.xpath("./w:num/@w:numId")
         num_ids = [int(numId_str) for numId_str in numId_strs]
         for num in range(1, len(num_ids) + 2):
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index 72ab5c6f4..75d80eeb1 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -14,23 +14,21 @@
 
 
 class CT_HdrFtr(BaseOxmlElement):
-    """`w:hdr` and `w:ftr`, the root element for header and footer part respectively"""
+    """`w:hdr` and `w:ftr`, the root element for header and footer part respectively."""
 
     p = ZeroOrMore("w:p", successors=())
     tbl = ZeroOrMore("w:tbl", successors=())
 
 
 class CT_HdrFtrRef(BaseOxmlElement):
-    """`w:headerReference` and `w:footerReference` elements"""
+    """`w:headerReference` and `w:footerReference` elements."""
 
     type_ = RequiredAttribute("w:type", WD_HEADER_FOOTER)
     rId = RequiredAttribute("r:id", XsdString)
 
 
 class CT_PageMar(BaseOxmlElement):
-    """
-    ``<w:pgMar>`` element, defining page margins.
-    """
+    """``<w:pgMar>`` element, defining page margins."""
 
     top = OptionalAttribute("w:top", ST_SignedTwipsMeasure)
     right = OptionalAttribute("w:right", ST_TwipsMeasure)
@@ -42,9 +40,7 @@ class CT_PageMar(BaseOxmlElement):
 
 
 class CT_PageSz(BaseOxmlElement):
-    """
-    ``<w:pgSz>`` element, defining page dimensions and orientation.
-    """
+    """``<w:pgSz>`` element, defining page dimensions and orientation."""
 
     w = OptionalAttribute("w:w", ST_TwipsMeasure)
     h = OptionalAttribute("w:h", ST_TwipsMeasure)
@@ -54,7 +50,7 @@ class CT_PageSz(BaseOxmlElement):
 
 
 class CT_SectPr(BaseOxmlElement):
-    """`w:sectPr` element, the container element for section properties"""
+    """`w:sectPr` element, the container element for section properties."""
 
     _tag_seq = (
         "w:footnotePr",
@@ -108,11 +104,9 @@ def add_headerReference(self, type_, rId):
 
     @property
     def bottom_margin(self):
-        """
-        The value of the ``w:bottom`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:bottom`` attribute in the ``<w:pgMar>`` child element,
+        as a |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -124,10 +118,10 @@ def bottom_margin(self, value):
         pgMar.bottom = value
 
     def clone(self):
-        """
-        Return an exact duplicate of this ``<w:sectPr>`` element tree
-        suitable for use in adding a section break. All rsid* attributes are
-        removed from the root ``<w:sectPr>`` element.
+        """Return an exact duplicate of this ``<w:sectPr>`` element tree suitable for
+        use in adding a section break.
+
+        All rsid* attributes are removed from the root ``<w:sectPr>`` element.
         """
         clone_sectPr = deepcopy(self)
         clone_sectPr.attrib.clear()
@@ -135,11 +129,9 @@ def clone(self):
 
     @property
     def footer(self):
-        """
-        The value of the ``w:footer`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:footer`` attribute in the ``<w:pgMar>`` child element,
+        as a |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -169,11 +161,9 @@ def get_headerReference(self, type_):
 
     @property
     def gutter(self):
-        """
-        The value of the ``w:gutter`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:gutter`` attribute in the ``<w:pgMar>`` child element,
+        as a |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -186,11 +176,9 @@ def gutter(self, value):
 
     @property
     def header(self):
-        """
-        The value of the ``w:header`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:header`` attribute in the ``<w:pgMar>`` child element,
+        as a |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -203,11 +191,9 @@ def header(self, value):
 
     @property
     def left_margin(self):
-        """
-        The value of the ``w:left`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:left`` attribute in the ``<w:pgMar>`` child element, as
+        a |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -220,11 +206,9 @@ def left_margin(self, value):
 
     @property
     def orientation(self):
-        """
-        The member of the ``WD_ORIENTATION`` enumeration corresponding to the
-        value of the ``orient`` attribute of the ``<w:pgSz>`` child element,
-        or ``WD_ORIENTATION.PORTRAIT`` if not present.
-        """
+        """The member of the ``WD_ORIENTATION`` enumeration corresponding to the value
+        of the ``orient`` attribute of the ``<w:pgSz>`` child element, or
+        ``WD_ORIENTATION.PORTRAIT`` if not present."""
         pgSz = self.pgSz
         if pgSz is None:
             return WD_ORIENTATION.PORTRAIT
@@ -237,10 +221,8 @@ def orientation(self, value):
 
     @property
     def page_height(self):
-        """
-        Value in EMU of the ``h`` attribute of the ``<w:pgSz>`` child
-        element, or |None| if not present.
-        """
+        """Value in EMU of the ``h`` attribute of the ``<w:pgSz>`` child element, or
+        |None| if not present."""
         pgSz = self.pgSz
         if pgSz is None:
             return None
@@ -253,10 +235,8 @@ def page_height(self, value):
 
     @property
     def page_width(self):
-        """
-        Value in EMU of the ``w`` attribute of the ``<w:pgSz>`` child
-        element, or |None| if not present.
-        """
+        """Value in EMU of the ``w`` attribute of the ``<w:pgSz>`` child element, or
+        |None| if not present."""
         pgSz = self.pgSz
         if pgSz is None:
             return None
@@ -269,7 +249,7 @@ def page_width(self, value):
 
     @property
     def preceding_sectPr(self):
-        """sectPr immediately preceding this one or None if this is the first."""
+        """SectPr immediately preceding this one or None if this is the first."""
         # ---[1] predicate returns list of zero or one value---
         preceding_sectPrs = self.xpath("./preceding::w:sectPr[1]")
         return preceding_sectPrs[0] if len(preceding_sectPrs) > 0 else None
@@ -290,11 +270,9 @@ def remove_headerReference(self, type_):
 
     @property
     def right_margin(self):
-        """
-        The value of the ``w:right`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:right`` attribute in the ``<w:pgMar>`` child element, as
+        a |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -307,11 +285,9 @@ def right_margin(self, value):
 
     @property
     def start_type(self):
-        """
-        The member of the ``WD_SECTION_START`` enumeration corresponding to
-        the value of the ``val`` attribute of the ``<w:type>`` child element,
-        or ``WD_SECTION_START.NEW_PAGE`` if not present.
-        """
+        """The member of the ``WD_SECTION_START`` enumeration corresponding to the value
+        of the ``val`` attribute of the ``<w:type>`` child element, or
+        ``WD_SECTION_START.NEW_PAGE`` if not present."""
         type = self.type
         if type is None or type.val is None:
             return WD_SECTION_START.NEW_PAGE
@@ -327,7 +303,7 @@ def start_type(self, value):
 
     @property
     def titlePg_val(self):
-        """Value of `w:titlePg/@val` or |None| if not present"""
+        """Value of `w:titlePg/@val` or |None| if not present."""
         titlePg = self.titlePg
         if titlePg is None:
             return False
@@ -342,11 +318,9 @@ def titlePg_val(self, value):
 
     @property
     def top_margin(self):
-        """
-        The value of the ``w:top`` attribute in the ``<w:pgMar>`` child
-        element, as a |Length| object, or |None| if either the element or the
-        attribute is not present.
-        """
+        """The value of the ``w:top`` attribute in the ``<w:pgMar>`` child element, as a
+        |Length| object, or |None| if either the element or the attribute is not
+        present."""
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -359,8 +333,6 @@ def top_margin(self, value):
 
 
 class CT_SectType(BaseOxmlElement):
-    """
-    ``<w:sectType>`` element, defining the section start type.
-    """
+    """``<w:sectType>`` element, defining the section start type."""
 
     val = OptionalAttribute("w:val", WD_SECTION_START)
diff --git a/src/docx/oxml/settings.py b/src/docx/oxml/settings.py
index dc899cbc0..fd39fbd99 100644
--- a/src/docx/oxml/settings.py
+++ b/src/docx/oxml/settings.py
@@ -1,10 +1,10 @@
-"""Custom element classes related to document settings"""
+"""Custom element classes related to document settings."""
 
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
 class CT_Settings(BaseOxmlElement):
-    """`w:settings` element, root element for the settings part"""
+    """`w:settings` element, root element for the settings part."""
 
     _tag_seq = (
         "w:writeProtection",
@@ -111,7 +111,7 @@ class CT_Settings(BaseOxmlElement):
 
     @property
     def evenAndOddHeaders_val(self):
-        """value of `w:evenAndOddHeaders/@w:val` or |None| if not present."""
+        """Value of `w:evenAndOddHeaders/@w:val` or |None| if not present."""
         evenAndOddHeaders = self.evenAndOddHeaders
         if evenAndOddHeaders is None:
             return False
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index a66d251bf..f26179fbb 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -20,44 +20,34 @@
 
 
 class CT_Blip(BaseOxmlElement):
-    """
-    ``<a:blip>`` element, specifies image source and adjustments such as
-    alpha and tint.
-    """
+    """``<a:blip>`` element, specifies image source and adjustments such as alpha and
+    tint."""
 
     embed = OptionalAttribute("r:embed", ST_RelationshipId)
     link = OptionalAttribute("r:link", ST_RelationshipId)
 
 
 class CT_BlipFillProperties(BaseOxmlElement):
-    """
-    ``<pic:blipFill>`` element, specifies picture properties
-    """
+    """``<pic:blipFill>`` element, specifies picture properties."""
 
     blip = ZeroOrOne("a:blip", successors=("a:srcRect", "a:tile", "a:stretch"))
 
 
 class CT_GraphicalObject(BaseOxmlElement):
-    """
-    ``<a:graphic>`` element, container for a DrawingML object
-    """
+    """``<a:graphic>`` element, container for a DrawingML object."""
 
     graphicData = OneAndOnlyOne("a:graphicData")
 
 
 class CT_GraphicalObjectData(BaseOxmlElement):
-    """
-    ``<a:graphicData>`` element, container for the XML of a DrawingML object
-    """
+    """``<a:graphicData>`` element, container for the XML of a DrawingML object."""
 
     pic = ZeroOrOne("pic:pic")
     uri = RequiredAttribute("uri", XsdToken)
 
 
 class CT_Inline(BaseOxmlElement):
-    """
-    ``<w:inline>`` element, container for an inline shape.
-    """
+    """``<w:inline>`` element, container for an inline shape."""
 
     extent = OneAndOnlyOne("wp:extent")
     docPr = OneAndOnlyOne("wp:docPr")
@@ -65,10 +55,8 @@ class CT_Inline(BaseOxmlElement):
 
     @classmethod
     def new(cls, cx, cy, shape_id, pic):
-        """
-        Return a new ``<wp:inline>`` element populated with the values passed
-        as parameters.
-        """
+        """Return a new ``<wp:inline>`` element populated with the values passed as
+        parameters."""
         inline = parse_xml(cls._inline_xml())
         inline.extent.cx = cx
         inline.extent.cy = cy
@@ -82,10 +70,8 @@ def new(cls, cx, cy, shape_id, pic):
 
     @classmethod
     def new_pic_inline(cls, shape_id, rId, filename, cx, cy):
-        """
-        Return a new `wp:inline` element containing the `pic:pic` element
-        specified by the argument values.
-        """
+        """Return a new `wp:inline` element containing the `pic:pic` element specified
+        by the argument values."""
         pic_id = 0  # Word doesn't seem to use this, but does not omit it
         pic = CT_Picture.new(pic_id, filename, rId, cx, cy)
         inline = cls.new(cx, cy, shape_id, pic)
@@ -109,9 +95,9 @@ def _inline_xml(cls):
 
 
 class CT_NonVisualDrawingProps(BaseOxmlElement):
-    """
-    Used for ``<wp:docPr>`` element, and perhaps others. Specifies the id and
-    name of a DrawingML drawing.
+    """Used for ``<wp:docPr>`` element, and perhaps others.
+
+    Specifies the id and name of a DrawingML drawing.
     """
 
     id = RequiredAttribute("id", ST_DrawingElementId)
@@ -119,16 +105,11 @@ class CT_NonVisualDrawingProps(BaseOxmlElement):
 
 
 class CT_NonVisualPictureProperties(BaseOxmlElement):
-    """
-    ``<pic:cNvPicPr>`` element, specifies picture locking and resize
-    behaviors.
-    """
+    """``<pic:cNvPicPr>`` element, specifies picture locking and resize behaviors."""
 
 
 class CT_Picture(BaseOxmlElement):
-    """
-    ``<pic:pic>`` element, a DrawingML picture
-    """
+    """``<pic:pic>`` element, a DrawingML picture."""
 
     nvPicPr = OneAndOnlyOne("pic:nvPicPr")
     blipFill = OneAndOnlyOne("pic:blipFill")
@@ -136,11 +117,9 @@ class CT_Picture(BaseOxmlElement):
 
     @classmethod
     def new(cls, pic_id, filename, rId, cx, cy):
-        """
-        Return a new ``<pic:pic>`` element populated with the minimal
-        contents required to define a viable picture element, based on the
-        values passed as parameters.
-        """
+        """Return a new ``<pic:pic>`` element populated with the minimal contents
+        required to define a viable picture element, based on the values passed as
+        parameters."""
         pic = parse_xml(cls._pic_xml())
         pic.nvPicPr.cNvPr.id = pic_id
         pic.nvPicPr.cNvPr.name = filename
@@ -175,17 +154,15 @@ def _pic_xml(cls):
 
 
 class CT_PictureNonVisual(BaseOxmlElement):
-    """
-    ``<pic:nvPicPr>`` element, non-visual picture properties
-    """
+    """``<pic:nvPicPr>`` element, non-visual picture properties."""
 
     cNvPr = OneAndOnlyOne("pic:cNvPr")
 
 
 class CT_Point2D(BaseOxmlElement):
-    """
-    Used for ``<a:off>`` element, and perhaps others. Specifies an x, y
-    coordinate (point).
+    """Used for ``<a:off>`` element, and perhaps others.
+
+    Specifies an x, y coordinate (point).
     """
 
     x = RequiredAttribute("x", ST_Coordinate)
@@ -193,9 +170,9 @@ class CT_Point2D(BaseOxmlElement):
 
 
 class CT_PositiveSize2D(BaseOxmlElement):
-    """
-    Used for ``<wp:extent>`` element, and perhaps others later. Specifies the
-    size of a DrawingML drawing.
+    """Used for ``<wp:extent>`` element, and perhaps others later.
+
+    Specifies the size of a DrawingML drawing.
     """
 
     cx = RequiredAttribute("cx", ST_PositiveCoordinate)
@@ -203,23 +180,17 @@ class CT_PositiveSize2D(BaseOxmlElement):
 
 
 class CT_PresetGeometry2D(BaseOxmlElement):
-    """
-    ``<a:prstGeom>`` element, specifies an preset autoshape geometry, such
-    as ``rect``.
-    """
+    """``<a:prstGeom>`` element, specifies an preset autoshape geometry, such as
+    ``rect``."""
 
 
 class CT_RelativeRect(BaseOxmlElement):
-    """
-    ``<a:fillRect>`` element, specifying picture should fill containing
-    rectangle shape.
-    """
+    """``<a:fillRect>`` element, specifying picture should fill containing rectangle
+    shape."""
 
 
 class CT_ShapeProperties(BaseOxmlElement):
-    """
-    ``<pic:spPr>`` element, specifies size and shape of picture container.
-    """
+    """``<pic:spPr>`` element, specifies size and shape of picture container."""
 
     xfrm = ZeroOrOne(
         "a:xfrm",
@@ -237,9 +208,7 @@ class CT_ShapeProperties(BaseOxmlElement):
 
     @property
     def cx(self):
-        """
-        Shape width as an instance of Emu, or None if not present.
-        """
+        """Shape width as an instance of Emu, or None if not present."""
         xfrm = self.xfrm
         if xfrm is None:
             return None
@@ -252,9 +221,7 @@ def cx(self, value):
 
     @property
     def cy(self):
-        """
-        Shape height as an instance of Emu, or None if not present.
-        """
+        """Shape height as an instance of Emu, or None if not present."""
         xfrm = self.xfrm
         if xfrm is None:
             return None
@@ -267,16 +234,12 @@ def cy(self, value):
 
 
 class CT_StretchInfoProperties(BaseOxmlElement):
-    """
-    ``<a:stretch>`` element, specifies how picture should fill its containing
-    shape.
-    """
+    """``<a:stretch>`` element, specifies how picture should fill its containing
+    shape."""
 
 
 class CT_Transform2D(BaseOxmlElement):
-    """
-    ``<a:xfrm>`` element, specifies size and shape of picture container.
-    """
+    """``<a:xfrm>`` element, specifies size and shape of picture container."""
 
     off = ZeroOrOne("a:off", successors=("a:ext",))
     ext = ZeroOrOne("a:ext", successors=())
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index eb939291d..b8a79550c 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -7,46 +7,36 @@
 
 
 class CT_DecimalNumber(BaseOxmlElement):
-    """
-    Used for ``<w:numId>``, ``<w:ilvl>``, ``<w:abstractNumId>`` and several
-    others, containing a text representation of a decimal number (e.g. 42) in
-    its ``val`` attribute.
-    """
+    """Used for ``<w:numId>``, ``<w:ilvl>``, ``<w:abstractNumId>`` and several others,
+    containing a text representation of a decimal number (e.g. 42) in its ``val``
+    attribute."""
 
     val = RequiredAttribute("w:val", ST_DecimalNumber)
 
     @classmethod
     def new(cls, nsptagname, val):
-        """
-        Return a new ``CT_DecimalNumber`` element having tagname `nsptagname`
-        and ``val`` attribute set to `val`.
-        """
+        """Return a new ``CT_DecimalNumber`` element having tagname `nsptagname` and
+        ``val`` attribute set to `val`."""
         return OxmlElement(nsptagname, attrs={qn("w:val"): str(val)})
 
 
 class CT_OnOff(BaseOxmlElement):
-    """
-    Used for ``<w:b>``, ``<w:i>`` elements and others, containing a bool-ish
-    string in its ``val`` attribute, xsd:boolean plus 'on' and 'off'.
-    """
+    """Used for ``<w:b>``, ``<w:i>`` elements and others, containing a bool-ish string
+    in its ``val`` attribute, xsd:boolean plus 'on' and 'off'."""
 
     val = OptionalAttribute("w:val", ST_OnOff, default=True)
 
 
 class CT_String(BaseOxmlElement):
-    """
-    Used for ``<w:pStyle>`` and ``<w:tblStyle>`` elements and others,
-    containing a style name in its ``val`` attribute.
-    """
+    """Used for ``<w:pStyle>`` and ``<w:tblStyle>`` elements and others, containing a
+    style name in its ``val`` attribute."""
 
     val = RequiredAttribute("w:val", ST_String)
 
     @classmethod
     def new(cls, nsptagname, val):
-        """
-        Return a new ``CT_String`` element with tagname `nsptagname` and
-        ``val`` attribute set to `val`.
-        """
+        """Return a new ``CT_String`` element with tagname `nsptagname` and ``val``
+        attribute set to `val`."""
         elm = OxmlElement(nsptagname)
         elm.val = val
         return elm
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index 56226b6da..e0c609959 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -83,11 +83,9 @@ def validate(cls, value):
 
 
 class XsdAnyUri(BaseStringType):
-    """
-    There's a regular expression this is supposed to meet but so far thinking
-    spending cycles on validating wouldn't be worth it for the number of
-    programming errors it would catch.
-    """
+    """There's a regular expression this is supposed to meet but so far thinking
+    spending cycles on validating wouldn't be worth it for the number of programming
+    errors it would catch."""
 
 
 class XsdBoolean(BaseSimpleType):
@@ -113,9 +111,9 @@ def validate(cls, value):
 
 
 class XsdId(BaseStringType):
-    """
-    String that must begin with a letter or underscore and cannot contain any
-    colons. Not fully validated because not used in external API.
+    """String that must begin with a letter or underscore and cannot contain any colons.
+
+    Not fully validated because not used in external API.
     """
 
     pass
@@ -138,16 +136,12 @@ class XsdString(BaseStringType):
 
 
 class XsdStringEnumeration(BaseStringEnumerationType):
-    """
-    Set of enumerated xsd:string values.
-    """
+    """Set of enumerated xsd:string values."""
 
 
 class XsdToken(BaseStringType):
-    """
-    xsd:string with whitespace collapsing, e.g. multiple spaces reduced to
-    one, leading and trailing space stripped.
-    """
+    """Xsd:string with whitespace collapsing, e.g. multiple spaces reduced to one,
+    leading and trailing space stripped."""
 
     pass
 
@@ -217,9 +211,7 @@ def convert_from_xml(cls, str_value):
 
     @classmethod
     def convert_to_xml(cls, value):
-        """
-        Keep alpha hex numerals all uppercase just for consistency.
-        """
+        """Keep alpha hex numerals all uppercase just for consistency."""
         # expecting 3-tuple of ints in range 0-255
         return "%02X%02X%02X" % value
 
@@ -234,9 +226,7 @@ def validate(cls, value):
 
 
 class ST_HexColorAuto(XsdStringEnumeration):
-    """
-    Value for `w:color/[@val="auto"] attribute setting
-    """
+    """Value for `w:color/[@val="auto"] attribute setting."""
 
     AUTO = "auto"
 
@@ -244,9 +234,7 @@ class ST_HexColorAuto(XsdStringEnumeration):
 
 
 class ST_HpsMeasure(XsdUnsignedLong):
-    """
-    Half-point measure, e.g. 24.0 represents 12.0 points.
-    """
+    """Half-point measure, e.g. 24.0 represents 12.0 points."""
 
     @classmethod
     def convert_from_xml(cls, str_value):
@@ -262,9 +250,7 @@ def convert_to_xml(cls, value):
 
 
 class ST_Merge(XsdStringEnumeration):
-    """
-    Valid values for <w:xMerge val=""> attribute
-    """
+    """Valid values for <w:xMerge val=""> attribute."""
 
     CONTINUE = "continue"
     RESTART = "restart"
@@ -365,9 +351,7 @@ def convert_from_xml(cls, str_value):
 
 
 class ST_VerticalAlignRun(XsdStringEnumeration):
-    """
-    Valid values for `w:vertAlign/@val`.
-    """
+    """Valid values for `w:vertAlign/@val`."""
 
     BASELINE = "baseline"
     SUPERSCRIPT = "superscript"
diff --git a/src/docx/oxml/styles.py b/src/docx/oxml/styles.py
index 8de7a2290..486110848 100644
--- a/src/docx/oxml/styles.py
+++ b/src/docx/oxml/styles.py
@@ -12,10 +12,8 @@
 
 
 def styleId_from_name(name):
-    """
-    Return the style id corresponding to `name`, taking into account
-    special-case names such as 'Heading 1'.
-    """
+    """Return the style id corresponding to `name`, taking into account special-case
+    names such as 'Heading 1'."""
     return {
         "caption": "Caption",
         "heading 1": "Heading1",
@@ -31,11 +29,9 @@ def styleId_from_name(name):
 
 
 class CT_LatentStyles(BaseOxmlElement):
-    """
-    `w:latentStyles` element, defining behavior defaults for latent styles
-    and containing `w:lsdException` child elements that each override those
-    defaults for a named latent style.
-    """
+    """`w:latentStyles` element, defining behavior defaults for latent styles and
+    containing `w:lsdException` child elements that each override those defaults for a
+    named latent style."""
 
     lsdException = ZeroOrMore("w:lsdException", successors=())
 
@@ -47,37 +43,28 @@ class CT_LatentStyles(BaseOxmlElement):
     defUnhideWhenUsed = OptionalAttribute("w:defUnhideWhenUsed", ST_OnOff)
 
     def bool_prop(self, attr_name):
-        """
-        Return the boolean value of the attribute having `attr_name`, or
-        |False| if not present.
-        """
+        """Return the boolean value of the attribute having `attr_name`, or |False| if
+        not present."""
         value = getattr(self, attr_name)
         if value is None:
             return False
         return value
 
     def get_by_name(self, name):
-        """
-        Return the `w:lsdException` child having `name`, or |None| if not
-        found.
-        """
+        """Return the `w:lsdException` child having `name`, or |None| if not found."""
         found = self.xpath('w:lsdException[@w:name="%s"]' % name)
         if not found:
             return None
         return found[0]
 
     def set_bool_prop(self, attr_name, value):
-        """
-        Set the on/off attribute having `attr_name` to `value`.
-        """
+        """Set the on/off attribute having `attr_name` to `value`."""
         setattr(self, attr_name, bool(value))
 
 
 class CT_LsdException(BaseOxmlElement):
-    """
-    ``<w:lsdException>`` element, defining override visibility behaviors for
-    a named latent style.
-    """
+    """``<w:lsdException>`` element, defining override visibility behaviors for a named
+    latent style."""
 
     locked = OptionalAttribute("w:locked", ST_OnOff)
     name = RequiredAttribute("w:name", ST_String)
@@ -87,29 +74,21 @@ class CT_LsdException(BaseOxmlElement):
     unhideWhenUsed = OptionalAttribute("w:unhideWhenUsed", ST_OnOff)
 
     def delete(self):
-        """
-        Remove this `w:lsdException` element from the XML document.
-        """
+        """Remove this `w:lsdException` element from the XML document."""
         self.getparent().remove(self)
 
     def on_off_prop(self, attr_name):
-        """
-        Return the boolean value of the attribute having `attr_name`, or
-        |None| if not present.
-        """
+        """Return the boolean value of the attribute having `attr_name`, or |None| if
+        not present."""
         return getattr(self, attr_name)
 
     def set_on_off_prop(self, attr_name, value):
-        """
-        Set the on/off attribute having `attr_name` to `value`.
-        """
+        """Set the on/off attribute having `attr_name` to `value`."""
         setattr(self, attr_name, value)
 
 
 class CT_Style(BaseOxmlElement):
-    """
-    A ``<w:style>`` element, representing a style definition
-    """
+    """A ``<w:style>`` element, representing a style definition."""
 
     _tag_seq = (
         "w:name",
@@ -154,9 +133,7 @@ class CT_Style(BaseOxmlElement):
 
     @property
     def basedOn_val(self):
-        """
-        Value of `w:basedOn/@w:val` or |None| if not present.
-        """
+        """Value of `w:basedOn/@w:val` or |None| if not present."""
         basedOn = self.basedOn
         if basedOn is None:
             return None
@@ -171,10 +148,8 @@ def basedOn_val(self, value):
 
     @property
     def base_style(self):
-        """
-        Sibling CT_Style element this style is based on or |None| if no base
-        style or base style not found.
-        """
+        """Sibling CT_Style element this style is based on or |None| if no base style or
+        base style not found."""
         basedOn = self.basedOn
         if basedOn is None:
             return None
@@ -185,16 +160,12 @@ def base_style(self):
         return base_style
 
     def delete(self):
-        """
-        Remove this `w:style` element from its parent `w:styles` element.
-        """
+        """Remove this `w:style` element from its parent `w:styles` element."""
         self.getparent().remove(self)
 
     @property
     def locked_val(self):
-        """
-        Value of `w:locked/@w:val` or |False| if not present.
-        """
+        """Value of `w:locked/@w:val` or |False| if not present."""
         locked = self.locked
         if locked is None:
             return False
@@ -209,9 +180,7 @@ def locked_val(self, value):
 
     @property
     def name_val(self):
-        """
-        Value of ``<w:name>`` child or |None| if not present.
-        """
+        """Value of ``<w:name>`` child or |None| if not present."""
         name = self.name
         if name is None:
             return None
@@ -226,11 +195,8 @@ def name_val(self, value):
 
     @property
     def next_style(self):
-        """
-        Sibling CT_Style element identified by the value of `w:name/@w:val`
-        or |None| if no value is present or no style with that style id
-        is found.
-        """
+        """Sibling CT_Style element identified by the value of `w:name/@w:val` or |None|
+        if no value is present or no style with that style id is found."""
         next = self.next
         if next is None:
             return None
@@ -239,9 +205,7 @@ def next_style(self):
 
     @property
     def qFormat_val(self):
-        """
-        Value of `w:qFormat/@w:val` or |False| if not present.
-        """
+        """Value of `w:qFormat/@w:val` or |False| if not present."""
         qFormat = self.qFormat
         if qFormat is None:
             return False
@@ -255,9 +219,7 @@ def qFormat_val(self, value):
 
     @property
     def semiHidden_val(self):
-        """
-        Value of ``<w:semiHidden>`` child or |False| if not present.
-        """
+        """Value of ``<w:semiHidden>`` child or |False| if not present."""
         semiHidden = self.semiHidden
         if semiHidden is None:
             return False
@@ -272,9 +234,7 @@ def semiHidden_val(self, value):
 
     @property
     def uiPriority_val(self):
-        """
-        Value of ``<w:uiPriority>`` child or |None| if not present.
-        """
+        """Value of ``<w:uiPriority>`` child or |None| if not present."""
         uiPriority = self.uiPriority
         if uiPriority is None:
             return None
@@ -289,9 +249,7 @@ def uiPriority_val(self, value):
 
     @property
     def unhideWhenUsed_val(self):
-        """
-        Value of `w:unhideWhenUsed/@w:val` or |False| if not present.
-        """
+        """Value of `w:unhideWhenUsed/@w:val` or |False| if not present."""
         unhideWhenUsed = self.unhideWhenUsed
         if unhideWhenUsed is None:
             return False
@@ -306,10 +264,7 @@ def unhideWhenUsed_val(self, value):
 
 
 class CT_Styles(BaseOxmlElement):
-    """
-    ``<w:styles>`` element, the root element of a styles part, i.e.
-    styles.xml
-    """
+    """``<w:styles>`` element, the root element of a styles part, i.e. styles.xml."""
 
     _tag_seq = ("w:docDefaults", "w:latentStyles", "w:style")
     latentStyles = ZeroOrOne("w:latentStyles", successors=_tag_seq[2:])
@@ -317,10 +272,9 @@ class CT_Styles(BaseOxmlElement):
     del _tag_seq
 
     def add_style_of_type(self, name, style_type, builtin):
-        """
-        Return a newly added `w:style` element having `name` and
-        `style_type`. `w:style/@customStyle` is set based on the value of
-        `builtin`.
+        """Return a newly added `w:style` element having `name` and `style_type`.
+
+        `w:style/@customStyle` is set based on the value of `builtin`.
         """
         style = self.add_style()
         style.type = style_type
@@ -330,9 +284,7 @@ def add_style_of_type(self, name, style_type, builtin):
         return style
 
     def default_for(self, style_type):
-        """
-        Return `w:style[@w:type="*{style_type}*][-1]` or |None| if not found.
-        """
+        """Return `w:style[@w:type="*{style_type}*][-1]` or |None| if not found."""
         default_styles_for_type = [
             s for s in self._iter_styles() if s.type == style_type and s.default
         ]
@@ -342,10 +294,8 @@ def default_for(self, style_type):
         return default_styles_for_type[-1]
 
     def get_by_id(self, styleId):
-        """
-        Return the ``<w:style>`` child element having ``styleId`` attribute
-        matching `styleId`, or |None| if not found.
-        """
+        """Return the ``<w:style>`` child element having ``styleId`` attribute matching
+        `styleId`, or |None| if not found."""
         xpath = 'w:style[@w:styleId="%s"]' % styleId
         try:
             return self.xpath(xpath)[0]
@@ -353,10 +303,8 @@ def get_by_id(self, styleId):
             return None
 
     def get_by_name(self, name):
-        """
-        Return the ``<w:style>`` child element having ``<w:name>`` child
-        element with value `name`, or |None| if not found.
-        """
+        """Return the ``<w:style>`` child element having ``<w:name>`` child element with
+        value `name`, or |None| if not found."""
         xpath = 'w:style[w:name/@w:val="%s"]' % name
         try:
             return self.xpath(xpath)[0]
@@ -364,7 +312,5 @@ def get_by_name(self, name):
             return None
 
     def _iter_styles(self):
-        """
-        Generate each of the `w:style` child elements in document order.
-        """
+        """Generate each of the `w:style` child elements in document order."""
         return (style for style in self.xpath("w:style"))
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index ef5e44702..e86214a62 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -24,27 +24,23 @@
 
 
 class CT_Height(BaseOxmlElement):
-    """
-    Used for ``<w:trHeight>`` to specify a row height and row height rule.
-    """
+    """Used for ``<w:trHeight>`` to specify a row height and row height rule."""
 
     val = OptionalAttribute("w:val", ST_TwipsMeasure)
     hRule = OptionalAttribute("w:hRule", WD_ROW_HEIGHT_RULE)
 
 
 class CT_Row(BaseOxmlElement):
-    """
-    ``<w:tr>`` element
-    """
+    """``<w:tr>`` element."""
 
     tblPrEx = ZeroOrOne("w:tblPrEx")  # custom inserter below
     trPr = ZeroOrOne("w:trPr")  # custom inserter below
     tc = ZeroOrMore("w:tc")
 
     def tc_at_grid_col(self, idx):
-        """
-        The ``<w:tc>`` element appearing at grid column `idx`. Raises
-        |ValueError| if no ``w:tc`` element begins at that grid column.
+        """The ``<w:tc>`` element appearing at grid column `idx`.
+
+        Raises |ValueError| if no ``w:tc`` element begins at that grid column.
         """
         grid_col = 0
         for tc in self.tc_lst:
@@ -57,18 +53,13 @@ def tc_at_grid_col(self, idx):
 
     @property
     def tr_idx(self):
-        """
-        The index of this ``<w:tr>`` element within its parent ``<w:tbl>``
-        element.
-        """
+        """The index of this ``<w:tr>`` element within its parent ``<w:tbl>``
+        element."""
         return self.getparent().tr_lst.index(self)
 
     @property
     def trHeight_hRule(self):
-        """
-        Return the value of `w:trPr/w:trHeight@w:hRule`, or |None| if not
-        present.
-        """
+        """Return the value of `w:trPr/w:trHeight@w:hRule`, or |None| if not present."""
         trPr = self.trPr
         if trPr is None:
             return None
@@ -81,10 +72,7 @@ def trHeight_hRule(self, value):
 
     @property
     def trHeight_val(self):
-        """
-        Return the value of `w:trPr/w:trHeight@w:val`, or |None| if not
-        present.
-        """
+        """Return the value of `w:trPr/w:trHeight@w:val`, or |None| if not present."""
         trPr = self.trPr
         if trPr is None:
             return None
@@ -110,9 +98,7 @@ def _new_tc(self):
 
 
 class CT_Tbl(BaseOxmlElement):
-    """
-    ``<w:tbl>`` element
-    """
+    """``<w:tbl>`` element."""
 
     tblPr = OneAndOnlyOne("w:tblPr")
     tblGrid = OneAndOnlyOne("w:tblGrid")
@@ -120,10 +106,9 @@ class CT_Tbl(BaseOxmlElement):
 
     @property
     def bidiVisual_val(self):
-        """
-        Value of `w:tblPr/w:bidiVisual/@w:val` or |None| if not present.
-        Controls whether table cells are displayed right-to-left or
-        left-to-right.
+        """Value of `w:tblPr/w:bidiVisual/@w:val` or |None| if not present.
+
+        Controls whether table cells are displayed right-to-left or left-to-right.
         """
         bidiVisual = self.tblPr.bidiVisual
         if bidiVisual is None:
@@ -140,16 +125,15 @@ def bidiVisual_val(self, value):
 
     @property
     def col_count(self):
-        """
-        The number of grid columns in this table.
-        """
+        """The number of grid columns in this table."""
         return len(self.tblGrid.gridCol_lst)
 
     def iter_tcs(self):
-        """
-        Generate each of the `w:tc` elements in this table, left to right and
-        top to bottom. Each cell in the first row is generated, followed by
-        each cell in the second row, etc.
+        """Generate each of the `w:tc` elements in this table, left to right and top to
+        bottom.
+
+        Each cell in the first row is generated, followed by each cell in the second
+        row, etc.
         """
         for tr in self.tr_lst:
             for tc in tr.tc_lst:
@@ -157,18 +141,14 @@ def iter_tcs(self):
 
     @classmethod
     def new_tbl(cls, rows, cols, width):
-        """
-        Return a new `w:tbl` element having `rows` rows and `cols` columns
-        with `width` distributed evenly between the columns.
-        """
+        """Return a new `w:tbl` element having `rows` rows and `cols` columns with
+        `width` distributed evenly between the columns."""
         return parse_xml(cls._tbl_xml(rows, cols, width))
 
     @property
     def tblStyle_val(self):
-        """
-        Value of `w:tblPr/w:tblStyle/@w:val` (a table style id) or |None| if
-        not present.
-        """
+        """Value of `w:tblPr/w:tblStyle/@w:val` (a table style id) or |None| if not
+        present."""
         tblStyle = self.tblPr.tblStyle
         if tblStyle is None:
             return None
@@ -176,9 +156,9 @@ def tblStyle_val(self):
 
     @tblStyle_val.setter
     def tblStyle_val(self, styleId):
-        """
-        Set the value of `w:tblPr/w:tblStyle/@w:val` (a table style id) to
-        `styleId`. If `styleId` is None, remove the `w:tblStyle` element.
+        """Set the value of `w:tblPr/w:tblStyle/@w:val` (a table style id) to `styleId`.
+
+        If `styleId` is None, remove the `w:tblStyle` element.
         """
         tblPr = self.tblPr
         tblPr._remove_tblStyle()
@@ -239,45 +219,34 @@ def _tcs_xml(cls, col_count, col_width):
 
 
 class CT_TblGrid(BaseOxmlElement):
-    """
-    ``<w:tblGrid>`` element, child of ``<w:tbl>``, holds ``<w:gridCol>``
-    elements that define column count, width, etc.
-    """
+    """``<w:tblGrid>`` element, child of ``<w:tbl>``, holds ``<w:gridCol>`` elements
+    that define column count, width, etc."""
 
     gridCol = ZeroOrMore("w:gridCol", successors=("w:tblGridChange",))
 
 
 class CT_TblGridCol(BaseOxmlElement):
-    """
-    ``<w:gridCol>`` element, child of ``<w:tblGrid>``, defines a table
-    column.
-    """
+    """``<w:gridCol>`` element, child of ``<w:tblGrid>``, defines a table column."""
 
     w = OptionalAttribute("w:w", ST_TwipsMeasure)
 
     @property
     def gridCol_idx(self):
-        """
-        The index of this ``<w:gridCol>`` element within its parent
-        ``<w:tblGrid>`` element.
-        """
+        """The index of this ``<w:gridCol>`` element within its parent ``<w:tblGrid>``
+        element."""
         return self.getparent().gridCol_lst.index(self)
 
 
 class CT_TblLayoutType(BaseOxmlElement):
-    """
-    ``<w:tblLayout>`` element, specifying whether column widths are fixed or
-    can be automatically adjusted based on content.
-    """
+    """``<w:tblLayout>`` element, specifying whether column widths are fixed or can be
+    automatically adjusted based on content."""
 
     type = OptionalAttribute("w:type", ST_TblLayoutType)
 
 
 class CT_TblPr(BaseOxmlElement):
-    """
-    ``<w:tblPr>`` element, child of ``<w:tbl>``, holds child elements that
-    define table properties such as style and borders.
-    """
+    """``<w:tblPr>`` element, child of ``<w:tbl>``, holds child elements that define
+    table properties such as style and borders."""
 
     _tag_seq = (
         "w:tblStyle",
@@ -307,10 +276,10 @@ class CT_TblPr(BaseOxmlElement):
 
     @property
     def alignment(self):
-        """
-        Member of :ref:`WdRowAlignment` enumeration or |None|, based on the
-        contents of the `w:val` attribute of `./w:jc`. |None| if no `w:jc`
-        element is present.
+        """Member of :ref:`WdRowAlignment` enumeration or |None|, based on the contents
+        of the `w:val` attribute of `./w:jc`.
+
+        |None| if no `w:jc` element is present.
         """
         jc = self.jc
         if jc is None:
@@ -341,10 +310,8 @@ def autofit(self, value):
 
     @property
     def style(self):
-        """
-        Return the value of the ``val`` attribute of the ``<w:tblStyle>``
-        child or |None| if not present.
-        """
+        """Return the value of the ``val`` attribute of the ``<w:tblStyle>`` child or
+        |None| if not present."""
         tblStyle = self.tblStyle
         if tblStyle is None:
             return None
@@ -359,10 +326,8 @@ def style(self, value):
 
 
 class CT_TblWidth(BaseOxmlElement):
-    """
-    Used for ``<w:tblW>`` and ``<w:tcW>`` elements and many others, to
-    specify a table-related width.
-    """
+    """Used for ``<w:tblW>`` and ``<w:tcW>`` elements and many others, to specify a
+    table-related width."""
 
     # the type for `w` attr is actually ST_MeasurementOrPercent, but using
     # XsdInt for now because only dxa (twips) values are being used. It's not
@@ -372,10 +337,8 @@ class CT_TblWidth(BaseOxmlElement):
 
     @property
     def width(self):
-        """
-        Return the EMU length value represented by the combined ``w:w`` and
-        ``w:type`` attributes.
-        """
+        """Return the EMU length value represented by the combined ``w:w`` and
+        ``w:type`` attributes."""
         if self.type != "dxa":
             return None
         return Twips(self.w)
@@ -387,7 +350,7 @@ def width(self, value):
 
 
 class CT_Tc(BaseOxmlElement):
-    """`w:tc` table cell element"""
+    """`w:tc` table cell element."""
 
     tcPr = ZeroOrOne("w:tcPr")  # bunches of successors, overriding insert
     p = OneOrMore("w:p")
@@ -395,11 +358,10 @@ class CT_Tc(BaseOxmlElement):
 
     @property
     def bottom(self):
-        """
-        The row index that marks the bottom extent of the vertical span of
-        this cell. This is one greater than the index of the bottom-most row
-        of the span, similar to how a slice of the cell's rows would be
-        specified.
+        """The row index that marks the bottom extent of the vertical span of this cell.
+
+        This is one greater than the index of the bottom-most row of the span, similar
+        to how a slice of the cell's rows would be specified.
         """
         if self.vMerge is not None:
             tc_below = self._tc_below
@@ -408,12 +370,12 @@ def bottom(self):
         return self._tr_idx + 1
 
     def clear_content(self):
-        """
-        Remove all content child elements, preserving the ``<w:tcPr>``
-        element if present. Note that this leaves the ``<w:tc>`` element in
-        an invalid state because it doesn't contain at least one block-level
-        element. It's up to the caller to add a ``<w:p>``child element as the
-        last content element.
+        """Remove all content child elements, preserving the ``<w:tcPr>`` element if
+        present.
+
+        Note that this leaves the ``<w:tc>`` element in an invalid state because it
+        doesn't contain at least one block-level element. It's up to the caller to add a
+        ``<w:p>``child element as the last content element.
         """
         new_children = []
         tcPr = self.tcPr
@@ -423,9 +385,9 @@ def clear_content(self):
 
     @property
     def grid_span(self):
-        """
-        The integer number of columns this cell spans. Determined by
-        ./w:tcPr/w:gridSpan/@val, it defaults to 1.
+        """The integer number of columns this cell spans.
+
+        Determined by ./w:tcPr/w:gridSpan/@val, it defaults to 1.
         """
         tcPr = self.tcPr
         if tcPr is None:
@@ -438,10 +400,8 @@ def grid_span(self, value):
         tcPr.grid_span = value
 
     def iter_block_items(self):
-        """
-        Generate a reference to each of the block-level content elements in
-        this cell, in the order they appear.
-        """
+        """Generate a reference to each of the block-level content elements in this
+        cell, in the order they appear."""
         block_item_tags = (qn("w:p"), qn("w:tbl"), qn("w:sdt"))
         for child in self:
             if child.tag in block_item_tags:
@@ -449,17 +409,13 @@ def iter_block_items(self):
 
     @property
     def left(self):
-        """
-        The grid column index at which this ``<w:tc>`` element appears.
-        """
+        """The grid column index at which this ``<w:tc>`` element appears."""
         return self._grid_col
 
     def merge(self, other_tc):
-        """
-        Return the top-left ``<w:tc>`` element of a new span formed by
-        merging the rectangular region defined by using this tc element and
-        `other_tc` as diagonal corners.
-        """
+        """Return the top-left ``<w:tc>`` element of a new span formed by merging the
+        rectangular region defined by using this tc element and `other_tc` as diagonal
+        corners."""
         top, left, height, width = self._span_dimensions(other_tc)
         top_tc = self._tbl.tr_lst[top].tc_at_grid_col(left)
         top_tc._grow_to(width, height)
@@ -467,37 +423,31 @@ def merge(self, other_tc):
 
     @classmethod
     def new(cls):
-        """
-        Return a new ``<w:tc>`` element, containing an empty paragraph as the
-        required EG_BlockLevelElt.
-        """
+        """Return a new ``<w:tc>`` element, containing an empty paragraph as the
+        required EG_BlockLevelElt."""
         return parse_xml("<w:tc %s>\n" "  <w:p/>\n" "</w:tc>" % nsdecls("w"))
 
     @property
     def right(self):
-        """
-        The grid column index that marks the right-side extent of the
-        horizontal span of this cell. This is one greater than the index of
-        the right-most column of the span, similar to how a slice of the
-        cell's columns would be specified.
+        """The grid column index that marks the right-side extent of the horizontal span
+        of this cell.
+
+        This is one greater than the index of the right-most column of the span, similar
+        to how a slice of the cell's columns would be specified.
         """
         return self._grid_col + self.grid_span
 
     @property
     def top(self):
-        """
-        The top-most row index in the vertical span of this cell.
-        """
+        """The top-most row index in the vertical span of this cell."""
         if self.vMerge is None or self.vMerge == ST_Merge.RESTART:
             return self._tr_idx
         return self._tc_above.top
 
     @property
     def vMerge(self):
-        """
-        The value of the ./w:tcPr/w:vMerge/@val attribute, or |None| if the
-        w:vMerge element is not present.
-        """
+        """The value of the ./w:tcPr/w:vMerge/@val attribute, or |None| if the w:vMerge
+        element is not present."""
         tcPr = self.tcPr
         if tcPr is None:
             return None
@@ -510,10 +460,8 @@ def vMerge(self, value):
 
     @property
     def width(self):
-        """
-        Return the EMU length value represented in the ``./w:tcPr/w:tcW``
-        child element or |None| if not present.
-        """
+        """Return the EMU length value represented in the ``./w:tcPr/w:tcW`` child
+        element or |None| if not present."""
         tcPr = self.tcPr
         if tcPr is None:
             return None
@@ -525,29 +473,24 @@ def width(self, value):
         tcPr.width = value
 
     def _add_width_of(self, other_tc):
-        """
-        Add the width of `other_tc` to this cell. Does nothing if either this
-        tc or `other_tc` does not have a specified width.
+        """Add the width of `other_tc` to this cell.
+
+        Does nothing if either this tc or `other_tc` does not have a specified width.
         """
         if self.width and other_tc.width:
             self.width += other_tc.width
 
     @property
     def _grid_col(self):
-        """
-        The grid column at which this cell begins.
-        """
+        """The grid column at which this cell begins."""
         tr = self._tr
         idx = tr.tc_lst.index(self)
         preceding_tcs = tr.tc_lst[:idx]
         return sum(tc.grid_span for tc in preceding_tcs)
 
     def _grow_to(self, width, height, top_tc=None):
-        """
-        Grow this cell to `width` grid columns and `height` rows by expanding
-        horizontal spans and creating continuation cells to form vertical
-        spans.
-        """
+        """Grow this cell to `width` grid columns and `height` rows by expanding
+        horizontal spans and creating continuation cells to form vertical spans."""
 
         def vMerge_val(top_tc):
             if top_tc is not self:
@@ -562,19 +505,14 @@ def vMerge_val(top_tc):
             self._tc_below._grow_to(width, height - 1, top_tc)
 
     def _insert_tcPr(self, tcPr):
-        """
-        ``tcPr`` has a bunch of successors, but it comes first if it appears,
-        so just overriding and using insert(0, ...) rather than spelling out
-        successors.
-        """
+        """``tcPr`` has a bunch of successors, but it comes first if it appears, so just
+        overriding and using insert(0, ...) rather than spelling out successors."""
         self.insert(0, tcPr)
         return tcPr
 
     @property
     def _is_empty(self):
-        """
-        True if this cell contains only a single empty ``<w:p>`` element.
-        """
+        """True if this cell contains only a single empty ``<w:p>`` element."""
         block_items = list(self.iter_block_items())
         if len(block_items) > 1:
             return False
@@ -584,10 +522,8 @@ def _is_empty(self):
         return False
 
     def _move_content_to(self, other_tc):
-        """
-        Append the content of this cell to `other_tc`, leaving this cell with
-        a single empty ``<w:p>`` element.
-        """
+        """Append the content of this cell to `other_tc`, leaving this cell with a
+        single empty ``<w:p>`` element."""
         if other_tc is self:
             return
         if self._is_empty:
@@ -604,24 +540,18 @@ def _new_tbl(self):
 
     @property
     def _next_tc(self):
-        """
-        The `w:tc` element immediately following this one in this row, or
-        |None| if this is the last `w:tc` element in the row.
-        """
+        """The `w:tc` element immediately following this one in this row, or |None| if
+        this is the last `w:tc` element in the row."""
         following_tcs = self.xpath("./following-sibling::w:tc")
         return following_tcs[0] if following_tcs else None
 
     def _remove(self):
-        """
-        Remove this `w:tc` element from the XML tree.
-        """
+        """Remove this `w:tc` element from the XML tree."""
         self.getparent().remove(self)
 
     def _remove_trailing_empty_p(self):
-        """
-        Remove the last content element from this cell if it is an empty
-        ``<w:p>`` element.
-        """
+        """Remove the last content element from this cell if it is an empty ``<w:p>``
+        element."""
         block_items = list(self.iter_block_items())
         last_content_elm = block_items[-1]
         if last_content_elm.tag != qn("w:p"):
@@ -632,11 +562,9 @@ def _remove_trailing_empty_p(self):
         self.remove(p)
 
     def _span_dimensions(self, other_tc):
-        """
-        Return a (top, left, height, width) 4-tuple specifying the extents of
-        the merged cell formed by using this tc and `other_tc` as opposite
-        corner extents.
-        """
+        """Return a (top, left, height, width) 4-tuple specifying the extents of the
+        merged cell formed by using this tc and `other_tc` as opposite corner
+        extents."""
 
         def raise_on_inverted_L(a, b):
             if a.top == b.top and a.bottom != b.bottom:
@@ -664,15 +592,15 @@ def raise_on_tee_shaped(a, b):
         return top, left, bottom - top, right - left
 
     def _span_to_width(self, grid_width, top_tc, vMerge):
-        """
-        Incorporate and then remove `w:tc` elements to the right of this one
-        until this cell spans `grid_width`. Raises |ValueError| if
-        `grid_width` cannot be exactly achieved, such as when a merged cell
-        would drive the span width greater than `grid_width` or if not enough
-        grid columns are available to make this cell that wide. All content
-        from incorporated cells is appended to `top_tc`. The val attribute of
-        the vMerge element on the single remaining cell is set to `vMerge`.
-        If `vMerge` is |None|, the vMerge element is removed if present.
+        """Incorporate and then remove `w:tc` elements to the right of this one until
+        this cell spans `grid_width`.
+
+        Raises |ValueError| if `grid_width` cannot be exactly achieved, such as when a
+        merged cell would drive the span width greater than `grid_width` or if not
+        enough grid columns are available to make this cell that wide. All content from
+        incorporated cells is appended to `top_tc`. The val attribute of the vMerge
+        element on the single remaining cell is set to `vMerge`. If `vMerge` is |None|,
+        the vMerge element is removed if present.
         """
         self._move_content_to(top_tc)
         while self.grid_span < grid_width:
@@ -680,14 +608,14 @@ def _span_to_width(self, grid_width, top_tc, vMerge):
         self.vMerge = vMerge
 
     def _swallow_next_tc(self, grid_width, top_tc):
-        """
-        Extend the horizontal span of this `w:tc` element to incorporate the
-        following `w:tc` element in the row and then delete that following
-        `w:tc` element. Any content in the following `w:tc` element is
-        appended to the content of `top_tc`. The width of the following
-        `w:tc` element is added to this one, if present. Raises
-        |InvalidSpanError| if the width of the resulting cell is greater than
-        `grid_width` or if there is no next `<w:tc>` element in the row.
+        """Extend the horizontal span of this `w:tc` element to incorporate the
+        following `w:tc` element in the row and then delete that following `w:tc`
+        element.
+
+        Any content in the following `w:tc` element is appended to the content of
+        `top_tc`. The width of the following `w:tc` element is added to this one, if
+        present. Raises |InvalidSpanError| if the width of the resulting cell is greater
+        than `grid_width` or if there is no next `<w:tc>` element in the row.
         """
 
         def raise_on_invalid_swallow(next_tc):
@@ -705,23 +633,17 @@ def raise_on_invalid_swallow(next_tc):
 
     @property
     def _tbl(self):
-        """
-        The tbl element this tc element appears in.
-        """
+        """The tbl element this tc element appears in."""
         return self.xpath("./ancestor::w:tbl[position()=1]")[0]
 
     @property
     def _tc_above(self):
-        """
-        The `w:tc` element immediately above this one in its grid column.
-        """
+        """The `w:tc` element immediately above this one in its grid column."""
         return self._tr_above.tc_at_grid_col(self._grid_col)
 
     @property
     def _tc_below(self):
-        """
-        The tc element immediately below this one in its grid column.
-        """
+        """The tc element immediately below this one in its grid column."""
         tr_below = self._tr_below
         if tr_below is None:
             return None
@@ -729,15 +651,13 @@ def _tc_below(self):
 
     @property
     def _tr(self):
-        """
-        The tr element this tc element appears in.
-        """
+        """The tr element this tc element appears in."""
         return self.xpath("./ancestor::w:tr[position()=1]")[0]
 
     @property
     def _tr_above(self):
-        """
-        The tr element prior in sequence to the tr this cell appears in.
+        """The tr element prior in sequence to the tr this cell appears in.
+
         Raises |ValueError| if called on a cell in the top-most row.
         """
         tr_lst = self._tbl.tr_lst
@@ -748,10 +668,8 @@ def _tr_above(self):
 
     @property
     def _tr_below(self):
-        """
-        The tr element next in sequence after the tr this cell appears in, or
-        |None| if this cell appears in the last row.
-        """
+        """The tr element next in sequence after the tr this cell appears in, or |None|
+        if this cell appears in the last row."""
         tr_lst = self._tbl.tr_lst
         tr_idx = tr_lst.index(self._tr)
         try:
@@ -761,16 +679,12 @@ def _tr_below(self):
 
     @property
     def _tr_idx(self):
-        """
-        The row index of the tr element this tc element appears in.
-        """
+        """The row index of the tr element this tc element appears in."""
         return self._tbl.tr_lst.index(self._tr)
 
 
 class CT_TcPr(BaseOxmlElement):
-    """
-    ``<w:tcPr>`` element, defining table cell properties
-    """
+    """``<w:tcPr>`` element, defining table cell properties."""
 
     _tag_seq = (
         "w:cnfStyle",
@@ -800,9 +714,9 @@ class CT_TcPr(BaseOxmlElement):
 
     @property
     def grid_span(self):
-        """
-        The integer number of columns this cell spans. Determined by
-        ./w:gridSpan/@val, it defaults to 1.
+        """The integer number of columns this cell spans.
+
+        Determined by ./w:gridSpan/@val, it defaults to 1.
         """
         gridSpan = self.gridSpan
         if gridSpan is None:
@@ -819,8 +733,8 @@ def grid_span(self, value):
     def vAlign_val(self):
         """Value of `w:val` attribute on  `w:vAlign` child.
 
-        Value is |None| if `w:vAlign` child is not present. The `w:val`
-        attribute on `w:vAlign` is required.
+        Value is |None| if `w:vAlign` child is not present. The `w:val` attribute on
+        `w:vAlign` is required.
         """
         vAlign = self.vAlign
         if vAlign is None:
@@ -836,10 +750,8 @@ def vAlign_val(self, value):
 
     @property
     def vMerge_val(self):
-        """
-        The value of the ./w:vMerge/@val attribute, or |None| if the
-        w:vMerge element is not present.
-        """
+        """The value of the ./w:vMerge/@val attribute, or |None| if the w:vMerge element
+        is not present."""
         vMerge = self.vMerge
         if vMerge is None:
             return None
@@ -853,10 +765,8 @@ def vMerge_val(self, value):
 
     @property
     def width(self):
-        """
-        Return the EMU length value represented in the ``<w:tcW>`` child
-        element or |None| if not present or its type is not 'dxa'.
-        """
+        """Return the EMU length value represented in the ``<w:tcW>`` child element or
+        |None| if not present or its type is not 'dxa'."""
         tcW = self.tcW
         if tcW is None:
             return None
@@ -869,9 +779,7 @@ def width(self, value):
 
 
 class CT_TrPr(BaseOxmlElement):
-    """
-    ``<w:trPr>`` element, defining table row properties
-    """
+    """``<w:trPr>`` element, defining table row properties."""
 
     _tag_seq = (
         "w:cnfStyle",
@@ -895,9 +803,7 @@ class CT_TrPr(BaseOxmlElement):
 
     @property
     def trHeight_hRule(self):
-        """
-        Return the value of `w:trHeight@w:hRule`, or |None| if not present.
-        """
+        """Return the value of `w:trHeight@w:hRule`, or |None| if not present."""
         trHeight = self.trHeight
         if trHeight is None:
             return None
@@ -912,9 +818,7 @@ def trHeight_hRule(self, value):
 
     @property
     def trHeight_val(self):
-        """
-        Return the value of `w:trHeight@w:val`, or |None| if not present.
-        """
+        """Return the value of `w:trHeight@w:val`, or |None| if not present."""
         trHeight = self.trHeight
         if trHeight is None:
             return None
@@ -935,8 +839,6 @@ class CT_VerticalJc(BaseOxmlElement):
 
 
 class CT_VMerge(BaseOxmlElement):
-    """
-    ``<w:vMerge>`` element, specifying vertical merging behavior of a cell.
-    """
+    """``<w:vMerge>`` element, specifying vertical merging behavior of a cell."""
 
     val = OptionalAttribute("w:val", ST_Merge, default=ST_Merge.CONTINUE)
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 75c7f1b71..45b2335e0 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -19,46 +19,34 @@
 
 
 class CT_Color(BaseOxmlElement):
-    """
-    `w:color` element, specifying the color of a font and perhaps other
-    objects.
-    """
+    """`w:color` element, specifying the color of a font and perhaps other objects."""
 
     val = RequiredAttribute("w:val", ST_HexColor)
     themeColor = OptionalAttribute("w:themeColor", MSO_THEME_COLOR)
 
 
 class CT_Fonts(BaseOxmlElement):
-    """
-    ``<w:rFonts>`` element, specifying typeface name for the various language
-    types.
-    """
+    """``<w:rFonts>`` element, specifying typeface name for the various language
+    types."""
 
     ascii = OptionalAttribute("w:ascii", ST_String)
     hAnsi = OptionalAttribute("w:hAnsi", ST_String)
 
 
 class CT_Highlight(BaseOxmlElement):
-    """
-    `w:highlight` element, specifying font highlighting/background color.
-    """
+    """`w:highlight` element, specifying font highlighting/background color."""
 
     val = RequiredAttribute("w:val", WD_COLOR)
 
 
 class CT_HpsMeasure(BaseOxmlElement):
-    """
-    Used for ``<w:sz>`` element and others, specifying font size in
-    half-points.
-    """
+    """Used for ``<w:sz>`` element and others, specifying font size in half-points."""
 
     val = RequiredAttribute("w:val", ST_HpsMeasure)
 
 
 class CT_RPr(BaseOxmlElement):
-    """
-    ``<w:rPr>`` element, containing the properties for a run.
-    """
+    """``<w:rPr>`` element, containing the properties for a run."""
 
     _tag_seq = (
         "w:rStyle",
@@ -131,18 +119,13 @@ class CT_RPr(BaseOxmlElement):
     del _tag_seq
 
     def _new_color(self):
-        """
-        Override metaclass method to set `w:color/@val` to RGB black on
-        create.
-        """
+        """Override metaclass method to set `w:color/@val` to RGB black on create."""
         return parse_xml('<w:color %s w:val="000000"/>' % nsdecls("w"))
 
     @property
     def highlight_val(self):
-        """
-        Value of `w:highlight/@val` attribute, specifying a font's highlight
-        color, or `None` if the text is not highlighted.
-        """
+        """Value of `w:highlight/@val` attribute, specifying a font's highlight color,
+        or `None` if the text is not highlighted."""
         highlight = self.highlight
         if highlight is None:
             return None
@@ -158,11 +141,11 @@ def highlight_val(self, value):
 
     @property
     def rFonts_ascii(self):
-        """
-        The value of `w:rFonts/@w:ascii` or |None| if not present. Represents
-        the assigned typeface name. The rFonts element also specifies other
-        special-case typeface names; this method handles the case where just
-        the common name is required.
+        """The value of `w:rFonts/@w:ascii` or |None| if not present.
+
+        Represents the assigned typeface name. The rFonts element also specifies other
+        special-case typeface names; this method handles the case where just the common
+        name is required.
         """
         rFonts = self.rFonts
         if rFonts is None:
@@ -179,9 +162,7 @@ def rFonts_ascii(self, value):
 
     @property
     def rFonts_hAnsi(self):
-        """
-        The value of `w:rFonts/@w:hAnsi` or |None| if not present.
-        """
+        """The value of `w:rFonts/@w:hAnsi` or |None| if not present."""
         rFonts = self.rFonts
         if rFonts is None:
             return None
@@ -196,10 +177,8 @@ def rFonts_hAnsi(self, value):
 
     @property
     def style(self):
-        """
-        String contained in <w:rStyle> child, or None if that element is not
-        present.
-        """
+        """String contained in <w:rStyle> child, or None if that element is not
+        present."""
         rStyle = self.rStyle
         if rStyle is None:
             return None
@@ -207,10 +186,10 @@ def style(self):
 
     @style.setter
     def style(self, style):
-        """
-        Set val attribute of <w:rStyle> child element to `style`, adding a
-        new element if necessary. If `style` is |None|, remove the <w:rStyle>
-        element if present.
+        """Set val attribute of <w:rStyle> child element to `style`, adding a new
+        element if necessary.
+
+        If `style` is |None|, remove the <w:rStyle> element if present.
         """
         if style is None:
             self._remove_rStyle()
@@ -221,9 +200,9 @@ def style(self, style):
 
     @property
     def subscript(self):
-        """
-        |True| if `w:vertAlign/@w:val` is 'subscript'. |False| if
-        `w:vertAlign/@w:val` contains any other value. |None| if
+        """|True| if `w:vertAlign/@w:val` is 'subscript'.
+
+        |False| if `w:vertAlign/@w:val` contains any other value. |None| if
         `w:vertAlign` is not present.
         """
         vertAlign = self.vertAlign
@@ -246,9 +225,9 @@ def subscript(self, value):
 
     @property
     def superscript(self):
-        """
-        |True| if `w:vertAlign/@w:val` is 'superscript'. |False| if
-        `w:vertAlign/@w:val` contains any other value. |None| if
+        """|True| if `w:vertAlign/@w:val` is 'superscript'.
+
+        |False| if `w:vertAlign/@w:val` contains any other value. |None| if
         `w:vertAlign` is not present.
         """
         vertAlign = self.vertAlign
@@ -271,9 +250,7 @@ def superscript(self, value):
 
     @property
     def sz_val(self):
-        """
-        The value of `w:sz/@w:val` or |None| if not present.
-        """
+        """The value of `w:sz/@w:val` or |None| if not present."""
         sz = self.sz
         if sz is None:
             return None
@@ -289,9 +266,7 @@ def sz_val(self, value):
 
     @property
     def u_val(self):
-        """
-        Value of `w:u/@val`, or None if not present.
-        """
+        """Value of `w:u/@val`, or None if not present."""
         u = self.u
         if u is None:
             return None
@@ -304,10 +279,8 @@ def u_val(self, value):
             self._add_u().val = value
 
     def _get_bool_val(self, name):
-        """
-        Return the value of the boolean child element having `name`, e.g.
-        'b', 'i', and 'smallCaps'.
-        """
+        """Return the value of the boolean child element having `name`, e.g. 'b', 'i',
+        and 'smallCaps'."""
         element = getattr(self, name)
         if element is None:
             return None
@@ -322,15 +295,11 @@ def _set_bool_val(self, name, value):
 
 
 class CT_Underline(BaseOxmlElement):
-    """
-    ``<w:u>`` element, specifying the underlining style for a run.
-    """
+    """``<w:u>`` element, specifying the underlining style for a run."""
 
     @property
     def val(self):
-        """
-        The underline type corresponding to the ``w:val`` attribute value.
-        """
+        """The underline type corresponding to the ``w:val`` attribute value."""
         val = self.get(qn("w:val"))
         underline = WD_UNDERLINE.from_xml(val)
         if underline == WD_UNDERLINE.SINGLE:
@@ -354,8 +323,6 @@ def val(self, value):
 
 
 class CT_VerticalAlignRun(BaseOxmlElement):
-    """
-    ``<w:vertAlign>`` element, specifying subscript or superscript.
-    """
+    """``<w:vertAlign>`` element, specifying subscript or superscript."""
 
     val = RequiredAttribute("w:val", ST_VerticalAlignRun)
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index e459d4dfa..255a71f36 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -18,9 +18,7 @@
 
 
 class CT_Ind(BaseOxmlElement):
-    """
-    ``<w:ind>`` element, specifying paragraph indentation.
-    """
+    """``<w:ind>`` element, specifying paragraph indentation."""
 
     left = OptionalAttribute("w:left", ST_SignedTwipsMeasure)
     right = OptionalAttribute("w:right", ST_SignedTwipsMeasure)
@@ -29,17 +27,13 @@ class CT_Ind(BaseOxmlElement):
 
 
 class CT_Jc(BaseOxmlElement):
-    """
-    ``<w:jc>`` element, specifying paragraph justification.
-    """
+    """``<w:jc>`` element, specifying paragraph justification."""
 
     val = RequiredAttribute("w:val", WD_ALIGN_PARAGRAPH)
 
 
 class CT_PPr(BaseOxmlElement):
-    """
-    ``<w:pPr>`` element, containing the properties for a paragraph.
-    """
+    """``<w:pPr>`` element, containing the properties for a paragraph."""
 
     _tag_seq = (
         "w:pStyle",
@@ -94,10 +88,10 @@ class CT_PPr(BaseOxmlElement):
 
     @property
     def first_line_indent(self):
-        """
-        A |Length| value calculated from the values of `w:ind/@w:firstLine`
-        and `w:ind/@w:hanging`. Returns |None| if the `w:ind` child is not
-        present.
+        """A |Length| value calculated from the values of `w:ind/@w:firstLine` and
+        `w:ind/@w:hanging`.
+
+        Returns |None| if the `w:ind` child is not present.
         """
         ind = self.ind
         if ind is None:
@@ -125,9 +119,7 @@ def first_line_indent(self, value):
 
     @property
     def ind_left(self):
-        """
-        The value of `w:ind/@w:left` or |None| if not present.
-        """
+        """The value of `w:ind/@w:left` or |None| if not present."""
         ind = self.ind
         if ind is None:
             return None
@@ -142,9 +134,7 @@ def ind_left(self, value):
 
     @property
     def ind_right(self):
-        """
-        The value of `w:ind/@w:right` or |None| if not present.
-        """
+        """The value of `w:ind/@w:right` or |None| if not present."""
         ind = self.ind
         if ind is None:
             return None
@@ -159,9 +149,7 @@ def ind_right(self, value):
 
     @property
     def jc_val(self):
-        """
-        The value of the ``<w:jc>`` child element or |None| if not present.
-        """
+        """The value of the ``<w:jc>`` child element or |None| if not present."""
         jc = self.jc
         if jc is None:
             return None
@@ -176,9 +164,7 @@ def jc_val(self, value):
 
     @property
     def keepLines_val(self):
-        """
-        The value of `keepLines/@val` or |None| if not present.
-        """
+        """The value of `keepLines/@val` or |None| if not present."""
         keepLines = self.keepLines
         if keepLines is None:
             return None
@@ -193,9 +179,7 @@ def keepLines_val(self, value):
 
     @property
     def keepNext_val(self):
-        """
-        The value of `keepNext/@val` or |None| if not present.
-        """
+        """The value of `keepNext/@val` or |None| if not present."""
         keepNext = self.keepNext
         if keepNext is None:
             return None
@@ -210,9 +194,7 @@ def keepNext_val(self, value):
 
     @property
     def pageBreakBefore_val(self):
-        """
-        The value of `pageBreakBefore/@val` or |None| if not present.
-        """
+        """The value of `pageBreakBefore/@val` or |None| if not present."""
         pageBreakBefore = self.pageBreakBefore
         if pageBreakBefore is None:
             return None
@@ -227,9 +209,7 @@ def pageBreakBefore_val(self, value):
 
     @property
     def spacing_after(self):
-        """
-        The value of `w:spacing/@w:after` or |None| if not present.
-        """
+        """The value of `w:spacing/@w:after` or |None| if not present."""
         spacing = self.spacing
         if spacing is None:
             return None
@@ -243,9 +223,7 @@ def spacing_after(self, value):
 
     @property
     def spacing_before(self):
-        """
-        The value of `w:spacing/@w:before` or |None| if not present.
-        """
+        """The value of `w:spacing/@w:before` or |None| if not present."""
         spacing = self.spacing
         if spacing is None:
             return None
@@ -259,9 +237,7 @@ def spacing_before(self, value):
 
     @property
     def spacing_line(self):
-        """
-        The value of `w:spacing/@w:line` or |None| if not present.
-        """
+        """The value of `w:spacing/@w:line` or |None| if not present."""
         spacing = self.spacing
         if spacing is None:
             return None
@@ -275,12 +251,13 @@ def spacing_line(self, value):
 
     @property
     def spacing_lineRule(self):
-        """
-        The value of `w:spacing/@w:lineRule` as a member of the
-        :ref:`WdLineSpacing` enumeration. Only the `MULTIPLE`, `EXACTLY`, and
-        `AT_LEAST` members are used. It is the responsibility of the client
-        to calculate the use of `SINGLE`, `DOUBLE`, and `MULTIPLE` based on
-        the value of `w:spacing/@w:line` if that behavior is desired.
+        """The value of `w:spacing/@w:lineRule` as a member of the :ref:`WdLineSpacing`
+        enumeration.
+
+        Only the `MULTIPLE`, `EXACTLY`, and `AT_LEAST` members are used. It is the
+        responsibility of the client to calculate the use of `SINGLE`, `DOUBLE`, and
+        `MULTIPLE` based on the value of `w:spacing/@w:line` if that behavior is
+        desired.
         """
         spacing = self.spacing
         if spacing is None:
@@ -298,10 +275,8 @@ def spacing_lineRule(self, value):
 
     @property
     def style(self):
-        """
-        String contained in <w:pStyle> child, or None if that element is not
-        present.
-        """
+        """String contained in <w:pStyle> child, or None if that element is not
+        present."""
         pStyle = self.pStyle
         if pStyle is None:
             return None
@@ -309,10 +284,10 @@ def style(self):
 
     @style.setter
     def style(self, style):
-        """
-        Set val attribute of <w:pStyle> child element to `style`, adding a
-        new element if necessary. If `style` is |None|, remove the <w:pStyle>
-        element if present.
+        """Set val attribute of <w:pStyle> child element to `style`, adding a new
+        element if necessary.
+
+        If `style` is |None|, remove the <w:pStyle> element if present.
         """
         if style is None:
             self._remove_pStyle()
@@ -322,9 +297,7 @@ def style(self, style):
 
     @property
     def widowControl_val(self):
-        """
-        The value of `widowControl/@val` or |None| if not present.
-        """
+        """The value of `widowControl/@val` or |None| if not present."""
         widowControl = self.widowControl
         if widowControl is None:
             return None
@@ -339,10 +312,8 @@ def widowControl_val(self, value):
 
 
 class CT_Spacing(BaseOxmlElement):
-    """
-    ``<w:spacing>`` element, specifying paragraph spacing attributes such as
-    space before and line spacing.
-    """
+    """``<w:spacing>`` element, specifying paragraph spacing attributes such as space
+    before and line spacing."""
 
     after = OptionalAttribute("w:after", ST_TwipsMeasure)
     before = OptionalAttribute("w:before", ST_TwipsMeasure)
@@ -359,16 +330,12 @@ class CT_TabStop(BaseOxmlElement):
 
 
 class CT_TabStops(BaseOxmlElement):
-    """
-    ``<w:tabs>`` element, container for a sorted sequence of tab stops.
-    """
+    """``<w:tabs>`` element, container for a sorted sequence of tab stops."""
 
     tab = OneOrMore("w:tab", successors=())
 
     def insert_tab_in_order(self, pos, align, leader):
-        """
-        Insert a newly created `w:tab` child element in `pos` order.
-        """
+        """Insert a newly created `w:tab` child element in `pos` order."""
         new_tab = self._new_tab()
         new_tab.pos, new_tab.val, new_tab.leader = pos, align, leader
         for tab in self.tab_lst:
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index f4504a1cd..57a095730 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -11,19 +11,17 @@
 
 
 def serialize_for_reading(element):
-    """
-    Serialize `element` to human-readable XML suitable for tests. No XML
-    declaration.
+    """Serialize `element` to human-readable XML suitable for tests.
+
+    No XML declaration.
     """
     xml = etree.tostring(element, encoding="unicode", pretty_print=True)
     return XmlString(xml)
 
 
 class XmlString(str):
-    """
-    Provides string comparison override suitable for serialized XML that is
-    useful for tests.
-    """
+    """Provides string comparison override suitable for serialized XML that is useful
+    for tests."""
 
     # '    <w:xyz xmlns:a="http://ns/decl/a" attr_name="val">text</w:xyz>'
     # |          |                                          ||           |
@@ -47,19 +45,17 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
     def _attr_seq(self, attrs):
-        """
-        Return a sequence of attribute strings parsed from `attrs`. Each
-        attribute string is stripped of whitespace on both ends.
+        """Return a sequence of attribute strings parsed from `attrs`.
+
+        Each attribute string is stripped of whitespace on both ends.
         """
         attrs = attrs.strip()
         attr_lst = attrs.split()
         return sorted(attr_lst)
 
     def _eq_elm_strs(self, line, line_2):
-        """
-        Return True if the element in `line_2` is XML equivalent to the
-        element in `line`.
-        """
+        """Return True if the element in `line_2` is XML equivalent to the element in
+        `line`."""
         front, attrs, close, text = self._parse_line(line)
         front_2, attrs_2, close_2, text_2 = self._parse_line(line_2)
         if front != front_2:
@@ -74,10 +70,8 @@ def _eq_elm_strs(self, line, line_2):
 
     @classmethod
     def _parse_line(cls, line):
-        """
-        Return front, attrs, close, text 4-tuple result of parsing XML element
-        string `line`.
-        """
+        """Return front, attrs, close, text 4-tuple result of parsing XML element string
+        `line`."""
         match = cls._xml_elm_line_patt.match(line)
         front, attrs, close, text = [match.group(n) for n in range(1, 5)]
         return front, attrs, close, text
@@ -102,10 +96,8 @@ def __init__(cls, clsname, bases, clsdict):
 
 
 class BaseAttribute(object):
-    """
-    Base class for OptionalAttribute and RequiredAttribute, providing common
-    methods.
-    """
+    """Base class for OptionalAttribute and RequiredAttribute, providing common
+    methods."""
 
     def __init__(self, attr_name, simple_type):
         super(BaseAttribute, self).__init__()
@@ -113,20 +105,16 @@ def __init__(self, attr_name, simple_type):
         self._simple_type = simple_type
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._prop_name = prop_name
 
         self._add_attr_property()
 
     def _add_attr_property(self):
-        """
-        Add a read/write ``{prop_name}`` property to the element class that
-        returns the interpreted value of this attribute on access and changes
-        the attribute value to its ST_* counterpart on assignment.
-        """
+        """Add a read/write ``{prop_name}`` property to the element class that returns
+        the interpreted value of this attribute on access and changes the attribute
+        value to its ST_* counterpart on assignment."""
         property_ = property(self._getter, self._setter, None)
         # assign unconditionally to overwrite element name definition
         setattr(self._element_cls, self._prop_name, property_)
@@ -139,9 +127,9 @@ def _clark_name(self):
 
 
 class OptionalAttribute(BaseAttribute):
-    """
-    Defines an optional attribute on a custom element class. An optional
-    attribute returns a default value when not present for reading. When
+    """Defines an optional attribute on a custom element class.
+
+    An optional attribute returns a default value when not present for reading. When
     assigned |None|, the attribute is removed.
     """
 
@@ -151,10 +139,8 @@ def __init__(self, attr_name, simple_type, default=None):
 
     @property
     def _getter(self):
-        """
-        Return a function object suitable for the "get" side of the attribute
-        property descriptor.
-        """
+        """Return a function object suitable for the "get" side of the attribute
+        property descriptor."""
 
         def get_attr_value(obj):
             attr_str_value = obj.get(self._clark_name)
@@ -167,10 +153,8 @@ def get_attr_value(obj):
 
     @property
     def _docstring(self):
-        """
-        Return the string to use as the ``__doc__`` attribute of the property
-        for this attribute.
-        """
+        """Return the string to use as the ``__doc__`` attribute of the property for
+        this attribute."""
         return (
             "%s type-converted value of ``%s`` attribute, or |None| (or spec"
             "ified default value) if not present. Assigning the default valu"
@@ -180,10 +164,8 @@ def _docstring(self):
 
     @property
     def _setter(self):
-        """
-        Return a function object suitable for the "set" side of the attribute
-        property descriptor.
-        """
+        """Return a function object suitable for the "set" side of the attribute
+        property descriptor."""
 
         def set_attr_value(obj, value):
             if value is None or value == self._default:
@@ -197,21 +179,19 @@ def set_attr_value(obj, value):
 
 
 class RequiredAttribute(BaseAttribute):
-    """
-    Defines a required attribute on a custom element class. A required
-    attribute is assumed to be present for reading, so does not have
-    a default value; its actual value is always used. If missing on read,
-    an |InvalidXmlError| is raised. It also does not remove the attribute if
-    |None| is assigned. Assigning |None| raises |TypeError| or |ValueError|,
-    depending on the simple type of the attribute.
+    """Defines a required attribute on a custom element class.
+
+    A required attribute is assumed to be present for reading, so does not have a
+    default value; its actual value is always used. If missing on read, an
+    |InvalidXmlError| is raised. It also does not remove the attribute if |None| is
+    assigned. Assigning |None| raises |TypeError| or |ValueError|, depending on the
+    simple type of the attribute.
     """
 
     @property
     def _getter(self):
-        """
-        Return a function object suitable for the "get" side of the attribute
-        property descriptor.
-        """
+        """Return a function object suitable for the "get" side of the attribute
+        property descriptor."""
 
         def get_attr_value(obj):
             attr_str_value = obj.get(self._clark_name)
@@ -227,10 +207,8 @@ def get_attr_value(obj):
 
     @property
     def _docstring(self):
-        """
-        Return the string to use as the ``__doc__`` attribute of the property
-        for this attribute.
-        """
+        """Return the string to use as the ``__doc__`` attribute of the property for
+        this attribute."""
         return "%s type-converted value of ``%s`` attribute." % (
             self._simple_type.__name__,
             self._attr_name,
@@ -238,10 +216,8 @@ def _docstring(self):
 
     @property
     def _setter(self):
-        """
-        Return a function object suitable for the "set" side of the attribute
-        property descriptor.
-        """
+        """Return a function object suitable for the "set" side of the attribute
+        property descriptor."""
 
         def set_attr_value(obj, value):
             str_value = self._simple_type.to_xml(value)
@@ -251,10 +227,8 @@ def set_attr_value(obj, value):
 
 
 class _BaseChildElement(object):
-    """
-    Base class for the child element classes corresponding to varying
-    cardinalities, such as ZeroOrOne and ZeroOrMore.
-    """
+    """Base class for the child element classes corresponding to varying cardinalities,
+    such as ZeroOrOne and ZeroOrMore."""
 
     def __init__(self, nsptagname, successors=()):
         super(_BaseChildElement, self).__init__()
@@ -262,18 +236,12 @@ def __init__(self, nsptagname, successors=()):
         self._successors = successors
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Baseline behavior for adding the appropriate methods to
-        `element_cls`.
-        """
+        """Baseline behavior for adding the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._prop_name = prop_name
 
     def _add_adder(self):
-        """
-        Add an ``_add_x()`` method to the element class for this child
-        element.
-        """
+        """Add an ``_add_x()`` method to the element class for this child element."""
 
         def _add_child(obj, **attrs):
             new_method = getattr(obj, self._new_method_name)
@@ -291,10 +259,8 @@ def _add_child(obj, **attrs):
         self._add_to_class(self._add_method_name, _add_child)
 
     def _add_creator(self):
-        """
-        Add a ``_new_{prop_name}()`` method to the element class that creates
-        a new, empty element of the correct type, having no attributes.
-        """
+        """Add a ``_new_{prop_name}()`` method to the element class that creates a new,
+        empty element of the correct type, having no attributes."""
         creator = self._creator
         creator.__doc__ = (
             'Return a "loose", newly created ``<%s>`` element having no attri'
@@ -303,19 +269,14 @@ def _add_creator(self):
         self._add_to_class(self._new_method_name, creator)
 
     def _add_getter(self):
-        """
-        Add a read-only ``{prop_name}`` property to the element class for
-        this child element.
-        """
+        """Add a read-only ``{prop_name}`` property to the element class for this child
+        element."""
         property_ = property(self._getter, None, None)
         # assign unconditionally to overwrite element name definition
         setattr(self._element_cls, self._prop_name, property_)
 
     def _add_inserter(self):
-        """
-        Add an ``_insert_x()`` method to the element class for this child
-        element.
-        """
+        """Add an ``_insert_x()`` method to the element class for this child element."""
 
         def _insert_child(obj, child):
             obj.insert_element_before(child, *self._successors)
@@ -328,10 +289,8 @@ def _insert_child(obj, child):
         self._add_to_class(self._insert_method_name, _insert_child)
 
     def _add_list_getter(self):
-        """
-        Add a read-only ``{prop_name}_lst`` property to the element class to
-        retrieve a list of child elements matching this type.
-        """
+        """Add a read-only ``{prop_name}_lst`` property to the element class to retrieve
+        a list of child elements matching this type."""
         prop_name = "%s_lst" % self._prop_name
         property_ = property(self._list_getter, None, None)
         setattr(self._element_cls, prop_name, property_)
@@ -341,9 +300,7 @@ def _add_method_name(self):
         return "_add_%s" % self._prop_name
 
     def _add_public_adder(self):
-        """
-        Add a public ``add_x()`` method to the parent element class.
-        """
+        """Add a public ``add_x()`` method to the parent element class."""
 
         def add_child(obj):
             private_add_method = getattr(obj, self._add_method_name)
@@ -357,20 +314,16 @@ def add_child(obj):
         self._add_to_class(self._public_add_method_name, add_child)
 
     def _add_to_class(self, name, method):
-        """
-        Add `method` to the target class as `name`, unless `name` is already
-        defined on the class.
-        """
+        """Add `method` to the target class as `name`, unless `name` is already defined
+        on the class."""
         if hasattr(self._element_cls, name):
             return
         setattr(self._element_cls, name, method)
 
     @property
     def _creator(self):
-        """
-        Return a function object that creates a new, empty element of the
-        right type, having no attributes.
-        """
+        """Return a function object that creates a new, empty element of the right type,
+        having no attributes."""
 
         def new_child_element(obj):
             return OxmlElement(self._nsptagname)
@@ -379,10 +332,11 @@ def new_child_element(obj):
 
     @property
     def _getter(self):
-        """
-        Return a function object suitable for the "get" side of the property
-        descriptor. This default getter returns the child element with
-        matching tag name or |None| if not present.
+        """Return a function object suitable for the "get" side of the property
+        descriptor.
+
+        This default getter returns the child element with matching tag name or |None|
+        if not present.
         """
 
         def get_child_element(obj):
@@ -399,10 +353,8 @@ def _insert_method_name(self):
 
     @property
     def _list_getter(self):
-        """
-        Return a function object suitable for the "get" side of a list
-        property descriptor.
-        """
+        """Return a function object suitable for the "get" side of a list property
+        descriptor."""
 
         def get_child_element_list(obj):
             return obj.findall(qn(self._nsptagname))
@@ -415,11 +367,11 @@ def get_child_element_list(obj):
 
     @lazyproperty
     def _public_add_method_name(self):
-        """
-        add_childElement() is public API for a repeating element, allowing
-        new elements to be added to the sequence. May be overridden to
-        provide a friendlier API to clients having domain appropriate
-        parameter names for required attributes.
+        """add_childElement() is public API for a repeating element, allowing new
+        elements to be added to the sequence.
+
+        May be overridden to provide a friendlier API to clients having domain
+        appropriate parameter names for required attributes.
         """
         return "add_%s" % self._prop_name
 
@@ -433,19 +385,15 @@ def _new_method_name(self):
 
 
 class Choice(_BaseChildElement):
-    """
-    Defines a child element belonging to a group, only one of which may
-    appear as a child.
-    """
+    """Defines a child element belonging to a group, only one of which may appear as a
+    child."""
 
     @property
     def nsptagname(self):
         return self._nsptagname
 
     def populate_class_members(self, element_cls, group_prop_name, successors):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._group_prop_name = group_prop_name
         self._successors = successors
@@ -457,10 +405,8 @@ def populate_class_members(self, element_cls, group_prop_name, successors):
         self._add_get_or_change_to_method()
 
     def _add_get_or_change_to_method(self):
-        """
-        Add a ``get_or_change_to_x()`` method to the element class for this
-        child element.
-        """
+        """Add a ``get_or_change_to_x()`` method to the element class for this child
+        element."""
 
         def get_or_change_to_child(obj):
             child = getattr(obj, self._prop_name)
@@ -479,7 +425,7 @@ def get_or_change_to_child(obj):
 
     @property
     def _prop_name(self):
-        """property name computed from tag name, e.g. a:schemeClr -> schemeClr."""
+        """Property name computed from tag name, e.g. a:schemeClr -> schemeClr."""
         start = self._nsptagname.index(":") + 1 if ":" in self._nsptagname else 0
         return self._nsptagname[start:]
 
@@ -493,26 +439,20 @@ def _remove_group_method_name(self):
 
 
 class OneAndOnlyOne(_BaseChildElement):
-    """
-    Defines a required child element for MetaOxmlElement.
-    """
+    """Defines a required child element for MetaOxmlElement."""
 
     def __init__(self, nsptagname):
         super(OneAndOnlyOne, self).__init__(nsptagname, None)
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         super(OneAndOnlyOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
 
     @property
     def _getter(self):
-        """
-        Return a function object suitable for the "get" side of the property
-        descriptor.
-        """
+        """Return a function object suitable for the "get" side of the property
+        descriptor."""
 
         def get_child_element(obj):
             child = obj.find(qn(self._nsptagname))
@@ -529,15 +469,11 @@ def get_child_element(obj):
 
 
 class OneOrMore(_BaseChildElement):
-    """
-    Defines a repeating child element for MetaOxmlElement that must appear at
-    least once.
-    """
+    """Defines a repeating child element for MetaOxmlElement that must appear at least
+    once."""
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         super(OneOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
         self._add_creator()
@@ -548,14 +484,10 @@ def populate_class_members(self, element_cls, prop_name):
 
 
 class ZeroOrMore(_BaseChildElement):
-    """
-    Defines an optional repeating child element for MetaOxmlElement.
-    """
+    """Defines an optional repeating child element for MetaOxmlElement."""
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         super(ZeroOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
         self._add_creator()
@@ -566,14 +498,10 @@ def populate_class_members(self, element_cls, prop_name):
 
 
 class ZeroOrOne(_BaseChildElement):
-    """
-    Defines an optional child element for MetaOxmlElement.
-    """
+    """Defines an optional child element for MetaOxmlElement."""
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         super(ZeroOrOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
         self._add_creator()
@@ -583,10 +511,8 @@ def populate_class_members(self, element_cls, prop_name):
         self._add_remover()
 
     def _add_get_or_adder(self):
-        """
-        Add a ``get_or_add_x()`` method to the element class for this
-        child element.
-        """
+        """Add a ``get_or_add_x()`` method to the element class for this child
+        element."""
 
         def get_or_add_child(obj):
             child = getattr(obj, self._prop_name)
@@ -601,10 +527,7 @@ def get_or_add_child(obj):
         self._add_to_class(self._get_or_add_method_name, get_or_add_child)
 
     def _add_remover(self):
-        """
-        Add a ``_remove_x()`` method to the element class for this child
-        element.
-        """
+        """Add a ``_remove_x()`` method to the element class for this child element."""
 
         def _remove_child(obj):
             obj.remove_all(self._nsptagname)
@@ -620,19 +543,15 @@ def _get_or_add_method_name(self):
 
 
 class ZeroOrOneChoice(_BaseChildElement):
-    """
-    Correspondes to an ``EG_*`` element group where at most one of its
-    members may appear as a child.
-    """
+    """Correspondes to an ``EG_*`` element group where at most one of its members may
+    appear as a child."""
 
     def __init__(self, choices, successors=()):
         self._choices = choices
         self._successors = successors
 
     def populate_class_members(self, element_cls, prop_name):
-        """
-        Add the appropriate methods to `element_cls`.
-        """
+        """Add the appropriate methods to `element_cls`."""
         super(ZeroOrOneChoice, self).populate_class_members(element_cls, prop_name)
         self._add_choice_getter()
         for choice in self._choices:
@@ -642,20 +561,15 @@ def populate_class_members(self, element_cls, prop_name):
         self._add_group_remover()
 
     def _add_choice_getter(self):
-        """
-        Add a read-only ``{prop_name}`` property to the element class that
-        returns the present member of this group, or |None| if none are
-        present.
-        """
+        """Add a read-only ``{prop_name}`` property to the element class that returns
+        the present member of this group, or |None| if none are present."""
         property_ = property(self._choice_getter, None, None)
         # assign unconditionally to overwrite element name definition
         setattr(self._element_cls, self._prop_name, property_)
 
     def _add_group_remover(self):
-        """
-        Add a ``_remove_eg_x()`` method to the element class for this choice
-        group.
-        """
+        """Add a ``_remove_eg_x()`` method to the element class for this choice
+        group."""
 
         def _remove_choice_group(obj):
             for tagname in self._member_nsptagnames:
@@ -668,10 +582,8 @@ def _remove_choice_group(obj):
 
     @property
     def _choice_getter(self):
-        """
-        Return a function object suitable for the "get" side of the property
-        descriptor.
-        """
+        """Return a function object suitable for the "get" side of the property
+        descriptor."""
 
         def get_group_member_element(obj):
             return obj.first_child_found_in(*self._member_nsptagnames)
@@ -684,10 +596,8 @@ def get_group_member_element(obj):
 
     @lazyproperty
     def _member_nsptagnames(self):
-        """
-        Sequence of namespace-prefixed tagnames, one for each of the member
-        elements of this choice group.
-        """
+        """Sequence of namespace-prefixed tagnames, one for each of the member elements
+        of this choice group."""
         return [choice.nsptagname for choice in self._choices]
 
     @lazyproperty
diff --git a/src/docx/package.py b/src/docx/package.py
index e4e9433e9..27a1da937 100644
--- a/src/docx/package.py
+++ b/src/docx/package.py
@@ -9,7 +9,7 @@
 
 
 class Package(OpcPackage):
-    """Customizations specific to a WordprocessingML package"""
+    """Customizations specific to a WordprocessingML package."""
 
     def after_unmarshal(self):
         """Called by loading code after all parts and relationships have been loaded.
@@ -44,7 +44,7 @@ def _gather_image_parts(self):
 
 
 class ImageParts(object):
-    """Collection of |ImagePart| objects corresponding to images in the package"""
+    """Collection of |ImagePart| objects corresponding to images in the package."""
 
     def __init__(self):
         self._image_parts = []
@@ -74,31 +74,27 @@ def get_or_add_image_part(self, image_descriptor):
         return self._add_image_part(image)
 
     def _add_image_part(self, image):
-        """
-        Return an |ImagePart| instance newly created from image and appended
-        to the collection.
-        """
+        """Return an |ImagePart| instance newly created from image and appended to the
+        collection."""
         partname = self._next_image_partname(image.ext)
         image_part = ImagePart.from_image(image, partname)
         self.append(image_part)
         return image_part
 
     def _get_by_sha1(self, sha1):
-        """
-        Return the image part in this collection having a SHA1 hash matching
-        `sha1`, or |None| if not found.
-        """
+        """Return the image part in this collection having a SHA1 hash matching `sha1`,
+        or |None| if not found."""
         for image_part in self._image_parts:
             if image_part.sha1 == sha1:
                 return image_part
         return None
 
     def _next_image_partname(self, ext):
-        """
-        The next available image partname, starting from
-        ``/word/media/image1.{ext}`` where unused numbers are reused. The
-        partname is unique by number, without regard to the extension. `ext`
-        does not include the leading period.
+        """The next available image partname, starting from ``/word/media/image1.{ext}``
+        where unused numbers are reused.
+
+        The partname is unique by number, without regard to the extension. `ext` does
+        not include the leading period.
         """
 
         def image_partname(n):
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 1d02033f1..fb72a8b4c 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -34,17 +34,13 @@ def add_header_part(self):
 
     @property
     def core_properties(self):
-        """
-        A |CoreProperties| object providing read/write access to the core
-        properties of this document.
-        """
+        """A |CoreProperties| object providing read/write access to the core properties
+        of this document."""
         return self.package.core_properties
 
     @property
     def document(self):
-        """
-        A |Document| object providing access to the content of this document.
-        """
+        """A |Document| object providing access to the content of this document."""
         return Document(self._element, self)
 
     def drop_header_part(self, rId):
@@ -56,20 +52,20 @@ def footer_part(self, rId):
         return self.related_parts[rId]
 
     def get_style(self, style_id, style_type):
-        """
-        Return the style in this document matching `style_id`. Returns the
-        default style for `style_type` if `style_id` is |None| or does not
+        """Return the style in this document matching `style_id`.
+
+        Returns the default style for `style_type` if `style_id` is |None| or does not
         match a defined style of `style_type`.
         """
         return self.styles.get_by_id(style_id, style_type)
 
     def get_style_id(self, style_or_name, style_type):
-        """
-        Return the style_id (|str|) of the style of `style_type` matching
-        `style_or_name`. Returns |None| if the style resolves to the default
-        style for `style_type` or if `style_or_name` is itself |None|. Raises
-        if `style_or_name` is a style of the wrong type or names a style not
-        present in the document.
+        """Return the style_id (|str|) of the style of `style_type` matching
+        `style_or_name`.
+
+        Returns |None| if the style resolves to the default style for `style_type` or if
+        `style_or_name` is itself |None|. Raises if `style_or_name` is a style of the
+        wrong type or names a style not present in the document.
         """
         return self.styles.get_style_id(style_or_name, style_type)
 
@@ -79,18 +75,15 @@ def header_part(self, rId):
 
     @lazyproperty
     def inline_shapes(self):
-        """
-        The |InlineShapes| instance containing the inline shapes in the
-        document.
-        """
+        """The |InlineShapes| instance containing the inline shapes in the document."""
         return InlineShapes(self._element.body, self)
 
     @lazyproperty
     def numbering_part(self):
-        """
-        A |NumberingPart| object providing access to the numbering
-        definitions for this document. Creates an empty numbering part if one
-        is not present.
+        """A |NumberingPart| object providing access to the numbering definitions for
+        this document.
+
+        Creates an empty numbering part if one is not present.
         """
         try:
             return self.part_related_by(RT.NUMBERING)
@@ -100,34 +93,28 @@ def numbering_part(self):
             return numbering_part
 
     def save(self, path_or_stream):
-        """
-        Save this document to `path_or_stream`, which can be either a path to
-        a filesystem location (a string) or a file-like object.
-        """
+        """Save this document to `path_or_stream`, which can be either a path to a
+        filesystem location (a string) or a file-like object."""
         self.package.save(path_or_stream)
 
     @property
     def settings(self):
-        """
-        A |Settings| object providing access to the settings in the settings
-        part of this document.
-        """
+        """A |Settings| object providing access to the settings in the settings part of
+        this document."""
         return self._settings_part.settings
 
     @property
     def styles(self):
-        """
-        A |Styles| object providing access to the styles in the styles part
-        of this document.
-        """
+        """A |Styles| object providing access to the styles in the styles part of this
+        document."""
         return self._styles_part.styles
 
     @property
     def _settings_part(self):
-        """
-        A |SettingsPart| object providing access to the document-level
-        settings for this document. Creates a default settings part if one is
-        not present.
+        """A |SettingsPart| object providing access to the document-level settings for
+        this document.
+
+        Creates a default settings part if one is not present.
         """
         try:
             return self.part_related_by(RT.SETTINGS)
@@ -138,9 +125,9 @@ def _settings_part(self):
 
     @property
     def _styles_part(self):
-        """
-        Instance of |StylesPart| for this document. Creates an empty styles
-        part if one is not present.
+        """Instance of |StylesPart| for this document.
+
+        Creates an empty styles part if one is not present.
         """
         try:
             return self.part_related_by(RT.STYLES)
diff --git a/src/docx/parts/image.py b/src/docx/parts/image.py
index deb099289..d93c47922 100644
--- a/src/docx/parts/image.py
+++ b/src/docx/parts/image.py
@@ -8,9 +8,9 @@
 
 
 class ImagePart(Part):
-    """
-    An image part. Corresponds to the target part of a relationship with type
-    RELATIONSHIP_TYPE.IMAGE.
+    """An image part.
+
+    Corresponds to the target part of a relationship with type RELATIONSHIP_TYPE.IMAGE.
     """
 
     def __init__(self, partname, content_type, blob, image=None):
@@ -19,10 +19,8 @@ def __init__(self, partname, content_type, blob, image=None):
 
     @property
     def default_cx(self):
-        """
-        Native width of this image, calculated from its width in pixels and
-        horizontal dots per inch (dpi).
-        """
+        """Native width of this image, calculated from its width in pixels and
+        horizontal dots per inch (dpi)."""
         px_width = self.image.px_width
         horz_dpi = self.image.horz_dpi
         width_in_inches = px_width / horz_dpi
@@ -30,10 +28,8 @@ def default_cx(self):
 
     @property
     def default_cy(self):
-        """
-        Native height of this image, calculated from its height in pixels and
-        vertical dots per inch (dpi).
-        """
+        """Native height of this image, calculated from its height in pixels and
+        vertical dots per inch (dpi)."""
         px_height = self.image.px_height
         horz_dpi = self.image.horz_dpi
         height_in_emu = 914400 * px_height / horz_dpi
@@ -41,12 +37,11 @@ def default_cy(self):
 
     @property
     def filename(self):
-        """
-        Filename from which this image part was originally created. A generic
-        name, e.g. 'image.png', is substituted if no name is available, for
-        example when the image was loaded from an unnamed stream. In that
-        case a default extension is applied based on the detected MIME type
-        of the image.
+        """Filename from which this image part was originally created.
+
+        A generic name, e.g. 'image.png', is substituted if no name is available, for
+        example when the image was loaded from an unnamed stream. In that case a default
+        extension is applied based on the detected MIME type of the image.
         """
         if self._image is not None:
             return self._image.filename
@@ -54,10 +49,8 @@ def filename(self):
 
     @classmethod
     def from_image(cls, image, partname):
-        """
-        Return an |ImagePart| instance newly created from `image` and
-        assigned `partname`.
-        """
+        """Return an |ImagePart| instance newly created from `image` and assigned
+        `partname`."""
         return ImagePart(partname, image.content_type, image.blob, image)
 
     @property
@@ -68,15 +61,11 @@ def image(self):
 
     @classmethod
     def load(cls, partname, content_type, blob, package):
-        """
-        Called by ``docx.opc.package.PartFactory`` to load an image part from
-        a package being opened by ``Document(...)`` call.
-        """
+        """Called by ``docx.opc.package.PartFactory`` to load an image part from a
+        package being opened by ``Document(...)`` call."""
         return cls(partname, content_type, blob)
 
     @property
     def sha1(self):
-        """
-        SHA1 hash digest of the blob of this image part.
-        """
+        """SHA1 hash digest of the blob of this image part."""
         return hashlib.sha1(self._blob).hexdigest()
diff --git a/src/docx/parts/numbering.py b/src/docx/parts/numbering.py
index 3eae202ab..31ba05e99 100644
--- a/src/docx/parts/numbering.py
+++ b/src/docx/parts/numbering.py
@@ -5,33 +5,25 @@
 
 
 class NumberingPart(XmlPart):
-    """
-    Proxy for the numbering.xml part containing numbering definitions for
-    a document or glossary.
-    """
+    """Proxy for the numbering.xml part containing numbering definitions for a document
+    or glossary."""
 
     @classmethod
     def new(cls):
-        """
-        Return newly created empty numbering part, containing only the root
-        ``<w:numbering>`` element.
-        """
+        """Return newly created empty numbering part, containing only the root
+        ``<w:numbering>`` element."""
         raise NotImplementedError
 
     @lazyproperty
     def numbering_definitions(self):
-        """
-        The |_NumberingDefinitions| instance containing the numbering
-        definitions (<w:num> element proxies) for this numbering part.
-        """
+        """The |_NumberingDefinitions| instance containing the numbering definitions
+        (<w:num> element proxies) for this numbering part."""
         return _NumberingDefinitions(self._element)
 
 
 class _NumberingDefinitions(object):
-    """
-    Collection of |_NumberingDefinition| instances corresponding to the
-    ``<w:num>`` elements in a numbering part.
-    """
+    """Collection of |_NumberingDefinition| instances corresponding to the ``<w:num>``
+    elements in a numbering part."""
 
     def __init__(self, numbering_elm):
         super(_NumberingDefinitions, self).__init__()
diff --git a/src/docx/parts/settings.py b/src/docx/parts/settings.py
index f23bf459a..08d310124 100644
--- a/src/docx/parts/settings.py
+++ b/src/docx/parts/settings.py
@@ -10,16 +10,12 @@
 
 
 class SettingsPart(XmlPart):
-    """
-    Document-level settings part of a WordprocessingML (WML) package.
-    """
+    """Document-level settings part of a WordprocessingML (WML) package."""
 
     @classmethod
     def default(cls, package):
-        """
-        Return a newly created settings part, containing a default
-        `w:settings` element tree.
-        """
+        """Return a newly created settings part, containing a default `w:settings`
+        element tree."""
         partname = PackURI("/word/settings.xml")
         content_type = CT.WML_SETTINGS
         element = parse_xml(cls._default_settings_xml())
@@ -27,17 +23,13 @@ def default(cls, package):
 
     @property
     def settings(self):
-        """
-        A |Settings| proxy object for the `w:settings` element in this part,
-        containing the document-level settings for this document.
-        """
+        """A |Settings| proxy object for the `w:settings` element in this part,
+        containing the document-level settings for this document."""
         return Settings(self.element)
 
     @classmethod
     def _default_settings_xml(cls):
-        """
-        Return a bytestream containing XML for a default settings part.
-        """
+        """Return a bytestream containing XML for a default settings part."""
         path = os.path.join(
             os.path.split(__file__)[0], "..", "templates", "default-settings.xml"
         )
diff --git a/src/docx/parts/styles.py b/src/docx/parts/styles.py
index c23637e54..5f42f31c7 100644
--- a/src/docx/parts/styles.py
+++ b/src/docx/parts/styles.py
@@ -10,17 +10,12 @@
 
 
 class StylesPart(XmlPart):
-    """
-    Proxy for the styles.xml part containing style definitions for a document
-    or glossary.
-    """
+    """Proxy for the styles.xml part containing style definitions for a document or
+    glossary."""
 
     @classmethod
     def default(cls, package):
-        """
-        Return a newly created styles part, containing a default set of
-        elements.
-        """
+        """Return a newly created styles part, containing a default set of elements."""
         partname = PackURI("/word/styles.xml")
         content_type = CT.WML_STYLES
         element = parse_xml(cls._default_styles_xml())
@@ -28,17 +23,13 @@ def default(cls, package):
 
     @property
     def styles(self):
-        """
-        The |_Styles| instance containing the styles (<w:style> element
-        proxies) for this styles part.
-        """
+        """The |_Styles| instance containing the styles (<w:style> element proxies) for
+        this styles part."""
         return Styles(self.element)
 
     @classmethod
     def _default_styles_xml(cls):
-        """
-        Return a bytestream containing XML for a default styles part.
-        """
+        """Return a bytestream containing XML for a default styles part."""
         path = os.path.join(
             os.path.split(__file__)[0], "..", "templates", "default-styles.xml"
         )
diff --git a/src/docx/section.py b/src/docx/section.py
index 4b81b368d..ccae91975 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -47,10 +47,8 @@ def __init__(self, sectPr, document_part):
 
     @property
     def bottom_margin(self):
-        """
-        |Length| object representing the bottom margin for all pages in this
-        section in English Metric Units.
-        """
+        """|Length| object representing the bottom margin for all pages in this section
+        in English Metric Units."""
         return self._sectPr.bottom_margin
 
     @bottom_margin.setter
@@ -117,10 +115,10 @@ def footer(self):
 
     @property
     def footer_distance(self):
-        """
-        |Length| object representing the distance from the bottom edge of the
-        page to the bottom edge of the footer. |None| if no setting is present
-        in the XML.
+        """|Length| object representing the distance from the bottom edge of the page to
+        the bottom edge of the footer.
+
+        |None| if no setting is present in the XML.
         """
         return self._sectPr.footer
 
@@ -130,11 +128,11 @@ def footer_distance(self, value):
 
     @property
     def gutter(self):
-        """
-        |Length| object representing the page gutter size in English Metric
-        Units for all pages in this section. The page gutter is extra spacing
-        added to the `inner` margin to ensure even margins after page
-        binding.
+        """|Length| object representing the page gutter size in English Metric Units for
+        all pages in this section.
+
+        The page gutter is extra spacing added to the `inner` margin to ensure even
+        margins after page binding.
         """
         return self._sectPr.gutter
 
@@ -153,10 +151,10 @@ def header(self):
 
     @property
     def header_distance(self):
-        """
-        |Length| object representing the distance from the top edge of the
-        page to the top edge of the header. |None| if no setting is present
-        in the XML.
+        """|Length| object representing the distance from the top edge of the page to
+        the top edge of the header.
+
+        |None| if no setting is present in the XML.
         """
         return self._sectPr.header
 
@@ -166,10 +164,8 @@ def header_distance(self, value):
 
     @property
     def left_margin(self):
-        """
-        |Length| object representing the left margin for all pages in this
-        section in English Metric Units.
-        """
+        """|Length| object representing the left margin for all pages in this section in
+        English Metric Units."""
         return self._sectPr.left_margin
 
     @left_margin.setter
@@ -178,11 +174,9 @@ def left_margin(self, value):
 
     @property
     def orientation(self):
-        """
-        Member of the :ref:`WdOrientation` enumeration specifying the page
+        """Member of the :ref:`WdOrientation` enumeration specifying the page
         orientation for this section, one of ``WD_ORIENT.PORTRAIT`` or
-        ``WD_ORIENT.LANDSCAPE``.
-        """
+        ``WD_ORIENT.LANDSCAPE``."""
         return self._sectPr.orientation
 
     @orientation.setter
@@ -191,11 +185,11 @@ def orientation(self, value):
 
     @property
     def page_height(self):
-        """
-        Total page height used for this section, inclusive of all edge spacing
-        values such as margins. Page orientation is taken into account, so
-        for example, its expected value would be ``Inches(8.5)`` for
-        letter-sized paper when orientation is landscape.
+        """Total page height used for this section, inclusive of all edge spacing values
+        such as margins.
+
+        Page orientation is taken into account, so for example, its expected value would
+        be ``Inches(8.5)`` for letter-sized paper when orientation is landscape.
         """
         return self._sectPr.page_height
 
@@ -205,11 +199,11 @@ def page_height(self, value):
 
     @property
     def page_width(self):
-        """
-        Total page width used for this section, inclusive of all edge spacing
-        values such as margins. Page orientation is taken into account, so
-        for example, its expected value would be ``Inches(11)`` for
-        letter-sized paper when orientation is landscape.
+        """Total page width used for this section, inclusive of all edge spacing values
+        such as margins.
+
+        Page orientation is taken into account, so for example, its expected value would
+        be ``Inches(11)`` for letter-sized paper when orientation is landscape.
         """
         return self._sectPr.page_width
 
@@ -219,10 +213,8 @@ def page_width(self, value):
 
     @property
     def right_margin(self):
-        """
-        |Length| object representing the right margin for all pages in this
-        section in English Metric Units.
-        """
+        """|Length| object representing the right margin for all pages in this section
+        in English Metric Units."""
         return self._sectPr.right_margin
 
     @right_margin.setter
@@ -231,12 +223,9 @@ def right_margin(self, value):
 
     @property
     def start_type(self):
-        """
-        The member of the :ref:`WdSectionStart` enumeration corresponding to
-        the initial break behavior of this section, e.g.
-        ``WD_SECTION.ODD_PAGE`` if the section should begin on the next odd
-        page.
-        """
+        """The member of the :ref:`WdSectionStart` enumeration corresponding to the
+        initial break behavior of this section, e.g. ``WD_SECTION.ODD_PAGE`` if the
+        section should begin on the next odd page."""
         return self._sectPr.start_type
 
     @start_type.setter
@@ -245,10 +234,8 @@ def start_type(self, value):
 
     @property
     def top_margin(self):
-        """
-        |Length| object representing the top margin for all pages in this
-        section in English Metric Units.
-        """
+        """|Length| object representing the top margin for all pages in this section in
+        English Metric Units."""
         return self._sectPr.top_margin
 
     @top_margin.setter
@@ -257,7 +244,7 @@ def top_margin(self, value):
 
 
 class _BaseHeaderFooter(BlockItemContainer):
-    """Base class for header and footer classes"""
+    """Base class for header and footer classes."""
 
     def __init__(self, sectPr, document_part, header_footer_index):
         self._sectPr = sectPr
diff --git a/src/docx/shape.py b/src/docx/shape.py
index 1f7a938a3..bc7818693 100644
--- a/src/docx/shape.py
+++ b/src/docx/shape.py
@@ -9,19 +9,15 @@
 
 
 class InlineShapes(Parented):
-    """
-    Sequence of |InlineShape| instances, supporting len(), iteration, and
-    indexed access.
-    """
+    """Sequence of |InlineShape| instances, supporting len(), iteration, and indexed
+    access."""
 
     def __init__(self, body_elm, parent):
         super(InlineShapes, self).__init__(parent)
         self._body = body_elm
 
     def __getitem__(self, idx):
-        """
-        Provide indexed access, e.g. 'inline_shapes[idx]'
-        """
+        """Provide indexed access, e.g. 'inline_shapes[idx]'."""
         try:
             inline = self._inline_lst[idx]
         except IndexError:
@@ -43,10 +39,8 @@ def _inline_lst(self):
 
 
 class InlineShape(object):
-    """
-    Proxy for an ``<wp:inline>`` element, representing the container for an
-    inline graphical object.
-    """
+    """Proxy for an ``<wp:inline>`` element, representing the container for an inline
+    graphical object."""
 
     def __init__(self, inline):
         super(InlineShape, self).__init__()
@@ -54,9 +48,9 @@ def __init__(self, inline):
 
     @property
     def height(self):
-        """
-        Read/write. The display height of this inline shape as an |Emu|
-        instance.
+        """Read/write.
+
+        The display height of this inline shape as an |Emu| instance.
         """
         return self._inline.extent.cy
 
@@ -67,9 +61,9 @@ def height(self, cy):
 
     @property
     def type(self):
-        """
-        The type of this inline shape as a member of
+        """The type of this inline shape as a member of
         ``docx.enum.shape.WD_INLINE_SHAPE``, e.g. ``LINKED_PICTURE``.
+
         Read-only.
         """
         graphicData = self._inline.graphic.graphicData
@@ -87,9 +81,9 @@ def type(self):
 
     @property
     def width(self):
-        """
-        Read/write. The display width of this inline shape as an |Emu|
-        instance.
+        """Read/write.
+
+        The display width of this inline shape as an |Emu| instance.
         """
         return self._inline.extent.cx
 
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 63f3969fa..062669724 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -2,11 +2,11 @@
 
 
 class Length(int):
-    """
-    Base class for length constructor classes Inches, Cm, Mm, Px, and Emu.
-    Behaves as an int count of English Metric Units, 914,400 to the inch,
-    36,000 to the mm. Provides convenience unit conversion methods in the form
-    of read-only properties. Immutable.
+    """Base class for length constructor classes Inches, Cm, Mm, Px, and Emu.
+
+    Behaves as an int count of English Metric Units, 914,400 to the inch, 36,000 to the
+    mm. Provides convenience unit conversion methods in the form of read-only
+    properties. Immutable.
     """
 
     _EMUS_PER_INCH = 914400
@@ -20,52 +20,37 @@ def __new__(cls, emu):
 
     @property
     def cm(self):
-        """
-        The equivalent length expressed in centimeters (float).
-        """
+        """The equivalent length expressed in centimeters (float)."""
         return self / float(self._EMUS_PER_CM)
 
     @property
     def emu(self):
-        """
-        The equivalent length expressed in English Metric Units (int).
-        """
+        """The equivalent length expressed in English Metric Units (int)."""
         return self
 
     @property
     def inches(self):
-        """
-        The equivalent length expressed in inches (float).
-        """
+        """The equivalent length expressed in inches (float)."""
         return self / float(self._EMUS_PER_INCH)
 
     @property
     def mm(self):
-        """
-        The equivalent length expressed in millimeters (float).
-        """
+        """The equivalent length expressed in millimeters (float)."""
         return self / float(self._EMUS_PER_MM)
 
     @property
     def pt(self):
-        """
-        Floating point length in points
-        """
+        """Floating point length in points."""
         return self / float(self._EMUS_PER_PT)
 
     @property
     def twips(self):
-        """
-        The equivalent length expressed in twips (int).
-        """
+        """The equivalent length expressed in twips (int)."""
         return int(round(self / float(self._EMUS_PER_TWIP)))
 
 
 class Inches(Length):
-    """
-    Convenience constructor for length in inches, e.g.
-    ``width = Inches(0.5)``.
-    """
+    """Convenience constructor for length in inches, e.g. ``width = Inches(0.5)``."""
 
     def __new__(cls, inches):
         emu = int(inches * Length._EMUS_PER_INCH)
@@ -73,10 +58,7 @@ def __new__(cls, inches):
 
 
 class Cm(Length):
-    """
-    Convenience constructor for length in centimeters, e.g.
-    ``height = Cm(12)``.
-    """
+    """Convenience constructor for length in centimeters, e.g. ``height = Cm(12)``."""
 
     def __new__(cls, cm):
         emu = int(cm * Length._EMUS_PER_CM)
@@ -84,20 +66,15 @@ def __new__(cls, cm):
 
 
 class Emu(Length):
-    """
-    Convenience constructor for length in English Metric Units, e.g.
-    ``width = Emu(457200)``.
-    """
+    """Convenience constructor for length in English Metric Units, e.g. ``width =
+    Emu(457200)``."""
 
     def __new__(cls, emu):
         return Length.__new__(cls, int(emu))
 
 
 class Mm(Length):
-    """
-    Convenience constructor for length in millimeters, e.g.
-    ``width = Mm(240.5)``.
-    """
+    """Convenience constructor for length in millimeters, e.g. ``width = Mm(240.5)``."""
 
     def __new__(cls, mm):
         emu = int(mm * Length._EMUS_PER_MM)
@@ -105,9 +82,7 @@ def __new__(cls, mm):
 
 
 class Pt(Length):
-    """
-    Convenience value class for specifying a length in points
-    """
+    """Convenience value class for specifying a length in points."""
 
     def __new__(cls, points):
         emu = int(points * Length._EMUS_PER_PT)
@@ -115,8 +90,8 @@ def __new__(cls, points):
 
 
 class Twips(Length):
-    """
-    Convenience constructor for length in twips, e.g. ``width = Twips(42)``.
+    """Convenience constructor for length in twips, e.g. ``width = Twips(42)``.
+
     A twip is a twentieth of a point, 635 EMU.
     """
 
@@ -126,9 +101,7 @@ def __new__(cls, twips):
 
 
 class RGBColor(tuple):
-    """
-    Immutable value object defining a particular RGB color.
-    """
+    """Immutable value object defining a particular RGB color."""
 
     def __new__(cls, r, g, b):
         msg = "RGBColor() takes three integer values 0-255"
@@ -141,16 +114,12 @@ def __repr__(self):
         return "RGBColor(0x%02x, 0x%02x, 0x%02x)" % self
 
     def __str__(self):
-        """
-        Return a hex string rgb value, like '3C2F80'
-        """
+        """Return a hex string rgb value, like '3C2F80'."""
         return "%02X%02X%02X" % self
 
     @classmethod
     def from_string(cls, rgb_hex_str):
-        """
-        Return a new instance from an RGB color hex string like ``'3C2F80'``.
-        """
+        """Return a new instance from an RGB color hex string like ``'3C2F80'``."""
         r = int(rgb_hex_str[:2], 16)
         g = int(rgb_hex_str[2:4], 16)
         b = int(rgb_hex_str[4:], 16)
@@ -158,10 +127,10 @@ def from_string(cls, rgb_hex_str):
 
 
 def lazyproperty(f):
-    """
-    @lazyprop decorator. Decorated method will be called only on first access
-    to calculate a cached property value. After that, the cached value is
-    returned.
+    """@lazyprop decorator.
+
+    Decorated method will be called only on first access to calculate a cached property
+    value. After that, the cached value is returned.
     """
     cache_attr_name = "_%s" % f.__name__  # like '_foobar' for prop 'foobar'
     docstring = f.__doc__
@@ -178,9 +147,10 @@ def get_prop_value(obj):
 
 
 def write_only_property(f):
-    """
-    @write_only_property decorator. Creates a property (descriptor attribute)
-    that accepts assignment, but not getattr (use in an expression).
+    """@write_only_property decorator.
+
+    Creates a property (descriptor attribute) that accepts assignment, but not getattr
+    (use in an expression).
     """
     docstring = f.__doc__
 
@@ -188,11 +158,11 @@ def write_only_property(f):
 
 
 class ElementProxy(object):
-    """
-    Base class for lxml element proxy classes. An element proxy class is one
-    whose primary responsibilities are fulfilled by manipulating the
-    attributes and child elements of an XML element. They are the most common
-    type of class in python-docx other than custom element (oxml) classes.
+    """Base class for lxml element proxy classes.
+
+    An element proxy class is one whose primary responsibilities are fulfilled by
+    manipulating the attributes and child elements of an XML element. They are the most
+    common type of class in python-docx other than custom element (oxml) classes.
     """
 
     __slots__ = ("_element", "_parent")
@@ -202,12 +172,12 @@ def __init__(self, element, parent=None):
         self._parent = parent
 
     def __eq__(self, other):
-        """
-        Return |True| if this proxy object refers to the same oxml element as
-        does `other`. ElementProxy objects are value objects and should
-        maintain no mutable local state. Equality for proxy objects is
-        defined as referring to the same XML element, whether or not they are
-        the same proxy object instance.
+        """Return |True| if this proxy object refers to the same oxml element as does
+        `other`.
+
+        ElementProxy objects are value objects and should maintain no mutable local
+        state. Equality for proxy objects is defined as referring to the same XML
+        element, whether or not they are the same proxy object instance.
         """
         if not isinstance(other, ElementProxy):
             return False
@@ -220,25 +190,21 @@ def __ne__(self, other):
 
     @property
     def element(self):
-        """
-        The lxml element proxied by this object.
-        """
+        """The lxml element proxied by this object."""
         return self._element
 
     @property
     def part(self):
-        """
-        The package part containing this object
-        """
+        """The package part containing this object."""
         return self._parent.part
 
 
 class Parented(object):
-    """
-    Provides common services for document elements that occur below a part
-    but may occasionally require an ancestor object to provide a service,
-    such as add or drop a relationship. Provides ``self._parent`` attribute
-    to subclasses.
+    """Provides common services for document elements that occur below a part but may
+    occasionally require an ancestor object to provide a service, such as add or drop a
+    relationship.
+
+    Provides ``self._parent`` attribute to subclasses.
     """
 
     def __init__(self, parent):
@@ -247,7 +213,5 @@ def __init__(self, parent):
 
     @property
     def part(self):
-        """
-        The package part containing this object
-        """
+        """The package part containing this object."""
         return self._parent.part
diff --git a/src/docx/styles/__init__.py b/src/docx/styles/__init__.py
index bcd84ac9b..b6b09e0ca 100644
--- a/src/docx/styles/__init__.py
+++ b/src/docx/styles/__init__.py
@@ -2,10 +2,8 @@
 
 
 class BabelFish(object):
-    """
-    Translates special-case style names from UI name (e.g. Heading 1) to
-    internal/styles.xml name (e.g. heading 1) and back.
-    """
+    """Translates special-case style names from UI name (e.g. Heading 1) to
+    internal/styles.xml name (e.g. heading 1) and back."""
 
     style_aliases = (
         ("Caption", "caption"),
@@ -27,16 +25,12 @@ class BabelFish(object):
 
     @classmethod
     def ui2internal(cls, ui_style_name):
-        """
-        Return the internal style name corresponding to `ui_style_name`, such
-        as 'heading 1' for 'Heading 1'.
-        """
+        """Return the internal style name corresponding to `ui_style_name`, such as
+        'heading 1' for 'Heading 1'."""
         return cls.internal_style_names.get(ui_style_name, ui_style_name)
 
     @classmethod
     def internal2ui(cls, internal_style_name):
-        """
-        Return the user interface style name corresponding to
-        `internal_style_name`, such as 'Heading 1' for 'heading 1'.
-        """
+        """Return the user interface style name corresponding to `internal_style_name`,
+        such as 'Heading 1' for 'heading 1'."""
         return cls.ui_style_names.get(internal_style_name, internal_style_name)
diff --git a/src/docx/styles/latent.py b/src/docx/styles/latent.py
index 0b9121332..fdcbbb6e7 100644
--- a/src/docx/styles/latent.py
+++ b/src/docx/styles/latent.py
@@ -5,18 +5,14 @@
 
 
 class LatentStyles(ElementProxy):
-    """
-    Provides access to the default behaviors for latent styles in this
-    document and to the collection of |_LatentStyle| objects that define
-    overrides of those defaults for a particular named latent style.
-    """
+    """Provides access to the default behaviors for latent styles in this document and
+    to the collection of |_LatentStyle| objects that define overrides of those defaults
+    for a particular named latent style."""
 
     __slots__ = ()
 
     def __getitem__(self, key):
-        """
-        Enables dictionary-style access to a latent style by name.
-        """
+        """Enables dictionary-style access to a latent style by name."""
         style_name = BabelFish.ui2internal(key)
         lsdException = self._element.get_by_name(style_name)
         if lsdException is None:
@@ -30,21 +26,18 @@ def __len__(self):
         return len(self._element.lsdException_lst)
 
     def add_latent_style(self, name):
-        """
-        Return a newly added |_LatentStyle| object to override the inherited
-        defaults defined in this latent styles object for the built-in style
-        having `name`.
-        """
+        """Return a newly added |_LatentStyle| object to override the inherited defaults
+        defined in this latent styles object for the built-in style having `name`."""
         lsdException = self._element.add_lsdException()
         lsdException.name = BabelFish.ui2internal(name)
         return _LatentStyle(lsdException)
 
     @property
     def default_priority(self):
-        """
-        Integer between 0 and 99 inclusive specifying the default sort order
-        for latent styles in style lists and the style gallery. |None| if no
-        value is assigned, which causes Word to use the default value 99.
+        """Integer between 0 and 99 inclusive specifying the default sort order for
+        latent styles in style lists and the style gallery.
+
+        |None| if no value is assigned, which causes Word to use the default value 99.
         """
         return self._element.defUIPriority
 
@@ -54,10 +47,10 @@ def default_priority(self, value):
 
     @property
     def default_to_hidden(self):
-        """
-        Boolean specifying whether the default behavior for latent styles is
-        to be hidden. A hidden style does not appear in the recommended list
-        or in the style gallery.
+        """Boolean specifying whether the default behavior for latent styles is to be
+        hidden.
+
+        A hidden style does not appear in the recommended list or in the style gallery.
         """
         return self._element.bool_prop("defSemiHidden")
 
@@ -67,12 +60,12 @@ def default_to_hidden(self, value):
 
     @property
     def default_to_locked(self):
-        """
-        Boolean specifying whether the default behavior for latent styles is
-        to be locked. A locked style does not appear in the styles panel or
-        the style gallery and cannot be applied to document content. This
-        behavior is only active when formatting protection is turned on for
-        the document (via the Developer menu).
+        """Boolean specifying whether the default behavior for latent styles is to be
+        locked.
+
+        A locked style does not appear in the styles panel or the style gallery and
+        cannot be applied to document content. This behavior is only active when
+        formatting protection is turned on for the document (via the Developer menu).
         """
         return self._element.bool_prop("defLockedState")
 
@@ -82,10 +75,8 @@ def default_to_locked(self, value):
 
     @property
     def default_to_quick_style(self):
-        """
-        Boolean specifying whether the default behavior for latent styles is
-        to appear in the style gallery when not hidden.
-        """
+        """Boolean specifying whether the default behavior for latent styles is to
+        appear in the style gallery when not hidden."""
         return self._element.bool_prop("defQFormat")
 
     @default_to_quick_style.setter
@@ -94,10 +85,8 @@ def default_to_quick_style(self, value):
 
     @property
     def default_to_unhide_when_used(self):
-        """
-        Boolean specifying whether the default behavior for latent styles is
-        to be unhidden when first applied to content.
-        """
+        """Boolean specifying whether the default behavior for latent styles is to be
+        unhidden when first applied to content."""
         return self._element.bool_prop("defUnhideWhenUsed")
 
     @default_to_unhide_when_used.setter
@@ -106,11 +95,11 @@ def default_to_unhide_when_used(self, value):
 
     @property
     def load_count(self):
-        """
-        Integer specifying the number of built-in styles to initialize to the
-        defaults specified in this |LatentStyles| object. |None| if there is
-        no setting in the XML (very uncommon). The default Word 2011 template
-        sets this value to 276, accounting for the built-in styles in Word
+        """Integer specifying the number of built-in styles to initialize to the
+        defaults specified in this |LatentStyles| object.
+
+        |None| if there is no setting in the XML (very uncommon). The default Word 2011
+        template sets this value to 276, accounting for the built-in styles in Word
         2010.
         """
         return self._element.count
@@ -121,31 +110,34 @@ def load_count(self, value):
 
 
 class _LatentStyle(ElementProxy):
-    """
-    Proxy for an `w:lsdException` element, which specifies display behaviors
-    for a built-in style when no definition for that style is stored yet in
-    the `styles.xml` part. The values in this element override the defaults
-    specified in the parent `w:latentStyles` element.
+    """Proxy for an `w:lsdException` element, which specifies display behaviors for a
+    built-in style when no definition for that style is stored yet in the `styles.xml`
+    part.
+
+    The values in this element override the defaults specified in the parent
+    `w:latentStyles` element.
     """
 
     __slots__ = ()
 
     def delete(self):
-        """
-        Remove this latent style definition such that the defaults defined in
-        the containing |LatentStyles| object provide the effective value for
-        each of its attributes. Attempting to access any attributes on this
-        object after calling this method will raise |AttributeError|.
+        """Remove this latent style definition such that the defaults defined in the
+        containing |LatentStyles| object provide the effective value for each of its
+        attributes.
+
+        Attempting to access any attributes on this object after calling this method
+        will raise |AttributeError|.
         """
         self._element.delete()
         self._element = None
 
     @property
     def hidden(self):
-        """
-        Tri-state value specifying whether this latent style should appear in
-        the recommended list. |None| indicates the effective value is
-        inherited from the parent ``<w:latentStyles>`` element.
+        """Tri-state value specifying whether this latent style should appear in the
+        recommended list.
+
+        |None| indicates the effective value is inherited from the parent
+        ``<w:latentStyles>`` element.
         """
         return self._element.on_off_prop("semiHidden")
 
@@ -155,12 +147,11 @@ def hidden(self, value):
 
     @property
     def locked(self):
-        """
-        Tri-state value specifying whether this latent styles is locked.
-        A locked style does not appear in the styles panel or the style
-        gallery and cannot be applied to document content. This behavior is
-        only active when formatting protection is turned on for the document
-        (via the Developer menu).
+        """Tri-state value specifying whether this latent styles is locked.
+
+        A locked style does not appear in the styles panel or the style gallery and
+        cannot be applied to document content. This behavior is only active when
+        formatting protection is turned on for the document (via the Developer menu).
         """
         return self._element.on_off_prop("locked")
 
@@ -170,16 +161,12 @@ def locked(self, value):
 
     @property
     def name(self):
-        """
-        The name of the built-in style this exception applies to.
-        """
+        """The name of the built-in style this exception applies to."""
         return BabelFish.internal2ui(self._element.name)
 
     @property
     def priority(self):
-        """
-        The integer sort key for this latent style in the Word UI.
-        """
+        """The integer sort key for this latent style in the Word UI."""
         return self._element.uiPriority
 
     @priority.setter
@@ -188,11 +175,11 @@ def priority(self, value):
 
     @property
     def quick_style(self):
-        """
-        Tri-state value specifying whether this latent style should appear in
-        the Word styles gallery when not hidden. |None| indicates the
-        effective value should be inherited from the default values in its
-        parent |LatentStyles| object.
+        """Tri-state value specifying whether this latent style should appear in the
+        Word styles gallery when not hidden.
+
+        |None| indicates the effective value should be inherited from the default values
+        in its parent |LatentStyles| object.
         """
         return self._element.on_off_prop("qFormat")
 
@@ -202,12 +189,11 @@ def quick_style(self, value):
 
     @property
     def unhide_when_used(self):
-        """
-        Tri-state value specifying whether this style should have its
-        :attr:`hidden` attribute set |False| the next time the style is
-        applied to content. |None| indicates the effective value should be
-        inherited from the default specified by its parent |LatentStyles|
-        object.
+        """Tri-state value specifying whether this style should have its :attr:`hidden`
+        attribute set |False| the next time the style is applied to content.
+
+        |None| indicates the effective value should be inherited from the default
+        specified by its parent |LatentStyles| object.
         """
         return self._element.on_off_prop("unhideWhenUsed")
 
diff --git a/src/docx/styles/style.py b/src/docx/styles/style.py
index 8d5917b23..0f46b67f5 100644
--- a/src/docx/styles/style.py
+++ b/src/docx/styles/style.py
@@ -8,10 +8,8 @@
 
 
 def StyleFactory(style_elm):
-    """
-    Return a style object of the appropriate |BaseStyle| subclass, according
-    to the type of `style_elm`.
-    """
+    """Return a style object of the appropriate |BaseStyle| subclass, according to the
+    type of `style_elm`."""
     style_cls = {
         WD_STYLE_TYPE.PARAGRAPH: _ParagraphStyle,
         WD_STYLE_TYPE.CHARACTER: _CharacterStyle,
@@ -23,42 +21,42 @@ def StyleFactory(style_elm):
 
 
 class BaseStyle(ElementProxy):
-    """
-    Base class for the various types of style object, paragraph, character,
-    table, and numbering. These properties and methods are inherited by all
-    style objects.
+    """Base class for the various types of style object, paragraph, character, table,
+    and numbering.
+
+    These properties and methods are inherited by all style objects.
     """
 
     __slots__ = ()
 
     @property
     def builtin(self):
-        """
-        Read-only. |True| if this style is a built-in style. |False|
-        indicates it is a custom (user-defined) style. Note this value is
-        based on the presence of a `customStyle` attribute in the XML, not on
-        specific knowledge of which styles are built into Word.
+        """Read-only.
+
+        |True| if this style is a built-in style. |False| indicates it is a custom
+        (user-defined) style. Note this value is based on the presence of a
+        `customStyle` attribute in the XML, not on specific knowledge of which styles
+        are built into Word.
         """
         return not self._element.customStyle
 
     def delete(self):
-        """
-        Remove this style definition from the document. Note that calling
-        this method does not remove or change the style applied to any
-        document content. Content items having the deleted style will be
-        rendered using the default style, as is any content with a style not
-        defined in the document.
+        """Remove this style definition from the document.
+
+        Note that calling this method does not remove or change the style applied to any
+        document content. Content items having the deleted style will be rendered using
+        the default style, as is any content with a style not defined in the document.
         """
         self._element.delete()
         self._element = None
 
     @property
     def hidden(self):
-        """
-        |True| if display of this style in the style gallery and list of
-        recommended styles is suppressed. |False| otherwise. In order to be
-        shown in the style gallery, this value must be |False| and
-        :attr:`.quick_style` must be |True|.
+        """|True| if display of this style in the style gallery and list of recommended
+        styles is suppressed.
+
+        |False| otherwise. In order to be shown in the style gallery, this value must be
+        |False| and :attr:`.quick_style` must be |True|.
         """
         return self._element.semiHidden_val
 
@@ -68,12 +66,12 @@ def hidden(self, value):
 
     @property
     def locked(self):
-        """
-        Read/write Boolean. |True| if this style is locked. A locked style
-        does not appear in the styles panel or the style gallery and cannot
-        be applied to document content. This behavior is only active when
-        formatting protection is turned on for the document (via the
-        Developer menu).
+        """Read/write Boolean.
+
+        |True| if this style is locked. A locked style does not appear in the styles
+        panel or the style gallery and cannot be applied to document content. This
+        behavior is only active when formatting protection is turned on for the document
+        (via the Developer menu).
         """
         return self._element.locked_val
 
@@ -83,9 +81,7 @@ def locked(self, value):
 
     @property
     def name(self):
-        """
-        The UI name of this style.
-        """
+        """The UI name of this style."""
         name = self._element.name_val
         if name is None:
             return None
@@ -97,11 +93,11 @@ def name(self, value):
 
     @property
     def priority(self):
-        """
-        The integer sort key governing display sequence of this style in the
-        Word UI. |None| indicates no setting is defined, causing Word to use
-        the default value of 0. Style name is used as a secondary sort key to
-        resolve ordering of styles having the same priority value.
+        """The integer sort key governing display sequence of this style in the Word UI.
+
+        |None| indicates no setting is defined, causing Word to use the default value of
+        0. Style name is used as a secondary sort key to resolve ordering of styles
+        having the same priority value.
         """
         return self._element.uiPriority_val
 
@@ -111,9 +107,10 @@ def priority(self, value):
 
     @property
     def quick_style(self):
-        """
-        |True| if this style should be displayed in the style gallery when
-        :attr:`.hidden` is |False|. Read/write Boolean.
+        """|True| if this style should be displayed in the style gallery when
+        :attr:`.hidden` is |False|.
+
+        Read/write Boolean.
         """
         return self._element.qFormat_val
 
@@ -123,10 +120,10 @@ def quick_style(self, value):
 
     @property
     def style_id(self):
-        """
-        The unique key name (string) for this style. This value is subject to
-        rewriting by Word and should generally not be changed unless you are
-        familiar with the internals involved.
+        """The unique key name (string) for this style.
+
+        This value is subject to rewriting by Word and should generally not be changed
+        unless you are familiar with the internals involved.
         """
         return self._element.styleId
 
@@ -136,10 +133,8 @@ def style_id(self, value):
 
     @property
     def type(self):
-        """
-        Member of :ref:`WdStyleType` corresponding to the type of this style,
-        e.g. ``WD_STYLE_TYPE.PARAGRAPH``.
-        """
+        """Member of :ref:`WdStyleType` corresponding to the type of this style, e.g.
+        ``WD_STYLE_TYPE.PARAGRAPH``."""
         type = self._element.type
         if type is None:
             return WD_STYLE_TYPE.PARAGRAPH
@@ -147,11 +142,11 @@ def type(self):
 
     @property
     def unhide_when_used(self):
-        """
-        |True| if an application should make this style visible the next time
-        it is applied to content. False otherwise. Note that |docx| does not
-        automatically unhide a style having |True| for this attribute when it
-        is applied to content.
+        """|True| if an application should make this style visible the next time it is
+        applied to content.
+
+        False otherwise. Note that |docx| does not automatically unhide a style having
+        |True| for this attribute when it is applied to content.
         """
         return self._element.unhideWhenUsed_val
 
@@ -161,20 +156,18 @@ def unhide_when_used(self, value):
 
 
 class _CharacterStyle(BaseStyle):
-    """
-    A character style. A character style is applied to a |Run| object and
-    primarily provides character-level formatting via the |Font| object in
-    its :attr:`.font` property.
+    """A character style.
+
+    A character style is applied to a |Run| object and primarily provides character-
+    level formatting via the |Font| object in its :attr:`.font` property.
     """
 
     __slots__ = ()
 
     @property
     def base_style(self):
-        """
-        Style object this style inherits from or |None| if this style is
-        not based on another style.
-        """
+        """Style object this style inherits from or |None| if this style is not based on
+        another style."""
         base_style = self._element.base_style
         if base_style is None:
             return None
@@ -187,17 +180,16 @@ def base_style(self, style):
 
     @property
     def font(self):
-        """
-        The |Font| object providing access to the character formatting
-        properties for this style, such as font name and size.
-        """
+        """The |Font| object providing access to the character formatting properties for
+        this style, such as font name and size."""
         return Font(self._element)
 
 
 class _ParagraphStyle(_CharacterStyle):
-    """
-    A paragraph style. A paragraph style provides both character formatting
-    and paragraph formatting such as indentation and line-spacing.
+    """A paragraph style.
+
+    A paragraph style provides both character formatting and paragraph formatting such
+    as indentation and line-spacing.
     """
 
     __slots__ = ()
@@ -207,12 +199,11 @@ def __repr__(self):
 
     @property
     def next_paragraph_style(self):
-        """
-        |_ParagraphStyle| object representing the style to be applied
-        automatically to a new paragraph inserted after a paragraph of this
-        style. Returns self if no next paragraph style is defined. Assigning
-        |None| or `self` removes the setting such that new paragraphs are
-        created using this same style.
+        """|_ParagraphStyle| object representing the style to be applied automatically
+        to a new paragraph inserted after a paragraph of this style.
+
+        Returns self if no next paragraph style is defined. Assigning |None| or `self`
+        removes the setting such that new paragraphs are created using this same style.
         """
         next_style_elm = self._element.next_style
         if next_style_elm is None:
@@ -230,17 +221,16 @@ def next_paragraph_style(self, style):
 
     @property
     def paragraph_format(self):
-        """
-        The |ParagraphFormat| object providing access to the paragraph
-        formatting properties for this style such as indentation.
-        """
+        """The |ParagraphFormat| object providing access to the paragraph formatting
+        properties for this style such as indentation."""
         return ParagraphFormat(self._element)
 
 
 class _TableStyle(_ParagraphStyle):
-    """
-    A table style. A table style provides character and paragraph formatting
-    for its contents as well as special table formatting properties.
+    """A table style.
+
+    A table style provides character and paragraph formatting for its contents as well
+    as special table formatting properties.
     """
 
     __slots__ = ()
@@ -250,8 +240,9 @@ def __repr__(self):
 
 
 class _NumberingStyle(BaseStyle):
-    """
-    A numbering style. Not yet implemented.
+    """A numbering style.
+
+    Not yet implemented.
     """
 
     __slots__ = ()
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index 8e9cffffb..8583e9ede 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -18,17 +18,15 @@ class Styles(ElementProxy):
     __slots__ = ()
 
     def __contains__(self, name):
-        """
-        Enables `in` operator on style name.
-        """
+        """Enables `in` operator on style name."""
         internal_name = BabelFish.ui2internal(name)
         return any(style.name_val == internal_name for style in self._element.style_lst)
 
     def __getitem__(self, key):
-        """
-        Enables dictionary-style access by UI name. Lookup by style id is
-        deprecated, triggers a warning, and will be removed in a near-future
-        release.
+        """Enables dictionary-style access by UI name.
+
+        Lookup by style id is deprecated, triggers a warning, and will be removed in a
+        near-future release.
         """
         style_elm = self._element.get_by_name(BabelFish.ui2internal(key))
         if style_elm is not None:
@@ -52,10 +50,10 @@ def __len__(self):
         return len(self._element.style_lst)
 
     def add_style(self, name, style_type, builtin=False):
-        """
-        Return a newly added style object of `style_type` and identified
-        by `name`. A builtin style can be defined by passing True for the
-        optional `builtin` argument.
+        """Return a newly added style object of `style_type` and identified by `name`.
+
+        A builtin style can be defined by passing True for the optional `builtin`
+        argument.
         """
         style_name = BabelFish.ui2internal(name)
         if style_name in self:
@@ -64,10 +62,8 @@ def add_style(self, name, style_type, builtin=False):
         return StyleFactory(style)
 
     def default(self, style_type):
-        """
-        Return the default style for `style_type` or |None| if no default is
-        defined for that type (not common).
-        """
+        """Return the default style for `style_type` or |None| if no default is defined
+        for that type (not common)."""
         style = self._element.default_for(style_type)
         if style is None:
             return None
@@ -84,13 +80,12 @@ def get_by_id(self, style_id, style_type):
         return self._get_by_id(style_id, style_type)
 
     def get_style_id(self, style_or_name, style_type):
-        """
-        Return the id of the style corresponding to `style_or_name`, or
-        |None| if `style_or_name` is |None|. If `style_or_name` is not
-        a style object, the style is looked up using `style_or_name` as
-        a style name, raising |ValueError| if no style with that name is
-        defined. Raises |ValueError| if the target style is not of
-        `style_type`.
+        """Return the id of the style corresponding to `style_or_name`, or |None| if
+        `style_or_name` is |None|.
+
+        If `style_or_name` is not a style object, the style is looked up using
+        `style_or_name` as a style name, raising |ValueError| if no style with that name
+        is defined. Raises |ValueError| if the target style is not of `style_type`.
         """
         if style_or_name is None:
             return None
@@ -101,18 +96,15 @@ def get_style_id(self, style_or_name, style_type):
 
     @property
     def latent_styles(self):
-        """
-        A |LatentStyles| object providing access to the default behaviors for
-        latent styles and the collection of |_LatentStyle| objects that
-        define overrides of those defaults for a particular named latent
-        style.
-        """
+        """A |LatentStyles| object providing access to the default behaviors for latent
+        styles and the collection of |_LatentStyle| objects that define overrides of
+        those defaults for a particular named latent style."""
         return LatentStyles(self._element.get_or_add_latentStyles())
 
     def _get_by_id(self, style_id, style_type):
-        """
-        Return the style of `style_type` matching `style_id`. Returns the
-        default for `style_type` if `style_id` is not found or if the style
+        """Return the style of `style_type` matching `style_id`.
+
+        Returns the default for `style_type` if `style_id` is not found or if the style
         having `style_id` is not of `style_type`.
         """
         style = self._element.get_by_id(style_id)
@@ -121,18 +113,19 @@ def _get_by_id(self, style_id, style_type):
         return StyleFactory(style)
 
     def _get_style_id_from_name(self, style_name, style_type):
-        """
-        Return the id of the style of `style_type` corresponding to
-        `style_name`. Returns |None| if that style is the default style for
-        `style_type`. Raises |ValueError| if the named style is not found in
-        the document or does not match `style_type`.
+        """Return the id of the style of `style_type` corresponding to `style_name`.
+
+        Returns |None| if that style is the default style for `style_type`. Raises
+        |ValueError| if the named style is not found in the document or does not match
+        `style_type`.
         """
         return self._get_style_id_from_style(self[style_name], style_type)
 
     def _get_style_id_from_style(self, style, style_type):
-        """
-        Return the id of `style`, or |None| if it is the default style of
-        `style_type`. Raises |ValueError| if style is not of `style_type`.
+        """Return the id of `style`, or |None| if it is the default style of
+        `style_type`.
+
+        Raises |ValueError| if style is not of `style_type`.
         """
         if style.type != style_type:
             raise ValueError(
diff --git a/src/docx/table.py b/src/docx/table.py
index 43482ae96..b05bffefc 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -7,19 +7,14 @@
 
 
 class Table(Parented):
-    """
-    Proxy class for a WordprocessingML ``<w:tbl>`` element.
-    """
+    """Proxy class for a WordprocessingML ``<w:tbl>`` element."""
 
     def __init__(self, tbl, parent):
         super(Table, self).__init__(parent)
         self._element = self._tbl = tbl
 
     def add_column(self, width):
-        """
-        Return a |_Column| object of `width`, newly added rightmost to the
-        table.
-        """
+        """Return a |_Column| object of `width`, newly added rightmost to the table."""
         tblGrid = self._tbl.tblGrid
         gridCol = tblGrid.add_gridCol()
         gridCol.w = width
@@ -29,9 +24,7 @@ def add_column(self, width):
         return _Column(gridCol, self)
 
     def add_row(self):
-        """
-        Return a |_Row| instance, newly added bottom-most to the table.
-        """
+        """Return a |_Row| instance, newly added bottom-most to the table."""
         tbl = self._tbl
         tr = tbl.add_tr()
         for gridCol in tbl.tblGrid.gridCol_lst:
@@ -41,11 +34,11 @@ def add_row(self):
 
     @property
     def alignment(self):
-        """
-        Read/write. A member of :ref:`WdRowAlignment` or None, specifying the
-        positioning of this table between the page margins. |None| if no
-        setting is specified, causing the effective value to be inherited
-        from the style hierarchy.
+        """Read/write.
+
+        A member of :ref:`WdRowAlignment` or None, specifying the positioning of this
+        table between the page margins. |None| if no setting is specified, causing the
+        effective value to be inherited from the style hierarchy.
         """
         return self._tblPr.alignment
 
@@ -55,11 +48,11 @@ def alignment(self, value):
 
     @property
     def autofit(self):
-        """
-        |True| if column widths can be automatically adjusted to improve the
-        fit of cell contents. |False| if table layout is fixed. Column widths
-        are adjusted in either case if total column width exceeds page width.
-        Read/write boolean.
+        """|True| if column widths can be automatically adjusted to improve the fit of
+        cell contents.
+
+        |False| if table layout is fixed. Column widths are adjusted in either case if
+        total column width exceeds page width. Read/write boolean.
         """
         return self._tblPr.autofit
 
@@ -68,33 +61,24 @@ def autofit(self, value):
         self._tblPr.autofit = value
 
     def cell(self, row_idx, col_idx):
-        """
-        Return |_Cell| instance correponding to table cell at `row_idx`,
-        `col_idx` intersection, where (0, 0) is the top, left-most cell.
-        """
+        """Return |_Cell| instance correponding to table cell at `row_idx`, `col_idx`
+        intersection, where (0, 0) is the top, left-most cell."""
         cell_idx = col_idx + (row_idx * self._column_count)
         return self._cells[cell_idx]
 
     def column_cells(self, column_idx):
-        """
-        Sequence of cells in the column at `column_idx` in this table.
-        """
+        """Sequence of cells in the column at `column_idx` in this table."""
         cells = self._cells
         idxs = range(column_idx, len(cells), self._column_count)
         return [cells[idx] for idx in idxs]
 
     @lazyproperty
     def columns(self):
-        """
-        |_Columns| instance representing the sequence of columns in this
-        table.
-        """
+        """|_Columns| instance representing the sequence of columns in this table."""
         return _Columns(self._tbl, self)
 
     def row_cells(self, row_idx):
-        """
-        Sequence of cells in the row at `row_idx` in this table.
-        """
+        """Sequence of cells in the row at `row_idx` in this table."""
         column_count = self._column_count
         start = row_idx * column_count
         end = start + column_count
@@ -102,23 +86,20 @@ def row_cells(self, row_idx):
 
     @lazyproperty
     def rows(self):
-        """
-        |_Rows| instance containing the sequence of rows in this table.
-        """
+        """|_Rows| instance containing the sequence of rows in this table."""
         return _Rows(self._tbl, self)
 
     @property
     def style(self):
-        """
-        Read/write. A |_TableStyle| object representing the style applied to
-        this table. The default table style for the document (often `Normal
-        Table`) is returned if the table has no directly-applied style.
-        Assigning |None| to this property removes any directly-applied table
-        style causing it to inherit the default table style of the document.
-        Note that the style name of a table style differs slightly from that
-        displayed in the user interface; a hyphen, if it appears, must be
-        removed. For example, `Light Shading - Accent 1` becomes `Light
-        Shading Accent 1`.
+        """Read/write. A |_TableStyle| object representing the style applied to this
+        table. The default table style for the document (often `Normal Table`) is
+        returned if the table has no directly-applied style. Assigning |None| to this
+        property removes any directly-applied table style causing it to inherit the
+        default table style of the document. Note that the style name of a table style
+        differs slightly from that.
+
+        displayed in the user interface; a hyphen, if it appears, must be removed. For
+        example, `Light Shading - Accent 1` becomes `Light Shading Accent 1`.
         """
         style_id = self._tbl.tblStyle_val
         return self.part.get_style(style_id, WD_STYLE_TYPE.TABLE)
@@ -130,20 +111,20 @@ def style(self, style_or_name):
 
     @property
     def table(self):
-        """
-        Provide child objects with reference to the |Table| object they
-        belong to, without them having to know their direct parent is
-        a |Table| object. This is the terminus of a series of `parent._table`
-        calls from an arbitrary child through its ancestors.
+        """Provide child objects with reference to the |Table| object they belong to,
+        without them having to know their direct parent is a |Table| object.
+
+        This is the terminus of a series of `parent._table` calls from an arbitrary
+        child through its ancestors.
         """
         return self
 
     @property
     def table_direction(self):
-        """
-        A member of :ref:`WdTableDirection` indicating the direction in which
-        the table cells are ordered, e.g. `WD_TABLE_DIRECTION.LTR`. |None|
-        indicates the value is inherited from the style hierarchy.
+        """A member of :ref:`WdTableDirection` indicating the direction in which the
+        table cells are ordered, e.g. `WD_TABLE_DIRECTION.LTR`.
+
+        |None| indicates the value is inherited from the style hierarchy.
         """
         return self._element.bidiVisual_val
 
@@ -153,10 +134,10 @@ def table_direction(self, value):
 
     @property
     def _cells(self):
-        """
-        A sequence of |_Cell| objects, one for each cell of the layout grid.
-        If the table contains a span, one or more |_Cell| object references
-        are repeated.
+        """A sequence of |_Cell| objects, one for each cell of the layout grid.
+
+        If the table contains a span, one or more |_Cell| object references are
+        repeated.
         """
         col_count = self._column_count
         cells = []
@@ -172,9 +153,7 @@ def _cells(self):
 
     @property
     def _column_count(self):
-        """
-        The number of grid columns in this table.
-        """
+        """The number of grid columns in this table."""
         return self._tbl.col_count
 
     @property
@@ -183,32 +162,31 @@ def _tblPr(self):
 
 
 class _Cell(BlockItemContainer):
-    """Table cell"""
+    """Table cell."""
 
     def __init__(self, tc, parent):
         super(_Cell, self).__init__(tc, parent)
         self._tc = self._element = tc
 
     def add_paragraph(self, text="", style=None):
-        """
-        Return a paragraph newly added to the end of the content in this
-        cell. If present, `text` is added to the paragraph in a single run.
-        If specified, the paragraph style `style` is applied. If `style` is
-        not specified or is |None|, the result is as though the 'Normal'
-        style was applied. Note that the formatting of text in a cell can be
-        influenced by the table style. `text` can contain tab (``\\t``)
-        characters, which are converted to the appropriate XML form for
-        a tab. `text` can also include newline (``\\n``) or carriage return
-        (``\\r``) characters, each of which is converted to a line break.
+        """Return a paragraph newly added to the end of the content in this cell.
+
+        If present, `text` is added to the paragraph in a single run. If specified, the
+        paragraph style `style` is applied. If `style` is not specified or is |None|,
+        the result is as though the 'Normal' style was applied. Note that the formatting
+        of text in a cell can be influenced by the table style. `text` can contain tab
+        (``\\t``) characters, which are converted to the appropriate XML form for a tab.
+        `text` can also include newline (``\\n``) or carriage return (``\\r``)
+        characters, each of which is converted to a line break.
         """
         return super(_Cell, self).add_paragraph(text, style)
 
     def add_table(self, rows, cols):
-        """
-        Return a table newly added to this cell after any existing cell
-        content, having `rows` rows and `cols` columns. An empty paragraph is
-        added after the table because Word requires a paragraph element as
-        the last element in every cell.
+        """Return a table newly added to this cell after any existing cell content,
+        having `rows` rows and `cols` columns.
+
+        An empty paragraph is added after the table because Word requires a paragraph
+        element as the last element in every cell.
         """
         width = self.width if self.width is not None else Inches(1)
         table = super(_Cell, self).add_table(rows, cols, width)
@@ -216,10 +194,10 @@ def add_table(self, rows, cols):
         return table
 
     def merge(self, other_cell):
-        """
-        Return a merged cell created by spanning the rectangular region
-        having this cell and `other_cell` as diagonal corners. Raises
-        |InvalidSpanError| if the cells do not define a rectangular region.
+        """Return a merged cell created by spanning the rectangular region having this
+        cell and `other_cell` as diagonal corners.
+
+        Raises |InvalidSpanError| if the cells do not define a rectangular region.
         """
         tc, tc_2 = self._tc, other_cell._tc
         merged_tc = tc.merge(tc_2)
@@ -227,34 +205,36 @@ def merge(self, other_cell):
 
     @property
     def paragraphs(self):
-        """
-        List of paragraphs in the cell. A table cell is required to contain
-        at least one block-level element and end with a paragraph. By
-        default, a new cell contains a single paragraph. Read-only
+        """List of paragraphs in the cell.
+
+        A table cell is required to contain at least one block-level element and end
+        with a paragraph. By default, a new cell contains a single paragraph. Read-only
         """
         return super(_Cell, self).paragraphs
 
     @property
     def tables(self):
-        """
-        List of tables in the cell, in the order they appear. Read-only.
+        """List of tables in the cell, in the order they appear.
+
+        Read-only.
         """
         return super(_Cell, self).tables
 
     @property
     def text(self):
-        """
-        The entire contents of this cell as a string of text. Assigning
-        a string to this property replaces all existing content with a single
+        """The entire contents of this cell as a string of text.
+
+        Assigning a string to this property replaces all existing content with a single
         paragraph containing the assigned text in a single run.
         """
         return "\n".join(p.text for p in self.paragraphs)
 
     @text.setter
     def text(self, text):
-        """
-        Write-only. Set entire contents of cell to the string `text`. Any
-        existing content or revisions are replaced.
+        """Write-only.
+
+        Set entire contents of cell to the string `text`. Any existing content or
+        revisions are replaced.
         """
         tc = self._tc
         tc.clear_content()
@@ -266,9 +246,9 @@ def text(self, text):
     def vertical_alignment(self):
         """Member of :ref:`WdCellVerticalAlignment` or None.
 
-        A value of |None| indicates vertical alignment for this cell is
-        inherited. Assigning |None| causes any explicitly defined vertical
-        alignment to be removed, restoring inheritance.
+        A value of |None| indicates vertical alignment for this cell is inherited.
+        Assigning |None| causes any explicitly defined vertical alignment to be removed,
+        restoring inheritance.
         """
         tcPr = self._element.tcPr
         if tcPr is None:
@@ -282,9 +262,7 @@ def vertical_alignment(self, value):
 
     @property
     def width(self):
-        """
-        The width of this cell in EMU, or |None| if no explicit width is set.
-        """
+        """The width of this cell in EMU, or |None| if no explicit width is set."""
         return self._tc.width
 
     @width.setter
@@ -293,9 +271,7 @@ def width(self, value):
 
 
 class _Column(Parented):
-    """
-    Table column
-    """
+    """Table column."""
 
     def __init__(self, gridCol, parent):
         super(_Column, self).__init__(parent)
@@ -303,24 +279,17 @@ def __init__(self, gridCol, parent):
 
     @property
     def cells(self):
-        """
-        Sequence of |_Cell| instances corresponding to cells in this column.
-        """
+        """Sequence of |_Cell| instances corresponding to cells in this column."""
         return tuple(self.table.column_cells(self._index))
 
     @property
     def table(self):
-        """
-        Reference to the |Table| object this column belongs to.
-        """
+        """Reference to the |Table| object this column belongs to."""
         return self._parent.table
 
     @property
     def width(self):
-        """
-        The width of this column in EMU, or |None| if no explicit width is
-        set.
-        """
+        """The width of this column in EMU, or |None| if no explicit width is set."""
         return self._gridCol.w
 
     @width.setter
@@ -329,15 +298,13 @@ def width(self, value):
 
     @property
     def _index(self):
-        """
-        Index of this column in its table, starting from zero.
-        """
+        """Index of this column in its table, starting from zero."""
         return self._gridCol.gridCol_idx
 
 
 class _Columns(Parented):
-    """
-    Sequence of |_Column| instances corresponding to the columns in a table.
+    """Sequence of |_Column| instances corresponding to the columns in a table.
+
     Supports ``len()``, iteration and indexed access.
     """
 
@@ -346,9 +313,7 @@ def __init__(self, tbl, parent):
         self._tbl = tbl
 
     def __getitem__(self, idx):
-        """
-        Provide indexed access, e.g. 'columns[0]'
-        """
+        """Provide indexed access, e.g. 'columns[0]'."""
         try:
             gridCol = self._gridCol_lst[idx]
         except IndexError:
@@ -365,25 +330,19 @@ def __len__(self):
 
     @property
     def table(self):
-        """
-        Reference to the |Table| object this column collection belongs to.
-        """
+        """Reference to the |Table| object this column collection belongs to."""
         return self._parent.table
 
     @property
     def _gridCol_lst(self):
-        """
-        Sequence containing ``<w:gridCol>`` elements for this table, each
-        representing a table column.
-        """
+        """Sequence containing ``<w:gridCol>`` elements for this table, each
+        representing a table column."""
         tblGrid = self._tbl.tblGrid
         return tblGrid.gridCol_lst
 
 
 class _Row(Parented):
-    """
-    Table row
-    """
+    """Table row."""
 
     def __init__(self, tr, parent):
         super(_Row, self).__init__(parent)
@@ -391,17 +350,13 @@ def __init__(self, tr, parent):
 
     @property
     def cells(self):
-        """
-        Sequence of |_Cell| instances corresponding to cells in this row.
-        """
+        """Sequence of |_Cell| instances corresponding to cells in this row."""
         return tuple(self.table.row_cells(self._index))
 
     @property
     def height(self):
-        """
-        Return a |Length| object representing the height of this cell, or
-        |None| if no explicit height is set.
-        """
+        """Return a |Length| object representing the height of this cell, or |None| if
+        no explicit height is set."""
         return self._tr.trHeight_val
 
     @height.setter
@@ -410,11 +365,8 @@ def height(self, value):
 
     @property
     def height_rule(self):
-        """
-        Return the height rule of this cell as a member of the
-        :ref:`WdRowHeightRule` enumeration, or |None| if no explicit
-        height_rule is set.
-        """
+        """Return the height rule of this cell as a member of the :ref:`WdRowHeightRule`
+        enumeration, or |None| if no explicit height_rule is set."""
         return self._tr.trHeight_hRule
 
     @height_rule.setter
@@ -423,22 +375,18 @@ def height_rule(self, value):
 
     @property
     def table(self):
-        """
-        Reference to the |Table| object this row belongs to.
-        """
+        """Reference to the |Table| object this row belongs to."""
         return self._parent.table
 
     @property
     def _index(self):
-        """
-        Index of this row in its table, starting from zero.
-        """
+        """Index of this row in its table, starting from zero."""
         return self._tr.tr_idx
 
 
 class _Rows(Parented):
-    """
-    Sequence of |_Row| objects corresponding to the rows in a table.
+    """Sequence of |_Row| objects corresponding to the rows in a table.
+
     Supports ``len()``, iteration, indexed access, and slicing.
     """
 
@@ -447,9 +395,7 @@ def __init__(self, tbl, parent):
         self._tbl = tbl
 
     def __getitem__(self, idx):
-        """
-        Provide indexed access, (e.g. 'rows[0]')
-        """
+        """Provide indexed access, (e.g. 'rows[0]')"""
         return list(self)[idx]
 
     def __iter__(self):
@@ -460,7 +406,5 @@ def __len__(self):
 
     @property
     def table(self):
-        """
-        Reference to the |Table| object this row collection belongs to.
-        """
+        """Reference to the |Table| object this row collection belongs to."""
         return self._parent.table
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index 80d0b7dad..8329966ed 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -5,18 +5,16 @@
 
 
 class Font(ElementProxy):
-    """
-    Proxy object wrapping the parent of a ``<w:rPr>`` element and providing
-    access to character properties such as font name, font size, bold, and
-    subscript.
-    """
+    """Proxy object wrapping the parent of a ``<w:rPr>`` element and providing access to
+    character properties such as font name, font size, bold, and subscript."""
 
     __slots__ = ()
 
     @property
     def all_caps(self):
-        """
-        Read/write. Causes text in this font to appear in capital letters.
+        """Read/write.
+
+        Causes text in this font to appear in capital letters.
         """
         return self._get_bool_prop("caps")
 
@@ -26,8 +24,9 @@ def all_caps(self, value):
 
     @property
     def bold(self):
-        """
-        Read/write. Causes text in this font to appear in bold.
+        """Read/write.
+
+        Causes text in this font to appear in bold.
         """
         return self._get_bool_prop("b")
 
@@ -37,18 +36,16 @@ def bold(self, value):
 
     @property
     def color(self):
-        """
-        A |ColorFormat| object providing a way to get and set the text color
-        for this font.
-        """
+        """A |ColorFormat| object providing a way to get and set the text color for this
+        font."""
         return ColorFormat(self._element)
 
     @property
     def complex_script(self):
-        """
-        Read/write tri-state value. When |True|, causes the characters in the
-        run to be treated as complex script regardless of their Unicode
-        values.
+        """Read/write tri-state value.
+
+        When |True|, causes the characters in the run to be treated as complex script
+        regardless of their Unicode values.
         """
         return self._get_bool_prop("cs")
 
@@ -58,9 +55,10 @@ def complex_script(self, value):
 
     @property
     def cs_bold(self):
-        """
-        Read/write tri-state value. When |True|, causes the complex script
-        characters in the run to be displayed in bold typeface.
+        """Read/write tri-state value.
+
+        When |True|, causes the complex script characters in the run to be displayed in
+        bold typeface.
         """
         return self._get_bool_prop("bCs")
 
@@ -70,9 +68,10 @@ def cs_bold(self, value):
 
     @property
     def cs_italic(self):
-        """
-        Read/write tri-state value. When |True|, causes the complex script
-        characters in the run to be displayed in italic typeface.
+        """Read/write tri-state value.
+
+        When |True|, causes the complex script characters in the run to be displayed in
+        italic typeface.
         """
         return self._get_bool_prop("iCs")
 
@@ -82,9 +81,9 @@ def cs_italic(self, value):
 
     @property
     def double_strike(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to appear with double strikethrough.
+        """Read/write tri-state value.
+
+        When |True|, causes the text in the run to appear with double strikethrough.
         """
         return self._get_bool_prop("dstrike")
 
@@ -94,9 +93,10 @@ def double_strike(self, value):
 
     @property
     def emboss(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to appear as if raised off the page in relief.
+        """Read/write tri-state value.
+
+        When |True|, causes the text in the run to appear as if raised off the page in
+        relief.
         """
         return self._get_bool_prop("emboss")
 
@@ -106,10 +106,10 @@ def emboss(self, value):
 
     @property
     def hidden(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to be hidden from display, unless applications settings force hidden
-        text to be shown.
+        """Read/write tri-state value.
+
+        When |True|, causes the text in the run to be hidden from display, unless
+        applications settings force hidden text to be shown.
         """
         return self._get_bool_prop("vanish")
 
@@ -119,10 +119,8 @@ def hidden(self, value):
 
     @property
     def highlight_color(self):
-        """
-        A member of :ref:`WdColorIndex` indicating the color of highlighting
-        applied, or `None` if no highlighting is applied.
-        """
+        """A member of :ref:`WdColorIndex` indicating the color of highlighting applied,
+        or `None` if no highlighting is applied."""
         rPr = self._element.rPr
         if rPr is None:
             return None
@@ -135,10 +133,10 @@ def highlight_color(self, value):
 
     @property
     def italic(self):
-        """
-        Read/write tri-state value. When |True|, causes the text of the run
-        to appear in italics. |None| indicates the effective value is
-        inherited from the style hierarchy.
+        """Read/write tri-state value.
+
+        When |True|, causes the text of the run to appear in italics. |None| indicates
+        the effective value is inherited from the style hierarchy.
         """
         return self._get_bool_prop("i")
 
@@ -148,9 +146,9 @@ def italic(self, value):
 
     @property
     def imprint(self):
-        """
-        Read/write tri-state value. When |True|, causes the text in the run
-        to appear as if pressed into the page.
+        """Read/write tri-state value.
+
+        When |True|, causes the text in the run to appear as if pressed into the page.
         """
         return self._get_bool_prop("imprint")
 
@@ -160,9 +158,10 @@ def imprint(self, value):
 
     @property
     def math(self):
-        """
-        Read/write tri-state value. When |True|, specifies this run contains
-        WML that should be handled as though it was Office Open XML Math.
+        """Read/write tri-state value.
+
+        When |True|, specifies this run contains WML that should be handled as though it
+        was Office Open XML Math.
         """
         return self._get_bool_prop("oMath")
 
@@ -172,11 +171,10 @@ def math(self, value):
 
     @property
     def name(self):
-        """
-        Get or set the typeface name for this |Font| instance, causing the
-        text it controls to appear in the named font, if a matching font is
-        found. |None| indicates the typeface is inherited from the style
-        hierarchy.
+        """Get or set the typeface name for this |Font| instance, causing the text it
+        controls to appear in the named font, if a matching font is found.
+
+        |None| indicates the typeface is inherited from the style hierarchy.
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -191,10 +189,10 @@ def name(self, value):
 
     @property
     def no_proof(self):
-        """
-        Read/write tri-state value. When |True|, specifies that the contents
-        of this run should not report any errors when the document is scanned
-        for spelling and grammar.
+        """Read/write tri-state value.
+
+        When |True|, specifies that the contents of this run should not report any
+        errors when the document is scanned for spelling and grammar.
         """
         return self._get_bool_prop("noProof")
 
@@ -204,10 +202,11 @@ def no_proof(self, value):
 
     @property
     def outline(self):
-        """
-        Read/write tri-state value. When |True| causes the characters in the
-        run to appear as if they have an outline, by drawing a one pixel wide
-        border around the inside and outside borders of each character glyph.
+        """Read/write tri-state value.
+
+        When |True| causes the characters in the run to appear as if they have an
+        outline, by drawing a one pixel wide border around the inside and outside
+        borders of each character glyph.
         """
         return self._get_bool_prop("outline")
 
@@ -217,9 +216,9 @@ def outline(self, value):
 
     @property
     def rtl(self):
-        """
-        Read/write tri-state value. When |True| causes the text in the run
-        to have right-to-left characteristics.
+        """Read/write tri-state value.
+
+        When |True| causes the text in the run to have right-to-left characteristics.
         """
         return self._get_bool_prop("rtl")
 
@@ -229,9 +228,10 @@ def rtl(self, value):
 
     @property
     def shadow(self):
-        """
-        Read/write tri-state value. When |True| causes the text in the run
-        to appear as if each character has a shadow.
+        """Read/write tri-state value.
+
+        When |True| causes the text in the run to appear as if each character has a
+        shadow.
         """
         return self._get_bool_prop("shadow")
 
@@ -241,19 +241,13 @@ def shadow(self, value):
 
     @property
     def size(self):
-        """
-        Read/write |Length| value or |None|, indicating the font height in
-        English Metric Units (EMU). |None| indicates the font size should be
-        inherited from the style hierarchy. |Length| is a subclass of |int|
-        having properties for convenient conversion into points or other
-        length units. The :class:`docx.shared.Pt` class allows convenient
-        specification of point values::
-
-            >> font.size = Pt(24)
-            >> font.size
-            304800
-            >> font.size.pt
-            24.0
+        """Read/write |Length| value or |None|, indicating the font height in English
+        Metric Units (EMU). |None| indicates the font size should be inherited from the
+        style hierarchy. |Length| is a subclass of |int| having properties for
+        convenient conversion into points or other length units. The
+        :class:`docx.shared.Pt` class allows convenient specification of point values::
+
+        >> font.size = Pt(24) >> font.size 304800 >> font.size.pt 24.0
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -267,10 +261,10 @@ def size(self, emu):
 
     @property
     def small_caps(self):
-        """
-        Read/write tri-state value. When |True| causes the lowercase
-        characters in the run to appear as capital letters two points smaller
-        than the font size specified for the run.
+        """Read/write tri-state value.
+
+        When |True| causes the lowercase characters in the run to appear as capital
+        letters two points smaller than the font size specified for the run.
         """
         return self._get_bool_prop("smallCaps")
 
@@ -280,10 +274,10 @@ def small_caps(self, value):
 
     @property
     def snap_to_grid(self):
-        """
-        Read/write tri-state value. When |True| causes the run to use the
-        document grid characters per line settings defined in the docGrid
-        element when laying out the characters in this run.
+        """Read/write tri-state value.
+
+        When |True| causes the run to use the document grid characters per line settings
+        defined in the docGrid element when laying out the characters in this run.
         """
         return self._get_bool_prop("snapToGrid")
 
@@ -293,12 +287,12 @@ def snap_to_grid(self, value):
 
     @property
     def spec_vanish(self):
-        """
-        Read/write tri-state value. When |True|, specifies that the given run
-        shall always behave as if it is hidden, even when hidden text is
-        being displayed in the current document. The property has a very
-        narrow, specialized use related to the table of contents. Consult the
-        spec (§17.3.2.36) for more details.
+        """Read/write tri-state value.
+
+        When |True|, specifies that the given run shall always behave as if it is
+        hidden, even when hidden text is being displayed in the current document. The
+        property has a very narrow, specialized use related to the table of contents.
+        Consult the spec (§17.3.2.36) for more details.
         """
         return self._get_bool_prop("specVanish")
 
@@ -308,10 +302,10 @@ def spec_vanish(self, value):
 
     @property
     def strike(self):
-        """
-        Read/write tri-state value. When |True| causes the text in the run
-        to appear with a single horizontal line through the center of the
-        line.
+        """Read/write tri-state value.
+
+        When |True| causes the text in the run to appear with a single horizontal line
+        through the center of the line.
         """
         return self._get_bool_prop("strike")
 
@@ -321,10 +315,10 @@ def strike(self, value):
 
     @property
     def subscript(self):
-        """
-        Boolean indicating whether the characters in this |Font| appear as
-        subscript. |None| indicates the subscript/subscript value is
-        inherited from the style hierarchy.
+        """Boolean indicating whether the characters in this |Font| appear as subscript.
+
+        |None| indicates the subscript/subscript value is inherited from the style
+        hierarchy.
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -338,10 +332,11 @@ def subscript(self, value):
 
     @property
     def superscript(self):
-        """
-        Boolean indicating whether the characters in this |Font| appear as
-        superscript. |None| indicates the subscript/superscript value is
-        inherited from the style hierarchy.
+        """Boolean indicating whether the characters in this |Font| appear as
+        superscript.
+
+        |None| indicates the subscript/superscript value is inherited from the style
+        hierarchy.
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -355,13 +350,13 @@ def superscript(self, value):
 
     @property
     def underline(self):
-        """
-        The underline style for this |Font|, one of |None|, |True|, |False|,
-        or a value from :ref:`WdUnderline`. |None| indicates the font
-        inherits its underline value from the style hierarchy. |False|
-        indicates no underline. |True| indicates single underline. The values
-        from :ref:`WdUnderline` are used to specify other outline styles such
-        as double, wavy, and dotted.
+        """The underline style for this |Font|, one of |None|, |True|, |False|, or a
+        value from :ref:`WdUnderline`.
+
+        |None| indicates the font inherits its underline value from the style hierarchy.
+        |False| indicates no underline. |True| indicates single underline. The values
+        from :ref:`WdUnderline` are used to specify other outline styles such as double,
+        wavy, and dotted.
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -375,10 +370,10 @@ def underline(self, value):
 
     @property
     def web_hidden(self):
-        """
-        Read/write tri-state value. When |True|, specifies that the contents
-        of this run shall be hidden when the document is displayed in web
-        page view.
+        """Read/write tri-state value.
+
+        When |True|, specifies that the contents of this run shall be hidden when the
+        document is displayed in web page view.
         """
         return self._get_bool_prop("webHidden")
 
@@ -387,17 +382,13 @@ def web_hidden(self, value):
         self._set_bool_prop("webHidden", value)
 
     def _get_bool_prop(self, name):
-        """
-        Return the value of boolean child of `w:rPr` having `name`.
-        """
+        """Return the value of boolean child of `w:rPr` having `name`."""
         rPr = self._element.rPr
         if rPr is None:
             return None
         return rPr._get_bool_val(name)
 
     def _set_bool_prop(self, name, value):
-        """
-        Assign `value` to the boolean child `name` of `w:rPr`.
-        """
+        """Assign `value` to the boolean child `name` of `w:rPr`."""
         rPr = self._element.get_or_add_rPr()
         rPr._set_bool_val(name, value)
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index c397bb328..9ca235bdb 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -14,12 +14,12 @@ def __init__(self, p, parent):
         self._p = self._element = p
 
     def add_run(self, text=None, style=None):
-        """
-        Append a run to this paragraph containing `text` and having character
-        style identified by style ID `style`. `text` can contain tab
-        (``\\t``) characters, which are converted to the appropriate XML form
-        for a tab. `text` can also include newline (``\\n``) or carriage
-        return (``\\r``) characters, each of which is converted to a line
+        """Append a run to this paragraph containing `text` and having character style
+        identified by style ID `style`.
+
+        `text` can contain tab (``\\t``) characters, which are converted to the
+        appropriate XML form for a tab. `text` can also include newline (``\\n``) or
+        carriage return (``\\r``) characters, each of which is converted to a line
         break.
         """
         r = self._p.add_r()
@@ -32,11 +32,11 @@ def add_run(self, text=None, style=None):
 
     @property
     def alignment(self):
-        """
-        A member of the :ref:`WdParagraphAlignment` enumeration specifying
-        the justification setting for this paragraph. A value of |None|
-        indicates the paragraph has no directly-applied alignment value and
-        will inherit its alignment value from its style hierarchy. Assigning
+        """A member of the :ref:`WdParagraphAlignment` enumeration specifying the
+        justification setting for this paragraph.
+
+        A value of |None| indicates the paragraph has no directly-applied alignment
+        value and will inherit its alignment value from its style hierarchy. Assigning
         |None| to this property removes any directly-applied alignment value.
         """
         return self._p.alignment
@@ -46,19 +46,18 @@ def alignment(self, value):
         self._p.alignment = value
 
     def clear(self):
-        """
-        Return this same paragraph after removing all its content.
+        """Return this same paragraph after removing all its content.
+
         Paragraph-level formatting, such as style, is preserved.
         """
         self._p.clear_content()
         return self
 
     def insert_paragraph_before(self, text=None, style=None):
-        """
-        Return a newly created paragraph, inserted directly before this
-        paragraph. If `text` is supplied, the new paragraph contains that
-        text in a single run. If `style` is provided, that style is assigned
-        to the new paragraph.
+        """Return a newly created paragraph, inserted directly before this paragraph.
+
+        If `text` is supplied, the new paragraph contains that text in a single run. If
+        `style` is provided, that style is assigned to the new paragraph.
         """
         paragraph = self._insert_paragraph_before()
         if text:
@@ -69,29 +68,25 @@ def insert_paragraph_before(self, text=None, style=None):
 
     @property
     def paragraph_format(self):
-        """
-        The |ParagraphFormat| object providing access to the formatting
-        properties for this paragraph, such as line spacing and indentation.
-        """
+        """The |ParagraphFormat| object providing access to the formatting properties
+        for this paragraph, such as line spacing and indentation."""
         return ParagraphFormat(self._element)
 
     @property
     def runs(self):
-        """
-        Sequence of |Run| instances corresponding to the <w:r> elements in
-        this paragraph.
-        """
+        """Sequence of |Run| instances corresponding to the <w:r> elements in this
+        paragraph."""
         return [Run(r, self) for r in self._p.r_lst]
 
     @property
     def style(self):
-        """
-        Read/Write. |_ParagraphStyle| object representing the style assigned
-        to this paragraph. If no explicit style is assigned to this
-        paragraph, its value is the default paragraph style for the document.
-        A paragraph style name can be assigned in lieu of a paragraph style
-        object. Assigning |None| removes any applied style, making its
-        effective value the default paragraph style for the document.
+        """Read/Write.
+
+        |_ParagraphStyle| object representing the style assigned to this paragraph. If
+        no explicit style is assigned to this paragraph, its value is the default
+        paragraph style for the document. A paragraph style name can be assigned in lieu
+        of a paragraph style object. Assigning |None| removes any applied style, making
+        its effective value the default paragraph style for the document.
         """
         style_id = self._p.style
         return self.part.get_style(style_id, WD_STYLE_TYPE.PARAGRAPH)
@@ -125,9 +120,6 @@ def text(self, text):
         self.add_run(text)
 
     def _insert_paragraph_before(self):
-        """
-        Return a newly created paragraph, inserted directly before this
-        paragraph.
-        """
+        """Return a newly created paragraph, inserted directly before this paragraph."""
         p = self._p.add_p_before()
         return Paragraph(p, self._parent)
diff --git a/src/docx/text/parfmt.py b/src/docx/text/parfmt.py
index 328eb7def..a4d408ec5 100644
--- a/src/docx/text/parfmt.py
+++ b/src/docx/text/parfmt.py
@@ -6,20 +6,18 @@
 
 
 class ParagraphFormat(ElementProxy):
-    """
-    Provides access to paragraph formatting such as justification,
-    indentation, line spacing, space before and after, and widow/orphan
-    control.
-    """
+    """Provides access to paragraph formatting such as justification, indentation, line
+    spacing, space before and after, and widow/orphan control."""
 
     __slots__ = ("_tab_stops",)
 
     @property
     def alignment(self):
-        """
-        A member of the :ref:`WdParagraphAlignment` enumeration specifying
-        the justification setting for this paragraph. A value of |None|
-        indicates paragraph alignment is inherited from the style hierarchy.
+        """A member of the :ref:`WdParagraphAlignment` enumeration specifying the
+        justification setting for this paragraph.
+
+        A value of |None| indicates paragraph alignment is inherited from the style
+        hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -33,12 +31,12 @@ def alignment(self, value):
 
     @property
     def first_line_indent(self):
-        """
-        |Length| value specifying the relative difference in indentation for
-        the first line of the paragraph. A positive value causes the first
-        line to be indented. A negative value produces a hanging indent.
-        |None| indicates first line indentation is inherited from the style
-        hierarchy.
+        """|Length| value specifying the relative difference in indentation for the
+        first line of the paragraph.
+
+        A positive value causes the first line to be indented. A negative value produces
+        a hanging indent. |None| indicates first line indentation is inherited from the
+        style hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -52,10 +50,10 @@ def first_line_indent(self, value):
 
     @property
     def keep_together(self):
-        """
-        |True| if the paragraph should be kept "in one piece" and not broken
-        across a page boundary when the document is rendered. |None|
-        indicates its effective value is inherited from the style hierarchy.
+        """|True| if the paragraph should be kept "in one piece" and not broken across a
+        page boundary when the document is rendered.
+
+        |None| indicates its effective value is inherited from the style hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -68,12 +66,12 @@ def keep_together(self, value):
 
     @property
     def keep_with_next(self):
-        """
-        |True| if the paragraph should be kept on the same page as the
-        subsequent paragraph when the document is rendered. For example, this
-        property could be used to keep a section heading on the same page as
-        its first paragraph. |None| indicates its effective value is
-        inherited from the style hierarchy.
+        """|True| if the paragraph should be kept on the same page as the subsequent
+        paragraph when the document is rendered.
+
+        For example, this property could be used to keep a section heading on the same
+        page as its first paragraph. |None| indicates its effective value is inherited
+        from the style hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -86,11 +84,12 @@ def keep_with_next(self, value):
 
     @property
     def left_indent(self):
-        """
-        |Length| value specifying the space between the left margin and the
-        left side of the paragraph. |None| indicates the left indent value is
-        inherited from the style hierarchy. Use an |Inches| value object as
-        a convenient way to apply indentation in units of inches.
+        """|Length| value specifying the space between the left margin and the left side
+        of the paragraph.
+
+        |None| indicates the left indent value is inherited from the style hierarchy.
+        Use an |Inches| value object as a convenient way to apply indentation in units
+        of inches.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -104,15 +103,15 @@ def left_indent(self, value):
 
     @property
     def line_spacing(self):
-        """
-        |float| or |Length| value specifying the space between baselines in
-        successive lines of the paragraph. A value of |None| indicates line
-        spacing is inherited from the style hierarchy. A float value, e.g.
-        ``2.0`` or ``1.75``, indicates spacing is applied in multiples of
-        line heights. A |Length| value such as ``Pt(12)`` indicates spacing
-        is a fixed height. The |Pt| value class is a convenient way to apply
-        line spacing in units of points. Assigning |None| resets line spacing
-        to inherit from the style hierarchy.
+        """|float| or |Length| value specifying the space between baselines in
+        successive lines of the paragraph.
+
+        A value of |None| indicates line spacing is inherited from the style hierarchy.
+        A float value, e.g. ``2.0`` or ``1.75``, indicates spacing is applied in
+        multiples of line heights. A |Length| value such as ``Pt(12)`` indicates spacing
+        is a fixed height. The |Pt| value class is a convenient way to apply line
+        spacing in units of points. Assigning |None| resets line spacing to inherit from
+        the style hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -135,12 +134,12 @@ def line_spacing(self, value):
 
     @property
     def line_spacing_rule(self):
-        """
-        A member of the :ref:`WdLineSpacing` enumeration indicating how the
-        value of :attr:`line_spacing` should be interpreted. Assigning any of
-        the :ref:`WdLineSpacing` members :attr:`SINGLE`, :attr:`DOUBLE`, or
-        :attr:`ONE_POINT_FIVE` will cause the value of :attr:`line_spacing`
-        to be updated to produce the corresponding line spacing.
+        """A member of the :ref:`WdLineSpacing` enumeration indicating how the value of
+        :attr:`line_spacing` should be interpreted.
+
+        Assigning any of the :ref:`WdLineSpacing` members :attr:`SINGLE`,
+        :attr:`DOUBLE`, or :attr:`ONE_POINT_FIVE` will cause the value of
+        :attr:`line_spacing` to be updated to produce the corresponding line spacing.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -164,10 +163,10 @@ def line_spacing_rule(self, value):
 
     @property
     def page_break_before(self):
-        """
-        |True| if the paragraph should appear at the top of the page
-        following the prior paragraph. |None| indicates its effective value
-        is inherited from the style hierarchy.
+        """|True| if the paragraph should appear at the top of the page following the
+        prior paragraph.
+
+        |None| indicates its effective value is inherited from the style hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -180,11 +179,12 @@ def page_break_before(self, value):
 
     @property
     def right_indent(self):
-        """
-        |Length| value specifying the space between the right margin and the
-        right side of the paragraph. |None| indicates the right indent value
-        is inherited from the style hierarchy. Use a |Cm| value object as
-        a convenient way to apply indentation in units of centimeters.
+        """|Length| value specifying the space between the right margin and the right
+        side of the paragraph.
+
+        |None| indicates the right indent value is inherited from the style hierarchy.
+        Use a |Cm| value object as a convenient way to apply indentation in units of
+        centimeters.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -198,13 +198,12 @@ def right_indent(self, value):
 
     @property
     def space_after(self):
-        """
-        |Length| value specifying the spacing to appear between this
-        paragraph and the subsequent paragraph. |None| indicates this value
-        is inherited from the style hierarchy. |Length| objects provide
-        convenience properties, such as :attr:`~.Length.pt` and
-        :attr:`~.Length.inches`, that allow easy conversion to various length
-        units.
+        """|Length| value specifying the spacing to appear between this paragraph and
+        the subsequent paragraph.
+
+        |None| indicates this value is inherited from the style hierarchy. |Length|
+        objects provide convenience properties, such as :attr:`~.Length.pt` and
+        :attr:`~.Length.inches`, that allow easy conversion to various length units.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -217,13 +216,12 @@ def space_after(self, value):
 
     @property
     def space_before(self):
-        """
-        |Length| value specifying the spacing to appear between this
-        paragraph and the prior paragraph. |None| indicates this value is
-        inherited from the style hierarchy. |Length| objects provide
-        convenience properties, such as :attr:`~.Length.pt` and
-        :attr:`~.Length.cm`, that allow easy conversion to various length
-        units.
+        """|Length| value specifying the spacing to appear between this paragraph and
+        the prior paragraph.
+
+        |None| indicates this value is inherited from the style hierarchy. |Length|
+        objects provide convenience properties, such as :attr:`~.Length.pt` and
+        :attr:`~.Length.cm`, that allow easy conversion to various length units.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -236,20 +234,17 @@ def space_before(self, value):
 
     @lazyproperty
     def tab_stops(self):
-        """
-        |TabStops| object providing access to the tab stops defined for this
-        paragraph format.
-        """
+        """|TabStops| object providing access to the tab stops defined for this
+        paragraph format."""
         pPr = self._element.get_or_add_pPr()
         return TabStops(pPr)
 
     @property
     def widow_control(self):
-        """
-        |True| if the first and last lines in the paragraph remain on the
-        same page as the rest of the paragraph when Word repaginates the
-        document. |None| indicates its effective value is inherited from the
-        style hierarchy.
+        """|True| if the first and last lines in the paragraph remain on the same page
+        as the rest of the paragraph when Word repaginates the document.
+
+        |None| indicates its effective value is inherited from the style hierarchy.
         """
         pPr = self._element.pPr
         if pPr is None:
@@ -262,12 +257,12 @@ def widow_control(self, value):
 
     @staticmethod
     def _line_spacing(spacing_line, spacing_lineRule):
-        """
-        Return the line spacing value calculated from the combination of
-        `spacing_line` and `spacing_lineRule`. Returns a |float| number of
-        lines when `spacing_lineRule` is ``WD_LINE_SPACING.MULTIPLE``,
-        otherwise a |Length| object of absolute line height is returned.
-        Returns |None| when `spacing_line` is |None|.
+        """Return the line spacing value calculated from the combination of
+        `spacing_line` and `spacing_lineRule`.
+
+        Returns a |float| number of lines when `spacing_lineRule` is
+        ``WD_LINE_SPACING.MULTIPLE``, otherwise a |Length| object of absolute line
+        height is returned. Returns |None| when `spacing_line` is |None|.
         """
         if spacing_line is None:
             return None
@@ -277,11 +272,11 @@ def _line_spacing(spacing_line, spacing_lineRule):
 
     @staticmethod
     def _line_spacing_rule(line, lineRule):
-        """
-        Return the line spacing rule value calculated from the combination of
-        `line` and `lineRule`. Returns special members of the
-        :ref:`WdLineSpacing` enumeration when line spacing is single, double,
-        or 1.5 lines.
+        """Return the line spacing rule value calculated from the combination of `line`
+        and `lineRule`.
+
+        Returns special members of the :ref:`WdLineSpacing` enumeration when line
+        spacing is single, double, or 1.5 lines.
         """
         if lineRule == WD_LINE_SPACING.MULTIPLE:
             if line == Twips(240):
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 72f49a069..05adcc24c 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -8,11 +8,11 @@
 
 
 class Run(Parented):
-    """
-    Proxy object wrapping ``<w:r>`` element. Several of the properties on Run
-    take a tri-state value, |True|, |False|, or |None|. |True| and |False|
-    correspond to on and off respectively. |None| indicates the property is
-    not specified directly on the run and its effective value is taken from
+    """Proxy object wrapping ``<w:r>`` element.
+
+    Several of the properties on Run take a tri-state value, |True|, |False|, or |None|.
+    |True| and |False| correspond to on and off respectively. |None| indicates the
+    property is not specified directly on the run and its effective value is taken from
     the style hierarchy.
     """
 
@@ -21,9 +21,9 @@ def __init__(self, r, parent):
         self._r = self._element = self.element = r
 
     def add_break(self, break_type=WD_BREAK.LINE):
-        """
-        Add a break element of `break_type` to this run. `break_type` can
-        take the values `WD_BREAK.LINE`, `WD_BREAK.PAGE`, and
+        """Add a break element of `break_type` to this run.
+
+        `break_type` can take the values `WD_BREAK.LINE`, `WD_BREAK.PAGE`, and
         `WD_BREAK.COLUMN` where `WD_BREAK` is imported from `docx.enum.text`.
         `break_type` defaults to `WD_BREAK.LINE`.
         """
@@ -42,16 +42,15 @@ def add_break(self, break_type=WD_BREAK.LINE):
             br.clear = clear
 
     def add_picture(self, image_path_or_stream, width=None, height=None):
-        """
-        Return an |InlineShape| instance containing the image identified by
+        """Return an |InlineShape| instance containing the image identified by
         `image_path_or_stream`, added to the end of this run.
-        `image_path_or_stream` can be a path (a string) or a file-like object
-        containing a binary image. If neither width nor height is specified,
-        the picture appears at its native size. If only one is specified, it
-        is used to compute a scaling factor that is then applied to the
-        unspecified dimension, preserving the aspect ratio of the image. The
-        native size of the picture is calculated using the dots-per-inch
-        (dpi) value specified in the image file, defaulting to 72 dpi if no
+
+        `image_path_or_stream` can be a path (a string) or a file-like object containing
+        a binary image. If neither width nor height is specified, the picture appears at
+        its native size. If only one is specified, it is used to compute a scaling
+        factor that is then applied to the unspecified dimension, preserving the aspect
+        ratio of the image. The native size of the picture is calculated using the dots-
+        per-inch (dpi) value specified in the image file, defaulting to 72 dpi if no
         value is specified, as is often the case.
         """
         inline = self.part.new_pic_inline(image_path_or_stream, width, height)
@@ -59,17 +58,15 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         return InlineShape(inline)
 
     def add_tab(self):
-        """
-        Add a ``<w:tab/>`` element at the end of the run, which Word
-        interprets as a tab character.
-        """
+        """Add a ``<w:tab/>`` element at the end of the run, which Word interprets as a
+        tab character."""
         self._r._add_tab()
 
     def add_text(self, text):
-        """
-        Returns a newly appended |_Text| object (corresponding to a new
-        ``<w:t>`` child element) to the run, containing `text`. Compare with
-        the possibly more friendly approach of assigning text to the
+        """Returns a newly appended |_Text| object (corresponding to a new ``<w:t>``
+        child element) to the run, containing `text`.
+
+        Compare with the possibly more friendly approach of assigning text to the
         :attr:`Run.text` property.
         """
         t = self._r.add_t(text)
@@ -77,8 +74,9 @@ def add_text(self, text):
 
     @property
     def bold(self):
-        """
-        Read/write. Causes the text of the run to appear in bold.
+        """Read/write.
+
+        Causes the text of the run to appear in bold.
         """
         return self.font.bold
 
@@ -87,26 +85,24 @@ def bold(self, value):
         self.font.bold = value
 
     def clear(self):
-        """
-        Return reference to this run after removing all its content. All run
-        formatting is preserved.
+        """Return reference to this run after removing all its content.
+
+        All run formatting is preserved.
         """
         self._r.clear_content()
         return self
 
     @property
     def font(self):
-        """
-        The |Font| object providing access to the character formatting
-        properties for this run, such as font name and size.
-        """
+        """The |Font| object providing access to the character formatting properties for
+        this run, such as font name and size."""
         return Font(self._element)
 
     @property
     def italic(self):
-        """
-        Read/write tri-state value. When |True|, causes the text of the run
-        to appear in italics.
+        """Read/write tri-state value.
+
+        When |True|, causes the text of the run to appear in italics.
         """
         return self.font.italic
 
@@ -116,12 +112,12 @@ def italic(self, value):
 
     @property
     def style(self):
-        """
-        Read/write. A |_CharacterStyle| object representing the character
-        style applied to this run. The default character style for the
-        document (often `Default Character Font`) is returned if the run has
-        no directly-applied character style. Setting this property to |None|
-        removes any directly-applied character style.
+        """Read/write.
+
+        A |_CharacterStyle| object representing the character style applied to this run.
+        The default character style for the document (often `Default Character Font`) is
+        returned if the run has no directly-applied character style. Setting this
+        property to |None| removes any directly-applied character style.
         """
         style_id = self._r.style
         return self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
@@ -133,21 +129,18 @@ def style(self, style_or_name):
 
     @property
     def text(self):
-        """
-        String formed by concatenating the text equivalent of each run
-        content child element into a Python string. Each ``<w:t>`` element
-        adds the text characters it contains. A ``<w:tab/>`` element adds
-        a ``\\t`` character. A ``<w:cr/>`` or ``<w:br>`` element each add
-        a ``\\n`` character. Note that a ``<w:br>`` element can indicate
-        a page break or column break as well as a line break. All ``<w:br>``
-        elements translate to a single ``\\n`` character regardless of their
-        type. All other content child elements, such as ``<w:drawing>``, are
-        ignored.
-
-        Assigning text to this property has the reverse effect, translating
-        each ``\\t`` character to a ``<w:tab/>`` element and each ``\\n`` or
-        ``\\r`` character to a ``<w:cr/>`` element. Any existing run content
-        is replaced. Run formatting is preserved.
+        """String formed by concatenating the text equivalent of each run content child
+        element into a Python string. Each ``<w:t>`` element adds the text characters it
+        contains. A ``<w:tab/>`` element adds a ``\\t`` character. A ``<w:cr/>`` or
+        ``<w:br>`` element each add a ``\\n`` character. Note that a ``<w:br>`` element
+        can indicate a page break or column break as well as a line break. All
+        ``<w:br>`` elements translate to a single ``\\n`` character regardless of their
+        type. All other content child elements, such as ``<w:drawing>``, are ignored.
+
+        Assigning text to this property has the reverse effect, translating each ``\\t``
+        character to a ``<w:tab/>`` element and each ``\\n`` or ``\\r`` character to a
+        ``<w:cr/>`` element. Any existing run content is replaced. Run formatting is
+        preserved.
         """
         return self._r.text
 
@@ -157,16 +150,16 @@ def text(self, text):
 
     @property
     def underline(self):
-        """
-        The underline style for this |Run|, one of |None|, |True|, |False|,
-        or a value from :ref:`WdUnderline`. A value of |None| indicates the
-        run has no directly-applied underline value and so will inherit the
-        underline value of its containing paragraph. Assigning |None| to this
-        property removes any directly-applied underline value. A value of
-        |False| indicates a directly-applied setting of no underline,
-        overriding any inherited value. A value of |True| indicates single
-        underline. The values from :ref:`WdUnderline` are used to specify
-        other outline styles such as double, wavy, and dotted.
+        """The underline style for this |Run|, one of |None|, |True|, |False|, or a
+        value from :ref:`WdUnderline`.
+
+        A value of |None| indicates the run has no directly-applied underline value and
+        so will inherit the underline value of its containing paragraph. Assigning
+        |None| to this property removes any directly-applied underline value. A value of
+        |False| indicates a directly-applied setting of no underline, overriding any
+        inherited value. A value of |True| indicates single underline. The values from
+        :ref:`WdUnderline` are used to specify other outline styles such as double,
+        wavy, and dotted.
         """
         return self.font.underline
 
@@ -176,9 +169,7 @@ def underline(self, value):
 
 
 class _Text(object):
-    """
-    Proxy object wrapping ``<w:t>`` element.
-    """
+    """Proxy object wrapping ``<w:t>`` element."""
 
     def __init__(self, t_elm):
         super(_Text, self).__init__()
diff --git a/src/docx/text/tabstops.py b/src/docx/text/tabstops.py
index 96cf44751..5906989a1 100644
--- a/src/docx/text/tabstops.py
+++ b/src/docx/text/tabstops.py
@@ -5,12 +5,12 @@
 
 
 class TabStops(ElementProxy):
-    """
-    A sequence of |TabStop| objects providing access to the tab stops of
-    a paragraph or paragraph style. Supports iteration, indexed access, del,
-    and len(). It is accesed using the :attr:`~.ParagraphFormat.tab_stops`
-    property of ParagraphFormat; it is not intended to be constructed
-    directly.
+    """A sequence of |TabStop| objects providing access to the tab stops of a paragraph
+    or paragraph style.
+
+    Supports iteration, indexed access, del, and len(). It is accesed using the
+    :attr:`~.ParagraphFormat.tab_stops` property of ParagraphFormat; it is not intended
+    to be constructed directly.
     """
 
     __slots__ = "_pPr"
@@ -20,9 +20,7 @@ def __init__(self, element):
         self._pPr = element
 
     def __delitem__(self, idx):
-        """
-        Remove the tab at offset `idx` in this sequence.
-        """
+        """Remove the tab at offset `idx` in this sequence."""
         tabs = self._pPr.tabs
         try:
             tabs.remove(tabs[idx])
@@ -33,9 +31,7 @@ def __delitem__(self, idx):
             self._pPr.remove(tabs)
 
     def __getitem__(self, idx):
-        """
-        Enables list-style access by index.
-        """
+        """Enables list-style access by index."""
         tabs = self._pPr.tabs
         if tabs is None:
             raise IndexError("TabStops object is empty")
@@ -43,10 +39,8 @@ def __getitem__(self, idx):
         return TabStop(tab)
 
     def __iter__(self):
-        """
-        Generate a TabStop object for each of the w:tab elements, in XML
-        document order.
-        """
+        """Generate a TabStop object for each of the w:tab elements, in XML document
+        order."""
         tabs = self._pPr.tabs
         if tabs is not None:
             for tab in tabs.tab_lst:
@@ -61,30 +55,28 @@ def __len__(self):
     def add_tab_stop(
         self, position, alignment=WD_TAB_ALIGNMENT.LEFT, leader=WD_TAB_LEADER.SPACES
     ):
-        """
-        Add a new tab stop at `position`, a |Length| object specifying the
-        location of the tab stop relative to the paragraph edge. A negative
-        `position` value is valid and appears in hanging indentation. Tab
-        alignment defaults to left, but may be specified by passing a member
-        of the :ref:`WdTabAlignment` enumeration as `alignment`. An optional
-        leader character can be specified by passing a member of the
-        :ref:`WdTabLeader` enumeration as `leader`.
+        """Add a new tab stop at `position`, a |Length| object specifying the location
+        of the tab stop relative to the paragraph edge.
+
+        A negative `position` value is valid and appears in hanging indentation. Tab
+        alignment defaults to left, but may be specified by passing a member of the
+        :ref:`WdTabAlignment` enumeration as `alignment`. An optional leader character
+        can be specified by passing a member of the :ref:`WdTabLeader` enumeration as
+        `leader`.
         """
         tabs = self._pPr.get_or_add_tabs()
         tab = tabs.insert_tab_in_order(position, alignment, leader)
         return TabStop(tab)
 
     def clear_all(self):
-        """
-        Remove all custom tab stops.
-        """
+        """Remove all custom tab stops."""
         self._pPr._remove_tabs()
 
 
 class TabStop(ElementProxy):
-    """
-    An individual tab stop applying to a paragraph or style. Accessed using
-    list semantics on its containing |TabStops| object.
+    """An individual tab stop applying to a paragraph or style.
+
+    Accessed using list semantics on its containing |TabStops| object.
     """
 
     __slots__ = "_tab"
@@ -95,9 +87,10 @@ def __init__(self, element):
 
     @property
     def alignment(self):
-        """
-        A member of :ref:`WdTabAlignment` specifying the alignment setting
-        for this tab stop. Read/write.
+        """A member of :ref:`WdTabAlignment` specifying the alignment setting for this
+        tab stop.
+
+        Read/write.
         """
         return self._tab.val
 
@@ -107,10 +100,10 @@ def alignment(self, value):
 
     @property
     def leader(self):
-        """
-        A member of :ref:`WdTabLeader` specifying a repeating character used
-        as a "leader", filling in the space spanned by this tab. Assigning
-        |None| produces the same result as assigning `WD_TAB_LEADER.SPACES`.
+        """A member of :ref:`WdTabLeader` specifying a repeating character used as a
+        "leader", filling in the space spanned by this tab.
+
+        Assigning |None| produces the same result as assigning `WD_TAB_LEADER.SPACES`.
         Read/write.
         """
         return self._tab.leader
@@ -121,10 +114,10 @@ def leader(self, value):
 
     @property
     def position(self):
-        """
-        A |Length| object representing the distance of this tab stop from the
-        inside edge of the paragraph. May be positive or negative.
-        Read/write.
+        """A |Length| object representing the distance of this tab stop from the inside
+        edge of the paragraph.
+
+        May be positive or negative. Read/write.
         """
         return self._tab.pos
 

From 5cd150e06fd187c24bd18b86cf9202d021418927 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 27 Sep 2023 15:52:24 -0700
Subject: [PATCH 253/367] rfctr: bulk test-layout updates

Back in the day I thought it better to extract a test-specific fixture
for each test. That had the benefit of making parameterized tests fold
cleanly without the parameters in the decorator. The downside was you
had to look in two places to understand the test so I dropped that
practice. Fix some of these I need to change or add to later.
---
 src/docx/oxml/text/run.py    |  4 ++-
 src/docx/text/run.py         | 25 +++++++-------
 tests/oxml/text/test_run.py  | 32 +++++++++--------
 tests/text/test_paragraph.py | 38 ++++++++++-----------
 tests/text/test_run.py       | 66 ++++++++++++++++++------------------
 tests/unitutil/cxml.py       |  4 +--
 6 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 9d930aad0..0f7261979 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -1,5 +1,7 @@
 """Custom element classes related to text runs (CT_R)."""
 
+from __future__ import annotations
+
 from docx.oxml.ns import qn
 from docx.oxml.simpletypes import ST_BrClear, ST_BrType
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
@@ -18,7 +20,7 @@ class CT_R(BaseOxmlElement):
     tab = ZeroOrMore("w:tab")
     drawing = ZeroOrMore("w:drawing")
 
-    def add_t(self, text):
+    def add_t(self, text: str) -> CT_Text:
         """Return a newly added `<w:t>` element containing `text`."""
         t = self._add_t(text=text)
         if len(text.strip()) < len(text):
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 05adcc24c..062f58332 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -128,18 +128,19 @@ def style(self, style_or_name):
         self._r.style = style_id
 
     @property
-    def text(self):
-        """String formed by concatenating the text equivalent of each run content child
-        element into a Python string. Each ``<w:t>`` element adds the text characters it
-        contains. A ``<w:tab/>`` element adds a ``\\t`` character. A ``<w:cr/>`` or
-        ``<w:br>`` element each add a ``\\n`` character. Note that a ``<w:br>`` element
-        can indicate a page break or column break as well as a line break. All
-        ``<w:br>`` elements translate to a single ``\\n`` character regardless of their
-        type. All other content child elements, such as ``<w:drawing>``, are ignored.
-
-        Assigning text to this property has the reverse effect, translating each ``\\t``
-        character to a ``<w:tab/>`` element and each ``\\n`` or ``\\r`` character to a
-        ``<w:cr/>`` element. Any existing run content is replaced. Run formatting is
+    def text(self) -> str:
+        """String formed by concatenating the text equivalent of each run.
+
+        Each `<w:t>` element adds the text characters it contains. A `<w:tab/>` element
+        adds a `\\t` character. A `<w:cr/>` or `<w:br>` element each add a `\\n`
+        character. Note that a `<w:br>` element can indicate a page break or column
+        break as well as a line break. Only line-break `<w:br>` elements translate to
+        a `\\n` character. Others are ignored. All other content child elements, such as
+        `<w:drawing>`, are ignored.
+
+        Assigning text to this property has the reverse effect, translating each `\\t`
+        character to a `<w:tab/>` element and each `\\n` or `\\r` character to a
+        `<w:cr/>` element. Any existing run content is replaced. Run formatting is
         preserved.
         """
         return self._r.text
diff --git a/tests/oxml/text/test_run.py b/tests/oxml/text/test_run.py
index db5ae727a..69aefe8ed 100644
--- a/tests/oxml/text/test_run.py
+++ b/tests/oxml/text/test_run.py
@@ -1,20 +1,20 @@
 """Test suite for the docx.oxml.text.run module."""
 
+from typing import cast
+
 import pytest
 
-from ...unitutil.cxml import element, xml
+from docx.oxml.text.run import CT_R
 
+from ...unitutil.cxml import element, xml
 
-class DescribeCT_R(object):
-    def it_can_add_a_t_preserving_edge_whitespace(self, add_t_fixture):
-        r, text, expected_xml = add_t_fixture
-        r.add_t(text)
-        assert r.xml == expected_xml
 
-    # fixtures -------------------------------------------------------
+class DescribeCT_R:
+    """Unit-test suite for the CT_R (run, <w:r>) element."""
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("initial_cxml", "text", "expected_cxml"),
+        [
             ("w:r", "foobar", 'w:r/w:t"foobar"'),
             ("w:r", "foobar ", 'w:r/w:t{xml:space=preserve}"foobar "'),
             (
@@ -22,10 +22,14 @@ def it_can_add_a_t_preserving_edge_whitespace(self, add_t_fixture):
                 "foobar",
                 'w:r/(w:rPr/w:rStyle{w:val=emphasis}, w:cr, w:t"foobar")',
             ),
-        ]
+        ],
     )
-    def add_t_fixture(self, request):
-        initial_cxml, text, expected_cxml = request.param
-        r = element(initial_cxml)
+    def it_can_add_a_t_preserving_edge_whitespace(
+        self, initial_cxml: str, text: str, expected_cxml: str
+    ):
+        r = cast(CT_R, element(initial_cxml))
         expected_xml = xml(expected_cxml)
-        return r, text, expected_xml
+
+        r.add_t(text)
+
+        assert r.xml == expected_xml
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index 29778c284..598d74e77 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -34,9 +34,23 @@ def it_can_change_its_paragraph_style(self, style_set_fixture):
         )
         assert paragraph._p.xml == expected_xml
 
-    def it_knows_the_text_it_contains(self, text_get_fixture):
-        paragraph, expected_text = text_get_fixture
-        assert paragraph.text == expected_text
+    @pytest.mark.parametrize(
+        ("p_cxml", "expected_value"),
+        [
+            ("w:p", ""),
+            ("w:p/w:r", ""),
+            ("w:p/w:r/w:t", ""),
+            ('w:p/w:r/w:t"foo"', "foo"),
+            ('w:p/w:r/(w:t"foo", w:t"bar")', "foobar"),
+            ('w:p/w:r/(w:t"fo ", w:t"bar")', "fo bar"),
+            ('w:p/w:r/(w:t"foo", w:tab, w:t"bar")', "foo\tbar"),
+            ('w:p/w:r/(w:t"foo", w:br,  w:t"bar")', "foo\nbar"),
+            ('w:p/w:r/(w:t"foo", w:cr,  w:t"bar")', "foo\nbar"),
+        ],
+    )
+    def it_knows_the_text_it_contains(self, p_cxml: str, expected_value: str):
+        paragraph = Paragraph(element(p_cxml), None)
+        assert paragraph.text == expected_value
 
     def it_can_replace_the_text_it_contains(self, text_set_fixture):
         paragraph, text, expected_text = text_set_fixture
@@ -223,24 +237,6 @@ def style_set_fixture(self, request, part_prop_):
         expected_xml = xml(expected_cxml)
         return paragraph, value, expected_xml
 
-    @pytest.fixture(
-        params=[
-            ("w:p", ""),
-            ("w:p/w:r", ""),
-            ("w:p/w:r/w:t", ""),
-            ('w:p/w:r/w:t"foo"', "foo"),
-            ('w:p/w:r/(w:t"foo", w:t"bar")', "foobar"),
-            ('w:p/w:r/(w:t"fo ", w:t"bar")', "fo bar"),
-            ('w:p/w:r/(w:t"foo", w:tab, w:t"bar")', "foo\tbar"),
-            ('w:p/w:r/(w:t"foo", w:br,  w:t"bar")', "foo\nbar"),
-            ('w:p/w:r/(w:t"foo", w:cr,  w:t"bar")', "foo\nbar"),
-        ]
-    )
-    def text_get_fixture(self, request):
-        p_cxml, expected_text_value = request.param
-        paragraph = Paragraph(element(p_cxml), None)
-        return paragraph, expected_text_value
-
     @pytest.fixture
     def text_set_fixture(self):
         paragraph = Paragraph(element("w:p"), None)
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index dd546f005..4762c6248 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -1,9 +1,14 @@
 """Test suite for the docx.text.run module."""
 
+from __future__ import annotations
+
+from typing import cast
+
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
+from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
 from docx.text.font import Font
@@ -64,9 +69,23 @@ def it_can_add_text(self, add_text_fixture, Text_):
         assert run._r.xml == expected_xml
         assert _text is Text_.return_value
 
-    def it_can_add_a_break(self, add_break_fixture):
-        run, break_type, expected_xml = add_break_fixture
+    @pytest.mark.parametrize(
+        ("break_type", "expected_cxml"),
+        [
+            (WD_BREAK.LINE, "w:r/w:br"),
+            (WD_BREAK.PAGE, "w:r/w:br{w:type=page}"),
+            (WD_BREAK.COLUMN, "w:r/w:br{w:type=column}"),
+            (WD_BREAK.LINE_CLEAR_LEFT, "w:r/w:br{w:type=textWrapping, w:clear=left}"),
+            (WD_BREAK.LINE_CLEAR_RIGHT, "w:r/w:br{w:type=textWrapping, w:clear=right}"),
+            (WD_BREAK.LINE_CLEAR_ALL, "w:r/w:br{w:type=textWrapping, w:clear=all}"),
+        ],
+    )
+    def it_can_add_a_break(self, break_type: WD_BREAK, expected_cxml: str):
+        run = Run(element("w:r"), None)
+        expected_xml = xml(expected_cxml)
+
         run.add_break(break_type)
+
         assert run._r.xml == expected_xml
 
     def it_can_add_a_tab(self, add_tab_fixture):
@@ -91,8 +110,18 @@ def it_can_remove_its_content_but_keep_formatting(self, clear_fixture):
         assert run._r.xml == expected_xml
         assert _run is run
 
-    def it_knows_the_text_it_contains(self, text_get_fixture):
-        run, expected_text = text_get_fixture
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_text"),
+        [
+            ("w:r", ""),
+            ('w:r/w:t"foobar"', "foobar"),
+            ('w:r/(w:t"abc", w:tab, w:t"def", w:cr)', "abc\tdef\n"),
+            ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', "\nabcdef\t"),
+        ],
+    )
+    def it_knows_the_text_it_contains(self, r_cxml: str, expected_text: str):
+        r = cast(CT_R, element(r_cxml))
+        run = Run(r, None)  # pyright: ignore[reportGeneralTypeIssues]
         assert run.text == expected_text
 
     def it_can_replace_the_text_it_contains(self, text_set_fixture):
@@ -102,22 +131,6 @@ def it_can_replace_the_text_it_contains(self, text_set_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(
-        params=[
-            (WD_BREAK.LINE, "w:r/w:br"),
-            (WD_BREAK.PAGE, "w:r/w:br{w:type=page}"),
-            (WD_BREAK.COLUMN, "w:r/w:br{w:type=column}"),
-            (WD_BREAK.LINE_CLEAR_LEFT, "w:r/w:br{w:type=textWrapping, w:clear=left}"),
-            (WD_BREAK.LINE_CLEAR_RIGHT, "w:r/w:br{w:type=textWrapping, w:clear=right}"),
-            (WD_BREAK.LINE_CLEAR_ALL, "w:r/w:br{w:type=textWrapping, w:clear=all}"),
-        ]
-    )
-    def add_break_fixture(self, request):
-        break_type, expected_cxml = request.param
-        run = Run(element("w:r"), None)
-        expected_xml = xml(expected_cxml)
-        return run, break_type, expected_xml
-
     @pytest.fixture
     def add_picture_fixture(self, part_prop_, document_part_, InlineShape_, picture_):
         run = Run(element("w:r/wp:x"), None)
@@ -247,19 +260,6 @@ def style_set_fixture(self, request, part_prop_):
         expected_xml = xml(expected_cxml)
         return run, value, expected_xml
 
-    @pytest.fixture(
-        params=[
-            ("w:r", ""),
-            ('w:r/w:t"foobar"', "foobar"),
-            ('w:r/(w:t"abc", w:tab, w:t"def", w:cr)', "abc\tdef\n"),
-            ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', "\nabcdef\t"),
-        ]
-    )
-    def text_get_fixture(self, request):
-        r_cxml, expected_text = request.param
-        run = Run(element(r_cxml), None)
-        return run, expected_text
-
     @pytest.fixture(
         params=[
             ("abc  def", 'w:r/w:t"abc  def"'),
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index 9c687df67..bccbd2b83 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -28,13 +28,13 @@
 # ====================================================================
 
 
-def element(cxel_str):
+def element(cxel_str: str):
     """Return an oxml element parsed from the XML generated from `cxel_str`."""
     _xml = xml(cxel_str)
     return parse_xml(_xml)
 
 
-def xml(cxel_str):
+def xml(cxel_str: str) -> str:
     """Return the XML generated from `cxel_str`."""
     root_token = root_node.parseString(cxel_str)
     xml = root_token.element.xml

From ae6592bd5bddf0a807d9bfd54e3f6f60fa29df38 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 29 Sep 2023 19:25:12 -0700
Subject: [PATCH 254/367] rfctr: bulk remove __slots__

---
 src/docx/dml/color.py     |  2 --
 src/docx/document.py      |  2 --
 src/docx/settings.py      |  2 --
 src/docx/shared.py        |  2 --
 src/docx/styles/latent.py |  4 ----
 src/docx/styles/style.py  | 10 ----------
 src/docx/styles/styles.py |  2 --
 src/docx/text/font.py     |  2 --
 src/docx/text/parfmt.py   |  2 --
 src/docx/text/tabstops.py |  4 ----
 10 files changed, 32 deletions(-)

diff --git a/src/docx/dml/color.py b/src/docx/dml/color.py
index ec0a0f3e0..d7ee0a21c 100644
--- a/src/docx/dml/color.py
+++ b/src/docx/dml/color.py
@@ -9,8 +9,6 @@ class ColorFormat(ElementProxy):
     """Provides access to color settings such as RGB color, theme color, and luminance
     adjustments."""
 
-    __slots__ = ()
-
     def __init__(self, rPr_parent):
         super(ColorFormat, self).__init__(rPr_parent)
 
diff --git a/src/docx/document.py b/src/docx/document.py
index 1baca5643..07751f155 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -15,8 +15,6 @@ class Document(ElementProxy):
     a document.
     """
 
-    __slots__ = ("_part", "__body")
-
     def __init__(self, element, part):
         super(Document, self).__init__(element)
         self._part = part
diff --git a/src/docx/settings.py b/src/docx/settings.py
index 3485e76d3..78f816e87 100644
--- a/src/docx/settings.py
+++ b/src/docx/settings.py
@@ -9,8 +9,6 @@ class Settings(ElementProxy):
     Accessed using the :attr:`.Document.settings` property.
     """
 
-    __slots__ = ()
-
     @property
     def odd_and_even_pages_header_footer(self):
         """True if this document has distinct odd and even page headers and footers.
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 062669724..b4878d6f8 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -165,8 +165,6 @@ class ElementProxy(object):
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    __slots__ = ("_element", "_parent")
-
     def __init__(self, element, parent=None):
         self._element = element
         self._parent = parent
diff --git a/src/docx/styles/latent.py b/src/docx/styles/latent.py
index fdcbbb6e7..c9db62f82 100644
--- a/src/docx/styles/latent.py
+++ b/src/docx/styles/latent.py
@@ -9,8 +9,6 @@ class LatentStyles(ElementProxy):
     to the collection of |_LatentStyle| objects that define overrides of those defaults
     for a particular named latent style."""
 
-    __slots__ = ()
-
     def __getitem__(self, key):
         """Enables dictionary-style access to a latent style by name."""
         style_name = BabelFish.ui2internal(key)
@@ -118,8 +116,6 @@ class _LatentStyle(ElementProxy):
     `w:latentStyles` element.
     """
 
-    __slots__ = ()
-
     def delete(self):
         """Remove this latent style definition such that the defaults defined in the
         containing |LatentStyles| object provide the effective value for each of its
diff --git a/src/docx/styles/style.py b/src/docx/styles/style.py
index 0f46b67f5..233ee0d37 100644
--- a/src/docx/styles/style.py
+++ b/src/docx/styles/style.py
@@ -27,8 +27,6 @@ class BaseStyle(ElementProxy):
     These properties and methods are inherited by all style objects.
     """
 
-    __slots__ = ()
-
     @property
     def builtin(self):
         """Read-only.
@@ -162,8 +160,6 @@ class _CharacterStyle(BaseStyle):
     level formatting via the |Font| object in its :attr:`.font` property.
     """
 
-    __slots__ = ()
-
     @property
     def base_style(self):
         """Style object this style inherits from or |None| if this style is not based on
@@ -192,8 +188,6 @@ class _ParagraphStyle(_CharacterStyle):
     as indentation and line-spacing.
     """
 
-    __slots__ = ()
-
     def __repr__(self):
         return "_ParagraphStyle('%s') id: %s" % (self.name, id(self))
 
@@ -233,8 +227,6 @@ class _TableStyle(_ParagraphStyle):
     as special table formatting properties.
     """
 
-    __slots__ = ()
-
     def __repr__(self):
         return "_TableStyle('%s') id: %s" % (self.name, id(self))
 
@@ -244,5 +236,3 @@ class _NumberingStyle(BaseStyle):
 
     Not yet implemented.
     """
-
-    __slots__ = ()
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index 8583e9ede..c9b8d47fb 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -15,8 +15,6 @@ class Styles(ElementProxy):
     and dictionary-style access by style name.
     """
 
-    __slots__ = ()
-
     def __contains__(self, name):
         """Enables `in` operator on style name."""
         internal_name = BabelFish.ui2internal(name)
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index 8329966ed..7a15eb7c1 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -8,8 +8,6 @@ class Font(ElementProxy):
     """Proxy object wrapping the parent of a ``<w:rPr>`` element and providing access to
     character properties such as font name, font size, bold, and subscript."""
 
-    __slots__ = ()
-
     @property
     def all_caps(self):
         """Read/write.
diff --git a/src/docx/text/parfmt.py b/src/docx/text/parfmt.py
index a4d408ec5..ea374373b 100644
--- a/src/docx/text/parfmt.py
+++ b/src/docx/text/parfmt.py
@@ -9,8 +9,6 @@ class ParagraphFormat(ElementProxy):
     """Provides access to paragraph formatting such as justification, indentation, line
     spacing, space before and after, and widow/orphan control."""
 
-    __slots__ = ("_tab_stops",)
-
     @property
     def alignment(self):
         """A member of the :ref:`WdParagraphAlignment` enumeration specifying the
diff --git a/src/docx/text/tabstops.py b/src/docx/text/tabstops.py
index 5906989a1..824085d2b 100644
--- a/src/docx/text/tabstops.py
+++ b/src/docx/text/tabstops.py
@@ -13,8 +13,6 @@ class TabStops(ElementProxy):
     to be constructed directly.
     """
 
-    __slots__ = "_pPr"
-
     def __init__(self, element):
         super(TabStops, self).__init__(element, None)
         self._pPr = element
@@ -79,8 +77,6 @@ class TabStop(ElementProxy):
     Accessed using list semantics on its containing |TabStops| object.
     """
 
-    __slots__ = "_tab"
-
     def __init__(self, element):
         super(TabStop, self).__init__(element, None)
         self._tab = element

From 99e9a0e0a741d53bac466357904e054a08e159b8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 29 Sep 2023 19:29:46 -0700
Subject: [PATCH 255/367] rfctr: modernize lazyproperty

The old @lazyproperty implementation worked, but was much messier than
the modern version, adding a member to the object __dict__. This later
version that stores the value in the descriptor is much more tidy and
more performant too I expect.
---
 src/docx/shared.py | 129 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 114 insertions(+), 15 deletions(-)

diff --git a/src/docx/shared.py b/src/docx/shared.py
index b4878d6f8..19375f53e 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -1,5 +1,10 @@
 """Objects shared by docx modules."""
 
+from __future__ import annotations
+
+import functools
+from typing import Any, Callable, Generic, TypeVar, cast
+
 
 class Length(int):
     """Base class for length constructor classes Inches, Cm, Mm, Px, and Emu.
@@ -126,24 +131,118 @@ def from_string(cls, rgb_hex_str):
         return cls(r, g, b)
 
 
-def lazyproperty(f):
-    """@lazyprop decorator.
+T = TypeVar("T")
 
-    Decorated method will be called only on first access to calculate a cached property
-    value. After that, the cached value is returned.
-    """
-    cache_attr_name = "_%s" % f.__name__  # like '_foobar' for prop 'foobar'
-    docstring = f.__doc__
 
-    def get_prop_value(obj):
-        try:
-            return getattr(obj, cache_attr_name)
-        except AttributeError:
-            value = f(obj)
-            setattr(obj, cache_attr_name, value)
-            return value
+class lazyproperty(Generic[T]):
+    """Decorator like @property, but evaluated only on first access.
+
+    Like @property, this can only be used to decorate methods having only a `self`
+    parameter, and is accessed like an attribute on an instance, i.e. trailing
+    parentheses are not used. Unlike @property, the decorated method is only evaluated
+    on first access; the resulting value is cached and that same value returned on
+    second and later access without re-evaluation of the method.
+
+    Like @property, this class produces a *data descriptor* object, which is stored in
+    the __dict__ of the *class* under the name of the decorated method ('fget'
+    nominally). The cached value is stored in the __dict__ of the *instance* under that
+    same name.
+
+    Because it is a data descriptor (as opposed to a *non-data descriptor*), its
+    `__get__()` method is executed on each access of the decorated attribute; the
+    __dict__ item of the same name is "shadowed" by the descriptor.
+
+    While this may represent a performance improvement over a property, its greater
+    benefit may be its other characteristics. One common use is to construct
+    collaborator objects, removing that "real work" from the constructor, while still
+    only executing once. It also de-couples client code from any sequencing
+    considerations; if it's accessed from more than one location, it's assured it will
+    be ready whenever needed.
+
+    Loosely based on: https://stackoverflow.com/a/6849299/1902513.
+
+    A lazyproperty is read-only. There is no counterpart to the optional "setter" (or
+    deleter) behavior of an @property. This is critically important to maintaining its
+    immutability and idempotence guarantees. Attempting to assign to a lazyproperty
+    raises AttributeError unconditionally.
+
+    The parameter names in the methods below correspond to this usage example::
+
+        class Obj(object)
 
-    return property(get_prop_value, doc=docstring)
+            @lazyproperty
+            def fget(self):
+                return 'some result'
+
+        obj = Obj()
+
+    Not suitable for wrapping a function (as opposed to a method) because it is not
+    callable."""
+
+    def __init__(self, fget: Callable[..., T]) -> None:
+        """*fget* is the decorated method (a "getter" function).
+
+        A lazyproperty is read-only, so there is only an *fget* function (a regular
+        @property can also have an fset and fdel function). This name was chosen for
+        consistency with Python's `property` class which uses this name for the
+        corresponding parameter.
+        """
+        # --- maintain a reference to the wrapped getter method
+        self._fget = fget
+        # --- and store the name of that decorated method
+        self._name = fget.__name__
+        # --- adopt fget's __name__, __doc__, and other attributes
+        functools.update_wrapper(self, fget)  # pyright: ignore
+
+    def __get__(self, obj: Any, type: Any = None) -> T:
+        """Called on each access of 'fget' attribute on class or instance.
+
+        *self* is this instance of a lazyproperty descriptor "wrapping" the property
+        method it decorates (`fget`, nominally).
+
+        *obj* is the "host" object instance when the attribute is accessed from an
+        object instance, e.g. `obj = Obj(); obj.fget`. *obj* is None when accessed on
+        the class, e.g. `Obj.fget`.
+
+        *type* is the class hosting the decorated getter method (`fget`) on both class
+        and instance attribute access.
+        """
+        # --- when accessed on class, e.g. Obj.fget, just return this descriptor
+        # --- instance (patched above to look like fget).
+        if obj is None:
+            return self  # type: ignore
+
+        # --- when accessed on instance, start by checking instance __dict__ for
+        # --- item with key matching the wrapped function's name
+        value = obj.__dict__.get(self._name)
+        if value is None:
+            # --- on first access, the __dict__ item will be absent. Evaluate fget()
+            # --- and store that value in the (otherwise unused) host-object
+            # --- __dict__ value of same name ('fget' nominally)
+            value = self._fget(obj)
+            obj.__dict__[self._name] = value
+        return cast(T, value)
+
+    def __set__(self, obj: Any, value: Any) -> None:
+        """Raises unconditionally, to preserve read-only behavior.
+
+        This decorator is intended to implement immutable (and idempotent) object
+        attributes. For that reason, assignment to this property must be explicitly
+        prevented.
+
+        If this __set__ method was not present, this descriptor would become a
+        *non-data descriptor*. That would be nice because the cached value would be
+        accessed directly once set (__dict__ attrs have precedence over non-data
+        descriptors on instance attribute lookup). The problem is, there would be
+        nothing to stop assignment to the cached value, which would overwrite the result
+        of `fget()` and break both the immutability and idempotence guarantees of this
+        decorator.
+
+        The performance with this __set__() method in place was roughly 0.4 usec per
+        access when measured on a 2.8GHz development machine; so quite snappy and
+        probably not a rich target for optimization efforts.
+        """
+        raise AttributeError("can't set attribute")
 
 
 def write_only_property(f):

From 08ab7e6313df3db664bf83076ab5f1708e3acbf5 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 26 Sep 2023 15:22:31 -0700
Subject: [PATCH 256/367] rfctr: improve typing

---
 pyrightconfig.json              | 19 +++++++++
 requirements-test.txt           |  1 +
 src/docx/api.py                 |  5 ++-
 src/docx/opc/oxml.py            |  4 +-
 src/docx/opc/rel.py             | 20 ++++++----
 src/docx/oxml/__init__.py       |  2 +
 src/docx/oxml/coreprops.py      | 17 +++++----
 src/docx/oxml/ns.py             | 68 +++++++++++++++++++--------------
 src/docx/oxml/shape.py          |  2 +
 src/docx/oxml/text/paragraph.py | 35 ++++++++++-------
 src/docx/oxml/text/parfmt.py    | 19 +++++----
 src/docx/oxml/text/run.py       |  3 +-
 src/docx/oxml/xmlchemy.py       | 24 +++++++++---
 src/docx/shared.py              |  7 +++-
 src/docx/text/run.py            |  4 +-
 15 files changed, 149 insertions(+), 81 deletions(-)
 create mode 100644 pyrightconfig.json

diff --git a/pyrightconfig.json b/pyrightconfig.json
new file mode 100644
index 000000000..4690b8cb8
--- /dev/null
+++ b/pyrightconfig.json
@@ -0,0 +1,19 @@
+{
+    "exclude": [
+        "**/__pycache__",
+        "**/.*"
+    ],
+    "ignore":  [
+    ],
+    "include": [
+        "src/docx/",
+        "tests"
+    ],
+    "pythonPlatform": "All",
+    "pythonVersion": "3.7",
+    "reportImportCycles": true,
+    "reportUnnecessaryCast": true,
+    "typeCheckingMode": "strict",
+    "useLibraryCodeForTypes": false,
+    "verboseOutput": true
+}
diff --git a/requirements-test.txt b/requirements-test.txt
index 85d9f6ba3..868eea2c9 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -3,3 +3,4 @@ behave>=1.2.3
 pyparsing>=2.0.1
 pytest>=2.5
 ruff
+typing-extensions
diff --git a/src/docx/api.py b/src/docx/api.py
index ab37ed608..a17c1dad4 100644
--- a/src/docx/api.py
+++ b/src/docx/api.py
@@ -3,13 +3,16 @@
 Provides a syntactically more convenient API for interacting with the OpcPackage graph.
 """
 
+from __future__ import annotations
+
 import os
+from typing import IO
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
 
 
-def Document(docx=None):
+def Document(docx: str | IO[bytes] | None = None):
     """Return a |Document| object loaded from `docx`, where `docx` can be either a path
     to a ``.docx`` file (a string) or a file-like object.
 
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index dfbad8d06..570dcf413 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -27,8 +27,8 @@
 # ===========================================================================
 
 
-def parse_xml(text):
-    """``etree.fromstring()`` replacement that uses oxml parser."""
+def parse_xml(text: str) -> etree._Element:  # pyright: ignore[reportPrivateUsage]
+    """`etree.fromstring()` replacement that uses oxml parser."""
     return etree.fromstring(text, oxml_parser)
 
 
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index 58acfc6e3..3155e2c6b 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -1,17 +1,23 @@
 """Relationship-related objects."""
 
-from .oxml import CT_Relationships
+from __future__ import annotations
 
+from typing import Any, Dict
 
-class Relationships(dict):
+from docx.opc.oxml import CT_Relationships
+
+
+class Relationships(Dict[str, "_Relationship"]):
     """Collection object for |_Relationship| instances, having list semantics."""
 
-    def __init__(self, baseURI):
+    def __init__(self, baseURI: str):
         super(Relationships, self).__init__()
         self._baseURI = baseURI
-        self._target_parts_by_rId = {}
+        self._target_parts_by_rId: Dict[str, Any] = {}
 
-    def add_relationship(self, reltype, target, rId, is_external=False):
+    def add_relationship(
+        self, reltype: str, target: str | Any, rId: str, is_external: bool = False
+    ) -> "_Relationship":
         """Return a newly added |_Relationship| instance."""
         rel = _Relationship(rId, reltype, target, self._baseURI, is_external)
         self[rId] = rel
@@ -105,7 +111,7 @@ def _next_rId(self):
 class _Relationship(object):
     """Value object for relationship to part."""
 
-    def __init__(self, rId, reltype, target, baseURI, external=False):
+    def __init__(self, rId: str, reltype, target, baseURI, external=False):
         super(_Relationship, self).__init__()
         self._rId = rId
         self._reltype = reltype
@@ -135,7 +141,7 @@ def target_part(self):
         return self._target
 
     @property
-    def target_ref(self):
+    def target_ref(self) -> str:
         if self._is_external:
             return self._target
         else:
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index b8278b3e4..e1ac4d6bd 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -3,6 +3,8 @@
 This including registering custom element classes corresponding to Open XML elements.
 """
 
+from __future__ import annotations
+
 from lxml import etree
 
 from docx.oxml.ns import NamespacePrefixedTag, nsmap
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index ddb9f703c..940d4d3f2 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -2,6 +2,7 @@
 
 import re
 from datetime import datetime, timedelta
+from typing import Any
 
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
@@ -47,23 +48,23 @@ def author_text(self):
         return self._text_of_element("creator")
 
     @author_text.setter
-    def author_text(self, value):
+    def author_text(self, value: str):
         self._set_element_text("creator", value)
 
     @property
-    def category_text(self):
+    def category_text(self) -> str:
         return self._text_of_element("category")
 
     @category_text.setter
-    def category_text(self, value):
+    def category_text(self, value: str):
         self._set_element_text("category", value)
 
     @property
-    def comments_text(self):
+    def comments_text(self) -> str:
         return self._text_of_element("description")
 
     @comments_text.setter
-    def comments_text(self, value):
+    def comments_text(self, value: str):
         self._set_element_text("description", value)
 
     @property
@@ -71,7 +72,7 @@ def contentStatus_text(self):
         return self._text_of_element("contentStatus")
 
     @contentStatus_text.setter
-    def contentStatus_text(self, value):
+    def contentStatus_text(self, value: str):
         self._set_element_text("contentStatus", value)
 
     @property
@@ -264,7 +265,7 @@ def _set_element_datetime(self, prop_name, value):
             element.set(qn("xsi:type"), "dcterms:W3CDTF")
             del self.attrib[qn("xsi:foo")]
 
-    def _set_element_text(self, prop_name, value):
+    def _set_element_text(self, prop_name: str, value: Any) -> None:
         """Set string value of `name` property to `value`."""
         if not isinstance(value, str):
             value = str(value)
@@ -275,7 +276,7 @@ def _set_element_text(self, prop_name, value):
         element = self._get_or_add(prop_name)
         element.text = value
 
-    def _text_of_element(self, property_name):
+    def _text_of_element(self, property_name: str) -> str:
         """The text in the element matching `property_name`.
 
         The empty string if the element is not present or contains no text.
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index dd8745634..3238864e9 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -1,5 +1,9 @@
 """Namespace-related objects."""
 
+from typing import Any, Dict
+
+from typing_extensions import Self
+
 nsmap = {
     "a": "http://schemas.openxmlformats.org/drawingml/2006/main",
     "c": "http://schemas.openxmlformats.org/drawingml/2006/chart",
@@ -25,74 +29,80 @@
 class NamespacePrefixedTag(str):
     """Value object that knows the semantics of an XML tag having a namespace prefix."""
 
-    def __new__(cls, nstag, *args):
+    def __new__(cls, nstag: str, *args: Any):
         return super(NamespacePrefixedTag, cls).__new__(cls, nstag)
 
-    def __init__(self, nstag):
+    def __init__(self, nstag: str):
         self._pfx, self._local_part = nstag.split(":")
         self._ns_uri = nsmap[self._pfx]
 
     @property
-    def clark_name(self):
+    def clark_name(self) -> str:
         return "{%s}%s" % (self._ns_uri, self._local_part)
 
     @classmethod
-    def from_clark_name(cls, clark_name):
+    def from_clark_name(cls, clark_name: str) -> Self:
         nsuri, local_name = clark_name[1:].split("}")
         nstag = "%s:%s" % (pfxmap[nsuri], local_name)
         return cls(nstag)
 
     @property
-    def local_part(self):
-        """Return the local part of the tag as a string.
+    def local_part(self) -> str:
+        """The local part of this tag.
 
-        E.g. 'foobar' is returned for tag 'f:foobar'.
+        E.g. "foobar" is returned for tag "f:foobar".
         """
         return self._local_part
 
     @property
-    def nsmap(self):
-        """Return a dict having a single member, mapping the namespace prefix of this
-        tag to it's namespace name (e.g. {'f': 'http://foo/bar'}).
+    def nsmap(self) -> Dict[str, str]:
+        """Single-member dict mapping prefix of this tag to it's namespace name.
 
-        This is handy for passing to xpath calls and other uses.
+        Example: `{"f": "http://foo/bar"}`. This is handy for passing to xpath calls
+        and other uses.
         """
         return {self._pfx: self._ns_uri}
 
     @property
-    def nspfx(self):
-        """Return the string namespace prefix for the tag, e.g. 'f' is returned for tag
-        'f:foobar'."""
+    def nspfx(self) -> str:
+        """The namespace-prefix for this tag.
+
+        For example, "f" is returned for tag "f:foobar".
+        """
         return self._pfx
 
     @property
-    def nsuri(self):
-        """Return the namespace URI for the tag, e.g. 'http://foo/bar' would be returned
-        for tag 'f:foobar' if the 'f' prefix maps to 'http://foo/bar' in nsmap."""
+    def nsuri(self) -> str:
+        """The namespace URI for this tag.
+
+        For example, "http://foo/bar" would be returned for tag "f:foobar" if the "f"
+        prefix maps to "http://foo/bar" in nsmap.
+        """
         return self._ns_uri
 
 
-def nsdecls(*prefixes):
-    """Return a string containing a namespace declaration for each of the namespace
-    prefix strings, e.g. 'p', 'ct', passed as `prefixes`."""
+def nsdecls(*prefixes: str) -> str:
+    """Namespace declaration including each namespace-prefix in `prefixes`.
+
+    Handy for adding required namespace declarations to a tree root element.
+    """
     return " ".join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
 
 
-def nspfxmap(*nspfxs):
-    """Return a dict containing the subset namespace prefix mappings specified by
-    `nspfxs`.
+def nspfxmap(*nspfxs: str) -> Dict[str, str]:
+    """Subset namespace-prefix mappings specified by *nspfxs*.
 
-    Any number of namespace prefixes can be supplied, e.g. namespaces('a', 'r', 'p').
+    Any number of namespace prefixes can be supplied, e.g. namespaces("a", "r", "p").
     """
     return {pfx: nsmap[pfx] for pfx in nspfxs}
 
 
-def qn(tag):
-    """Stands for "qualified name", a utility function to turn a namespace prefixed tag
-    name into a Clark-notation qualified tag name for lxml.
+def qn(tag: str) -> str:
+    """Stands for "qualified name".
 
-    For
-    example, ``qn('p:cSld')`` returns ``'{http://schemas.../main}cSld'``.
+    This utility function converts a familiar namespace-prefixed tag name like "w:p"
+    into a Clark-notation qualified tag name for lxml. For example, `qn("w:p")` returns
+    "{http://schemas.openxmlformats.org/wordprocessingml/2006/main}p".
     """
     prefix, tagroot = tag.split(":")
     uri = nsmap[prefix]
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index f26179fbb..fc79ce52e 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -1,5 +1,7 @@
 """Custom element classes for shape-related elements like `<w:inline>`."""
 
+from __future__ import annotations
+
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls
 from docx.oxml.simpletypes import (
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index e50914c2c..244107311 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -1,27 +1,34 @@
 """Custom element classes related to paragraphs (CT_P)."""
 
-from docx.oxml.ns import qn
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Callable, List
+
 from docx.oxml.xmlchemy import BaseOxmlElement, OxmlElement, ZeroOrMore, ZeroOrOne
 
+if TYPE_CHECKING:
+    from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+    from docx.oxml.text.parfmt import CT_PPr
+    from docx.oxml.text.run import CT_R
+
 
 class CT_P(BaseOxmlElement):
     """`<w:p>` element, containing the properties and text for a paragraph."""
 
-    pPr = ZeroOrOne("w:pPr")
-    r = ZeroOrMore("w:r")
+    get_or_add_pPr: Callable[[], CT_PPr]
+    r_lst: List[CT_R]
 
-    def _insert_pPr(self, pPr):
-        self.insert(0, pPr)
-        return pPr
+    pPr: CT_PPr | None = ZeroOrOne("w:pPr")  # pyright: ignore[reportGeneralTypeIssues]
+    r = ZeroOrMore("w:r")
 
-    def add_p_before(self):
+    def add_p_before(self) -> CT_P:
         """Return a new `<w:p>` element inserted directly prior to this one."""
         new_p = OxmlElement("w:p")
         self.addprevious(new_p)
         return new_p
 
     @property
-    def alignment(self):
+    def alignment(self) -> WD_PARAGRAPH_ALIGNMENT | None:
         """The value of the `<w:jc>` grandchild element or |None| if not present."""
         pPr = self.pPr
         if pPr is None:
@@ -29,15 +36,13 @@ def alignment(self):
         return pPr.jc_val
 
     @alignment.setter
-    def alignment(self, value):
+    def alignment(self, value: WD_PARAGRAPH_ALIGNMENT):
         pPr = self.get_or_add_pPr()
         pPr.jc_val = value
 
     def clear_content(self):
         """Remove all child elements, except the `<w:pPr>` element if present."""
-        for child in self[:]:
-            if child.tag == qn("w:pPr"):
-                continue
+        for child in self.xpath("./*[not(self::w:pPr)]"):
             self.remove(child)
 
     def set_sectPr(self, sectPr):
@@ -47,7 +52,7 @@ def set_sectPr(self, sectPr):
         pPr._insert_sectPr(sectPr)
 
     @property
-    def style(self):
+    def style(self) -> str | None:
         """String contained in `w:val` attribute of `./w:pPr/w:pStyle` grandchild.
 
         |None| if not present.
@@ -61,3 +66,7 @@ def style(self):
     def style(self, style):
         pPr = self.get_or_add_pPr()
         pPr.style = style
+
+    def _insert_pPr(self, pPr: CT_PPr) -> CT_PPr:
+        self.insert(0, pPr)
+        return pPr
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index 255a71f36..086012599 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -1,20 +1,22 @@
 """Custom element classes related to paragraph properties (CT_PPr)."""
 
-from ...enum.text import (
+from __future__ import annotations
+
+from docx.enum.text import (
     WD_ALIGN_PARAGRAPH,
     WD_LINE_SPACING,
     WD_TAB_ALIGNMENT,
     WD_TAB_LEADER,
 )
-from ...shared import Length
-from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
-from ..xmlchemy import (
+from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
+from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OneOrMore,
     OptionalAttribute,
     RequiredAttribute,
     ZeroOrOne,
 )
+from docx.shared import Length
 
 
 class CT_Ind(BaseOxmlElement):
@@ -148,12 +150,9 @@ def ind_right(self, value):
         ind.right = value
 
     @property
-    def jc_val(self):
-        """The value of the ``<w:jc>`` child element or |None| if not present."""
-        jc = self.jc
-        if jc is None:
-            return None
-        return jc.val
+    def jc_val(self) -> WD_ALIGN_PARAGRAPH | None:
+        """Value of the `<w:jc>` child element or |None| if not present."""
+        return self.jc.val if self.jc is not None else None
 
     @jc_val.setter
     def jc_val(self, value):
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 0f7261979..aedede812 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -4,6 +4,7 @@
 
 from docx.oxml.ns import qn
 from docx.oxml.simpletypes import ST_BrClear, ST_BrType
+from docx.oxml.text.font import CT_RPr
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
 
 # ------------------------------------------------------------------------------------
@@ -85,7 +86,7 @@ def text(self, text):
         self.clear_content()
         _RunContentAppender.append_to_run_from_text(self, text)
 
-    def _insert_rPr(self, rPr):
+    def _insert_rPr(self, rPr: CT_RPr) -> CT_RPr:
         self.insert(0, rPr)
         return rPr
 
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 57a095730..e4f4cf177 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -1,8 +1,12 @@
 """Enabling declarative definition of lxml custom element classes."""
 
+from __future__ import annotations
+
 import re
+from typing import Any, Callable, List
 
 from lxml import etree
+from lxml.etree import ElementBase
 
 from docx.oxml import OxmlElement
 from docx.oxml.exceptions import InvalidXmlError
@@ -615,6 +619,12 @@ class _OxmlElementBase(etree.ElementBase):
 
     __metaclass__ = MetaOxmlElement
 
+    append: Callable[[ElementBase], None]
+    find: Callable[[str], ElementBase | None]
+    findall: Callable[[str], List[ElementBase]]
+    remove: Callable[[ElementBase], None]
+    tag: str
+
     def __repr__(self):
         return "<%s '<%s>' at 0x%0x>" % (
             self.__class__.__name__,
@@ -622,7 +632,7 @@ def __repr__(self):
             id(self),
         )
 
-    def first_child_found_in(self, *tagnames):
+    def first_child_found_in(self, *tagnames: str) -> ElementBase | None:
         """First child with tag in `tagnames`, or None if not found."""
         for tagname in tagnames:
             child = self.find(qn(tagname))
@@ -630,7 +640,7 @@ def first_child_found_in(self, *tagnames):
                 return child
         return None
 
-    def insert_element_before(self, elm, *tagnames):
+    def insert_element_before(self, elm: ElementBase, *tagnames: str):
         successor = self.first_child_found_in(*tagnames)
         if successor is not None:
             successor.addprevious(elm)
@@ -638,7 +648,7 @@ def insert_element_before(self, elm, *tagnames):
             self.append(elm)
         return elm
 
-    def remove_all(self, *tagnames):
+    def remove_all(self, *tagnames: str) -> None:
         """Remove child elements with tagname (e.g. "a:p") in `tagnames`."""
         for tagname in tagnames:
             matching = self.findall(qn(tagname))
@@ -646,14 +656,16 @@ def remove_all(self, *tagnames):
                 self.remove(child)
 
     @property
-    def xml(self):
+    def xml(self) -> str:
         """XML string for this element, suitable for testing purposes.
 
         Pretty printed for readability and without an XML declaration at the top.
         """
         return serialize_for_reading(self)
 
-    def xpath(self, xpath_str):
+    def xpath(  # pyright: ignore[reportIncompatibleMethodOverride]
+        self, xpath_str: str
+    ) -> Any:
         """Override of `lxml` _Element.xpath() method.
 
         Provides standard Open XML namespace mapping (`nsmap`) in centralized location.
@@ -661,7 +673,7 @@ def xpath(self, xpath_str):
         return super(BaseOxmlElement, self).xpath(xpath_str, namespaces=nsmap)
 
     @property
-    def _nsptag(self):
+    def _nsptag(self) -> str:
         return NamespacePrefixedTag.from_clark_name(self.tag)
 
 
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 19375f53e..c24e1ac8a 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -3,7 +3,10 @@
 from __future__ import annotations
 
 import functools
-from typing import Any, Callable, Generic, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Callable, Generic, TypeVar, cast
+
+if TYPE_CHECKING:
+    from docx.oxml.xmlchemy import BaseOxmlElement
 
 
 class Length(int):
@@ -264,7 +267,7 @@ class ElementProxy(object):
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    def __init__(self, element, parent=None):
+    def __init__(self, element: "BaseOxmlElement", parent=None):
         self._element = element
         self._parent = parent
 
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 062f58332..06ccd2e54 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -20,7 +20,7 @@ def __init__(self, r, parent):
         super(Run, self).__init__(parent)
         self._r = self._element = self.element = r
 
-    def add_break(self, break_type=WD_BREAK.LINE):
+    def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):
         """Add a break element of `break_type` to this run.
 
         `break_type` can take the values `WD_BREAK.LINE`, `WD_BREAK.PAGE`, and
@@ -170,7 +170,7 @@ def underline(self, value):
 
 
 class _Text(object):
-    """Proxy object wrapping ``<w:t>`` element."""
+    """Proxy object wrapping `<w:t>` element."""
 
     def __init__(self, t_elm):
         super(_Text, self).__init__()

From 8280771a138744bc9a9c86bd6ead688143c4f8d1 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 12:35:30 -0700
Subject: [PATCH 257/367] rfctr: add type-stubs for behave

---
 features/steps/helpers.py   | 20 ++++++++------------
 pyrightconfig.json          |  2 ++
 typings/behave/__init__.pyi | 18 ++++++++++++++++++
 typings/behave/runner.pyi   |  3 +++
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 typings/behave/__init__.pyi
 create mode 100644 typings/behave/runner.pyi

diff --git a/features/steps/helpers.py b/features/steps/helpers.py
index 59495681f..fc40697b2 100644
--- a/features/steps/helpers.py
+++ b/features/steps/helpers.py
@@ -3,15 +3,15 @@
 import os
 
 
-def absjoin(*paths):
+def absjoin(*paths: str) -> str:
     return os.path.abspath(os.path.join(*paths))
 
 
-thisdir = os.path.split(__file__)[0]
-scratch_dir = absjoin(thisdir, "../_scratch")
+thisdir: str = os.path.split(__file__)[0]
+scratch_dir: str = absjoin(thisdir, "../_scratch")
 
 # scratch output docx file -------------
-saved_docx_path = absjoin(scratch_dir, "test_out.docx")
+saved_docx_path: str = absjoin(scratch_dir, "test_out.docx")
 
 bool_vals = {"True": True, "False": False}
 
@@ -24,15 +24,11 @@ def absjoin(*paths):
 }
 
 
-def test_docx(name):
-    """
-    Return the absolute path to test .docx file with root name `name`.
-    """
+def test_docx(name: str):
+    """Return the absolute path to test .docx file with root name `name`."""
     return absjoin(thisdir, "test_files", "%s.docx" % name)
 
 
-def test_file(name):
-    """
-    Return the absolute path to file with `name` in test_files directory
-    """
+def test_file(name: str):
+    """Return the absolute path to file with `name` in test_files directory"""
     return absjoin(thisdir, "test_files", "%s" % name)
diff --git a/pyrightconfig.json b/pyrightconfig.json
index 4690b8cb8..7808af007 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -13,6 +13,8 @@
     "pythonVersion": "3.7",
     "reportImportCycles": true,
     "reportUnnecessaryCast": true,
+    "reportUnnecessaryTypeIgnoreComment": true,
+    "stubPath": "./typings",
     "typeCheckingMode": "strict",
     "useLibraryCodeForTypes": false,
     "verboseOutput": true
diff --git a/typings/behave/__init__.pyi b/typings/behave/__init__.pyi
new file mode 100644
index 000000000..efc9b36ad
--- /dev/null
+++ b/typings/behave/__init__.pyi
@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from typing import Callable
+
+from typing_extensions import Concatenate, ParamSpec, TypeAlias
+
+from .runner import Context
+
+_P = ParamSpec("_P")
+
+_ArgsStep: TypeAlias = Callable[Concatenate[Context, _P], None]
+_NoArgsStep: TypeAlias = Callable[[Context], None]
+
+_Step: TypeAlias = _NoArgsStep | _ArgsStep[str]
+
+def given(phrase: str) -> Callable[[_Step], _Step]: ...
+def when(phrase: str) -> Callable[[_Step], _Step]: ...
+def then(phrase: str) -> Callable[[_Step], _Step]: ...
diff --git a/typings/behave/runner.pyi b/typings/behave/runner.pyi
new file mode 100644
index 000000000..aaea74dad
--- /dev/null
+++ b/typings/behave/runner.pyi
@@ -0,0 +1,3 @@
+from types import SimpleNamespace
+
+class Context(SimpleNamespace): ...

From 160e7090c7f5032a315e71f8486c94ce4eb898d1 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 29 Sep 2023 17:57:34 -0700
Subject: [PATCH 258/367] rfctr: rename private classes now used for typing

Also for example `BaseStoryPart` -> `StoryPart` for the same reason.
---
 src/docx/parts/document.py |  4 ++--
 src/docx/parts/hdrftr.py   |  6 +++---
 src/docx/parts/story.py    |  4 ++--
 src/docx/styles/style.py   | 18 +++++++++++-----
 tests/parts/test_story.py  | 24 ++++++++++-----------
 tests/styles/test_style.py | 44 +++++++++++++++++++-------------------
 6 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index fb72a8b4c..c877e5a57 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -5,13 +5,13 @@
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
-from docx.parts.story import BaseStoryPart
+from docx.parts.story import StoryPart
 from docx.parts.styles import StylesPart
 from docx.shape import InlineShapes
 from docx.shared import lazyproperty
 
 
-class DocumentPart(BaseStoryPart):
+class DocumentPart(StoryPart):
     """Main document part of a WordprocessingML (WML) package, aka a .docx file.
 
     Acts as broker to other parts such as image, core properties, and style parts. It
diff --git a/src/docx/parts/hdrftr.py b/src/docx/parts/hdrftr.py
index 1a4522dcf..f7effa61a 100644
--- a/src/docx/parts/hdrftr.py
+++ b/src/docx/parts/hdrftr.py
@@ -4,10 +4,10 @@
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.oxml import parse_xml
-from docx.parts.story import BaseStoryPart
+from docx.parts.story import StoryPart
 
 
-class FooterPart(BaseStoryPart):
+class FooterPart(StoryPart):
     """Definition of a section footer."""
 
     @classmethod
@@ -29,7 +29,7 @@ def _default_footer_xml(cls):
         return xml_bytes
 
 
-class HeaderPart(BaseStoryPart):
+class HeaderPart(StoryPart):
     """Definition of a section header."""
 
     @classmethod
diff --git a/src/docx/parts/story.py b/src/docx/parts/story.py
index fa3cacf0a..41d365c49 100644
--- a/src/docx/parts/story.py
+++ b/src/docx/parts/story.py
@@ -1,4 +1,4 @@
-"""|BaseStoryPart| and related objects."""
+"""|StoryPart| and related objects."""
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
@@ -6,7 +6,7 @@
 from docx.shared import lazyproperty
 
 
-class BaseStoryPart(XmlPart):
+class StoryPart(XmlPart):
     """Base class for story parts.
 
     A story part is one that can contain textual content, such as the document-part and
diff --git a/src/docx/styles/style.py b/src/docx/styles/style.py
index 233ee0d37..6ca4ba8df 100644
--- a/src/docx/styles/style.py
+++ b/src/docx/styles/style.py
@@ -11,8 +11,8 @@ def StyleFactory(style_elm):
     """Return a style object of the appropriate |BaseStyle| subclass, according to the
     type of `style_elm`."""
     style_cls = {
-        WD_STYLE_TYPE.PARAGRAPH: _ParagraphStyle,
-        WD_STYLE_TYPE.CHARACTER: _CharacterStyle,
+        WD_STYLE_TYPE.PARAGRAPH: ParagraphStyle,
+        WD_STYLE_TYPE.CHARACTER: CharacterStyle,
         WD_STYLE_TYPE.TABLE: _TableStyle,
         WD_STYLE_TYPE.LIST: _NumberingStyle,
     }[style_elm.type]
@@ -153,7 +153,7 @@ def unhide_when_used(self, value):
         self._element.unhideWhenUsed_val = value
 
 
-class _CharacterStyle(BaseStyle):
+class CharacterStyle(BaseStyle):
     """A character style.
 
     A character style is applied to a |Run| object and primarily provides character-
@@ -181,7 +181,11 @@ def font(self):
         return Font(self._element)
 
 
-class _ParagraphStyle(_CharacterStyle):
+# -- just in case someone uses the old name in an extension function --
+_CharacterStyle = CharacterStyle
+
+
+class ParagraphStyle(CharacterStyle):
     """A paragraph style.
 
     A paragraph style provides both character formatting and paragraph formatting such
@@ -220,7 +224,11 @@ def paragraph_format(self):
         return ParagraphFormat(self._element)
 
 
-class _TableStyle(_ParagraphStyle):
+# -- just in case someone uses the old name in an extension function --
+_ParagraphStyle = ParagraphStyle
+
+
+class _TableStyle(ParagraphStyle):
     """A table style.
 
     A table style provides character and paragraph formatting for its contents as well
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index 5fb461fe1..50bbf0953 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -8,7 +8,7 @@
 from docx.package import Package
 from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
-from docx.parts.story import BaseStoryPart
+from docx.parts.story import StoryPart
 from docx.styles.style import BaseStyle
 
 from ..unitutil.cxml import element
@@ -16,12 +16,12 @@
 from ..unitutil.mock import instance_mock, method_mock, property_mock
 
 
-class DescribeBaseStoryPart(object):
+class DescribeStoryPart(object):
     def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
         package_.get_or_add_image_part.return_value = image_part_
         relate_to_.return_value = "rId42"
         image_part_.image = image_
-        story_part = BaseStoryPart(None, None, None, package_)
+        story_part = StoryPart(None, None, None, package_)
 
         rId, image = story_part.get_or_add_image("image.png")
 
@@ -37,7 +37,7 @@ def it_can_get_a_style_by_id_and_type(
         style_type = WD_STYLE_TYPE.PARAGRAPH
         _document_part_prop_.return_value = document_part_
         document_part_.get_style.return_value = style_
-        story_part = BaseStoryPart(None, None, None, None)
+        story_part = StoryPart(None, None, None, None)
 
         style = story_part.get_style(style_id, style_type)
 
@@ -50,7 +50,7 @@ def it_can_get_a_style_id_by_style_or_name_and_type(
         style_type = WD_STYLE_TYPE.PARAGRAPH
         _document_part_prop_.return_value = document_part_
         document_part_.get_style_id.return_value = "BodyText"
-        story_part = BaseStoryPart(None, None, None, None)
+        story_part = StoryPart(None, None, None, None)
 
         style_id = story_part.get_style_id(style_, style_type)
 
@@ -63,7 +63,7 @@ def it_can_create_a_new_pic_inline(self, get_or_add_image_, image_, next_id_prop
         image_.filename = "bar.png"
         next_id_prop_.return_value = 24
         expected_xml = snippet_text("inline")
-        story_part = BaseStoryPart(None, None, None, None)
+        story_part = StoryPart(None, None, None, None)
 
         inline = story_part.new_pic_inline("foo/bar.png", width=100, height=200)
 
@@ -73,7 +73,7 @@ def it_can_create_a_new_pic_inline(self, get_or_add_image_, image_, next_id_prop
 
     def it_knows_the_next_available_xml_id(self, next_id_fixture):
         story_element, expected_value = next_id_fixture
-        story_part = BaseStoryPart(None, None, story_element, None)
+        story_part = StoryPart(None, None, story_element, None)
 
         next_id = story_part.next_id
 
@@ -81,7 +81,7 @@ def it_knows_the_next_available_xml_id(self, next_id_fixture):
 
     def it_knows_the_main_document_part_to_help(self, package_, document_part_):
         package_.main_document_part = document_part_
-        story_part = BaseStoryPart(None, None, None, package_)
+        story_part = StoryPart(None, None, None, package_)
 
         document_part = story_part._document_part
 
@@ -115,11 +115,11 @@ def document_part_(self, request):
 
     @pytest.fixture
     def _document_part_prop_(self, request):
-        return property_mock(request, BaseStoryPart, "_document_part")
+        return property_mock(request, StoryPart, "_document_part")
 
     @pytest.fixture
     def get_or_add_image_(self, request):
-        return method_mock(request, BaseStoryPart, "get_or_add_image")
+        return method_mock(request, StoryPart, "get_or_add_image")
 
     @pytest.fixture
     def image_(self, request):
@@ -131,7 +131,7 @@ def image_part_(self, request):
 
     @pytest.fixture
     def next_id_prop_(self, request):
-        return property_mock(request, BaseStoryPart, "next_id")
+        return property_mock(request, StoryPart, "next_id")
 
     @pytest.fixture
     def package_(self, request):
@@ -139,7 +139,7 @@ def package_(self, request):
 
     @pytest.fixture
     def relate_to_(self, request):
-        return method_mock(request, BaseStoryPart, "relate_to")
+        return method_mock(request, StoryPart, "relate_to")
 
     @pytest.fixture
     def style_(self, request):
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index 113da3339..ffd9baf22 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -5,10 +5,10 @@
 from docx.enum.style import WD_STYLE_TYPE
 from docx.styles.style import (
     BaseStyle,
+    CharacterStyle,
+    ParagraphStyle,
     StyleFactory,
-    _CharacterStyle,
     _NumberingStyle,
-    _ParagraphStyle,
     _TableStyle,
 )
 from docx.text.font import Font
@@ -32,9 +32,9 @@ def factory_fixture(
         self,
         request,
         paragraph_style_,
-        _ParagraphStyle_,
+        ParagraphStyle_,
         character_style_,
-        _CharacterStyle_,
+        CharacterStyle_,
         table_style_,
         _TableStyle_,
         numbering_style_,
@@ -42,8 +42,8 @@ def factory_fixture(
     ):
         type_attr_val = request.param
         StyleCls_, style_mock = {
-            "paragraph": (_ParagraphStyle_, paragraph_style_),
-            "character": (_CharacterStyle_, character_style_),
+            "paragraph": (ParagraphStyle_, paragraph_style_),
+            "character": (CharacterStyle_, character_style_),
             "table": (_TableStyle_, table_style_),
             "numbering": (_NumberingStyle_, numbering_style_),
         }[request.param]
@@ -54,24 +54,24 @@ def factory_fixture(
     # fixture components -----------------------------------
 
     @pytest.fixture
-    def _ParagraphStyle_(self, request, paragraph_style_):
+    def ParagraphStyle_(self, request, paragraph_style_):
         return class_mock(
-            request, "docx.styles.style._ParagraphStyle", return_value=paragraph_style_
+            request, "docx.styles.style.ParagraphStyle", return_value=paragraph_style_
         )
 
     @pytest.fixture
     def paragraph_style_(self, request):
-        return instance_mock(request, _ParagraphStyle)
+        return instance_mock(request, ParagraphStyle)
 
     @pytest.fixture
-    def _CharacterStyle_(self, request, character_style_):
+    def CharacterStyle_(self, request, character_style_):
         return class_mock(
-            request, "docx.styles.style._CharacterStyle", return_value=character_style_
+            request, "docx.styles.style.CharacterStyle", return_value=character_style_
         )
 
     @pytest.fixture
     def character_style_(self, request):
-        return instance_mock(request, _CharacterStyle)
+        return instance_mock(request, CharacterStyle)
 
     @pytest.fixture
     def _TableStyle_(self, request, table_style_):
@@ -396,7 +396,7 @@ def unhide_set_fixture(self, request):
         return style, value, expected_xml
 
 
-class Describe_CharacterStyle(object):
+class DescribeCharacterStyle(object):
     def it_knows_which_style_it_is_based_on(self, base_get_fixture):
         style, StyleFactory_, StyleFactory_calls, base_style_ = base_get_fixture
         base_style = style.base_style
@@ -427,7 +427,7 @@ def it_provides_access_to_its_font(self, font_fixture):
     def base_get_fixture(self, request, StyleFactory_):
         styles_cxml, style_idx, base_style_idx = request.param
         styles = element(styles_cxml)
-        style = _CharacterStyle(styles[style_idx])
+        style = CharacterStyle(styles[style_idx])
         if base_style_idx >= 0:
             base_style = styles[base_style_idx]
             StyleFactory_calls = [call(base_style)]
@@ -446,7 +446,7 @@ def base_get_fixture(self, request, StyleFactory_):
     )
     def base_set_fixture(self, request, style_):
         style_cxml, base_style_id, expected_style_cxml = request.param
-        style = _CharacterStyle(element(style_cxml))
+        style = CharacterStyle(element(style_cxml))
         style_.style_id = base_style_id
         base_style = style_ if base_style_id is not None else None
         expected_xml = xml(expected_style_cxml)
@@ -454,7 +454,7 @@ def base_set_fixture(self, request, style_):
 
     @pytest.fixture
     def font_fixture(self, Font_, font_):
-        style = _CharacterStyle(element("w:style"))
+        style = CharacterStyle(element("w:style"))
         return style, Font_, font_
 
     # fixture components ---------------------------------------------
@@ -476,7 +476,7 @@ def StyleFactory_(self, request):
         return function_mock(request, "docx.styles.style.StyleFactory")
 
 
-class Describe_ParagraphStyle(object):
+class DescribeParagraphStyle(object):
     def it_knows_its_next_paragraph_style(self, next_get_fixture):
         style, expected_value = next_get_fixture
         assert style.next_paragraph_style == expected_value
@@ -515,8 +515,8 @@ def next_get_fixture(self, request):
         style_names = ["H1", "H2", "Body", "Foo", "Char"]
         style_elm = styles[style_names.index(style_name)]
         next_style_elm = styles[style_names.index(next_style_name)]
-        style = _ParagraphStyle(style_elm)
-        next_style = _ParagraphStyle(next_style_elm) if style_name == "H1" else style
+        style = ParagraphStyle(style_elm)
+        next_style = ParagraphStyle(next_style_elm) if style_name == "H1" else style
         return style, next_style
 
     @pytest.fixture(
@@ -534,18 +534,18 @@ def next_set_fixture(self, request):
             "w:style{w:type=paragraph,w:styleId=B})"
         )
         style_elms = {"H": styles[0], "B": styles[1]}
-        style = _ParagraphStyle(style_elms[style_name])
+        style = ParagraphStyle(style_elms[style_name])
         next_style = (
             None
             if next_style_name is None
-            else _ParagraphStyle(style_elms[next_style_name])
+            else ParagraphStyle(style_elms[next_style_name])
         )
         expected_xml = xml(style_cxml)
         return style, next_style, expected_xml
 
     @pytest.fixture
     def parfmt_fixture(self, ParagraphFormat_, paragraph_format_):
-        style = _ParagraphStyle(element("w:style"))
+        style = ParagraphStyle(element("w:style"))
         return style, ParagraphFormat_, paragraph_format_
 
     # fixture components ---------------------------------------------

From 5c1b2f01f4645fc780fbad094969c250fb80b7cf Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 27 Sep 2023 12:40:00 -0700
Subject: [PATCH 259/367] rfctr: extract oxml.parser

This removes some import cycles.
---
 features/steps/text.py          |  2 +-
 src/docx/opc/part.py            |  2 +-
 src/docx/oxml/__init__.py       | 50 +--------------------------
 src/docx/oxml/coreprops.py      |  2 +-
 src/docx/oxml/numbering.py      |  2 +-
 src/docx/oxml/parser.py         | 60 +++++++++++++++++++++++++++++++++
 src/docx/oxml/shape.py          |  2 +-
 src/docx/oxml/shared.py         |  2 +-
 src/docx/oxml/table.py          |  2 +-
 src/docx/oxml/text/font.py      |  2 +-
 src/docx/oxml/text/paragraph.py |  3 +-
 src/docx/oxml/xmlchemy.py       |  2 +-
 src/docx/parts/hdrftr.py        |  2 +-
 src/docx/parts/settings.py      |  2 +-
 src/docx/parts/styles.py        |  2 +-
 tests/opc/test_coreprops.py     |  2 +-
 tests/oxml/test__init__.py      |  2 +-
 tests/oxml/test_table.py        |  2 +-
 tests/oxml/test_xmlchemy.py     |  2 +-
 tests/test_table.py             |  2 +-
 tests/unitdata.py               |  2 +-
 tests/unitutil/cxml.py          |  2 +-
 22 files changed, 82 insertions(+), 69 deletions(-)
 create mode 100644 src/docx/oxml/parser.py

diff --git a/features/steps/text.py b/features/steps/text.py
index 3eb5b0fee..99b3ba0f0 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -6,8 +6,8 @@
 
 from docx import Document
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
+from docx.oxml.parser import parse_xml
 from docx.text.font import Font
 from docx.text.run import Run
 
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index 1dd2c4b29..e8cf4a3d3 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -4,7 +4,7 @@
 from docx.opc.packuri import PackURI
 from docx.opc.rel import Relationships
 from docx.opc.shared import cls_method_fn, lazyproperty
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 
 
 class Part(object):
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index e1ac4d6bd..8f53b5d99 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -5,59 +5,11 @@
 
 from __future__ import annotations
 
-from lxml import etree
-
-from docx.oxml.ns import NamespacePrefixedTag, nsmap
-
-# configure XML parser
-element_class_lookup = etree.ElementNamespaceClassLookup()
-oxml_parser = etree.XMLParser(remove_blank_text=True, resolve_entities=False)
-oxml_parser.set_element_class_lookup(element_class_lookup)
-
-
-def parse_xml(xml):
-    """Return root lxml element obtained by parsing XML character string in `xml`, which
-    can be either a Python 2.x string or unicode.
-
-    The custom parser is used, so custom element classes are produced for elements in
-    `xml` that have them.
-    """
-    root_element = etree.fromstring(xml, oxml_parser)
-    return root_element
-
-
-def register_element_cls(tag, cls):
-    """Register `cls` to be constructed when the oxml parser encounters an element with
-    matching `tag`.
-
-    `tag` is a string of the form ``nspfx:tagroot``, e.g. ``'w:document'``.
-    """
-    nspfx, tagroot = tag.split(":")
-    namespace = element_class_lookup.get_namespace(nsmap[nspfx])
-    namespace[tagroot] = cls
-
-
-def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
-    """Return a 'loose' lxml element having the tag specified by `nsptag_str`.
-
-    `nsptag_str` must contain the standard namespace prefix, e.g. 'a:tbl'. The resulting
-    element is an instance of the custom element class for this tag name if one is
-    defined. A dictionary of attribute values may be provided as `attrs`; they are set
-    if present. All namespaces defined in the dict `nsdecls` are declared in the element
-    using the key as the prefix and the value as the namespace name. If `nsdecls` is not
-    provided, a single namespace declaration is added based on the prefix on
-    `nsptag_str`.
-    """
-    nsptag = NamespacePrefixedTag(nsptag_str)
-    if nsdecls is None:
-        nsdecls = nsptag.nsmap
-    return oxml_parser.makeelement(nsptag.clark_name, attrib=attrs, nsmap=nsdecls)
-
+from docx.oxml.parser import register_element_cls
 
 # ===========================================================================
 # custom element class mappings
 # ===========================================================================
-
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
 
 register_element_cls("w:evenAndOddHeaders", CT_OnOff)
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 940d4d3f2..2cafcd960 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -4,8 +4,8 @@
 from datetime import datetime, timedelta
 from typing import Any
 
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
+from docx.oxml.parser import parse_xml
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
diff --git a/src/docx/oxml/numbering.py b/src/docx/oxml/numbering.py
index 99ca7a74d..3512de655 100644
--- a/src/docx/oxml/numbering.py
+++ b/src/docx/oxml/numbering.py
@@ -1,6 +1,6 @@
 """Custom element classes related to the numbering part."""
 
-from docx.oxml import OxmlElement
+from docx.oxml.parser import OxmlElement
 from docx.oxml.shared import CT_DecimalNumber
 from docx.oxml.simpletypes import ST_DecimalNumber
 from docx.oxml.xmlchemy import (
diff --git a/src/docx/oxml/parser.py b/src/docx/oxml/parser.py
new file mode 100644
index 000000000..7e6a0fb49
--- /dev/null
+++ b/src/docx/oxml/parser.py
@@ -0,0 +1,60 @@
+"""XML parser for python-docx."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Dict, Type, cast
+
+from lxml import etree
+
+from docx.oxml.ns import NamespacePrefixedTag, nsmap
+
+if TYPE_CHECKING:
+    from docx.oxml.xmlchemy import BaseOxmlElement
+
+
+# -- configure XML parser --
+element_class_lookup = etree.ElementNamespaceClassLookup()
+oxml_parser = etree.XMLParser(remove_blank_text=True, resolve_entities=False)
+oxml_parser.set_element_class_lookup(element_class_lookup)
+
+
+def parse_xml(xml: str) -> "BaseOxmlElement":
+    """Root lxml element obtained by parsing XML character string `xml`.
+
+    The custom parser is used, so custom element classes are produced for elements in
+    `xml` that have them.
+    """
+    return cast("BaseOxmlElement", etree.fromstring(xml, oxml_parser))
+
+
+def register_element_cls(tag: str, cls: Type["BaseOxmlElement"]):
+    """Register an lxml custom element-class to use for `tag`.
+
+    A instance of `cls` to be constructed when the oxml parser encounters an element
+    with matching `tag`. `tag` is a string of the form `nspfx:tagroot`, e.g.
+    `'w:document'`.
+    """
+    nspfx, tagroot = tag.split(":")
+    namespace = element_class_lookup.get_namespace(nsmap[nspfx])
+    namespace[tagroot] = cls
+
+
+def OxmlElement(
+    nsptag_str: str,
+    attrs: Dict[str, str] | None = None,
+    nsdecls: Dict[str, str] | None = None,
+) -> BaseOxmlElement:
+    """Return a 'loose' lxml element having the tag specified by `nsptag_str`.
+
+    The tag in `nsptag_str` must contain the standard namespace prefix, e.g. `a:tbl`.
+    The resulting element is an instance of the custom element class for this tag name
+    if one is defined. A dictionary of attribute values may be provided as `attrs`; they
+    are set if present. All namespaces defined in the dict `nsdecls` are declared in the
+    element using the key as the prefix and the value as the namespace name. If
+    `nsdecls` is not provided, a single namespace declaration is added based on the
+    prefix on `nsptag_str`.
+    """
+    nsptag = NamespacePrefixedTag(nsptag_str)
+    if nsdecls is None:
+        nsdecls = nsptag.nsmap
+    return oxml_parser.makeelement(nsptag.clark_name, attrib=attrs, nsmap=nsdecls)
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index fc79ce52e..f9ae2d9af 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls
+from docx.oxml.parser import parse_xml
 from docx.oxml.simpletypes import (
     ST_Coordinate,
     ST_DrawingElementId,
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index b8a79550c..d2b2aa24a 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -1,7 +1,7 @@
 """Objects shared by modules in the docx.oxml subpackage."""
 
-from docx.oxml import OxmlElement
 from docx.oxml.ns import qn
+from docx.oxml.parser import OxmlElement
 from docx.oxml.simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute
 
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index e86214a62..cefc545bf 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -2,8 +2,8 @@
 
 from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
 from docx.exceptions import InvalidSpanError
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
+from docx.oxml.parser import parse_xml
 from docx.oxml.simpletypes import (
     ST_Merge,
     ST_TblLayoutType,
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 45b2335e0..78b395d03 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -2,8 +2,8 @@
 
 from docx.enum.dml import MSO_THEME_COLOR
 from docx.enum.text import WD_COLOR, WD_UNDERLINE
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
+from docx.oxml.parser import parse_xml
 from docx.oxml.simpletypes import (
     ST_HexColor,
     ST_HpsMeasure,
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index 244107311..9405edd39 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -4,7 +4,8 @@
 
 from typing import TYPE_CHECKING, Callable, List
 
-from docx.oxml.xmlchemy import BaseOxmlElement, OxmlElement, ZeroOrMore, ZeroOrOne
+from docx.oxml.parser import OxmlElement
+from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore, ZeroOrOne
 
 if TYPE_CHECKING:
     from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index e4f4cf177..d608bd5d7 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -8,9 +8,9 @@
 from lxml import etree
 from lxml.etree import ElementBase
 
-from docx.oxml import OxmlElement
 from docx.oxml.exceptions import InvalidXmlError
 from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
+from docx.oxml.parser import OxmlElement
 from docx.shared import lazyproperty
 
 
diff --git a/src/docx/parts/hdrftr.py b/src/docx/parts/hdrftr.py
index f7effa61a..46821d780 100644
--- a/src/docx/parts/hdrftr.py
+++ b/src/docx/parts/hdrftr.py
@@ -3,7 +3,7 @@
 import os
 
 from docx.opc.constants import CONTENT_TYPE as CT
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 from docx.parts.story import StoryPart
 
 
diff --git a/src/docx/parts/settings.py b/src/docx/parts/settings.py
index 08d310124..d83c9d5ca 100644
--- a/src/docx/parts/settings.py
+++ b/src/docx/parts/settings.py
@@ -5,7 +5,7 @@
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
 from docx.opc.part import XmlPart
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 from docx.settings import Settings
 
 
diff --git a/src/docx/parts/styles.py b/src/docx/parts/styles.py
index 5f42f31c7..9016163ab 100644
--- a/src/docx/parts/styles.py
+++ b/src/docx/parts/styles.py
@@ -5,7 +5,7 @@
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
 from docx.opc.part import XmlPart
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 from docx.styles.styles import Styles
 
 
diff --git a/tests/opc/test_coreprops.py b/tests/opc/test_coreprops.py
index a5e08bed4..73b9a1280 100644
--- a/tests/opc/test_coreprops.py
+++ b/tests/opc/test_coreprops.py
@@ -5,7 +5,7 @@
 import pytest
 
 from docx.opc.coreprops import CoreProperties
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 
 
 class DescribeCoreProperties(object):
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
index 6a5a2f901..9331780b0 100644
--- a/tests/oxml/test__init__.py
+++ b/tests/oxml/test__init__.py
@@ -3,8 +3,8 @@
 import pytest
 from lxml import etree
 
-from docx.oxml import OxmlElement, oxml_parser, parse_xml, register_element_cls
 from docx.oxml.ns import qn
+from docx.oxml.parser import OxmlElement, oxml_parser, parse_xml, register_element_cls
 from docx.oxml.shared import BaseOxmlElement
 
 
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 519151be4..2cddf925b 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -3,7 +3,7 @@
 import pytest
 
 from docx.exceptions import InvalidSpanError
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 from docx.oxml.table import CT_Row, CT_Tc
 
 from ..unitutil.cxml import element, xml
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
index 0cb769551..3242223d7 100644
--- a/tests/oxml/test_xmlchemy.py
+++ b/tests/oxml/test_xmlchemy.py
@@ -2,9 +2,9 @@
 
 import pytest
 
-from docx.oxml import parse_xml, register_element_cls
 from docx.oxml.exceptions import InvalidXmlError
 from docx.oxml.ns import qn
+from docx.oxml.parser import parse_xml, register_element_cls
 from docx.oxml.simpletypes import BaseIntType
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
diff --git a/tests/test_table.py b/tests/test_table.py
index 11823117f..e5f8a3c31 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -9,7 +9,7 @@
     WD_TABLE_ALIGNMENT,
     WD_TABLE_DIRECTION,
 )
-from docx.oxml import parse_xml
+from docx.oxml.parser import parse_xml
 from docx.oxml.table import CT_Tc
 from docx.parts.document import DocumentPart
 from docx.shared import Inches
diff --git a/tests/unitdata.py b/tests/unitdata.py
index 057b54490..c894c4796 100644
--- a/tests/unitdata.py
+++ b/tests/unitdata.py
@@ -1,7 +1,7 @@
 """Shared code for unit test data builders."""
 
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls
+from docx.oxml.parser import parse_xml
 
 
 class BaseBuilder(object):
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index bccbd2b83..b88e67bd4 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -20,8 +20,8 @@
     stringEnd,
 )
 
-from docx.oxml import parse_xml
 from docx.oxml.ns import nsmap
+from docx.oxml.parser import parse_xml
 
 # ====================================================================
 # api functions

From f07823c0867cf8f71890277ee1a0784b7a20921e Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 27 Sep 2023 14:08:13 -0700
Subject: [PATCH 260/367] spike: rejigger xmlchemy

Metaclasses are different and somewhat better in Python 3. Modernize the
`xmlchemy` custom element metaclass mechanism and remove Python 2
work-arounds that are no longer required.
---
 src/docx/oxml/xmlchemy.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index d608bd5d7..5d5050a82 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -3,14 +3,13 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Callable, List
+from typing import Any, Callable, Dict, List, Tuple
 
 from lxml import etree
 from lxml.etree import ElementBase
 
 from docx.oxml.exceptions import InvalidXmlError
 from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
-from docx.oxml.parser import OxmlElement
 from docx.shared import lazyproperty
 
 
@@ -84,7 +83,11 @@ def _parse_line(cls, line):
 class MetaOxmlElement(type):
     """Metaclass for BaseOxmlElement."""
 
-    def __init__(cls, clsname, bases, clsdict):
+    def __new__(cls, clsname: str, bases: Tuple[type, ...], clsdict: Dict[str, Any]):
+        bases = (*bases, etree.ElementBase)
+        return super().__new__(cls, clsname, bases, clsdict)
+
+    def __init__(cls, clsname: str, bases: Tuple[type, ...], clsdict: Dict[str, Any]):
         dispatchable = (
             OneAndOnlyOne,
             OneOrMore,
@@ -326,8 +329,8 @@ def _add_to_class(self, name, method):
 
     @property
     def _creator(self):
-        """Return a function object that creates a new, empty element of the right type,
-        having no attributes."""
+        """Callable that creates an empty element of the right type, with no attrs."""
+        from docx.oxml.parser import OxmlElement
 
         def new_child_element(obj):
             return OxmlElement(self._nsptagname)
@@ -609,21 +612,20 @@ def _remove_choice_group_method_name(self):
         return "_remove_%s" % self._prop_name
 
 
-class _OxmlElementBase(etree.ElementBase):
+class BaseOxmlElement(metaclass=MetaOxmlElement):
     """Effective base class for all custom element classes.
 
-    Adds standardized behavior to all classes in one place. Actual inheritance is from
-    BaseOxmlElement below, needed to manage Python 2-3 metaclass declaration
-    compatibility.
+    Adds standardized behavior to all classes in one place.
     """
 
-    __metaclass__ = MetaOxmlElement
-
     append: Callable[[ElementBase], None]
     find: Callable[[str], ElementBase | None]
     findall: Callable[[str], List[ElementBase]]
-    remove: Callable[[ElementBase], None]
+    getparent: Callable[[], BaseOxmlElement]
+    insert: Callable[[int, BaseOxmlElement], None]
+    remove: Callable[[BaseOxmlElement], None]
     tag: str
+    text: str | None
 
     def __repr__(self):
         return "<%s '<%s>' at 0x%0x>" % (
@@ -670,13 +672,8 @@ def xpath(  # pyright: ignore[reportIncompatibleMethodOverride]
 
         Provides standard Open XML namespace mapping (`nsmap`) in centralized location.
         """
-        return super(BaseOxmlElement, self).xpath(xpath_str, namespaces=nsmap)
+        return super().xpath(xpath_str, namespaces=nsmap)
 
     @property
     def _nsptag(self) -> str:
         return NamespacePrefixedTag.from_clark_name(self.tag)
-
-
-BaseOxmlElement = MetaOxmlElement(
-    "BaseOxmlElement", (etree.ElementBase,), dict(_OxmlElementBase.__dict__)
-)

From 4935c302c440eaf97a412a51e5d1311e8ce4687f Mon Sep 17 00:00:00 2001
From: yunshi <yunshi.tan@polyconseil.fr>
Date: Mon, 14 Mar 2016 21:10:40 +0100
Subject: [PATCH 261/367] docs: document hyperlink analysis

---
 docs/conf.py                                  |   2 +
 docs/dev/analysis/features/text/hyperlink.rst | 352 ++++++++++++++++++
 docs/dev/analysis/features/text/index.rst     |   1 +
 3 files changed, 355 insertions(+)
 create mode 100644 docs/dev/analysis/features/text/hyperlink.rst

diff --git a/docs/conf.py b/docs/conf.py
index ceea98093..0190aba5d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -115,6 +115,8 @@
 
 .. |HeaderPart| replace:: :class:`.HeaderPart`
 
+.. |Hyperlink| replace:: :class:`.Hyperlink`
+
 .. |ImageParts| replace:: :class:`.ImageParts`
 
 .. |Inches| replace:: :class:`.Inches`
diff --git a/docs/dev/analysis/features/text/hyperlink.rst b/docs/dev/analysis/features/text/hyperlink.rst
new file mode 100644
index 000000000..4dff91d20
--- /dev/null
+++ b/docs/dev/analysis/features/text/hyperlink.rst
@@ -0,0 +1,352 @@
+
+Hyperlink
+=========
+
+Word allows hyperlinks to be placed in a document wherever paragraphs can appear.
+
+The target (URL) of a hyperlink may be external, such as a web site, or internal, to
+another location in the document.
+
+The visible text of a hyperlink is held in one or more runs. Technically a hyperlink can
+have zero runs, but this occurs only in contrived cases (otherwise there would be
+nothing to click on). As usual, each run can have its own distinct text formatting
+(font), so for example one word in the hyperlink can be bold, etc. By default, Word
+applies the built-in `Hyperlink` character style to a newly inserted hyperlink.
+
+Note that rendered page-breaks can occur in the middle of a hyperlink.
+
+A |Hyperlink| is a child of |Paragraph|, a peer of |Run|.
+
+
+Candidate protocol
+------------------
+
+An external hyperlink has an address and an optional anchor. An internal hyperlink has
+only an anchor. An anchor is also known as a *URI fragment* and follows a hash mark
+("#").
+
+Note that the anchor and URL are stored in two distinct attributes, so you need to
+concatenate `.address` and `.anchor` if you want the whole thing.
+
+.. highlight:: python
+
+**Access hyperlinks in a paragraph**::
+
+    >>> hyperlinks = paragraph.hyperlinks
+    [<docx.text.hyperlink.Hyperlink at 0x7f...>]
+
+**Access hyperlinks in a paragraph in document order with runs**::
+
+    >>> list(paragraph.iter_inner_content())
+    [
+      <docx.text.run.Run at 0x7f...>
+      <docx.text.hyperlink.Hyperlink at 0x7f...>
+      <docx.text.run.Run at 0x7f...>
+    ]
+
+**Access hyperlink address**::
+
+    >>> hyperlink.address
+    'https://google.com/'
+
+**Access hyperlinks runs**::
+
+    >>> hyperlink.runs
+    [
+      <docx.text.run.Run at 0x7f...>
+      <docx.text.run.Run at 0x7f...>
+      <docx.text.run.Run at 0x7f...>
+    ]
+
+**Determine whether a hyperlink contains a rendered page-break**::
+
+    >>> hyperlink.contains_page_break
+    False
+
+**Access visible text of a hyperlink**::
+
+    >>> hyperlink.text
+    'an excellent Wikipedia article on ferrets'
+
+**Add an external hyperlink**::
+
+    >>> hyperlink = paragraph.add_hyperlink(
+          'About', address='http://us.com', anchor='about'
+        )
+    >>> hyperlink
+    <docx.text.hyperlink.Hyperlink at 0x7f...>
+    >>> hyperlink.text
+    'About'
+    >>> hyperlink.address
+    'http://us.com'
+    >>> hyperlink.anchor
+    'about'
+
+**Add an internal hyperlink (to a bookmark)**::
+
+    >>> hyperlink = paragraph.add_hyperlink('Section 1', anchor='Section_1')
+    >>> hyperlink.text
+    'Section 1'
+    >>> hyperlink.anchor
+    'Section_1'
+    >>> hyperlink.address
+    None
+
+**Modify hyperlink properties**::
+
+    >>> hyperlink.text = 'Froogle'
+    >>> hyperlink.text
+    'Froogle'
+    >>> hyperlink.address = 'mailto:info@froogle.com?subject=sup dawg?'
+    >>> hyperlink.address
+    'mailto:info@froogle.com?subject=sup%20dawg%3F'
+    >>> hyperlink.anchor = None
+    >>> hyperlink.anchor
+    None
+
+**Add additional runs to a hyperlink**::
+
+    >>> hyperlink.text = 'A '
+    >>> # .insert_run inserts a new run at idx, defaults to idx=-1
+    >>> hyperlink.insert_run(' link').bold = True
+    >>> hyperlink.insert_run('formatted', idx=1).bold = True
+    >>> hyperlink.text
+    'A formatted link'
+    >>> [r for r in hyperlink.iter_runs()]
+    [<docx.text.run.Run at 0x7fa...>,
+     <docx.text.run.Run at 0x7fb...>,
+     <docx.text.run.Run at 0x7fc...>]
+
+**Iterate over the run-level items a paragraph contains**::
+
+    >>> paragraph = document.add_paragraph('A paragraph having a link to: ')
+    >>> paragraph.add_hyperlink(text='github', address='http://github.com')
+    >>> [item for item in paragraph.iter_run_level_items()]:
+    [<docx.text.paragraph.Run at 0x7fd...>, <docx.text.paragraph.Hyperlink at 0x7fe...>]
+
+**Paragraph.text now includes text contained in a hyperlink**::
+
+    >>> paragraph.text
+    'A paragraph having a link to: github'
+
+
+Word Behaviors
+--------------
+
+* What are the semantics of the w:history attribute on w:hyperlink? I'm
+  suspecting this indicates whether the link should show up blue (unvisited)
+  or purple (visited). I'm inclined to think we need that as a read/write
+  property on hyperlink. We should see what the MS API does on this count.
+
+* We probably need to enforce some character-set restrictions on w:anchor.
+  Word doesn't seem to like spaces or hyphens, for example. The simple type
+  ST_String doesn't look like it takes care of this.
+
+* We'll need to test URL escaping of special characters like spaces and
+  question marks in Hyperlink.address.
+
+* What does Word do when loading a document containing an internal hyperlink
+  having an anchor value that doesn't match an existing bookmark? We'll want
+  to know because we're sure to get support inquiries from folks who don't
+  match those up and wonder why they get a repair error or whatever.
+
+
+Specimen XML
+------------
+
+.. highlight:: xml
+
+
+External links
+~~~~~~~~~~~~~~
+
+The address (URL) of an external hyperlink is stored in the document.xml.rels
+file, keyed by the w:hyperlink@r:id attribute::
+
+    <w:p>
+      <w:r>
+        <w:t xml:space="preserve">This is an external link to </w:t>
+      </w:r>
+      <w:hyperlink r:id="rId4">
+        <w:r>
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          <w:t>Google</w:t>
+        </w:r>
+      </w:hyperlink>
+    </w:p>
+
+... mapping to relationship in document.xml.rels::
+
+    <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+      <Relationship Id="rId4" Mode="External" Type="http://..." Target="http://google.com/"/>
+    </Relationships>
+
+A hyperlink can contain multiple runs of text (and a whole lot of other
+stuff, including nested hyperlinks, at least as far as the schema indicates)::
+
+    <w:p>
+      <w:hyperlink r:id="rId2">
+        <w:r>
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          <w:t xml:space="preserve">A hyperlink containing an </w:t>
+        </w:r>
+        <w:r>
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+            <w:i/>
+          </w:rPr>
+          <w:t>italicized</w:t>
+        </w:r>
+        <w:r>
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          <w:t xml:space="preserve"> word</w:t>
+        </w:r>
+      </w:hyperlink>
+    </w:p>
+
+
+Internal links
+~~~~~~~~~~~~~~
+
+An internal link provides "jump to another document location" behavior in the
+Word UI. An internal link is distinguished by the absence of an r:id
+attribute. In this case, the w:anchor attribute is required. The value of the
+anchor attribute is the name of a bookmark in the document.
+
+Example::
+
+    <w:p>
+      <w:r>
+        <w:t xml:space="preserve">See </w:t>
+      </w:r>
+      <w:hyperlink w:anchor="Section_4">
+        <w:r>
+          <w:rPr>
+            <w:rStyle w:val="Hyperlink"/>
+          </w:rPr>
+          <w:t>Section 4</w:t>
+        </w:r>
+      </w:hyperlink>
+      <w:r>
+        <w:t xml:space="preserve"> for more details.</w:t>
+      </w:r>
+    </w:p>
+
+... referring to this bookmark elsewhere in the document::
+
+    <w:p>
+      <w:bookmarkStart w:id="0" w:name="Section_4"/>
+        <w:r>
+          <w:t>Section 4</w:t>
+        </w:r>
+      <w:bookmarkEnd w:id="0"/>
+    </w:p>
+
+
+Schema excerpt
+--------------
+
+.. highlight:: xml
+
+::
+
+    <xsd:complexType name="CT_P">
+      <xsd:sequence>
+        <xsd:element name="pPr" type="CT_PPr" minOccurs="0"/>
+        <xsd:group   ref="EG_PContent"        minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="rsidRPr"      type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidR"        type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidDel"      type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidP"        type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidRDefault" type="ST_LongHexNumber"/>
+    </xsd:complexType>
+
+    <xsd:group name="EG_PContent">  <!-- denormalized -->
+      <xsd:choice>
+        <xsd:element name="r"         type="CT_R"/>
+        <xsd:element name="hyperlink" type="CT_Hyperlink"/>
+        <xsd:element name="fldSimple" type="CT_SimpleField"/>
+        <xsd:element name="sdt"       type="CT_SdtRun"/>
+        <xsd:element name="customXml" type="CT_CustomXmlRun"/>
+        <xsd:element name="smartTag"  type="CT_SmartTagRun"/>
+        <xsd:element name="dir"       type="CT_DirContentRun"/>
+        <xsd:element name="bdo"       type="CT_BdoContentRun"/>
+        <xsd:element name="subDoc"    type="CT_Rel"/>
+        <xsd:group ref="EG_RunLevelElts"/>
+      </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="CT_Hyperlink">
+      <xsd:group ref="EG_PContent" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:attribute name="tgtFrame"    type="s:ST_String"/>
+      <xsd:attribute name="tooltip"     type="s:ST_String"/>
+      <xsd:attribute name="docLocation" type="s:ST_String"/>
+      <xsd:attribute name="history"     type="s:ST_OnOff"/>
+      <xsd:attribute name="anchor"      type="s:ST_String"/>
+      <xsd:attribute  ref="r:id"/>
+    </xsd:complexType>
+
+    <xsd:group name="EG_RunLevelElts">
+      <xsd:choice>
+        <xsd:element name="proofErr"                    type="CT_ProofErr"/>
+        <xsd:element name="permStart"                   type="CT_PermStart"/>
+        <xsd:element name="permEnd"                     type="CT_Perm"/>
+        <xsd:element name="bookmarkStart"               type="CT_Bookmark"/>
+        <xsd:element name="bookmarkEnd"                 type="CT_MarkupRange"/>
+        <xsd:element name="moveFromRangeStart"          type="CT_MoveBookmark"/>
+        <xsd:element name="moveFromRangeEnd"            type="CT_MarkupRange"/>
+        <xsd:element name="moveToRangeStart"            type="CT_MoveBookmark"/>
+        <xsd:element name="moveToRangeEnd"              type="CT_MarkupRange"/>
+        <xsd:element name="commentRangeStart"           type="CT_MarkupRange"/>
+        <xsd:element name="commentRangeEnd"             type="CT_MarkupRange"/>
+        <xsd:element name="customXmlInsRangeStart"      type="CT_TrackChange"/>
+        <xsd:element name="customXmlInsRangeEnd"        type="CT_Markup"/>
+        <xsd:element name="customXmlDelRangeStart"      type="CT_TrackChange"/>
+        <xsd:element name="customXmlDelRangeEnd"        type="CT_Markup"/>
+        <xsd:element name="customXmlMoveFromRangeStart" type="CT_TrackChange"/>
+        <xsd:element name="customXmlMoveFromRangeEnd"   type="CT_Markup"/>
+        <xsd:element name="customXmlMoveToRangeStart"   type="CT_TrackChange"/>
+        <xsd:element name="customXmlMoveToRangeEnd"     type="CT_Markup"/>
+        <xsd:element name="ins"                         type="CT_RunTrackChange"/>
+        <xsd:element name="del"                         type="CT_RunTrackChange"/>
+        <xsd:element name="moveFrom"                    type="CT_RunTrackChange"/>
+        <xsd:element name="moveTo"                      type="CT_RunTrackChange"/>
+        <xsd:group ref="EG_MathContent" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="CT_R">
+      <xsd:sequence>
+        <xsd:group ref="EG_RPr"             minOccurs="0"/>
+        <xsd:group ref="EG_RunInnerContent" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="rsidRPr" type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidDel" type="ST_LongHexNumber"/>
+      <xsd:attribute name="rsidR"   type="ST_LongHexNumber"/>
+    </xsd:complexType>
+
+    <xsd:simpleType name="ST_OnOff">
+      <xsd:union memberTypes="xsd:boolean ST_OnOff1"/>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="ST_OnOff1">
+      <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="on"/>
+        <xsd:enumeration value="off"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="ST_RelationshipId">
+      <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="ST_String">
+      <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
diff --git a/docs/dev/analysis/features/text/index.rst b/docs/dev/analysis/features/text/index.rst
index 2fff03924..b1e2fa7f8 100644
--- a/docs/dev/analysis/features/text/index.rst
+++ b/docs/dev/analysis/features/text/index.rst
@@ -5,6 +5,7 @@ Text
 .. toctree::
    :titlesonly:
 
+   hyperlink
    tab-stops
    font-highlight-color
    paragraph-format

From fd54be19a09bf394a6ee4471631fe81e4218e05f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 13:11:51 -0700
Subject: [PATCH 262/367] acpt: add Run inner-content scenarios

---
 features/run-access-content.feature           |   9 ----
 features/run-access-inner-content.feature     |  28 ++++++++++
 features/run-add-content.feature              |   2 +-
 .../test_files/par-rendered-page-breaks.docx  | Bin 0 -> 12244 bytes
 features/steps/text.py                        |  48 +++++++++++++++---
 5 files changed, 69 insertions(+), 18 deletions(-)
 delete mode 100644 features/run-access-content.feature
 create mode 100644 features/run-access-inner-content.feature
 create mode 100644 features/steps/test_files/par-rendered-page-breaks.docx

diff --git a/features/run-access-content.feature b/features/run-access-content.feature
deleted file mode 100644
index ad30f6feb..000000000
--- a/features/run-access-content.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Access run content
-  In order to discover or locate existing inline content
-  As a developer using python-docx
-  I need ways to access the run content
-
-
-  Scenario: Get run content as Python text
-    Given a run having mixed text content
-     Then the text of the run represents the textual run content
diff --git a/features/run-access-inner-content.feature b/features/run-access-inner-content.feature
new file mode 100644
index 000000000..d09d382bb
--- /dev/null
+++ b/features/run-access-inner-content.feature
@@ -0,0 +1,28 @@
+Feature: Access run inner-content including rendered page-breaks
+  In order to extract run content with high-fidelity
+  As a developer using python-docx
+  I need to access differentiated run content in document order
+
+
+  @wip
+  Scenario Outline: Run.contains_page_break reports presence of page-break
+    Given a run having <zero-or-more> rendered page breaks
+     Then run.contains_page_break is <value>
+
+    Examples: Run.contains_page_break cases
+      | zero-or-more | value |
+      | no           | False |
+      | one          | True  |
+      | two          | True  |
+
+
+  @wip
+  Scenario: Run.iter_inner_content() generates the run's text and rendered page-breaks
+    Given a run having two rendered page breaks
+     Then run.iter_inner_content() generates the run text and rendered page-breaks
+
+
+  @wip
+  Scenario: Run.text contains the text content of the run
+    Given a run having mixed text content
+     Then run.text contains the text content of the run
diff --git a/features/run-add-content.feature b/features/run-add-content.feature
index d4257925c..078dccd33 100644
--- a/features/run-add-content.feature
+++ b/features/run-add-content.feature
@@ -11,4 +11,4 @@ Feature: Add content to a run
   Scenario: Assign mixed text to text property
     Given a run
      When I assign mixed text to the text property
-     Then the text of the run represents the textual run content
+     Then run.text contains the text content of the run
diff --git a/features/steps/test_files/par-rendered-page-breaks.docx b/features/steps/test_files/par-rendered-page-breaks.docx
new file mode 100644
index 0000000000000000000000000000000000000000..c3c678ec446f62ced553172688d71b8d841ae8ea
GIT binary patch
literal 12244
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

literal 0
HcmV?d00001

diff --git a/features/steps/text.py b/features/steps/text.py
index 99b3ba0f0..f969f066f 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -3,6 +3,7 @@
 import hashlib
 
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
@@ -47,13 +48,18 @@ def given_a_run_having_mixed_text_content(context):
     r_xml = """\
         <w:r %s>
           <w:t>abc</w:t>
-          <w:tab/>
+          <w:br/>
           <w:t>def</w:t>
           <w:cr/>
           <w:t>ghi</w:t>
           <w:drawing/>
-          <w:br/>
           <w:t>jkl</w:t>
+          <w:tab/>
+          <w:t>mno</w:t>
+          <w:noBreakHyphen/>
+          <w:t>pqr</w:t>
+          <w:ptab/>
+          <w:t>stu</w:t>
         </w:r>""" % nsdecls(
         "w"
     )
@@ -79,6 +85,14 @@ def given_a_run_having_style(context, style):
     context.run = document.paragraphs[0].runs[run_idx]
 
 
+@given("a run having {zero_or_more} rendered page breaks")
+def given_a_run_having_rendered_page_breaks(context: Context, zero_or_more: str):
+    paragraph_idx = {"no": 0, "one": 1, "two": 3}[zero_or_more]
+    document = Document(test_docx("par-rendered-page-breaks"))
+    paragraph = document.paragraphs[paragraph_idx]
+    context.run = paragraph.runs[0]
+
+
 @given("a run inside a table cell retrieved from {cell_source}")
 def given_a_run_inside_a_table_cell_from_source(context, cell_source):
     document = Document()
@@ -143,7 +157,7 @@ def when_I_add_text_to_the_run(context):
 
 @when("I assign mixed text to the text property")
 def when_I_assign_mixed_text_to_the_text_property(context):
-    context.run.text = "abc\tdef\nghi\rjkl"
+    context.run.text = "abc\ndef\rghijkl\tmno-pqr\tstu"
 
 
 @when("I assign {value_str} to its {bool_prop_name} property")
@@ -203,6 +217,13 @@ def then_type_is_page_break(context):
     assert attrib == {qn("w:type"): "page"}
 
 
+@then("run.contains_page_break is {value}")
+def then_run_contains_page_break_is_value(context: Context, value: str):
+    actual = context.run.contains_page_break
+    expected = {"True": True, "False": False}[value]
+    assert actual == expected, f"expected: {expected}, got: {actual}"
+
+
 @then("run.font is the Font object for the run")
 def then_run_font_is_the_Font_object_for_the_run(context):
     run, font = context.run, context.run.font
@@ -210,6 +231,15 @@ def then_run_font_is_the_Font_object_for_the_run(context):
     assert font.element is run.element
 
 
+@then("run.iter_inner_content() generates the run text and rendered page-breaks")
+def then_run_iter_inner_content_generates_text_and_page_breaks(context: Context):
+    actual_value = [type(item).__name__ for item in context.run.iter_inner_content()]
+    expected_value = ["str", "RenderedPageBreak", "str", "RenderedPageBreak", "str"]
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
 @then("run.style is styles['{style_name}']")
 def then_run_style_is_style(context, style_name):
     expected_value = context.document.styles[style_name]
@@ -217,6 +247,13 @@ def then_run_style_is_style(context, style_name):
     assert run.style == expected_value, "got %s" % run.style
 
 
+@then("run.text contains the text content of the run")
+def then_run_text_contains_the_text_content_of_the_run(context):
+    actual = context.run.text
+    expected = "abc\ndef\nghijkl\tmno-pqr\tstu"
+    assert actual == expected, f"expected:\n'{expected}'\n\ngot:\n'{actual}'"
+
+
 @then("the last item in the run is a break")
 def then_last_item_in_run_is_a_break(context):
     run = context.run
@@ -291,8 +328,3 @@ def then_the_tab_appears_at_the_end_of_the_run(context):
     r = context.run._r
     tab = r.find(qn("w:tab"))
     assert tab is not None
-
-
-@then("the text of the run represents the textual run content")
-def then_the_text_of_the_run_represents_the_textual_run_content(context):
-    assert context.run.text == "abc\tdef\nghi\njkl", "got '%s'" % context.run.text

From 45bf74bf48bdf806f47d0fab5f9ea84326f4dc43 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 14:24:54 -0700
Subject: [PATCH 263/367] rfctr: add types to Run and its tests

---
 src/docx/oxml/text/run.py | 26 ++++++-----
 src/docx/text/run.py      | 44 +++++++++++-------
 src/docx/types.py         | 19 ++++++++
 tests/text/test_run.py    |  9 ++--
 tests/unitutil/file.py    | 14 +++---
 tests/unitutil/mock.py    | 94 ++++++++++++++++++++++++++++-----------
 6 files changed, 145 insertions(+), 61 deletions(-)
 create mode 100644 src/docx/types.py

diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index aedede812..74a4e3065 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Callable
+
 from docx.oxml.ns import qn
 from docx.oxml.simpletypes import ST_BrClear, ST_BrType
 from docx.oxml.text.font import CT_RPr
@@ -14,12 +16,16 @@
 class CT_R(BaseOxmlElement):
     """`<w:r>` element, containing the properties and text for a run."""
 
+    add_br: Callable[[], CT_Br]
+    get_or_add_rPr: Callable[[], CT_RPr]
+    _add_t: Callable[..., CT_Text]
+
     rPr = ZeroOrOne("w:rPr")
-    t = ZeroOrMore("w:t")
     br = ZeroOrMore("w:br")
     cr = ZeroOrMore("w:cr")
-    tab = ZeroOrMore("w:tab")
     drawing = ZeroOrMore("w:drawing")
+    t = ZeroOrMore("w:t")
+    tab = ZeroOrMore("w:tab")
 
     def add_t(self, text: str) -> CT_Text:
         """Return a newly added `<w:t>` element containing `text`."""
@@ -44,7 +50,7 @@ def clear_content(self):
             self.remove(child)
 
     @property
-    def style(self):
+    def style(self) -> str | None:
         """String contained in `w:val` attribute of `w:rStyle` grandchild.
 
         |None| if that element is not present.
@@ -64,7 +70,7 @@ def style(self, style):
         rPr.style = style
 
     @property
-    def text(self):
+    def text(self) -> str:
         """The textual content of this run.
 
         Inner-content child elements like `w:tab` are translated to their text
@@ -82,7 +88,7 @@ def text(self):
         return text
 
     @text.setter
-    def text(self, text):
+    def text(self, text: str):
         self.clear_content()
         _RunContentAppender.append_to_run_from_text(self, text)
 
@@ -98,7 +104,7 @@ def _insert_rPr(self, rPr: CT_RPr) -> CT_RPr:
 class CT_Br(BaseOxmlElement):
     """`<w:br>` element, indicating a line, page, or column break in a run."""
 
-    type = OptionalAttribute("w:type", ST_BrType)
+    type = OptionalAttribute("w:type", ST_BrType, default="textWrapping")
     clear = OptionalAttribute("w:clear", ST_BrClear)
 
 
@@ -119,23 +125,23 @@ class _RunContentAppender(object):
     appended.
     """
 
-    def __init__(self, r):
+    def __init__(self, r: CT_R):
         self._r = r
         self._bfr = []
 
     @classmethod
-    def append_to_run_from_text(cls, r, text):
+    def append_to_run_from_text(cls, r: CT_R, text: str):
         """Append inner-content elements for `text` to `r` element."""
         appender = cls(r)
         appender.add_text(text)
 
-    def add_text(self, text):
+    def add_text(self, text: str):
         """Append inner-content elements for `text` to the `w:r` element."""
         for char in text:
             self.add_char(char)
         self.flush()
 
-    def add_char(self, char):
+    def add_char(self, char: str):
         """Process next character of input through finite state maching (FSM).
 
         There are two possible states, buffer pending and not pending, but those are
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 06ccd2e54..10acdbf92 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -1,14 +1,21 @@
 """Run-related proxy objects for python-docx, Run in particular."""
 
+from __future__ import annotations
+
+from typing import IO
+
+from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK
+from docx.oxml.text.run import CT_R, CT_Text
 from docx.shape import InlineShape
-from docx.shared import Parented
+from docx.shared import Length, Parented
+from docx.styles.style import CharacterStyle
 from docx.text.font import Font
 
 
 class Run(Parented):
-    """Proxy object wrapping ``<w:r>`` element.
+    """Proxy object wrapping `<w:r>` element.
 
     Several of the properties on Run take a tri-state value, |True|, |False|, or |None|.
     |True| and |False| correspond to on and off respectively. |None| indicates the
@@ -16,11 +23,11 @@ class Run(Parented):
     the style hierarchy.
     """
 
-    def __init__(self, r, parent):
+    def __init__(self, r: CT_R, parent: t.StoryChild):
         super(Run, self).__init__(parent)
         self._r = self._element = self.element = r
 
-    def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):
+    def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):  # pyright: ignore
         """Add a break element of `break_type` to this run.
 
         `break_type` can take the values `WD_BREAK.LINE`, `WD_BREAK.PAGE`, and
@@ -41,7 +48,12 @@ def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):
         if clear is not None:
             br.clear = clear
 
-    def add_picture(self, image_path_or_stream, width=None, height=None):
+    def add_picture(
+        self,
+        image_path_or_stream: str | IO[bytes],
+        width: Length | None = None,
+        height: Length | None = None,
+    ) -> InlineShape:
         """Return an |InlineShape| instance containing the image identified by
         `image_path_or_stream`, added to the end of this run.
 
@@ -62,7 +74,7 @@ def add_tab(self):
         tab character."""
         self._r._add_tab()
 
-    def add_text(self, text):
+    def add_text(self, text: str):
         """Returns a newly appended |_Text| object (corresponding to a new ``<w:t>``
         child element) to the run, containing `text`.
 
@@ -73,7 +85,7 @@ def add_text(self, text):
         return _Text(t)
 
     @property
-    def bold(self):
+    def bold(self) -> bool:
         """Read/write.
 
         Causes the text of the run to appear in bold.
@@ -81,7 +93,7 @@ def bold(self):
         return self.font.bold
 
     @bold.setter
-    def bold(self, value):
+    def bold(self, value: bool):
         self.font.bold = value
 
     def clear(self):
@@ -99,7 +111,7 @@ def font(self):
         return Font(self._element)
 
     @property
-    def italic(self):
+    def italic(self) -> bool:
         """Read/write tri-state value.
 
         When |True|, causes the text of the run to appear in italics.
@@ -107,11 +119,11 @@ def italic(self):
         return self.font.italic
 
     @italic.setter
-    def italic(self, value):
+    def italic(self, value: bool):
         self.font.italic = value
 
     @property
-    def style(self):
+    def style(self) -> CharacterStyle | None:
         """Read/write.
 
         A |_CharacterStyle| object representing the character style applied to this run.
@@ -123,7 +135,7 @@ def style(self):
         return self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
 
     @style.setter
-    def style(self, style_or_name):
+    def style(self, style_or_name: str | CharacterStyle | None):
         style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.CHARACTER)
         self._r.style = style_id
 
@@ -146,11 +158,11 @@ def text(self) -> str:
         return self._r.text
 
     @text.setter
-    def text(self, text):
+    def text(self, text: str):
         self._r.text = text
 
     @property
-    def underline(self):
+    def underline(self) -> bool:
         """The underline style for this |Run|, one of |None|, |True|, |False|, or a
         value from :ref:`WdUnderline`.
 
@@ -165,13 +177,13 @@ def underline(self):
         return self.font.underline
 
     @underline.setter
-    def underline(self, value):
+    def underline(self, value: bool):
         self.font.underline = value
 
 
 class _Text(object):
     """Proxy object wrapping `<w:t>` element."""
 
-    def __init__(self, t_elm):
+    def __init__(self, t_elm: CT_Text):
         super(_Text, self).__init__()
         self._t = t_elm
diff --git a/src/docx/types.py b/src/docx/types.py
new file mode 100644
index 000000000..6097f740c
--- /dev/null
+++ b/src/docx/types.py
@@ -0,0 +1,19 @@
+"""Abstract types used by `python-docx`."""
+
+from __future__ import annotations
+
+from typing_extensions import Protocol
+
+from docx.parts.story import StoryPart
+
+
+class StoryChild(Protocol):
+    """An object that can fulfill the `parent` role in a `Parented` class.
+
+    This type is for objects that have a story part like document or header as their
+    root part.
+    """
+
+    @property
+    def part(self) -> StoryPart:
+        ...
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 4762c6248..cf0d0f711 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -75,13 +75,14 @@ def it_can_add_text(self, add_text_fixture, Text_):
             (WD_BREAK.LINE, "w:r/w:br"),
             (WD_BREAK.PAGE, "w:r/w:br{w:type=page}"),
             (WD_BREAK.COLUMN, "w:r/w:br{w:type=column}"),
-            (WD_BREAK.LINE_CLEAR_LEFT, "w:r/w:br{w:type=textWrapping, w:clear=left}"),
-            (WD_BREAK.LINE_CLEAR_RIGHT, "w:r/w:br{w:type=textWrapping, w:clear=right}"),
-            (WD_BREAK.LINE_CLEAR_ALL, "w:r/w:br{w:type=textWrapping, w:clear=all}"),
+            (WD_BREAK.LINE_CLEAR_LEFT, "w:r/w:br{w:clear=left}"),
+            (WD_BREAK.LINE_CLEAR_RIGHT, "w:r/w:br{w:clear=right}"),
+            (WD_BREAK.LINE_CLEAR_ALL, "w:r/w:br{w:clear=all}"),
         ],
     )
     def it_can_add_a_break(self, break_type: WD_BREAK, expected_cxml: str):
-        run = Run(element("w:r"), None)
+        r = cast(CT_R, element("w:r"))
+        run = Run(r, None)  # pyright:ignore[reportGeneralTypeIssues]
         expected_xml = xml(expected_cxml)
 
         run.add_break(break_type)
diff --git a/tests/unitutil/file.py b/tests/unitutil/file.py
index 432c8635e..795052c8e 100644
--- a/tests/unitutil/file.py
+++ b/tests/unitutil/file.py
@@ -1,28 +1,30 @@
 """Utility functions for loading files for unit testing."""
 
+from __future__ import annotations
+
 import os
 
 _thisdir = os.path.split(__file__)[0]
 test_file_dir = os.path.abspath(os.path.join(_thisdir, "..", "test_files"))
 
 
-def abspath(relpath):
+def abspath(relpath: str) -> str:
     thisdir = os.path.split(__file__)[0]
     return os.path.abspath(os.path.join(thisdir, relpath))
 
 
-def absjoin(*paths):
+def absjoin(*paths: str) -> str:
     return os.path.abspath(os.path.join(*paths))
 
 
-def docx_path(name):
+def docx_path(name: str):
     """
     Return the absolute path to test .docx file with root name `name`.
     """
     return absjoin(test_file_dir, "%s.docx" % name)
 
 
-def snippet_seq(name, offset=0, count=1024):
+def snippet_seq(name: str, offset: int = 0, count: int = 1024):
     """
     Return a tuple containing the unicode text snippets read from the snippet
     file having `name`. Snippets are delimited by a blank line. If specified,
@@ -36,7 +38,7 @@ def snippet_seq(name, offset=0, count=1024):
     return tuple(snippets[start:end])
 
 
-def snippet_text(snippet_file_name):
+def snippet_text(snippet_file_name: str):
     """
     Return the unicode text read from the test snippet file having
     `snippet_file_name`.
@@ -49,7 +51,7 @@ def snippet_text(snippet_file_name):
     return snippet_bytes.decode("utf-8")
 
 
-def test_file(name):
+def test_file(name: str):
     """
     Return the absolute path to test file having `name`.
     """
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
index c2c15bd62..d0e41ce93 100644
--- a/tests/unitutil/mock.py
+++ b/tests/unitutil/mock.py
@@ -1,18 +1,40 @@
 """Utility functions wrapping the excellent `mock` library."""
 
-import sys
-
-if sys.version_info >= (3, 3):
-    from unittest import mock  # noqa
-    from unittest.mock import ANY, call, MagicMock  # noqa
-    from unittest.mock import create_autospec, Mock, mock_open, patch, PropertyMock
-else:
-    import mock  # noqa
-    from mock import ANY, call, MagicMock  # noqa
-    from mock import create_autospec, Mock, patch, PropertyMock
-
-
-def class_mock(request, q_class_name, autospec=True, **kwargs):
+from __future__ import annotations
+
+from typing import Any
+from unittest.mock import (
+    ANY,
+    MagicMock,
+    Mock,
+    PropertyMock,
+    call,
+    create_autospec,
+    mock_open,
+    patch,
+)
+
+from pytest import FixtureRequest, LogCaptureFixture  # noqa: PT013
+
+__all__ = (
+    "ANY",
+    "FixtureRequest",
+    "LogCaptureFixture",
+    "MagicMock",
+    "Mock",
+    "call",
+    "class_mock",
+    "function_mock",
+    "initializer_mock",
+    "instance_mock",
+    "method_mock",
+    "property_mock",
+)
+
+
+def class_mock(
+    request: FixtureRequest, q_class_name: str, autospec: bool = True, **kwargs: Any
+) -> Mock:
     """Return mock patching class with qualified name `q_class_name`.
 
     The mock is autospec'ed based on the patched class unless the optional
@@ -24,10 +46,16 @@ def class_mock(request, q_class_name, autospec=True, **kwargs):
     return _patch.start()
 
 
-def cls_attr_mock(request, cls, attr_name, name=None, **kwargs):
-    """
-    Return a mock for attribute `attr_name` on `cls` where the patch is
-    reversed after pytest uses it.
+def cls_attr_mock(
+    request: FixtureRequest,
+    cls: type,
+    attr_name: str,
+    name: str | None = None,
+    **kwargs: Any,
+):
+    """Return a mock for attribute `attr_name` on `cls`.
+
+    Patch is reversed after pytest uses it.
     """
     name = request.fixturename if name is None else name
     _patch = patch.object(cls, attr_name, name=name, **kwargs)
@@ -35,7 +63,9 @@ def cls_attr_mock(request, cls, attr_name, name=None, **kwargs):
     return _patch.start()
 
 
-def function_mock(request, q_function_name, autospec=True, **kwargs):
+def function_mock(
+    request: FixtureRequest, q_function_name: str, autospec: bool = True, **kwargs: Any
+):
     """Return mock patching function with qualified name `q_function_name`.
 
     Patch is reversed after calling test returns.
@@ -45,7 +75,9 @@ def function_mock(request, q_function_name, autospec=True, **kwargs):
     return _patch.start()
 
 
-def initializer_mock(request, cls, autospec=True, **kwargs):
+def initializer_mock(
+    request: FixtureRequest, cls: type, autospec: bool = True, **kwargs: Any
+):
     """Return mock for __init__() method on `cls`.
 
     The patch is reversed after pytest uses it.
@@ -57,7 +89,13 @@ def initializer_mock(request, cls, autospec=True, **kwargs):
     return _patch.start()
 
 
-def instance_mock(request, cls, name=None, spec_set=True, **kwargs):
+def instance_mock(
+    request: FixtureRequest,
+    cls: type,
+    name: str | None = None,
+    spec_set: bool = True,
+    **kwargs: Any,
+):
     """
     Return a mock for an instance of `cls` that draws its spec from the class
     and does not allow new attributes to be set on the instance. If `name` is
@@ -69,7 +107,7 @@ def instance_mock(request, cls, name=None, spec_set=True, **kwargs):
     return create_autospec(cls, _name=name, spec_set=spec_set, instance=True, **kwargs)
 
 
-def loose_mock(request, name=None, **kwargs):
+def loose_mock(request: FixtureRequest, name: str | None = None, **kwargs: Any):
     """
     Return a "loose" mock, meaning it has no spec to constrain calls on it.
     Additional keyword arguments are passed through to Mock(). If called
@@ -80,7 +118,13 @@ def loose_mock(request, name=None, **kwargs):
     return Mock(name=name, **kwargs)
 
 
-def method_mock(request, cls, method_name, autospec=True, **kwargs):
+def method_mock(
+    request: FixtureRequest,
+    cls: type,
+    method_name: str,
+    autospec: bool = True,
+    **kwargs: Any,
+):
     """Return mock for method `method_name` on `cls`.
 
     The patch is reversed after pytest uses it.
@@ -90,7 +134,7 @@ def method_mock(request, cls, method_name, autospec=True, **kwargs):
     return _patch.start()
 
 
-def open_mock(request, module_name, **kwargs):
+def open_mock(request: FixtureRequest, module_name: str, **kwargs: Any):
     """
     Return a mock for the builtin `open()` method in `module_name`.
     """
@@ -100,7 +144,7 @@ def open_mock(request, module_name, **kwargs):
     return _patch.start()
 
 
-def property_mock(request, cls, prop_name, **kwargs):
+def property_mock(request: FixtureRequest, cls: type, prop_name: str, **kwargs: Any):
     """
     Return a mock for property `prop_name` on class `cls` where the patch is
     reversed after pytest uses it.
@@ -110,7 +154,7 @@ def property_mock(request, cls, prop_name, **kwargs):
     return _patch.start()
 
 
-def var_mock(request, q_var_name, **kwargs):
+def var_mock(request: FixtureRequest, q_var_name: str, **kwargs: Any):
     """
     Return a mock patching the variable with qualified name `q_var_name`.
     Patch is reversed after calling test returns.

From ceb8cbec430bf93541ed23c8dcad644f9683e904 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 19:51:48 -0700
Subject: [PATCH 264/367] rfctr: add types to Paragraph and its tests

---
 src/docx/text/paragraph.py | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 9ca235bdb..d2db02dfd 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -1,7 +1,17 @@
 """Paragraph-related proxy types."""
 
+from __future__ import annotations
+
+from typing import List
+
+from typing_extensions import Self
+
+from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
+from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+from docx.oxml.text.paragraph import CT_P
 from docx.shared import Parented
+from docx.styles.style import CharacterStyle, ParagraphStyle
 from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Run
 
@@ -9,18 +19,19 @@
 class Paragraph(Parented):
     """Proxy object wrapping a `<w:p>` element."""
 
-    def __init__(self, p, parent):
+    def __init__(self, p: CT_P, parent: t.StoryChild):
         super(Paragraph, self).__init__(parent)
         self._p = self._element = p
 
-    def add_run(self, text=None, style=None):
-        """Append a run to this paragraph containing `text` and having character style
-        identified by style ID `style`.
+    def add_run(
+        self, text: str | None = None, style: str | CharacterStyle | None = None
+    ) -> Run:
+        """Append run containing `text` and having character-style `style`.
 
         `text` can contain tab (``\\t``) characters, which are converted to the
         appropriate XML form for a tab. `text` can also include newline (``\\n``) or
         carriage return (``\\r``) characters, each of which is converted to a line
-        break.
+        break. When `text` is `None`, the new run is empty.
         """
         r = self._p.add_r()
         run = Run(r, self)
@@ -31,7 +42,7 @@ def add_run(self, text=None, style=None):
         return run
 
     @property
-    def alignment(self):
+    def alignment(self) -> WD_PARAGRAPH_ALIGNMENT | None:
         """A member of the :ref:`WdParagraphAlignment` enumeration specifying the
         justification setting for this paragraph.
 
@@ -42,7 +53,7 @@ def alignment(self):
         return self._p.alignment
 
     @alignment.setter
-    def alignment(self, value):
+    def alignment(self, value: WD_PARAGRAPH_ALIGNMENT):
         self._p.alignment = value
 
     def clear(self):
@@ -53,7 +64,9 @@ def clear(self):
         self._p.clear_content()
         return self
 
-    def insert_paragraph_before(self, text=None, style=None):
+    def insert_paragraph_before(
+        self, text: str | None = None, style: str | ParagraphStyle | None = None
+    ) -> Self:
         """Return a newly created paragraph, inserted directly before this paragraph.
 
         If `text` is supplied, the new paragraph contains that text in a single run. If
@@ -73,13 +86,13 @@ def paragraph_format(self):
         return ParagraphFormat(self._element)
 
     @property
-    def runs(self):
+    def runs(self) -> List[Run]:
         """Sequence of |Run| instances corresponding to the <w:r> elements in this
         paragraph."""
         return [Run(r, self) for r in self._p.r_lst]
 
     @property
-    def style(self):
+    def style(self) -> ParagraphStyle | None:
         """Read/Write.
 
         |_ParagraphStyle| object representing the style assigned to this paragraph. If
@@ -92,7 +105,7 @@ def style(self):
         return self.part.get_style(style_id, WD_STYLE_TYPE.PARAGRAPH)
 
     @style.setter
-    def style(self, style_or_name):
+    def style(self, style_or_name: str | ParagraphStyle | None):
         style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.PARAGRAPH)
         self._p.style = style_id
 
@@ -115,7 +128,7 @@ def text(self) -> str:
         return text
 
     @text.setter
-    def text(self, text):
+    def text(self, text: str | None):
         self.clear()
         self.add_run(text)
 

From 2e13d5cc1341341421fd71f62bb20732a828d149 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 15:56:19 -0700
Subject: [PATCH 265/367] run: Run.text includes no-break hyphen, etc.

Add additional run inner-content elements having a text equivalent, in
particular `w:noBreakHyphen` and `w:ptab`. Give each of them their own
custom element class having a `__str__()` method so they can each report
their text content (constant in some cases like "-" for no-break
hyphen).
---
 features/run-access-inner-content.feature |  1 -
 features/steps/paragraph.py               | 12 ++-
 src/docx/enum/base.py                     | 15 +++-
 src/docx/enum/text.py                     | 10 ++-
 src/docx/oxml/__init__.py                 | 30 +++++---
 src/docx/oxml/text/parfmt.py              | 14 +++-
 src/docx/oxml/text/run.py                 | 92 ++++++++++++++++++++---
 tests/oxml/text/test_run.py               |  6 ++
 tests/text/test_run.py                    |  2 +-
 9 files changed, 150 insertions(+), 32 deletions(-)

diff --git a/features/run-access-inner-content.feature b/features/run-access-inner-content.feature
index d09d382bb..5bce127d6 100644
--- a/features/run-access-inner-content.feature
+++ b/features/run-access-inner-content.feature
@@ -22,7 +22,6 @@ Feature: Access run inner-content including rendered page-breaks
      Then run.iter_inner_content() generates the run text and rendered page-breaks
 
 
-  @wip
   Scenario: Run.text contains the text content of the run
     Given a run having mixed text content
      Then run.text contains the text content of the run
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index ae827a1ab..b79f30158 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -118,9 +118,11 @@ def then_the_document_contains_four_paragraphs(context):
 def then_document_contains_text_I_added(context):
     document = Document(saved_docx_path)
     paragraphs = document.paragraphs
-    p = paragraphs[-1]
-    r = p.runs[0]
-    assert r.text == test_text
+    paragraph = paragraphs[-1]
+    run = paragraph.runs[0]
+    actual = run.text
+    expected = test_text
+    assert actual == expected, f"expected: {expected}, got: {actual}"
 
 
 @then("the paragraph alignment property value is {align_value}")
@@ -153,7 +155,9 @@ def then_the_paragraph_has_the_style_I_set(context):
 
 @then("the paragraph has the text I set")
 def then_the_paragraph_has_the_text_I_set(context):
-    assert context.paragraph.text == "bar\tfoo\n"
+    actual = context.paragraph.text
+    expected = "bar\tfoo\n"
+    assert actual == expected, f"expected: {expected}, got: {actual}"
 
 
 @then("the style of the second paragraph matches the style I set")
diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index 054e1e3b4..679174ac2 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -1,14 +1,21 @@
 """Base classes and other objects used by enumerations."""
 
+from __future__ import annotations
+
+import enum
 import sys
 import textwrap
+from typing import Callable, Type
+
+from docx.exceptions import InvalidXmlError
 
-from ..exceptions import InvalidXmlError
 
+def alias(*aliases: str) -> Callable[..., Type[enum.Enum]]:
+    """Adds alternate name for an enumeration.
 
-def alias(*aliases):
-    """Decorating a class with @alias('FOO', 'BAR', ..) allows the class to be
-    referenced by each of the names provided as arguments."""
+    Decorating a class with @alias('FOO', 'BAR', ..) allows the class to be referenced
+    by each of the names provided as arguments.
+    """
 
     def decorator(cls):
         # alias must be set in globals from caller's frame
diff --git a/src/docx/enum/text.py b/src/docx/enum/text.py
index 2ccbdc522..2c9d25e37 100644
--- a/src/docx/enum/text.py
+++ b/src/docx/enum/text.py
@@ -1,6 +1,9 @@
 """Enumerations related to text in WordprocessingML files."""
 
-from .base import EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
+import enum
+from typing import ClassVar
+
+from docx.enum.base import EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
 
 
 @alias("WD_ALIGN_PARAGRAPH")
@@ -59,6 +62,9 @@ class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
     )
 
 
+WD_ALIGN_PARAGRAPH = WD_PARAGRAPH_ALIGNMENT
+
+
 class WD_BREAK_TYPE(object):
     """Corresponds to WdBreakType enumeration http://msdn.microsoft.com/en-
     us/library/office/ff195905.aspx."""
@@ -184,6 +190,8 @@ class WD_TAB_ALIGNMENT(XmlEnumeration):
 class WD_TAB_LEADER(XmlEnumeration):
     """Specifies the character to use as the leader with formatted tabs."""
 
+    SPACES: ClassVar[enum.Enum]
+
     __ms_name__ = "WdTabLeader"
 
     __url__ = "https://msdn.microsoft.com/en-us/library/office/ff845050.aspx"
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 8f53b5d99..4c2821c8b 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -6,10 +6,28 @@
 from __future__ import annotations
 
 from docx.oxml.parser import register_element_cls
+from docx.oxml.text.run import (
+    CT_R,
+    CT_Br,
+    CT_Cr,
+    CT_NoBreakHyphen,
+    CT_PTab,
+    CT_Text,
+)
+
+# ---------------------------------------------------------------------------
+# text-related elements
+
+register_element_cls("w:br", CT_Br)
+register_element_cls("w:cr", CT_Cr)
+register_element_cls("w:noBreakHyphen", CT_NoBreakHyphen)
+register_element_cls("w:ptab", CT_PTab)
+register_element_cls("w:r", CT_R)
+register_element_cls("w:t", CT_Text)
+
+# ---------------------------------------------------------------------------
+# other custom element class mappings
 
-# ===========================================================================
-# custom element class mappings
-# ===========================================================================
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
 
 register_element_cls("w:evenAndOddHeaders", CT_OnOff)
@@ -199,9 +217,3 @@
 register_element_cls("w:tab", CT_TabStop)
 register_element_cls("w:tabs", CT_TabStops)
 register_element_cls("w:widowControl", CT_OnOff)
-
-from .text.run import CT_Br, CT_R, CT_Text  # noqa
-
-register_element_cls("w:br", CT_Br)
-register_element_cls("w:r", CT_R)
-register_element_cls("w:t", CT_Text)
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index 086012599..74c2504ab 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -321,12 +321,24 @@ class CT_Spacing(BaseOxmlElement):
 
 
 class CT_TabStop(BaseOxmlElement):
-    """`<w:tab>` element, representing an individual tab stop."""
+    """`<w:tab>` element, representing an individual tab stop.
+
+    Overloaded to use for a tab-character in a run, which also uses the w:tab tag but
+    only needs a __str__ method.
+    """
 
     val = RequiredAttribute("w:val", WD_TAB_ALIGNMENT)
     leader = OptionalAttribute("w:leader", WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES)
     pos = RequiredAttribute("w:pos", ST_SignedTwipsMeasure)
 
+    def __str__(self) -> str:
+        """Text equivalent of a `w:tab` element appearing in a run.
+
+        Allows text of run inner-content to be accessed consistently across all text
+        inner-content.
+        """
+        return "\t"
+
 
 class CT_TabStops(BaseOxmlElement):
     """``<w:tabs>`` element, container for a sorted sequence of tab stops."""
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 74a4e3065..60294e7dc 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -76,16 +76,10 @@ def text(self) -> str:
         Inner-content child elements like `w:tab` are translated to their text
         equivalent.
         """
-        text = ""
-        for child in self:
-            if child.tag == qn("w:t"):
-                t_text = child.text
-                text += t_text if t_text is not None else ""
-            elif child.tag == qn("w:tab"):
-                text += "\t"
-            elif child.tag in (qn("w:br"), qn("w:cr")):
-                text += "\n"
-        return text
+        return "".join(
+            str(e)
+            for e in self.xpath("w:br | w:cr | w:noBreakHyphen | w:ptab | w:t | w:tab")
+        )
 
     @text.setter
     def text(self, text: str):
@@ -104,13 +98,89 @@ def _insert_rPr(self, rPr: CT_RPr) -> CT_RPr:
 class CT_Br(BaseOxmlElement):
     """`<w:br>` element, indicating a line, page, or column break in a run."""
 
-    type = OptionalAttribute("w:type", ST_BrType, default="textWrapping")
+    type: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:type", ST_BrType, default="textWrapping"
+    )
     clear = OptionalAttribute("w:clear", ST_BrClear)
 
+    def __str__(self) -> str:
+        """Text equivalent of this element. Actual value depends on break type.
+
+        A line break is translated as "\n". Column and page breaks produce the empty
+        string ("").
+
+        This allows the text of run inner-content to be accessed in a consistent way
+        for all run inner-context text elements.
+        """
+        return "\n" if self.type == "textWrapping" else ""
+
+
+class CT_Cr(BaseOxmlElement):
+    """`<w:cr>` element, representing a carriage-return (0x0D) character within a run.
+
+    In Word, this represents a "soft carriage-return" in the sense that it does not end
+    the paragraph the way pressing Enter (aka. Return) on the keyboard does. Here the
+    text equivalent is considered to be newline ("\n") since in plain-text that's the
+    closest Python equivalent.
+
+    NOTE: this complex-type name does not exist in the schema, where `w:tab` maps to
+    `CT_Empty`. This name was added to give it distinguished behavior. CT_Empty is used
+    for many elements.
+    """
+
+    def __str__(self) -> str:
+        """Text equivalent of this element, a single newline ("\n")."""
+        return "\n"
+
+
+class CT_NoBreakHyphen(BaseOxmlElement):
+    """`<w:noBreakHyphen>` element, a hyphen ineligible for a line-wrap position.
+
+    This maps to a plain-text dash ("-").
+
+    NOTE: this complex-type name does not exist in the schema, where `w:noBreakHyphen`
+    maps to `CT_Empty`. This name was added to give it behavior distinguished from the
+    many other elements represented in the schema by CT_Empty.
+    """
+
+    def __str__(self) -> str:
+        """Text equivalent of this element, a single dash character ("-")."""
+        return "-"
+
+
+class CT_PTab(BaseOxmlElement):
+    """`<w:ptab>` element, representing an absolute-position tab character within a run.
+
+    This character advances the rendering position to the specified position regardless
+    of any tab-stops, perhaps for layout of a table-of-contents (TOC) or similar.
+    """
+
+    def __str__(self) -> str:
+        """Text equivalent of this element, a single tab ("\t") character.
+
+        This allows the text of run inner-content to be accessed in a consistent way
+        for all run inner-context text elements.
+        """
+        return "\t"
+
+
+# -- CT_Tab functionality is provided by CT_TabStop which also uses `w:tab` tag. That
+# -- element class provides the __str__() method for this empty element, unconditionally
+# -- returning "\t".
+
 
 class CT_Text(BaseOxmlElement):
     """`<w:t>` element, containing a sequence of characters within a run."""
 
+    def __str__(self) -> str:
+        """Text contained in this element, the empty string if it has no content.
+
+        This property allows this run inner-content element to be queried for its text
+        the same way as other run-content elements are. In particular, this never
+        returns None, as etree._Element does when there is no content.
+        """
+        return self.text or ""
+
 
 # ------------------------------------------------------------------------------------
 # Utility
diff --git a/tests/oxml/text/test_run.py b/tests/oxml/text/test_run.py
index 69aefe8ed..6aad7cd02 100644
--- a/tests/oxml/text/test_run.py
+++ b/tests/oxml/text/test_run.py
@@ -33,3 +33,9 @@ def it_can_add_a_t_preserving_edge_whitespace(
         r.add_t(text)
 
         assert r.xml == expected_xml
+
+    def it_can_assemble_the_text_in_the_run(self):
+        cxml = 'w:r/(w:br,w:cr,w:noBreakHyphen,w:ptab,w:t"foobar",w:tab)'
+        r = cast(CT_R, element(cxml))
+
+        assert r.text == "\n\n-\tfoobar\t"
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index cf0d0f711..80f7a09c7 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -117,7 +117,7 @@ def it_can_remove_its_content_but_keep_formatting(self, clear_fixture):
             ("w:r", ""),
             ('w:r/w:t"foobar"', "foobar"),
             ('w:r/(w:t"abc", w:tab, w:t"def", w:cr)', "abc\tdef\n"),
-            ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', "\nabcdef\t"),
+            ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', "abcdef\t"),
         ],
     )
     def it_knows_the_text_it_contains(self, r_cxml: str, expected_text: str):

From 2364e909429fdda7c28d1fc3053d601d2f3941e8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 16:14:30 -0700
Subject: [PATCH 266/367] run: add Run.contains_page_break

---
 features/run-access-inner-content.feature |  1 -
 src/docx/oxml/__init__.py                 |  2 ++
 src/docx/oxml/text/pagebreak.py           | 18 ++++++++++++++++++
 src/docx/oxml/text/run.py                 | 10 +++++++++-
 src/docx/text/run.py                      | 13 +++++++++++++
 tests/text/test_run.py                    | 17 +++++++++++++++++
 6 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/docx/oxml/text/pagebreak.py

diff --git a/features/run-access-inner-content.feature b/features/run-access-inner-content.feature
index 5bce127d6..6c855856b 100644
--- a/features/run-access-inner-content.feature
+++ b/features/run-access-inner-content.feature
@@ -4,7 +4,6 @@ Feature: Access run inner-content including rendered page-breaks
   I need to access differentiated run content in document order
 
 
-  @wip
   Scenario Outline: Run.contains_page_break reports presence of page-break
     Given a run having <zero-or-more> rendered page breaks
      Then run.contains_page_break is <value>
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 4c2821c8b..a3f81aad1 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 from docx.oxml.parser import register_element_cls
+from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.oxml.text.run import (
     CT_R,
     CT_Br,
@@ -20,6 +21,7 @@
 
 register_element_cls("w:br", CT_Br)
 register_element_cls("w:cr", CT_Cr)
+register_element_cls("w:lastRenderedPageBreak", CT_LastRenderedPageBreak)
 register_element_cls("w:noBreakHyphen", CT_NoBreakHyphen)
 register_element_cls("w:ptab", CT_PTab)
 register_element_cls("w:r", CT_R)
diff --git a/src/docx/oxml/text/pagebreak.py b/src/docx/oxml/text/pagebreak.py
new file mode 100644
index 000000000..201de9267
--- /dev/null
+++ b/src/docx/oxml/text/pagebreak.py
@@ -0,0 +1,18 @@
+"""Custom element class for rendered page-break (CT_LastRenderedPageBreak)."""
+
+from __future__ import annotations
+
+from docx.oxml.xmlchemy import BaseOxmlElement
+
+
+class CT_LastRenderedPageBreak(BaseOxmlElement):
+    """`<w:lastRenderedPageBreak>` element, indicating page break inserted by renderer.
+
+    A rendered page-break is one inserted by the renderer when it runs out of room on a
+    page. It is an empty element (no attrs or children) and is a child of CT_R, peer to
+    CT_Text.
+
+    NOTE: this complex-type name does not exist in the schema, where
+    `w:lastRenderedPageBreak` maps to `CT_Empty`. This name was added to give it
+    distinguished behavior. CT_Empty is used for many elements.
+    """
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 60294e7dc..8a2e2da2e 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -2,13 +2,16 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from typing import TYPE_CHECKING, Callable, List
 
 from docx.oxml.ns import qn
 from docx.oxml.simpletypes import ST_BrClear, ST_BrType
 from docx.oxml.text.font import CT_RPr
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
 
+if TYPE_CHECKING:
+    from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
+
 # ------------------------------------------------------------------------------------
 # Run-level elements
 
@@ -49,6 +52,11 @@ def clear_content(self):
         for child in content_child_elms:
             self.remove(child)
 
+    @property
+    def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
+        """All `w:lastRenderedPageBreaks` descendants of this run."""
+        return self.xpath("./w:lastRenderedPageBreak")
+
     @property
     def style(self) -> str | None:
         """String contained in `w:val` attribute of `w:rStyle` grandchild.
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 10acdbf92..49fdce8a9 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -104,6 +104,19 @@ def clear(self):
         self._r.clear_content()
         return self
 
+    @property
+    def contains_page_break(self) -> bool:
+        """`True` when one or more rendered page-breaks occur in this run.
+
+        Note that "hard" page-breaks inserted by the author are not included. A hard
+        page-break gives rise to a rendered page-break in the right position so if those
+        were included that page-break would be "double-counted".
+
+        It would be very rare for multiple rendered page-breaks to occur in a single
+        run, but it is possible.
+        """
+        return bool(self._r.lastRenderedPageBreaks)
+
     @property
     def font(self):
         """The |Font| object providing access to the character formatting properties for
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 80f7a09c7..324faf2e3 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -28,6 +28,23 @@ def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
         setattr(run, prop_name, value)
         assert run._r.xml == expected_xml
 
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", False),
+            ('w:r/w:t"foobar"', False),
+            ('w:r/(w:t"abc", w:lastRenderedPageBreak, w:t"def")', True),
+            ("w:r/(w:lastRenderedPageBreak, w:lastRenderedPageBreak)", True),
+        ],
+    )
+    def it_knows_whether_it_contains_a_page_break(
+        self, r_cxml: str, expected_value: bool
+    ):
+        r = cast(CT_R, element(r_cxml))
+        run = Run(r, None)  # pyright: ignore[reportGeneralTypeIssues]
+
+        assert run.contains_page_break == expected_value
+
     def it_knows_its_character_style(self, style_get_fixture):
         run, style_id_, style_ = style_get_fixture
         style = run.style

From 08ee10a1d787327d04791cb0adfce651c4721f29 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 17:02:32 -0700
Subject: [PATCH 267/367] run: add Run.iter_inner_content()

---
 features/run-access-inner-content.feature |  1 -
 src/docx/drawing/__init__.py              | 16 ++++++
 src/docx/oxml/__init__.py                 | 64 ++++++++++++-----------
 src/docx/oxml/drawing.py                  | 11 ++++
 src/docx/oxml/text/run.py                 | 33 +++++++++++-
 src/docx/shared.py                        | 31 ++++++++++-
 src/docx/text/pagebreak.py                | 29 ++++++++++
 src/docx/text/run.py                      | 31 ++++++++++-
 tests/text/test_run.py                    | 45 +++++++++++++++-
 9 files changed, 226 insertions(+), 35 deletions(-)
 create mode 100644 src/docx/drawing/__init__.py
 create mode 100644 src/docx/oxml/drawing.py
 create mode 100644 src/docx/text/pagebreak.py

diff --git a/features/run-access-inner-content.feature b/features/run-access-inner-content.feature
index 6c855856b..a9bbb170c 100644
--- a/features/run-access-inner-content.feature
+++ b/features/run-access-inner-content.feature
@@ -15,7 +15,6 @@ Feature: Access run inner-content including rendered page-breaks
       | two          | True  |
 
 
-  @wip
   Scenario: Run.iter_inner_content() generates the run's text and rendered page-breaks
     Given a run having two rendered page breaks
      Then run.iter_inner_content() generates the run text and rendered page-breaks
diff --git a/src/docx/drawing/__init__.py b/src/docx/drawing/__init__.py
new file mode 100644
index 000000000..71bda0413
--- /dev/null
+++ b/src/docx/drawing/__init__.py
@@ -0,0 +1,16 @@
+"""DrawingML-related objects are in this subpackage."""
+
+from __future__ import annotations
+
+from docx import types as t
+from docx.oxml.drawing import CT_Drawing
+from docx.shared import Parented
+
+
+class Drawing(Parented):
+    """Container for a DrawingML object."""
+
+    def __init__(self, drawing: CT_Drawing, parent: t.StoryChild):
+        super().__init__(parent)
+        self._parent = parent
+        self._drawing = self._element = drawing
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index a3f81aad1..f31c67193 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -5,7 +5,22 @@
 
 from __future__ import annotations
 
+from docx.oxml.drawing import CT_Drawing
 from docx.oxml.parser import register_element_cls
+from docx.oxml.shape import (
+    CT_Blip,
+    CT_BlipFillProperties,
+    CT_GraphicalObject,
+    CT_GraphicalObjectData,
+    CT_Inline,
+    CT_NonVisualDrawingProps,
+    CT_Picture,
+    CT_PictureNonVisual,
+    CT_Point2D,
+    CT_PositiveSize2D,
+    CT_ShapeProperties,
+    CT_Transform2D,
+)
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.oxml.text.run import (
     CT_R,
@@ -16,6 +31,25 @@
     CT_Text,
 )
 
+# ---------------------------------------------------------------------------
+# DrawingML-related elements
+
+register_element_cls("a:blip", CT_Blip)
+register_element_cls("a:ext", CT_PositiveSize2D)
+register_element_cls("a:graphic", CT_GraphicalObject)
+register_element_cls("a:graphicData", CT_GraphicalObjectData)
+register_element_cls("a:off", CT_Point2D)
+register_element_cls("a:xfrm", CT_Transform2D)
+register_element_cls("pic:blipFill", CT_BlipFillProperties)
+register_element_cls("pic:cNvPr", CT_NonVisualDrawingProps)
+register_element_cls("pic:nvPicPr", CT_PictureNonVisual)
+register_element_cls("pic:pic", CT_Picture)
+register_element_cls("pic:spPr", CT_ShapeProperties)
+register_element_cls("w:drawing", CT_Drawing)
+register_element_cls("wp:docPr", CT_NonVisualDrawingProps)
+register_element_cls("wp:extent", CT_PositiveSize2D)
+register_element_cls("wp:inline", CT_Inline)
+
 # ---------------------------------------------------------------------------
 # text-related elements
 
@@ -78,36 +112,6 @@
 
 register_element_cls("w:settings", CT_Settings)
 
-from .shape import (  # noqa
-    CT_Blip,
-    CT_BlipFillProperties,
-    CT_GraphicalObject,
-    CT_GraphicalObjectData,
-    CT_Inline,
-    CT_NonVisualDrawingProps,
-    CT_Picture,
-    CT_PictureNonVisual,
-    CT_Point2D,
-    CT_PositiveSize2D,
-    CT_ShapeProperties,
-    CT_Transform2D,
-)
-
-register_element_cls("a:blip", CT_Blip)
-register_element_cls("a:ext", CT_PositiveSize2D)
-register_element_cls("a:graphic", CT_GraphicalObject)
-register_element_cls("a:graphicData", CT_GraphicalObjectData)
-register_element_cls("a:off", CT_Point2D)
-register_element_cls("a:xfrm", CT_Transform2D)
-register_element_cls("pic:blipFill", CT_BlipFillProperties)
-register_element_cls("pic:cNvPr", CT_NonVisualDrawingProps)
-register_element_cls("pic:nvPicPr", CT_PictureNonVisual)
-register_element_cls("pic:pic", CT_Picture)
-register_element_cls("pic:spPr", CT_ShapeProperties)
-register_element_cls("wp:docPr", CT_NonVisualDrawingProps)
-register_element_cls("wp:extent", CT_PositiveSize2D)
-register_element_cls("wp:inline", CT_Inline)
-
 from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles  # noqa
 
 register_element_cls("w:basedOn", CT_String)
diff --git a/src/docx/oxml/drawing.py b/src/docx/oxml/drawing.py
new file mode 100644
index 000000000..5b627f973
--- /dev/null
+++ b/src/docx/oxml/drawing.py
@@ -0,0 +1,11 @@
+"""Custom element-classes for DrawingML-related elements like `<w:drawing>`.
+
+For legacy reasons, many DrawingML-related elements are in `docx.oxml.shape`. Expect
+those to move over here as we have reason to touch them.
+"""
+
+from docx.oxml.xmlchemy import BaseOxmlElement
+
+
+class CT_Drawing(BaseOxmlElement):
+    """`<w:drawing>` element, containing a DrawingML object like a picture or chart."""
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 8a2e2da2e..c995bfbbb 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, List
+from typing import TYPE_CHECKING, Callable, Iterator, List
 
+from docx.oxml.drawing import CT_Drawing
 from docx.oxml.ns import qn
 from docx.oxml.simpletypes import ST_BrClear, ST_BrType
 from docx.oxml.text.font import CT_RPr
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
+from docx.shared import TextAccumulator
 
 if TYPE_CHECKING:
     from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
@@ -52,6 +54,35 @@ def clear_content(self):
         for child in content_child_elms:
             self.remove(child)
 
+    @property
+    def inner_content_items(self) -> List[str | CT_Drawing | CT_LastRenderedPageBreak]:
+        """Text of run, possibly punctuated by `w:lastRenderedPageBreak` elements."""
+        from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
+
+        accum = TextAccumulator()
+
+        def iter_items() -> Iterator[str | CT_Drawing | CT_LastRenderedPageBreak]:
+            for e in self.xpath(
+                "w:br"
+                " | w:cr"
+                " | w:drawing"
+                " | w:lastRenderedPageBreak"
+                " | w:noBreakHyphen"
+                " | w:ptab"
+                " | w:t"
+                " | w:tab"
+            ):
+                if isinstance(e, (CT_Drawing, CT_LastRenderedPageBreak)):
+                    yield from accum.pop()
+                    yield e
+                else:
+                    accum.push(str(e))
+
+            # -- don't forget the "tail" string --
+            yield from accum.pop()
+
+        return list(iter_items())
+
     @property
     def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
         """All `w:lastRenderedPageBreaks` descendants of this run."""
diff --git a/src/docx/shared.py b/src/docx/shared.py
index c24e1ac8a..83e064098 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import functools
-from typing import TYPE_CHECKING, Any, Callable, Generic, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Callable, Generic, Iterator, List, TypeVar, cast
 
 if TYPE_CHECKING:
     from docx.oxml.xmlchemy import BaseOxmlElement
@@ -315,3 +315,32 @@ def __init__(self, parent):
     def part(self):
         """The package part containing this object."""
         return self._parent.part
+
+
+class TextAccumulator:
+    """Accepts `str` fragments and joins them together, in order, on `.pop().
+
+    Handy when text in a stream is broken up arbitrarily and you want to join it back
+    together within certain bounds. The optional `separator` argument determines how
+    the text fragments are punctuated, defaulting to the empty string.
+    """
+
+    def __init__(self, separator: str = ""):
+        self._separator = separator
+        self._texts: List[str] = []
+
+    def push(self, text: str) -> None:
+        """Add a text fragment to the accumulator."""
+        self._texts.append(text)
+
+    def pop(self) -> Iterator[str]:
+        """Generate sero-or-one str from those accumulated.
+
+        Using `yield from accum.pop()` in a generator setting avoids producing an empty
+        string when no text is in the accumulator.
+        """
+        if not self._texts:
+            return
+        text = self._separator.join(self._texts)
+        self._texts.clear()
+        yield text
diff --git a/src/docx/text/pagebreak.py b/src/docx/text/pagebreak.py
new file mode 100644
index 000000000..e468a613a
--- /dev/null
+++ b/src/docx/text/pagebreak.py
@@ -0,0 +1,29 @@
+"""Proxy objects related to rendered page-breaks."""
+
+from __future__ import annotations
+
+from docx import types as t
+from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
+from docx.shared import Parented
+
+
+class RenderedPageBreak(Parented):
+    """A page-break inserted by Word during page-layout for print or display purposes.
+
+    This usually does not correspond to a "hard" page-break inserted by the document
+    author, rather just that Word ran out of room on one page and needed to start
+    another. The position of these can change depending on the printer and page-size, as
+    well as margins, etc. They also will change in response to edits, but not until Word
+    loads and saves the document.
+
+    Note these are never inserted by `python-docx` because it has no rendering function.
+    These are generally only useful for text-extraction of existing documents when
+    `python-docx` is being used solely as a document "reader".
+    """
+
+    def __init__(
+        self, lastRenderedPageBreak: CT_LastRenderedPageBreak, parent: t.StoryChild
+    ):
+        super().__init__(parent)
+        self._element = lastRenderedPageBreak
+        self._lastRenderedPageBreak = lastRenderedPageBreak
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 49fdce8a9..4a01aebc5 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -2,16 +2,20 @@
 
 from __future__ import annotations
 
-from typing import IO
+from typing import IO, Iterator
 
 from docx import types as t
+from docx.drawing import Drawing
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK
+from docx.oxml.drawing import CT_Drawing
+from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.oxml.text.run import CT_R, CT_Text
 from docx.shape import InlineShape
 from docx.shared import Length, Parented
 from docx.styles.style import CharacterStyle
 from docx.text.font import Font
+from docx.text.pagebreak import RenderedPageBreak
 
 
 class Run(Parented):
@@ -135,6 +139,31 @@ def italic(self) -> bool:
     def italic(self, value: bool):
         self.font.italic = value
 
+    def iter_inner_content(self) -> Iterator[str | Drawing | RenderedPageBreak]:
+        """Generate the content-items in this run in the order they appear.
+
+        NOTE: only content-types currently supported by `python-docx` are generated. In
+        this version, that is text and rendered page-breaks. Drawing is included but
+        currently only provides access to its XML element (CT_Drawing) on its
+        `._drawing` attribute. `Drawing` attributes and methods may be expanded in
+        future releases.
+
+        There are a number of element-types that can appear inside a run, but most of
+        those (w:br, w:cr, w:noBreakHyphen, w:t, w:tab) have a clear plain-text
+        equivalent. Any contiguous range of such elements is generated as a single
+        `str`. Rendered page-break and drawing elements are generated individually. Any
+        other elements are ignored.
+        """
+        for item in self._r.inner_content_items:
+            if isinstance(item, str):
+                yield item
+            elif isinstance(item, CT_LastRenderedPageBreak):
+                yield RenderedPageBreak(item, self)
+            elif isinstance(  # pyright: ignore[reportUnnecessaryIsInstance]
+                item, CT_Drawing
+            ):
+                yield Drawing(item, self)
+
     @property
     def style(self) -> CharacterStyle | None:
         """Read/write.
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 324faf2e3..558885176 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -2,14 +2,16 @@
 
 from __future__ import annotations
 
-from typing import cast
+from typing import List, cast
 
 import pytest
 
+from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
+from docx.parts.story import StoryPart
 from docx.shape import InlineShape
 from docx.text.font import Font
 from docx.text.run import Run
@@ -19,6 +21,8 @@
 
 
 class DescribeRun(object):
+    """Unit-test suite for `docx.text.run.Run`."""
+
     def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
         run, prop_name, expected_state = bool_prop_get_fixture
         assert getattr(run, prop_name) == expected_state
@@ -45,6 +49,36 @@ def it_knows_whether_it_contains_a_page_break(
 
         assert run.contains_page_break == expected_value
 
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected"),
+        [
+            # -- no content produces an empty iterator --
+            ("w:r", []),
+            # -- contiguous text content is condensed into a single str --
+            ('w:r/(w:t"foo",w:cr,w:t"bar")', ["str"]),
+            # -- page-breaks are a form of inner-content --
+            (
+                'w:r/(w:t"abc",w:br,w:lastRenderedPageBreak,w:noBreakHyphen,w:t"def")',
+                ["str", "RenderedPageBreak", "str"],
+            ),
+            # -- as are drawings --
+            (
+                'w:r/(w:t"abc", w:lastRenderedPageBreak, w:drawing)',
+                ["str", "RenderedPageBreak", "Drawing"],
+            ),
+        ],
+    )
+    def it_can_iterate_its_inner_content_items(
+        self, r_cxml: str, expected: List[str], fake_parent: t.StoryChild
+    ):
+        r = cast(CT_R, element(r_cxml))
+        run = Run(r, fake_parent)
+
+        inner_content = run.iter_inner_content()
+
+        actual = [type(item).__name__ for item in inner_content]
+        assert actual == expected, f"expected: {expected}, got: {actual}"
+
     def it_knows_its_character_style(self, style_get_fixture):
         run, style_id_, style_ = style_get_fixture
         style = run.style
@@ -244,6 +278,15 @@ def clear_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, expected_xml
 
+    @pytest.fixture
+    def fake_parent(self) -> t.StoryChild:
+        class StoryChild:
+            @property
+            def part(self) -> StoryPart:
+                raise NotImplementedError
+
+        return StoryChild()
+
     @pytest.fixture
     def font_fixture(self, Font_, font_):
         run = Run(element("w:r"), None)

From 1afedd0e2dc2702e449fba5f539072935123d5a4 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 17:55:52 -0700
Subject: [PATCH 268/367] acpt: add Paragraph inner-content scenarios

---
 features/par-access-inner-content.feature     |  48 +++++++
 features/steps/paragraph.py                   | 133 ++++++++++++++----
 features/steps/test_files/par-hyperlinks.docx | Bin 0 -> 12385 bytes
 3 files changed, 156 insertions(+), 25 deletions(-)
 create mode 100644 features/par-access-inner-content.feature
 create mode 100644 features/steps/test_files/par-hyperlinks.docx

diff --git a/features/par-access-inner-content.feature b/features/par-access-inner-content.feature
new file mode 100644
index 000000000..b454f6c95
--- /dev/null
+++ b/features/par-access-inner-content.feature
@@ -0,0 +1,48 @@
+Feature: Access paragraph inner-content including hyperlinks
+  In order to extract paragraph content with high-fidelity
+  As a developer using python-docx
+  I need to access differentiated paragraph content in document order
+
+
+  @wip
+  Scenario Outline: Paragraph.contains_page_break reports presence of page-break
+    Given a paragraph having <zero-or-more> rendered page breaks
+     Then paragraph.contains_page_break is <value>
+
+    Examples: Paragraph.contains_page_break cases
+      | zero-or-more | value |
+      | no           | False |
+      | one          | True  |
+      | two          | True  |
+
+
+  @wip
+  Scenario Outline: Paragraph.hyperlinks contains Hyperlink for each link in paragraph
+    Given a paragraph having <zero-or-more> hyperlinks
+     Then paragraph.hyperlinks has length <value>
+      And paragraph.hyperlinks contains only Hyperlink instances
+
+    Examples: Paragraph.hyperlinks cases
+      | zero-or-more | value |
+      | no           |   0   |
+      | one          |   1   |
+      | three        |   3   |
+
+
+  @wip
+  Scenario: Paragraph.iter_inner_content() generates the paragraph's runs and hyperlinks
+    Given a paragraph having three hyperlinks
+     Then paragraph.iter_inner_content() generates the paragraph runs and hyperlinks
+
+
+  @wip
+  Scenario Outline: Paragraph.rendered_page_breaks contains paragraph RenderedPageBreaks
+    Given a paragraph having <zero-or-more> rendered page breaks
+     Then paragraph.rendered_page_breaks has length <value>
+      And paragraph.rendered_page_breaks contains only RenderedPageBreak instances
+
+    Examples: Paragraph.rendered_page_breaks cases
+      | zero-or-more | value |
+      | no           |   0   |
+      | one          |   1   |
+      | two          |   2   |
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index b79f30158..326786e29 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -1,9 +1,14 @@
 """Step implementations for paragraph-related features."""
 
+from __future__ import annotations
+
+from typing import Any
+
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
-from docx.enum.text import WD_ALIGN_PARAGRAPH
+from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
 from docx.text.parfmt import ParagraphFormat
 
 from helpers import saved_docx_path, test_docx, test_text
@@ -12,7 +17,7 @@
 
 
 @given("a document containing three paragraphs")
-def given_a_document_containing_three_paragraphs(context):
+def given_a_document_containing_three_paragraphs(context: Context):
     document = Document()
     document.add_paragraph("foo")
     document.add_paragraph("bar")
@@ -21,7 +26,7 @@ def given_a_document_containing_three_paragraphs(context):
 
 
 @given("a paragraph having {align_type} alignment")
-def given_a_paragraph_align_type_alignment(context, align_type):
+def given_a_paragraph_align_type_alignment(context: Context, align_type: str):
     paragraph_idx = {
         "inherited": 0,
         "left": 1,
@@ -34,7 +39,7 @@ def given_a_paragraph_align_type_alignment(context, align_type):
 
 
 @given("a paragraph having {style_state} style")
-def given_a_paragraph_having_style(context, style_state):
+def given_a_paragraph_having_style(context: Context, style_state: str):
     paragraph_idx = {
         "no specified": 0,
         "a missing": 1,
@@ -45,8 +50,30 @@ def given_a_paragraph_having_style(context, style_state):
     context.paragraph = document.paragraphs[paragraph_idx]
 
 
+@given("a paragraph having {zero_or_more} hyperlinks")
+def given_a_paragraph_having_hyperlinks(context: Context, zero_or_more: str):
+    paragraph_idx = {
+        "no": 0,
+        "one": 1,
+        "three": 2,
+    }[zero_or_more]
+    document = context.document = Document(test_docx("par-hyperlinks"))
+    context.paragraph = document.paragraphs[paragraph_idx]
+
+
+@given("a paragraph having {zero_or_more} rendered page breaks")
+def given_a_paragraph_having_rendered_page_breaks(context: Context, zero_or_more: str):
+    paragraph_idx = {
+        "no": 0,
+        "one": 1,
+        "two": 2,
+    }[zero_or_more]
+    document = Document(test_docx("par-rendered-page-breaks"))
+    context.paragraph = document.paragraphs[paragraph_idx]
+
+
 @given("a paragraph with content and formatting")
-def given_a_paragraph_with_content_and_formatting(context):
+def given_a_paragraph_with_content_and_formatting(context: Context):
     document = Document(test_docx("par-known-paragraphs"))
     context.paragraph = document.paragraphs[0]
 
@@ -55,12 +82,12 @@ def given_a_paragraph_with_content_and_formatting(context):
 
 
 @when("I add a run to the paragraph")
-def when_add_new_run_to_paragraph(context):
+def when_add_new_run_to_paragraph(context: Context):
     context.run = context.p.add_run()
 
 
 @when("I assign a {style_type} to paragraph.style")
-def when_I_assign_a_style_type_to_paragraph_style(context, style_type):
+def when_I_assign_a_style_type_to_paragraph_style(context: Context, style_type: str):
     paragraph = context.paragraph
     style = context.style = context.document.styles["Heading 1"]
     style_spec = {
@@ -71,34 +98,88 @@ def when_I_assign_a_style_type_to_paragraph_style(context, style_type):
 
 
 @when("I clear the paragraph content")
-def when_I_clear_the_paragraph_content(context):
+def when_I_clear_the_paragraph_content(context: Context):
     context.paragraph.clear()
 
 
 @when("I insert a paragraph above the second paragraph")
-def when_I_insert_a_paragraph_above_the_second_paragraph(context):
+def when_I_insert_a_paragraph_above_the_second_paragraph(context: Context):
     paragraph = context.document.paragraphs[1]
     paragraph.insert_paragraph_before("foobar", "Heading1")
 
 
 @when("I set the paragraph text")
-def when_I_set_the_paragraph_text(context):
+def when_I_set_the_paragraph_text(context: Context):
     context.paragraph.text = "bar\tfoo\r"
 
 
 # then =====================================================
 
 
+@then("paragraph.contains_page_break is {value}")
+def then_paragraph_contains_page_break_is_value(context: Context, value: str):
+    actual_value = context.paragraph.contains_page_break
+    expected_value = {"True": True, "False": False}[value]
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
+@then("paragraph.hyperlinks contains only Hyperlink instances")
+def then_paragraph_hyperlinks_contains_only_Hyperlink_instances(context: Context):
+    assert all(
+        type(item).__name__ == "Hyperlink" for item in context.paragraph.hyperlinks
+    )
+
+
+@then("paragraph.hyperlinks has length {value}")
+def then_paragraph_hyperlinks_has_length(context: Context, value: str):
+    expected_value = int(value)
+    assert len(context.paragraph.hyperlinks) == expected_value
+
+
+@then("paragraph.iter_inner_content() generates the paragraph runs and hyperlinks")
+def then_paragraph_iter_inner_content_generates_runs_and_hyperlinks(context: Context):
+    assert [type(item).__name__ for item in context.paragraph.iter_inner_content()] == [
+        "Run",
+        "Hyperlink",
+        "Run",
+        "Hyperlink",
+        "Run",
+        "Hyperlink",
+        "Run",
+    ]
+
+
 @then("paragraph.paragraph_format is its ParagraphFormat object")
-def then_paragraph_paragraph_format_is_its_parfmt_object(context):
+def then_paragraph_paragraph_format_is_its_parfmt_object(context: Context):
     paragraph = context.paragraph
     paragraph_format = paragraph.paragraph_format
     assert isinstance(paragraph_format, ParagraphFormat)
     assert paragraph_format.element is paragraph._element
 
 
+@then("paragraph.rendered_page_breaks has length {value}")
+def then_paragraph_rendered_page_breaks_has_length(context: Context, value: str):
+    actual_value = len(context.paragraph.rendered_page_breaks)
+    expected_value = int(value)
+    assert (
+        actual_value == expected_value
+    ), f"got: {actual_value}, expected: {expected_value}"
+
+
+@then("paragraph.rendered_page_breaks contains only RenderedPageBreak instances")
+def then_paragraph_rendered_page_breaks_contains_only_RenderedPageBreak_instances(
+    context: Context,
+):
+    assert all(
+        type(item).__name__ == "RenderedPageBreak"
+        for item in context.paragraph.rendered_page_breaks
+    )
+
+
 @then("paragraph.style is {value_key}")
-def then_paragraph_style_is_value(context, value_key):
+def then_paragraph_style_is_value(context: Context, value_key: str):
     styles = context.document.styles
     expected_value = {
         "Normal": styles["Normal"],
@@ -110,12 +191,12 @@ def then_paragraph_style_is_value(context, value_key):
 
 
 @then("the document contains four paragraphs")
-def then_the_document_contains_four_paragraphs(context):
+def then_the_document_contains_four_paragraphs(context: Context):
     assert len(context.document.paragraphs) == 4
 
 
 @then("the document contains the text I added")
-def then_document_contains_text_I_added(context):
+def then_document_contains_text_I_added(context: Context):
     document = Document(saved_docx_path)
     paragraphs = document.paragraphs
     paragraph = paragraphs[-1]
@@ -126,47 +207,49 @@ def then_document_contains_text_I_added(context):
 
 
 @then("the paragraph alignment property value is {align_value}")
-def then_the_paragraph_alignment_prop_value_is_value(context, align_value):
-    expected_value = {
+def then_the_paragraph_alignment_prop_value_is_value(
+    context: Context, align_value: str
+):
+    expected_value: Any = {
         "None": None,
-        "WD_ALIGN_PARAGRAPH.LEFT": WD_ALIGN_PARAGRAPH.LEFT,
-        "WD_ALIGN_PARAGRAPH.CENTER": WD_ALIGN_PARAGRAPH.CENTER,
-        "WD_ALIGN_PARAGRAPH.RIGHT": WD_ALIGN_PARAGRAPH.RIGHT,
+        "WD_ALIGN_PARAGRAPH.LEFT": WD_PARAGRAPH_ALIGNMENT.LEFT,  # pyright: ignore
+        "WD_ALIGN_PARAGRAPH.CENTER": WD_PARAGRAPH_ALIGNMENT.CENTER,  # pyright: ignore
+        "WD_ALIGN_PARAGRAPH.RIGHT": WD_PARAGRAPH_ALIGNMENT.RIGHT,  # pyright: ignore
     }[align_value]
     assert context.paragraph.alignment == expected_value
 
 
 @then("the paragraph formatting is preserved")
-def then_the_paragraph_formatting_is_preserved(context):
+def then_the_paragraph_formatting_is_preserved(context: Context):
     paragraph = context.paragraph
     assert paragraph.style.name == "Heading 1"
 
 
 @then("the paragraph has no content")
-def then_the_paragraph_has_no_content(context):
+def then_the_paragraph_has_no_content(context: Context):
     assert context.paragraph.text == ""
 
 
 @then("the paragraph has the style I set")
-def then_the_paragraph_has_the_style_I_set(context):
+def then_the_paragraph_has_the_style_I_set(context: Context):
     paragraph, expected_style = context.paragraph, context.style
     assert paragraph.style == expected_style
 
 
 @then("the paragraph has the text I set")
-def then_the_paragraph_has_the_text_I_set(context):
+def then_the_paragraph_has_the_text_I_set(context: Context):
     actual = context.paragraph.text
     expected = "bar\tfoo\n"
     assert actual == expected, f"expected: {expected}, got: {actual}"
 
 
 @then("the style of the second paragraph matches the style I set")
-def then_the_style_of_the_second_paragraph_matches_the_style_I_set(context):
+def then_the_style_of_the_second_paragraph_matches_the_style_I_set(context: Context):
     second_paragraph = context.document.paragraphs[1]
     assert second_paragraph.style.name == "Heading 1"
 
 
 @then("the text of the second paragraph matches the text I set")
-def then_the_text_of_the_second_paragraph_matches_the_text_I_set(context):
+def then_the_text_of_the_second_paragraph_matches_the_text_I_set(context: Context):
     second_paragraph = context.document.paragraphs[1]
     assert second_paragraph.text == "foobar"
diff --git a/features/steps/test_files/par-hyperlinks.docx b/features/steps/test_files/par-hyperlinks.docx
new file mode 100644
index 0000000000000000000000000000000000000000..b3a4ea27ae89e9462c09941b9004c65874d49e5b
GIT binary patch
literal 12385
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

literal 0
HcmV?d00001


From b85b24f15072e6444f9502b617b551702449b85c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 19:44:46 -0700
Subject: [PATCH 269/367] para: add Paragraph.contains_page_break

---
 features/par-access-inner-content.feature |  1 -
 src/docx/oxml/text/paragraph.py           | 12 ++++++++++++
 src/docx/text/paragraph.py                |  5 +++++
 tests/conftest.py                         | 16 ++++++++++++++++
 tests/text/test_paragraph.py              | 22 ++++++++++++++++++++++
 tests/text/test_run.py                    | 10 ----------
 6 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 tests/conftest.py

diff --git a/features/par-access-inner-content.feature b/features/par-access-inner-content.feature
index b454f6c95..f159ccb79 100644
--- a/features/par-access-inner-content.feature
+++ b/features/par-access-inner-content.feature
@@ -4,7 +4,6 @@ Feature: Access paragraph inner-content including hyperlinks
   I need to access differentiated paragraph content in document order
 
 
-  @wip
   Scenario Outline: Paragraph.contains_page_break reports presence of page-break
     Given a paragraph having <zero-or-more> rendered page breaks
      Then paragraph.contains_page_break is <value>
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index 9405edd39..b855d89fe 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -9,6 +9,7 @@
 
 if TYPE_CHECKING:
     from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+    from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
     from docx.oxml.text.parfmt import CT_PPr
     from docx.oxml.text.run import CT_R
 
@@ -46,6 +47,17 @@ def clear_content(self):
         for child in self.xpath("./*[not(self::w:pPr)]"):
             self.remove(child)
 
+    @property
+    def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
+        """All `w:lastRenderedPageBreak` descendants of this paragraph.
+
+        Rendered page-breaks commonly occur in a run but can also occur in a run inside
+        a hyperlink. This returns both.
+        """
+        return self.xpath(
+            "./w:r/w:lastRenderedPageBreak | ./w:hyperlink/w:r/w:lastRenderedPageBreak"
+        )
+
     def set_sectPr(self, sectPr):
         """Unconditionally replace or add `sectPr` as grandchild in correct sequence."""
         pPr = self.get_or_add_pPr()
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index d2db02dfd..2518e11af 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -64,6 +64,11 @@ def clear(self):
         self._p.clear_content()
         return self
 
+    @property
+    def contains_page_break(self) -> bool:
+        """`True` when one or more rendered page-breaks occur in this paragraph."""
+        return bool(self._p.lastRenderedPageBreaks)
+
     def insert_paragraph_before(
         self, text: str | None = None, style: str | ParagraphStyle | None = None
     ) -> Self:
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 000000000..6503efb3b
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,16 @@
+"""pytest fixtures that are shared across test modules."""
+
+import pytest
+
+from docx import types as t
+from docx.parts.story import StoryPart
+
+
+@pytest.fixture
+def fake_parent() -> t.StoryChild:
+    class StoryChild:
+        @property
+        def part(self) -> StoryPart:
+            raise NotImplementedError
+
+    return StoryChild()
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index 598d74e77..9b4781459 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -1,7 +1,10 @@
 """Unit test suite for the docx.text.paragraph module."""
 
+from typing import cast
+
 import pytest
 
+from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 from docx.oxml.text.paragraph import CT_P
@@ -16,6 +19,25 @@
 
 
 class DescribeParagraph(object):
+    """Unit-test suite for `docx.text.run.Paragraph`."""
+
+    @pytest.mark.parametrize(
+        ("p_cxml", "expected_value"),
+        [
+            ("w:p/w:r", False),
+            ('w:p/w:r/w:t"foobar"', False),
+            ('w:p/w:hyperlink/w:r/(w:t"abc",w:lastRenderedPageBreak,w:t"def")', True),
+            ("w:p/w:r/(w:lastRenderedPageBreak, w:lastRenderedPageBreak)", True),
+        ],
+    )
+    def it_knows_whether_it_contains_a_page_break(
+        self, p_cxml: str, expected_value: bool, fake_parent: t.StoryChild
+    ):
+        p = cast(CT_P, element(p_cxml))
+        paragraph = Paragraph(p, fake_parent)
+
+        assert paragraph.contains_page_break == expected_value
+
     def it_knows_its_paragraph_style(self, style_get_fixture):
         paragraph, style_id_, style_ = style_get_fixture
         style = paragraph.style
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 558885176..6705595a0 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -11,7 +11,6 @@
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
-from docx.parts.story import StoryPart
 from docx.shape import InlineShape
 from docx.text.font import Font
 from docx.text.run import Run
@@ -278,15 +277,6 @@ def clear_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, expected_xml
 
-    @pytest.fixture
-    def fake_parent(self) -> t.StoryChild:
-        class StoryChild:
-            @property
-            def part(self) -> StoryPart:
-                raise NotImplementedError
-
-        return StoryChild()
-
     @pytest.fixture
     def font_fixture(self, Font_, font_):
         run = Run(element("w:r"), None)

From e654522916fc11b3ac39f7cd74e5755f383ebae8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 20:11:38 -0700
Subject: [PATCH 270/367] para: add Paragraph.hyperlinks

---
 features/par-access-inner-content.feature |  1 -
 src/docx/oxml/__init__.py                 |  6 ++++++
 src/docx/oxml/text/hyperlink.py           |  9 ++++++++
 src/docx/oxml/text/paragraph.py           |  3 +++
 src/docx/text/hyperlink.py                | 26 +++++++++++++++++++++++
 src/docx/text/paragraph.py                |  6 ++++++
 tests/text/test_paragraph.py              | 23 ++++++++++++++++++++
 7 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/docx/oxml/text/hyperlink.py
 create mode 100644 src/docx/text/hyperlink.py

diff --git a/features/par-access-inner-content.feature b/features/par-access-inner-content.feature
index f159ccb79..943c43c53 100644
--- a/features/par-access-inner-content.feature
+++ b/features/par-access-inner-content.feature
@@ -15,7 +15,6 @@ Feature: Access paragraph inner-content including hyperlinks
       | two          | True  |
 
 
-  @wip
   Scenario Outline: Paragraph.hyperlinks contains Hyperlink for each link in paragraph
     Given a paragraph having <zero-or-more> hyperlinks
      Then paragraph.hyperlinks has length <value>
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index f31c67193..53cbd5601 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -21,6 +21,7 @@
     CT_ShapeProperties,
     CT_Transform2D,
 )
+from docx.oxml.text.hyperlink import CT_Hyperlink
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.oxml.text.run import (
     CT_R,
@@ -50,6 +51,11 @@
 register_element_cls("wp:extent", CT_PositiveSize2D)
 register_element_cls("wp:inline", CT_Inline)
 
+# ---------------------------------------------------------------------------
+# hyperlink-related elements
+
+register_element_cls("w:hyperlink", CT_Hyperlink)
+
 # ---------------------------------------------------------------------------
 # text-related elements
 
diff --git a/src/docx/oxml/text/hyperlink.py b/src/docx/oxml/text/hyperlink.py
new file mode 100644
index 000000000..0b895ed27
--- /dev/null
+++ b/src/docx/oxml/text/hyperlink.py
@@ -0,0 +1,9 @@
+"""Custom element classes related to hyperlinks (CT_Hyperlink)."""
+
+from __future__ import annotations
+
+from docx.oxml.xmlchemy import BaseOxmlElement
+
+
+class CT_Hyperlink(BaseOxmlElement):
+    """`<w:hyperlink>` element, containing the text and address for a hyperlink."""
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index b855d89fe..71e2d84b2 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -9,6 +9,7 @@
 
 if TYPE_CHECKING:
     from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+    from docx.oxml.text.hyperlink import CT_Hyperlink
     from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
     from docx.oxml.text.parfmt import CT_PPr
     from docx.oxml.text.run import CT_R
@@ -18,9 +19,11 @@ class CT_P(BaseOxmlElement):
     """`<w:p>` element, containing the properties and text for a paragraph."""
 
     get_or_add_pPr: Callable[[], CT_PPr]
+    hyperlink_lst: List[CT_Hyperlink]
     r_lst: List[CT_R]
 
     pPr: CT_PPr | None = ZeroOrOne("w:pPr")  # pyright: ignore[reportGeneralTypeIssues]
+    hyperlink = ZeroOrMore("w:hyperlink")
     r = ZeroOrMore("w:r")
 
     def add_p_before(self) -> CT_P:
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
new file mode 100644
index 000000000..efa867e22
--- /dev/null
+++ b/src/docx/text/hyperlink.py
@@ -0,0 +1,26 @@
+"""Hyperlink-related proxy objects for python-docx, Hyperlink in particular.
+
+A hyperlink occurs in a paragraph, at the same level as a Run, and a hyperlink itself
+contains runs, which is where the visible text of the hyperlink is stored. So it's kind
+of in-between, less than a paragraph and more than a run. So it gets its own module.
+"""
+
+from __future__ import annotations
+
+from docx import types as t
+from docx.oxml.text.hyperlink import CT_Hyperlink
+from docx.shared import Parented
+
+
+class Hyperlink(Parented):
+    """Proxy object wrapping a `<w:hyperlink>` element.
+
+    A hyperlink occurs as a child of a paragraph, at the same level as a Run. A
+    hyperlink itself contains runs, which is where the visible text of the hyperlink is
+    stored.
+    """
+
+    def __init__(self, hyperlink: CT_Hyperlink, parent: t.StoryChild):
+        super().__init__(parent)
+        self._parent = parent
+        self._hyperlink = self._element = hyperlink
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 2518e11af..b962d8bd1 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -12,6 +12,7 @@
 from docx.oxml.text.paragraph import CT_P
 from docx.shared import Parented
 from docx.styles.style import CharacterStyle, ParagraphStyle
+from docx.text.hyperlink import Hyperlink
 from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Run
 
@@ -69,6 +70,11 @@ def contains_page_break(self) -> bool:
         """`True` when one or more rendered page-breaks occur in this paragraph."""
         return bool(self._p.lastRenderedPageBreaks)
 
+    @property
+    def hyperlinks(self) -> List[Hyperlink]:
+        """A |Hyperlink| instance for each hyperlink in this paragraph."""
+        return [Hyperlink(hyperlink, self) for hyperlink in self._p.hyperlink_lst]
+
     def insert_paragraph_before(
         self, text: str | None = None, style: str | ParagraphStyle | None = None
     ) -> Self:
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index 9b4781459..a14de618d 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -38,6 +38,29 @@ def it_knows_whether_it_contains_a_page_break(
 
         assert paragraph.contains_page_break == expected_value
 
+    @pytest.mark.parametrize(
+        ("p_cxml", "count"),
+        [
+            ("w:p", 0),
+            ("w:p/w:r", 0),
+            ("w:p/w:hyperlink", 1),
+            ("w:p/(w:r,w:hyperlink,w:r)", 1),
+            ("w:p/(w:r,w:hyperlink,w:r,w:hyperlink)", 2),
+            ("w:p/(w:hyperlink,w:r,w:hyperlink,w:r)", 2),
+        ],
+    )
+    def it_provides_access_to_the_hyperlinks_it_contains(
+        self, p_cxml: str, count: int, fake_parent: t.StoryChild
+    ):
+        p = cast(CT_P, element(p_cxml))
+        paragraph = Paragraph(p, fake_parent)
+
+        hyperlinks = paragraph.hyperlinks
+
+        actual = [type(item).__name__ for item in hyperlinks]
+        expected = ["Hyperlink" for _ in range(count)]
+        assert actual == expected, f"expected: {expected}, got: {actual}"
+
     def it_knows_its_paragraph_style(self, style_get_fixture):
         paragraph, style_id_, style_ = style_get_fixture
         style = paragraph.style

From 57d93e1b6fc3914134d479d928b6d1e6b4ddb8f0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 20:32:25 -0700
Subject: [PATCH 271/367] para: add Paragraph.iter_inner_content()

---
 features/par-access-inner-content.feature |  1 -
 src/docx/oxml/text/paragraph.py           |  5 +++++
 src/docx/text/paragraph.py                | 18 +++++++++++++++++-
 tests/text/test_paragraph.py              | 23 ++++++++++++++++++++++-
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/features/par-access-inner-content.feature b/features/par-access-inner-content.feature
index 943c43c53..1b0844ae1 100644
--- a/features/par-access-inner-content.feature
+++ b/features/par-access-inner-content.feature
@@ -27,7 +27,6 @@ Feature: Access paragraph inner-content including hyperlinks
       | three        |   3   |
 
 
-  @wip
   Scenario: Paragraph.iter_inner_content() generates the paragraph's runs and hyperlinks
     Given a paragraph having three hyperlinks
      Then paragraph.iter_inner_content() generates the paragraph runs and hyperlinks
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index 71e2d84b2..127e2b30b 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -50,6 +50,11 @@ def clear_content(self):
         for child in self.xpath("./*[not(self::w:pPr)]"):
             self.remove(child)
 
+    @property
+    def inner_content_elements(self) -> List[CT_R | CT_Hyperlink]:
+        """Run and hyperlink children of the `w:p` element, in document order."""
+        return self.xpath("./w:r | ./w:hyperlink")
+
     @property
     def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
         """All `w:lastRenderedPageBreak` descendants of this paragraph.
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index b962d8bd1..d202d37ba 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import Iterator, List
 
 from typing_extensions import Self
 
@@ -10,6 +10,7 @@
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
 from docx.oxml.text.paragraph import CT_P
+from docx.oxml.text.run import CT_R
 from docx.shared import Parented
 from docx.styles.style import CharacterStyle, ParagraphStyle
 from docx.text.hyperlink import Hyperlink
@@ -90,6 +91,21 @@ def insert_paragraph_before(
             paragraph.style = style
         return paragraph
 
+    def iter_inner_content(self) -> Iterator[Run | Hyperlink]:
+        """Generate the runs and hyperlinks in this paragraph, in the order they appear.
+
+        The content in a paragraph consists of both runs and hyperlinks. This method
+        allows accessing each of those separately, in document order, for when the
+        precise position of the hyperlink within the paragraph text is important. Note
+        that a hyperlink itself contains runs.
+        """
+        for r_or_hlink in self._p.inner_content_elements:
+            yield (
+                Run(r_or_hlink, self)
+                if isinstance(r_or_hlink, CT_R)
+                else Hyperlink(r_or_hlink, self)
+            )
+
     @property
     def paragraph_format(self):
         """The |ParagraphFormat| object providing access to the formatting properties
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index a14de618d..e9aba4f67 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -1,6 +1,6 @@
 """Unit test suite for the docx.text.paragraph module."""
 
-from typing import cast
+from typing import List, cast
 
 import pytest
 
@@ -61,6 +61,27 @@ def it_provides_access_to_the_hyperlinks_it_contains(
         expected = ["Hyperlink" for _ in range(count)]
         assert actual == expected, f"expected: {expected}, got: {actual}"
 
+    @pytest.mark.parametrize(
+        ("p_cxml", "expected"),
+        [
+            ("w:p", []),
+            ("w:p/w:r", ["Run"]),
+            ("w:p/w:hyperlink", ["Hyperlink"]),
+            ("w:p/(w:r,w:hyperlink,w:r)", ["Run", "Hyperlink", "Run"]),
+            ("w:p/(w:hyperlink,w:r,w:hyperlink)", ["Hyperlink", "Run", "Hyperlink"]),
+        ],
+    )
+    def it_can_iterate_its_inner_content_items(
+        self, p_cxml: str, expected: List[str], fake_parent: t.StoryChild
+    ):
+        p = cast(CT_P, element(p_cxml))
+        paragraph = Paragraph(p, fake_parent)
+
+        inner_content = paragraph.iter_inner_content()
+
+        actual = [type(item).__name__ for item in inner_content]
+        assert actual == expected, f"expected: {expected}, got: {actual}"
+
     def it_knows_its_paragraph_style(self, style_get_fixture):
         paragraph, style_id_, style_ = style_get_fixture
         style = paragraph.style

From 9dd28517b6343a5549a358702dc309fb87a4cacd Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 20:45:25 -0700
Subject: [PATCH 272/367] para: add Paragraph.rendered_page_breaks

---
 features/par-access-inner-content.feature |  1 -
 src/docx/text/paragraph.py                | 12 +++++++++
 tests/text/test_paragraph.py              | 31 +++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/features/par-access-inner-content.feature b/features/par-access-inner-content.feature
index 1b0844ae1..039c3ed4b 100644
--- a/features/par-access-inner-content.feature
+++ b/features/par-access-inner-content.feature
@@ -32,7 +32,6 @@ Feature: Access paragraph inner-content including hyperlinks
      Then paragraph.iter_inner_content() generates the paragraph runs and hyperlinks
 
 
-  @wip
   Scenario Outline: Paragraph.rendered_page_breaks contains paragraph RenderedPageBreaks
     Given a paragraph having <zero-or-more> rendered page breaks
      Then paragraph.rendered_page_breaks has length <value>
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index d202d37ba..a0aaf8ff4 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -14,6 +14,7 @@
 from docx.shared import Parented
 from docx.styles.style import CharacterStyle, ParagraphStyle
 from docx.text.hyperlink import Hyperlink
+from docx.text.pagebreak import RenderedPageBreak
 from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Run
 
@@ -112,6 +113,17 @@ def paragraph_format(self):
         for this paragraph, such as line spacing and indentation."""
         return ParagraphFormat(self._element)
 
+    @property
+    def rendered_page_breaks(self) -> List[RenderedPageBreak]:
+        """All rendered page-breaks in this paragraph.
+
+        Most often an empty list, sometimes contains one page-break, but can contain
+        more than one is rare or contrived cases.
+        """
+        return [
+            RenderedPageBreak(lrpb, self) for lrpb in self._p.lastRenderedPageBreaks
+        ]
+
     @property
     def runs(self) -> List[Run]:
         """Sequence of |Run| instances corresponding to the <w:r> elements in this
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index e9aba4f67..ecd555ef5 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -100,6 +100,37 @@ def it_can_change_its_paragraph_style(self, style_set_fixture):
         )
         assert paragraph._p.xml == expected_xml
 
+    @pytest.mark.parametrize(
+        ("p_cxml", "count"),
+        [
+            ("w:p", 0),
+            ("w:p/w:r", 0),
+            ("w:p/w:r/w:lastRenderedPageBreak", 1),
+            ("w:p/w:hyperlink/w:r/w:lastRenderedPageBreak", 1),
+            (
+                "w:p/(w:r/w:lastRenderedPageBreak,"
+                "w:hyperlink/w:r/w:lastRenderedPageBreak)",
+                2,
+            ),
+            (
+                "w:p/(w:hyperlink/w:r/w:lastRenderedPageBreak,w:r,"
+                "w:r/w:lastRenderedPageBreak,w:r,w:hyperlink)",
+                2,
+            ),
+        ],
+    )
+    def it_provides_access_to_the_rendered_page_breaks_it_contains(
+        self, p_cxml: str, count: int, fake_parent: t.StoryChild
+    ):
+        p = cast(CT_P, element(p_cxml))
+        paragraph = Paragraph(p, fake_parent)
+
+        rendered_page_breaks = paragraph.rendered_page_breaks
+
+        actual = [type(item).__name__ for item in rendered_page_breaks]
+        expected = ["RenderedPageBreak" for _ in range(count)]
+        assert actual == expected, f"expected: {expected}, got: {actual}"
+
     @pytest.mark.parametrize(
         ("p_cxml", "expected_value"),
         [

From 7868f3edaa7a39c45c85f7f7822602eaa6b706b0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 21:09:35 -0700
Subject: [PATCH 273/367] acpt: add Hyperlink properties scenarios

---
 features/hlk-props.feature  | 39 ++++++++++++++++
 features/steps/hyperlink.py | 88 +++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 features/hlk-props.feature
 create mode 100644 features/steps/hyperlink.py

diff --git a/features/hlk-props.feature b/features/hlk-props.feature
new file mode 100644
index 000000000..84e81763c
--- /dev/null
+++ b/features/hlk-props.feature
@@ -0,0 +1,39 @@
+Feature: Access hyperlink properties
+  In order to access the URL and other details for a hyperlink
+  As a developer using python-docx
+  I need properties on Hyperlink
+
+
+  @wip
+  Scenario: Hyperlink.address has the URL of the hyperlink
+    Given a hyperlink
+     Then hyperlink.address is the URL of the hyperlink
+
+
+  @wip
+  Scenario Outline: Hyperlink.contains_page_break reports presence of page-break
+    Given a hyperlink having <zero-or-more> rendered page breaks
+     Then hyperlink.contains_page_break is <value>
+
+    Examples: Hyperlink.contains_page_break cases
+      | zero-or-more | value |
+      | no           | False |
+      | one          | True  |
+
+
+  @wip
+  Scenario Outline: Hyperlink.runs contains Run for each run in hyperlink
+    Given a hyperlink having <zero-or-more> runs
+     Then hyperlink.runs has length <value>
+      And hyperlink.runs contains only Run instances
+
+    Examples: Hyperlink.runs cases
+      | zero-or-more | value |
+      | one          |   1   |
+      | two          |   2   |
+
+
+  @wip
+  Scenario: Hyperlink.text has the visible text of the hyperlink
+    Given a hyperlink
+     Then hyperlink.text is the visible text of the hyperlink
diff --git a/features/steps/hyperlink.py b/features/steps/hyperlink.py
new file mode 100644
index 000000000..0596a3cd6
--- /dev/null
+++ b/features/steps/hyperlink.py
@@ -0,0 +1,88 @@
+"""Step implementations for hyperlink-related features."""
+
+from __future__ import annotations
+
+from behave import given, then
+from behave.runner import Context
+
+from docx import Document
+
+from helpers import test_docx
+
+# given ===================================================
+
+
+@given("a hyperlink")
+def given_a_hyperlink(context: Context):
+    document = Document(test_docx("par-hyperlinks"))
+    context.hyperlink = document.paragraphs[1].hyperlinks[0]
+
+
+@given("a hyperlink having {zero_or_more} rendered page breaks")
+def given_a_hyperlink_having_rendered_page_breaks(context: Context, zero_or_more: str):
+    paragraph_idx = {
+        "no": 1,
+        "one": 2,
+    }[zero_or_more]
+    document = Document(test_docx("par-hyperlinks"))
+    paragraph = document.paragraphs[paragraph_idx]
+    context.hyperlink = paragraph.hyperlinks[0]
+
+
+@given("a hyperlink having {one_or_more} runs")
+def given_a_hyperlink_having_one_or_more_runs(context: Context, one_or_more: str):
+    paragraph_idx, hyperlink_idx = {
+        "one": (1, 0),
+        "two": (2, 1),
+    }[one_or_more]
+    document = Document(test_docx("par-hyperlinks"))
+    paragraph = document.paragraphs[paragraph_idx]
+    context.hyperlink = paragraph.hyperlinks[hyperlink_idx]
+
+
+# then =====================================================
+
+
+@then("hyperlink.address is the URL of the hyperlink")
+def then_hyperlink_address_is_the_URL_of_the_hyperlink(context: Context):
+    actual_value = context.hyperlink.address
+    expected_value = "http://yahoo.com/"
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
+@then("hyperlink.contains_page_break is {value}")
+def then_hyperlink_contains_page_break_is_value(context: Context, value: str):
+    actual_value = context.hyperlink.contains_page_break
+    expected_value = {"True": True, "False": False}[value]
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
+@then("hyperlink.runs contains only Run instances")
+def then_hyperlink_runs_contains_only_Run_instances(context: Context):
+    actual_value = [type(item).__name__ for item in context.hyperlink.runs]
+    expected_value = ["Run" for _ in context.hyperlink.runs]
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
+@then("hyperlink.runs has length {value}")
+def then_hyperlink_runs_has_length(context: Context, value: str):
+    actual_value = len(context.hyperlink.runs)
+    expected_value = int(value)
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
+@then("hyperlink.text is the visible text of the hyperlink")
+def then_hyperlink_text_is_the_visible_text_of_the_hyperlink(context: Context):
+    actual_value = context.hyperlink.text
+    expected_value = "awesome hyperlink"
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"

From 16e3f10aa864ff4bab927adb595f1e4c4afc45a0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 21:40:54 -0700
Subject: [PATCH 274/367] hlink: add Hyperlink.address

---
 features/hlk-props.feature        |  1 -
 src/docx/oxml/text/hyperlink.py   | 18 +++++++++++-
 src/docx/text/hyperlink.py        | 10 +++++++
 tests/oxml/text/test_hyperlink.py | 47 +++++++++++++++++++++++++++++++
 tests/text/test_hyperlink.py      | 44 +++++++++++++++++++++++++++++
 5 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 tests/oxml/text/test_hyperlink.py
 create mode 100644 tests/text/test_hyperlink.py

diff --git a/features/hlk-props.feature b/features/hlk-props.feature
index 84e81763c..3d99cc19f 100644
--- a/features/hlk-props.feature
+++ b/features/hlk-props.feature
@@ -4,7 +4,6 @@ Feature: Access hyperlink properties
   I need properties on Hyperlink
 
 
-  @wip
   Scenario: Hyperlink.address has the URL of the hyperlink
     Given a hyperlink
      Then hyperlink.address is the URL of the hyperlink
diff --git a/src/docx/oxml/text/hyperlink.py b/src/docx/oxml/text/hyperlink.py
index 0b895ed27..45a69d743 100644
--- a/src/docx/oxml/text/hyperlink.py
+++ b/src/docx/oxml/text/hyperlink.py
@@ -2,8 +2,24 @@
 
 from __future__ import annotations
 
-from docx.oxml.xmlchemy import BaseOxmlElement
+from typing import List
+
+from docx.oxml.simpletypes import ST_OnOff, XsdString
+from docx.oxml.text.run import CT_R
+from docx.oxml.xmlchemy import (
+    BaseOxmlElement,
+    OptionalAttribute,
+    RequiredAttribute,
+    ZeroOrMore,
+)
 
 
 class CT_Hyperlink(BaseOxmlElement):
     """`<w:hyperlink>` element, containing the text and address for a hyperlink."""
+
+    r_lst: List[CT_R]
+
+    rId = RequiredAttribute("r:id", XsdString)
+    history = OptionalAttribute("w:history", ST_OnOff, default=True)
+
+    r = ZeroOrMore("w:r")
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index efa867e22..5a1481770 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -24,3 +24,13 @@ def __init__(self, hyperlink: CT_Hyperlink, parent: t.StoryChild):
         super().__init__(parent)
         self._parent = parent
         self._hyperlink = self._element = hyperlink
+
+    @property
+    def address(self) -> str:
+        """The "URL" of the hyperlink (but not necessarily a web link).
+
+        While commonly a web link like "https://google.com" the hyperlink address can
+        take a variety of forms including "internal links" to bookmarked locations
+        within the document.
+        """
+        return self._parent.part.rels[self._hyperlink.rId].target_ref
diff --git a/tests/oxml/text/test_hyperlink.py b/tests/oxml/text/test_hyperlink.py
new file mode 100644
index 000000000..f55ab9c22
--- /dev/null
+++ b/tests/oxml/text/test_hyperlink.py
@@ -0,0 +1,47 @@
+"""Test suite for the docx.oxml.text.hyperlink module."""
+
+from typing import cast
+
+import pytest
+
+from docx.oxml.text.hyperlink import CT_Hyperlink
+from docx.oxml.text.run import CT_R
+
+from ...unitutil.cxml import element
+
+
+class DescribeCT_Hyperlink:
+    """Unit-test suite for the CT_Hyperlink (<w:hyperlink>) element."""
+
+    def it_has_a_relationship_that_contains_the_hyperlink_address(self):
+        cxml = 'w:hyperlink{r:id=rId6}/w:r/w:t"post"'
+        hyperlink = cast(CT_Hyperlink, element(cxml))
+
+        rId = hyperlink.rId
+
+        assert rId == "rId6"
+
+    @pytest.mark.parametrize(
+        ("cxml", "expected_value"),
+        [
+            # -- default (when omitted) is True, somewhat surprisingly --
+            ("w:hyperlink{r:id=rId6}", True),
+            ("w:hyperlink{r:id=rId6,w:history=0}", False),
+            ("w:hyperlink{r:id=rId6,w:history=1}", True),
+        ],
+    )
+    def it_knows_whether_it_has_been_clicked_on_aka_visited(
+        self, cxml: str, expected_value: bool
+    ):
+        hyperlink = cast(CT_Hyperlink, element(cxml))
+        assert hyperlink.history is expected_value
+
+    def it_has_zero_or_more_runs_containing_the_hyperlink_text(self):
+        cxml = 'w:hyperlink{r:id=rId6,w:history=1}/(w:r/w:t"blog",w:r/w:t" post")'
+        hyperlink = cast(CT_Hyperlink, element(cxml))
+
+        rs = hyperlink.r_lst
+
+        assert [type(r) for r in rs] == [CT_R, CT_R]
+        assert rs[0].text == "blog"
+        assert rs[1].text == " post"
diff --git a/tests/text/test_hyperlink.py b/tests/text/test_hyperlink.py
new file mode 100644
index 000000000..8e0710bc1
--- /dev/null
+++ b/tests/text/test_hyperlink.py
@@ -0,0 +1,44 @@
+"""Test suite for the docx.text.hyperlink module."""
+
+from typing import cast
+
+import pytest
+
+from docx import types as t
+from docx.opc.rel import _Relationship  # pyright: ignore[reportPrivateUsage]
+from docx.oxml.text.hyperlink import CT_Hyperlink
+from docx.parts.story import StoryPart
+from docx.text.hyperlink import Hyperlink
+
+from ..unitutil.cxml import element
+from ..unitutil.mock import FixtureRequest, Mock, instance_mock
+
+
+class DescribeHyperlink:
+    """Unit-test suite for the docx.text.hyperlink.Hyperlink object."""
+
+    def it_knows_the_hyperlink_URL(self, fake_parent: t.StoryChild):
+        cxml = 'w:hyperlink{r:id=rId6}/w:r/w:t"post"'
+        hlink = cast(CT_Hyperlink, element(cxml))
+        hyperlink = Hyperlink(hlink, fake_parent)
+
+        assert hyperlink.address == "https://google.com/"
+
+    # -- fixtures --------------------------------------------------------------------
+
+    @pytest.fixture
+    def fake_parent(self, story_part: Mock, rel: Mock) -> t.StoryChild:
+        class StoryChild:
+            @property
+            def part(self) -> StoryPart:
+                return story_part
+
+        return StoryChild()
+
+    @pytest.fixture
+    def rel(self, request: FixtureRequest):
+        return instance_mock(request, _Relationship, target_ref="https://google.com/")
+
+    @pytest.fixture
+    def story_part(self, request: FixtureRequest, rel: Mock):
+        return instance_mock(request, StoryPart, rels={"rId6": rel})

From d0499b9ccc98cec37fcc14137fc5eef2231d125d Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 22:08:45 -0700
Subject: [PATCH 275/367] hlink: add Hyperlink.contains_page_break

---
 features/hlk-props.feature      |  1 -
 src/docx/oxml/text/hyperlink.py | 10 +++++++++-
 src/docx/text/hyperlink.py      | 12 ++++++++++++
 tests/text/test_hyperlink.py    | 18 ++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/features/hlk-props.feature b/features/hlk-props.feature
index 3d99cc19f..5569e4341 100644
--- a/features/hlk-props.feature
+++ b/features/hlk-props.feature
@@ -9,7 +9,6 @@ Feature: Access hyperlink properties
      Then hyperlink.address is the URL of the hyperlink
 
 
-  @wip
   Scenario Outline: Hyperlink.contains_page_break reports presence of page-break
     Given a hyperlink having <zero-or-more> rendered page breaks
      Then hyperlink.contains_page_break is <value>
diff --git a/src/docx/oxml/text/hyperlink.py b/src/docx/oxml/text/hyperlink.py
index 45a69d743..dc38afd23 100644
--- a/src/docx/oxml/text/hyperlink.py
+++ b/src/docx/oxml/text/hyperlink.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import TYPE_CHECKING, List
 
 from docx.oxml.simpletypes import ST_OnOff, XsdString
 from docx.oxml.text.run import CT_R
@@ -13,6 +13,9 @@
     ZeroOrMore,
 )
 
+if TYPE_CHECKING:
+    from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
+
 
 class CT_Hyperlink(BaseOxmlElement):
     """`<w:hyperlink>` element, containing the text and address for a hyperlink."""
@@ -23,3 +26,8 @@ class CT_Hyperlink(BaseOxmlElement):
     history = OptionalAttribute("w:history", ST_OnOff, default=True)
 
     r = ZeroOrMore("w:r")
+
+    @property
+    def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
+        """All `w:lastRenderedPageBreak` descendants of this hyperlink."""
+        return self.xpath("./w:r/w:lastRenderedPageBreak")
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index 5a1481770..23a236042 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -34,3 +34,15 @@ def address(self) -> str:
         within the document.
         """
         return self._parent.part.rels[self._hyperlink.rId].target_ref
+
+    @property
+    def contains_page_break(self) -> bool:
+        """True when the text of this hyperlink is broken across page boundaries.
+
+        This is not uncommon and can happen for example when the hyperlink text is
+        multiple words and occurs in the last line of a page. Theoretically, a hyperlink
+        can contain more than one page break but that would be extremely uncommon in
+        practice. Still, this value should be understood to mean that "one-or-more"
+        rendered page breaks are present.
+        """
+        return bool(self._hyperlink.lastRenderedPageBreaks)
diff --git a/tests/text/test_hyperlink.py b/tests/text/test_hyperlink.py
index 8e0710bc1..f656bd6a1 100644
--- a/tests/text/test_hyperlink.py
+++ b/tests/text/test_hyperlink.py
@@ -24,6 +24,24 @@ def it_knows_the_hyperlink_URL(self, fake_parent: t.StoryChild):
 
         assert hyperlink.address == "https://google.com/"
 
+    @pytest.mark.parametrize(
+        ("hlink_cxml", "expected_value"),
+        [
+            ("w:hyperlink", False),
+            ("w:hyperlink/w:r", False),
+            ('w:hyperlink/w:r/(w:t"abc",w:lastRenderedPageBreak,w:t"def")', True),
+            ('w:hyperlink/w:r/(w:lastRenderedPageBreak,w:t"abc",w:t"def")', True),
+            ('w:hyperlink/w:r/(w:t"abc",w:t"def",w:lastRenderedPageBreak)', True),
+        ],
+    )
+    def it_knows_whether_it_contains_a_page_break(
+        self, hlink_cxml: str, expected_value: bool, fake_parent: t.StoryChild
+    ):
+        hlink = cast(CT_Hyperlink, element(hlink_cxml))
+        hyperlink = Hyperlink(hlink, fake_parent)
+
+        assert hyperlink.contains_page_break is expected_value
+
     # -- fixtures --------------------------------------------------------------------
 
     @pytest.fixture

From 01061a8f5da7da154511a6b9e510addbd6593e90 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 22:36:08 -0700
Subject: [PATCH 276/367] hlink: add Hyperlink.runs

---
 features/hlk-props.feature   |  1 -
 src/docx/text/hyperlink.py   | 14 ++++++++++++++
 tests/text/test_hyperlink.py | 23 +++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/features/hlk-props.feature b/features/hlk-props.feature
index 5569e4341..dc7e7a993 100644
--- a/features/hlk-props.feature
+++ b/features/hlk-props.feature
@@ -19,7 +19,6 @@ Feature: Access hyperlink properties
       | one          | True  |
 
 
-  @wip
   Scenario Outline: Hyperlink.runs contains Run for each run in hyperlink
     Given a hyperlink having <zero-or-more> runs
      Then hyperlink.runs has length <value>
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index 23a236042..133227faf 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -7,9 +7,12 @@
 
 from __future__ import annotations
 
+from typing import List
+
 from docx import types as t
 from docx.oxml.text.hyperlink import CT_Hyperlink
 from docx.shared import Parented
+from docx.text.run import Run
 
 
 class Hyperlink(Parented):
@@ -46,3 +49,14 @@ def contains_page_break(self) -> bool:
         rendered page breaks are present.
         """
         return bool(self._hyperlink.lastRenderedPageBreaks)
+
+    @property
+    def runs(self) -> List[Run]:
+        """List of |Run| instances in this hyperlink.
+
+        Together these define the visible text of the hyperlink. The text of a hyperlink
+        is typically contained in a single run will be broken into multiple runs if for
+        example part of the hyperlink is bold or the text was changed after the document
+        was saved.
+        """
+        return [Run(r, self) for r in self._hyperlink.r_lst]
diff --git a/tests/text/test_hyperlink.py b/tests/text/test_hyperlink.py
index f656bd6a1..28640b4a7 100644
--- a/tests/text/test_hyperlink.py
+++ b/tests/text/test_hyperlink.py
@@ -42,6 +42,29 @@ def it_knows_whether_it_contains_a_page_break(
 
         assert hyperlink.contains_page_break is expected_value
 
+    @pytest.mark.parametrize(
+        ("hlink_cxml", "count"),
+        [
+            ("w:hyperlink", 0),
+            ("w:hyperlink/w:r", 1),
+            ("w:hyperlink/(w:r,w:r)", 2),
+            ("w:hyperlink/(w:r,w:lastRenderedPageBreak)", 1),
+            ("w:hyperlink/(w:lastRenderedPageBreak,w:r)", 1),
+            ("w:hyperlink/(w:r,w:lastRenderedPageBreak,w:r)", 2),
+        ],
+    )
+    def it_provides_access_to_the_runs_it_contains(
+        self, hlink_cxml: str, count: int, fake_parent: t.StoryChild
+    ):
+        hlink = cast(CT_Hyperlink, element(hlink_cxml))
+        hyperlink = Hyperlink(hlink, fake_parent)
+
+        runs = hyperlink.runs
+
+        actual = [type(item).__name__ for item in runs]
+        expected = ["Run" for _ in range(count)]
+        assert actual == expected, f"expected: {expected}, got: {actual}"
+
     # -- fixtures --------------------------------------------------------------------
 
     @pytest.fixture

From a02c2206a3cc4c36a452b005c20766140968d1b2 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 22:50:23 -0700
Subject: [PATCH 277/367] hlink: add Hyperlink.text

---
 features/hlk-props.feature      |  1 -
 src/docx/oxml/text/hyperlink.py |  8 ++++++++
 src/docx/text/hyperlink.py      | 10 ++++++++++
 tests/text/test_hyperlink.py    | 22 +++++++++++++++++++++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/features/hlk-props.feature b/features/hlk-props.feature
index dc7e7a993..5472f49a3 100644
--- a/features/hlk-props.feature
+++ b/features/hlk-props.feature
@@ -30,7 +30,6 @@ Feature: Access hyperlink properties
       | two          |   2   |
 
 
-  @wip
   Scenario: Hyperlink.text has the visible text of the hyperlink
     Given a hyperlink
      Then hyperlink.text is the visible text of the hyperlink
diff --git a/src/docx/oxml/text/hyperlink.py b/src/docx/oxml/text/hyperlink.py
index dc38afd23..76733457b 100644
--- a/src/docx/oxml/text/hyperlink.py
+++ b/src/docx/oxml/text/hyperlink.py
@@ -31,3 +31,11 @@ class CT_Hyperlink(BaseOxmlElement):
     def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
         """All `w:lastRenderedPageBreak` descendants of this hyperlink."""
         return self.xpath("./w:r/w:lastRenderedPageBreak")
+
+    @property  # pyright: ignore[reportIncompatibleVariableOverride]
+    def text(self) -> str:
+        """The textual content of this hyperlink.
+
+        `CT_Hyperlink` stores the hyperlink-text as one or more `w:r` children.
+        """
+        return "".join(r.text for r in self.xpath("w:r"))
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index 133227faf..6082a53d1 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -60,3 +60,13 @@ def runs(self) -> List[Run]:
         was saved.
         """
         return [Run(r, self) for r in self._hyperlink.r_lst]
+
+    @property
+    def text(self) -> str:
+        """String formed by concatenating the text of each run in the hyperlink.
+
+        Tabs and line breaks in the XML are mapped to ``\\t`` and ``\\n`` characters
+        respectively. Note that rendered page-breaks can occur within a hyperlink but
+        they are not reflected in this text.
+        """
+        return self._hyperlink.text
diff --git a/tests/text/test_hyperlink.py b/tests/text/test_hyperlink.py
index 28640b4a7..484196902 100644
--- a/tests/text/test_hyperlink.py
+++ b/tests/text/test_hyperlink.py
@@ -63,7 +63,27 @@ def it_provides_access_to_the_runs_it_contains(
 
         actual = [type(item).__name__ for item in runs]
         expected = ["Run" for _ in range(count)]
-        assert actual == expected, f"expected: {expected}, got: {actual}"
+        assert actual == expected
+
+    @pytest.mark.parametrize(
+        ("hlink_cxml", "expected_text"),
+        [
+            ("w:hyperlink", ""),
+            ("w:hyperlink/w:r", ""),
+            ('w:hyperlink/w:r/w:t"foobar"', "foobar"),
+            ('w:hyperlink/w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar")', "foobar"),
+            ('w:hyperlink/w:r/(w:t"abc",w:tab,w:t"def",w:noBreakHyphen)', "abc\tdef-"),
+        ],
+    )
+    def it_knows_the_visible_text_of_the_link(
+        self, hlink_cxml: str, expected_text: str, fake_parent: t.StoryChild
+    ):
+        hlink = cast(CT_Hyperlink, element(hlink_cxml))
+        hyperlink = Hyperlink(hlink, fake_parent)
+
+        text = hyperlink.text
+
+        assert text == expected_text
 
     # -- fixtures --------------------------------------------------------------------
 

From 9abd14a8e9996f5e9ef5d072fe752c89ceca712f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 1 Oct 2023 11:42:26 -0700
Subject: [PATCH 278/367] para: Paragraph.text includes hyperlink text

---
 features/par-access-inner-content.feature | 5 +++++
 features/steps/paragraph.py               | 9 +++++++++
 src/docx/oxml/text/paragraph.py           | 9 +++++++++
 src/docx/text/paragraph.py                | 8 +++-----
 tests/text/test_paragraph.py              | 6 ++++++
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/features/par-access-inner-content.feature b/features/par-access-inner-content.feature
index 039c3ed4b..047168fcf 100644
--- a/features/par-access-inner-content.feature
+++ b/features/par-access-inner-content.feature
@@ -42,3 +42,8 @@ Feature: Access paragraph inner-content including hyperlinks
       | no           |   0   |
       | one          |   1   |
       | two          |   2   |
+
+
+  Scenario: Paragraph.text contains both run-text and hyperlink-text
+    Given a paragraph having three hyperlinks
+     Then paragraph.text contains the text of both the runs and the hyperlinks
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index 326786e29..4f8e2395a 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -190,6 +190,15 @@ def then_paragraph_style_is_value(context: Context, value_key: str):
     assert paragraph.style == expected_value
 
 
+@then("paragraph.text contains the text of both the runs and the hyperlinks")
+def then_paragraph_text_contains_the_text_of_both_the_runs_and_the_hyperlinks(
+    context: Context,
+):
+    actual = context.paragraph.text
+    expected = "Three hyperlinks: the first one here, the second one, and the third."
+    assert actual == expected, f"expected:\n'{expected}'\n\ngot:\n'{actual}'"
+
+
 @then("the document contains four paragraphs")
 def then_the_document_contains_four_paragraphs(context: Context):
     assert len(context.document.paragraphs) == 4
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index 127e2b30b..21384285f 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -88,6 +88,15 @@ def style(self, style):
         pPr = self.get_or_add_pPr()
         pPr.style = style
 
+    @property  # pyright: ignore[reportIncompatibleVariableOverride]
+    def text(self):
+        """The textual content of this paragraph.
+
+        Inner-content child elements like `w:r` and `w:hyperlink` are translated to
+        their text equivalent.
+        """
+        return "".join(e.text for e in self.xpath("w:r | w:hyperlink"))
+
     def _insert_pPr(self, pPr: CT_PPr) -> CT_PPr:
         self.insert(0, pPr)
         return pPr
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index a0aaf8ff4..72b0174d0 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -150,8 +150,9 @@ def style(self, style_or_name: str | ParagraphStyle | None):
 
     @property
     def text(self) -> str:
-        """String formed by concatenating the text of each run in the paragraph.
+        """The textual content of this paragraph.
 
+        The text includes the visible-text portion of any hyperlinks in the paragraph.
         Tabs and line breaks in the XML are mapped to ``\\t`` and ``\\n`` characters
         respectively.
 
@@ -161,10 +162,7 @@ def text(self) -> str:
         character is mapped to a line break. Paragraph-level formatting, such as style,
         is preserved. All run-level formatting, such as bold or italic, is removed.
         """
-        text = ""
-        for run in self.runs:
-            text += run.text
-        return text
+        return self._p.text
 
     @text.setter
     def text(self, text: str | None):
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index ecd555ef5..ff980aa0d 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -143,9 +143,15 @@ def it_provides_access_to_the_rendered_page_breaks_it_contains(
             ('w:p/w:r/(w:t"foo", w:tab, w:t"bar")', "foo\tbar"),
             ('w:p/w:r/(w:t"foo", w:br,  w:t"bar")', "foo\nbar"),
             ('w:p/w:r/(w:t"foo", w:cr,  w:t"bar")', "foo\nbar"),
+            (
+                'w:p/(w:r/w:t"click ",w:hyperlink{r:id=rId6}/w:r/w:t"here",'
+                'w:r/w:t" for more")',
+                "click here for more",
+            ),
         ],
     )
     def it_knows_the_text_it_contains(self, p_cxml: str, expected_value: str):
+        """Including the text of embedded hyperlinks."""
         paragraph = Paragraph(element(p_cxml), None)
         assert paragraph.text == expected_value
 

From 557fdeec8b14bcc89a66285c509bb333f30a4aa5 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 22:57:04 -0700
Subject: [PATCH 279/367] acpt: add RenderedPageBreak split-para scenarios

---
 features/pbk-split-para.feature |  28 ++++++
 features/steps/pagebreak.py     | 171 ++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 features/pbk-split-para.feature
 create mode 100644 features/steps/pagebreak.py

diff --git a/features/pbk-split-para.feature b/features/pbk-split-para.feature
new file mode 100644
index 000000000..438378f4d
--- /dev/null
+++ b/features/pbk-split-para.feature
@@ -0,0 +1,28 @@
+Feature: Split paragraph on rendered page-breaks
+  In order to extract document content with high page-attribution fidelity
+  As a developer using python-docx
+  I need to a way to split a paragraph on its first rendered page break
+
+
+  @wip
+  Scenario: RenderedPageBreak.preceding_paragraph_fragment is the content before break
+    Given a rendered_page_break in a paragraph
+     Then rendered_page_break.preceding_paragraph_fragment is the content before break
+
+
+  @wip
+  Scenario: RenderedPageBreak.preceding_paragraph_fragment includes the hyperlink
+    Given a rendered_page_break in a hyperlink
+     Then rendered_page_break.preceding_paragraph_fragment includes the hyperlink
+
+
+  @wip
+  Scenario: RenderedPageBreak.following_paragraph_fragment is the content after break
+    Given a rendered_page_break in a paragraph
+     Then rendered_page_break.following_paragraph_fragment is the content after break
+
+
+  @wip
+  Scenario: RenderedPageBreak.following_paragraph_fragment excludes the hyperlink
+    Given a rendered_page_break in a hyperlink
+     Then rendered_page_break.following_paragraph_fragment excludes the hyperlink
diff --git a/features/steps/pagebreak.py b/features/steps/pagebreak.py
new file mode 100644
index 000000000..7d443da46
--- /dev/null
+++ b/features/steps/pagebreak.py
@@ -0,0 +1,171 @@
+"""Step implementations for rendered page-break related features."""
+
+from __future__ import annotations
+
+from behave import given, then
+from behave.runner import Context
+
+from docx import Document
+from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+
+from helpers import test_docx
+
+# given ===================================================
+
+
+@given("a rendered_page_break in a hyperlink")
+def given_a_rendered_page_break_in_a_hyperlink(context: Context):
+    document = Document(test_docx("par-rendered-page-breaks"))
+    paragraph = document.paragraphs[2]
+    context.rendered_page_break = paragraph.rendered_page_breaks[0]
+
+
+@given("a rendered_page_break in a paragraph")
+def given_a_rendered_page_break_in_a_paragraph(context: Context):
+    document = Document(test_docx("par-rendered-page-breaks"))
+    paragraph = document.paragraphs[1]
+    context.rendered_page_break = paragraph.rendered_page_breaks[0]
+
+
+# then =====================================================
+
+
+@then("rendered_page_break.preceding_paragraph_fragment includes the hyperlink")
+def then_rendered_page_break_preceding_paragraph_fragment_includes_the_hyperlink(
+    context: Context,
+):
+    para_frag = context.rendered_page_break.preceding_paragraph_fragment
+
+    actual_value = type(para_frag).__name__
+    expected_value = "Paragraph"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.text
+    expected_value = "Page break in>><<this hyperlink"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.alignment
+    expected_value = WD_PARAGRAPH_ALIGNMENT.RIGHT  # pyright: ignore
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.hyperlinks[0].runs[0].style.name
+    expected_value = "Hyperlink"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.hyperlinks[0].address
+    expected_value = "http://google.com/"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+
+@then("rendered_page_break.preceding_paragraph_fragment is the content before break")
+def then_rendered_page_break_preceding_paragraph_fragment_is_the_content_before_break(
+    context: Context,
+):
+    para_frag = context.rendered_page_break.preceding_paragraph_fragment
+
+    actual_value = type(para_frag).__name__
+    expected_value = "Paragraph"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.text
+    expected_value = "Page break here>>"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.alignment
+    expected_value = WD_PARAGRAPH_ALIGNMENT.CENTER  # pyright: ignore
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.runs[0].style.name
+    expected_value = "Default Paragraph Font"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+
+@then("rendered_page_break.following_paragraph_fragment excludes the hyperlink")
+def then_rendered_page_break_following_paragraph_fragment_excludes_the_hyperlink(
+    context: Context,
+):
+    para_frag = context.rendered_page_break.following_paragraph_fragment
+
+    # -- paragraph fragment is a Paragraph object --
+    actual_value = type(para_frag).__name__
+    expected_value = "Paragraph"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    # -- paragraph text is only the fragment after the page-break --
+    actual_value = para_frag.text
+    expected_value = " and another one here>><<with text following"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    # -- paragraph properties are preserved --
+    actual_value = para_frag.alignment
+    expected_value = WD_PARAGRAPH_ALIGNMENT.RIGHT  # pyright: ignore
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    # -- paragraph has no hyperlinks --
+    actual_value = para_frag.hyperlinks
+    expected_value = []
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    # -- following paragraph fragment retains any remaining page-breaks --
+    actual_value = [type(rpb).__name__ for rpb in para_frag.rendered_page_breaks]
+    expected_value = ["RenderedPageBreak"]
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+
+@then("rendered_page_break.following_paragraph_fragment is the content after break")
+def then_rendered_page_break_following_paragraph_fragment_is_the_content_after_break(
+    context: Context,
+):
+    para_frag = context.rendered_page_break.following_paragraph_fragment
+
+    actual_value = type(para_frag).__name__
+    expected_value = "Paragraph"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.text
+    expected_value = "<<followed by more text."
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.alignment
+    expected_value = WD_PARAGRAPH_ALIGNMENT.CENTER  # pyright: ignore
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"
+
+    actual_value = para_frag.runs[0].style.name
+    expected_value = "Default Paragraph Font"
+    assert (
+        actual_value == expected_value
+    ), f"expected: '{expected_value}', got: '{actual_value}'"

From ac6c216c8f0bfb798e84194c541af9352a199aad Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 30 Sep 2023 23:56:39 -0700
Subject: [PATCH 280/367] lrpb: add RenderedPageBreak.preceding_pa..fragment

---
 features/pbk-split-para.feature |   2 -
 src/docx/oxml/text/pagebreak.py | 156 ++++++++++++++++++++++++++++++++
 src/docx/text/pagebreak.py      |  37 ++++++++
 tests/text/test_pagebreak.py    |  68 ++++++++++++++
 4 files changed, 261 insertions(+), 2 deletions(-)
 create mode 100644 tests/text/test_pagebreak.py

diff --git a/features/pbk-split-para.feature b/features/pbk-split-para.feature
index 438378f4d..9721abe16 100644
--- a/features/pbk-split-para.feature
+++ b/features/pbk-split-para.feature
@@ -4,13 +4,11 @@ Feature: Split paragraph on rendered page-breaks
   I need to a way to split a paragraph on its first rendered page break
 
 
-  @wip
   Scenario: RenderedPageBreak.preceding_paragraph_fragment is the content before break
     Given a rendered_page_break in a paragraph
      Then rendered_page_break.preceding_paragraph_fragment is the content before break
 
 
-  @wip
   Scenario: RenderedPageBreak.preceding_paragraph_fragment includes the hyperlink
     Given a rendered_page_break in a hyperlink
      Then rendered_page_break.preceding_paragraph_fragment includes the hyperlink
diff --git a/src/docx/oxml/text/pagebreak.py b/src/docx/oxml/text/pagebreak.py
index 201de9267..ef4953b28 100644
--- a/src/docx/oxml/text/pagebreak.py
+++ b/src/docx/oxml/text/pagebreak.py
@@ -2,7 +2,15 @@
 
 from __future__ import annotations
 
+import copy
+from typing import TYPE_CHECKING
+
 from docx.oxml.xmlchemy import BaseOxmlElement
+from docx.shared import lazyproperty
+
+if TYPE_CHECKING:
+    from docx.oxml.text.hyperlink import CT_Hyperlink
+    from docx.oxml.text.paragraph import CT_P
 
 
 class CT_LastRenderedPageBreak(BaseOxmlElement):
@@ -16,3 +24,151 @@ class CT_LastRenderedPageBreak(BaseOxmlElement):
     `w:lastRenderedPageBreak` maps to `CT_Empty`. This name was added to give it
     distinguished behavior. CT_Empty is used for many elements.
     """
+
+    @property
+    def precedes_all_content(self) -> bool:
+        """True when a `w:lastRenderedPageBreak` precedes all paragraph content.
+
+        This is a common case; it occurs whenever the page breaks on an even paragraph
+        boundary.
+        """
+        # -- a page-break inside a hyperlink never meets these criteria because there
+        # -- is always part of the hyperlink text before the page-break.
+        if self._is_in_hyperlink:
+            return False
+
+        return bool(
+            # -- XPath will match zero-or-one w:lastRenderedPageBreak element --
+            self._enclosing_p.xpath(
+                # -- in first run of paragraph --
+                f"./w:r[1]"
+                # -- all page-breaks --
+                f"/w:lastRenderedPageBreak"
+                # -- that are not preceded by any content-bearing elements --
+                f"[not(preceding-sibling::*[{self._run_inner_content_xpath}])]"
+            )
+        )
+
+    @property
+    def preceding_fragment_p(self) -> CT_P:
+        """A "loose" `CT_P` containing only the paragraph content before this break.
+
+        Raises `ValueError` if this `w:lastRenderedPageBreak` is not the first rendered
+        paragraph in its paragraph.
+
+        The returned `CT_P` is a "clone" (deepcopy) of the `w:p` ancestor of this
+        page-break with this `w:lastRenderedPageBreak` element and all its following
+        siblings removed.
+        """
+        if not self == self._first_lrpb_in_p(self._enclosing_p):
+            raise ValueError("only defined on first rendered page-break in paragraph")
+
+        # -- splitting approach is different when break is inside a hyperlink --
+        return (
+            self._preceding_frag_in_hlink
+            if self._is_in_hyperlink
+            else self._preceding_frag_in_run
+        )
+
+    def _enclosing_hyperlink(self, lrpb: CT_LastRenderedPageBreak) -> CT_Hyperlink:
+        """The `w:hyperlink` grandparent of this `w:lastRenderedPageBreak`.
+
+        Raises `IndexError` when this page-break has a `w:p` grandparent, so only call
+        when `._is_in_hyperlink` is True.
+        """
+        return lrpb.xpath("./parent::w:r/parent::w:hyperlink")[0]
+
+    @property
+    def _enclosing_p(self) -> CT_P:
+        """The `w:p` element parent or grandparent of this `w:lastRenderedPageBreak`."""
+        return self.xpath("./ancestor::w:p[1]")[0]
+
+    def _first_lrpb_in_p(self, p: CT_P) -> CT_LastRenderedPageBreak:
+        """The first `w:lastRenderedPageBreak` element in `p`.
+
+        Raises `ValueError` if there are no rendered page-breaks in `p`.
+        """
+        lrpbs = p.xpath(
+            "./w:r/w:lastRenderedPageBreak | ./w:hyperlink/w:r/w:lastRenderedPageBreak"
+        )
+        if not lrpbs:
+            raise ValueError("no rendered page-breaks in paragraph element")
+        return lrpbs[0]
+
+    @lazyproperty
+    def _is_in_hyperlink(self) -> bool:
+        """True when this page-break is embedded in a hyperlink run."""
+        return bool(self.xpath("./parent::w:r/parent::w:hyperlink"))
+
+    @lazyproperty
+    def _preceding_frag_in_hlink(self) -> CT_P:
+        """Preceding CT_P fragment when break occurs within a hyperlink.
+
+        Note this is a *partial-function* and raises when `lrpb` is not inside a
+        hyperlink.
+        """
+        if not self._is_in_hyperlink:
+            raise ValueError("only defined on a rendered page-break in a hyperlink")
+
+        # -- work on a clone `w:p` so our mutations don't persist --
+        p = copy.deepcopy(self._enclosing_p)
+
+        # -- get this `w:lastRenderedPageBreak` in the cloned `w:p` (not self) --
+        lrpb = self._first_lrpb_in_p(p)
+
+        # -- locate `w:hyperlink` in which this `w:lastRenderedPageBreak` is found --
+        hyperlink = lrpb._enclosing_hyperlink(lrpb)
+
+        # -- delete all w:p inner-content following the hyperlink --
+        for e in hyperlink.xpath("./following-sibling::*"):
+            p.remove(e)
+
+        # -- remove this page-break from inside the hyperlink --
+        lrpb.getparent().remove(lrpb)
+
+        # -- that's it, the entire hyperlink goes into the preceding fragment so
+        # -- the hyperlink is not "split".
+        return p
+
+    @lazyproperty
+    def _preceding_frag_in_run(self) -> CT_P:
+        """Preceding CT_P fragment when break does not occur in a hyperlink.
+
+        Note this is a *partial-function* and raises when `lrpb` is inside a hyperlink.
+        """
+        if self._is_in_hyperlink:
+            raise ValueError("only defined on a rendered page-break not in a hyperlink")
+
+        # -- work on a clone `w:p` so our mutations don't persist --
+        p = copy.deepcopy(self._enclosing_p)
+
+        # -- get this `w:lastRenderedPageBreak` in the cloned `w:p` (not self) --
+        lrpb = self._first_lrpb_in_p(p)
+
+        # -- locate `w:r` in which this `w:lastRenderedPageBreak` is found --
+        enclosing_r = lrpb.xpath("./parent::w:r")[0]
+
+        # -- delete all `w:p` inner-content following that run --
+        for e in enclosing_r.xpath("./following-sibling::*"):
+            p.remove(e)
+
+        # -- then delete all `w:r` inner-content following this lrpb in its run and
+        # -- also remove the page-break itself
+        for e in lrpb.xpath("./following-sibling::*"):
+            enclosing_r.remove(e)
+        enclosing_r.remove(lrpb)
+
+        return p
+
+    @lazyproperty
+    def _run_inner_content_xpath(self) -> str:
+        """XPath fragment matching any run inner-content elements."""
+        return (
+            "self::w:br"
+            " | self::w:cr"
+            " | self::w:drawing"
+            " | self::w:noBreakHyphen"
+            " | self::w:ptab"
+            " | self::w:t"
+            " | self::w:tab"
+        )
diff --git a/src/docx/text/pagebreak.py b/src/docx/text/pagebreak.py
index e468a613a..899d915e7 100644
--- a/src/docx/text/pagebreak.py
+++ b/src/docx/text/pagebreak.py
@@ -2,10 +2,15 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from docx import types as t
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.shared import Parented
 
+if TYPE_CHECKING:
+    from docx.text.paragraph import Paragraph
+
 
 class RenderedPageBreak(Parented):
     """A page-break inserted by Word during page-layout for print or display purposes.
@@ -27,3 +32,35 @@ def __init__(
         super().__init__(parent)
         self._element = lastRenderedPageBreak
         self._lastRenderedPageBreak = lastRenderedPageBreak
+
+    @property
+    def preceding_paragraph_fragment(self) -> Paragraph | None:
+        """A "loose" paragraph containing the content preceding this page-break.
+
+        Compare `.following_paragraph_fragment` as these two are intended to be used
+        together.
+
+        This value is `None` when no content precedes this page-break. This case is
+        common and occurs whenever a page breaks on an even paragraph boundary.
+        Returning `None` for this case avoids "inserting" a non-existent paragraph into
+        the content stream. Note that content can include DrawingML items like images or
+        charts.
+
+        Note the returned paragraph *is divorced from the document body*. Any changes
+        made to it will not be reflected in the document. It is intended to provide a
+        familiar container (`Paragraph`) to interrogate for the content preceding this
+        page-break in the paragraph in which it occured.
+
+        Also note that a rendered page-break can occur within a hyperlink; consider a
+        multi-word hyperlink like "excellent Wikipedia article on LLMs" that happens to
+        fall at the end of the last line on a page. THIS METHOD WILL "MOVE" the
+        page-break to occur after such a hyperlink. While this places the "tail" text of
+        the hyperlink on the "wrong" page, it avoids having two hyperlinks each with a
+        fragment of the actual text and pointing to the same address.
+        """
+        if self._lastRenderedPageBreak.precedes_all_content:
+            return None
+
+        from docx.text.paragraph import Paragraph
+
+        return Paragraph(self._lastRenderedPageBreak.preceding_fragment_p, self._parent)
diff --git a/tests/text/test_pagebreak.py b/tests/text/test_pagebreak.py
new file mode 100644
index 000000000..73060f6a3
--- /dev/null
+++ b/tests/text/test_pagebreak.py
@@ -0,0 +1,68 @@
+# pyright: reportPrivateUsage=false
+
+"""Unit-test suite for the docx.text.pagebreak module."""
+
+from typing import cast
+
+from docx import types as t
+from docx.oxml.text.paragraph import CT_P
+from docx.text.pagebreak import RenderedPageBreak
+
+from ..unitutil.cxml import element, xml
+
+
+class DescribeRenderedPageBreak:
+    """Unit-test suite for the docx.text.pagebreak.RenderedPageBreak object."""
+
+    def it_produces_None_for_preceding_fragment_when_page_break_is_leading(
+        self, fake_parent: t.StoryChild
+    ):
+        """A page-break with no preceding content is "leading"."""
+        p_cxml = 'w:p/(w:pPr/w:ind,w:r/(w:lastRenderedPageBreak,w:t"foo",w:t"bar"))'
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[0]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        preceding_fragment = page_break.preceding_paragraph_fragment
+
+        assert preceding_fragment is None
+
+    def it_can_split_off_the_preceding_paragraph_content_when_in_a_run(
+        self, fake_parent: t.StoryChild
+    ):
+        p_cxml = (
+            "w:p/("
+            "  w:pPr/w:ind"
+            '  ,w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar")'
+            '  ,w:r/w:t"barfoo"'
+            ")"
+        )
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[0]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        preceding_fragment = page_break.preceding_paragraph_fragment
+
+        expected_cxml = 'w:p/(w:pPr/w:ind,w:r/w:t"foo")'
+        assert preceding_fragment is not None
+        assert preceding_fragment._p.xml == xml(expected_cxml)
+
+    def and_it_can_split_off_the_preceding_paragraph_content_when_in_a_hyperlink(
+        self, fake_parent: t.StoryChild
+    ):
+        p_cxml = (
+            "w:p/("
+            "  w:pPr/w:ind"
+            '  ,w:hyperlink/w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar")'
+            '  ,w:r/w:t"barfoo"'
+            ")"
+        )
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[0]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        preceding_fragment = page_break.preceding_paragraph_fragment
+
+        expected_cxml = 'w:p/(w:pPr/w:ind,w:hyperlink/w:r/(w:t"foo",w:t"bar"))'
+        assert preceding_fragment is not None
+        assert preceding_fragment._p.xml == xml(expected_cxml)

From 1e42c55f9982e7fb88dd0b8f488e0acf27c7a7cd Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 1 Oct 2023 12:50:19 -0700
Subject: [PATCH 281/367] lrpb: add RenderedPageBreak.following_pa..fragment

---
 features/pbk-split-para.feature |   2 -
 src/docx/oxml/text/pagebreak.py | 110 ++++++++++++++++++++++++++++++++
 src/docx/text/pagebreak.py      |  48 ++++++++++++--
 tests/text/test_pagebreak.py    |  79 +++++++++++++++++++++++
 4 files changed, 231 insertions(+), 8 deletions(-)

diff --git a/features/pbk-split-para.feature b/features/pbk-split-para.feature
index 9721abe16..8ce048a40 100644
--- a/features/pbk-split-para.feature
+++ b/features/pbk-split-para.feature
@@ -14,13 +14,11 @@ Feature: Split paragraph on rendered page-breaks
      Then rendered_page_break.preceding_paragraph_fragment includes the hyperlink
 
 
-  @wip
   Scenario: RenderedPageBreak.following_paragraph_fragment is the content after break
     Given a rendered_page_break in a paragraph
      Then rendered_page_break.following_paragraph_fragment is the content after break
 
 
-  @wip
   Scenario: RenderedPageBreak.following_paragraph_fragment excludes the hyperlink
     Given a rendered_page_break in a hyperlink
      Then rendered_page_break.following_paragraph_fragment excludes the hyperlink
diff --git a/src/docx/oxml/text/pagebreak.py b/src/docx/oxml/text/pagebreak.py
index ef4953b28..943f9b6c2 100644
--- a/src/docx/oxml/text/pagebreak.py
+++ b/src/docx/oxml/text/pagebreak.py
@@ -25,6 +25,57 @@ class CT_LastRenderedPageBreak(BaseOxmlElement):
     distinguished behavior. CT_Empty is used for many elements.
     """
 
+    @property
+    def following_fragment_p(self) -> CT_P:
+        """A "loose" `CT_P` containing only the paragraph content before this break.
+
+        Raises `ValueError` if this `w:lastRenderedPageBreak` is not the first rendered
+        page-break in its paragraph.
+
+        The returned `CT_P` is a "clone" (deepcopy) of the `w:p` ancestor of this
+        page-break with this `w:lastRenderedPageBreak` element and all content preceding
+        it removed.
+
+        NOTE: this `w:p` can itself contain one or more `w:renderedPageBreak` elements
+        (when the paragraph contained more than one). While this is rare, the caller
+        should treat this paragraph the same as other paragraphs and split it if
+        necessary in a folloing step or recursion.
+        """
+        if not self == self._first_lrpb_in_p(self._enclosing_p):
+            raise ValueError("only defined on first rendered page-break in paragraph")
+
+        # -- splitting approach is different when break is inside a hyperlink --
+        return (
+            self._following_frag_in_hlink
+            if self._is_in_hyperlink
+            else self._following_frag_in_run
+        )
+
+    @property
+    def follows_all_content(self) -> bool:
+        """True when this page-break element is the last "content" in the paragraph.
+
+        This is very uncommon case and may only occur in contrived or cases where the
+        XML is edited by hand, but it is not precluded by the spec.
+        """
+        # -- a page-break inside a hyperlink never meets these criteria (for our
+        # -- purposes at least) because it is considered "atomic" and always associated
+        # -- with the page it starts on.
+        if self._is_in_hyperlink:
+            return False
+
+        return bool(
+            # -- XPath will match zero-or-one w:lastRenderedPageBreak element --
+            self._enclosing_p.xpath(
+                # -- in first run of paragraph --
+                f"(./w:r)[last()]"
+                # -- all page-breaks --
+                f"/w:lastRenderedPageBreak"
+                # -- that are not preceded by any content-bearing elements --
+                f"[not(following-sibling::*[{self._run_inner_content_xpath}])]"
+            )
+        )
+
     @property
     def precedes_all_content(self) -> bool:
         """True when a `w:lastRenderedPageBreak` precedes all paragraph content.
@@ -95,6 +146,65 @@ def _first_lrpb_in_p(self, p: CT_P) -> CT_LastRenderedPageBreak:
             raise ValueError("no rendered page-breaks in paragraph element")
         return lrpbs[0]
 
+    @lazyproperty
+    def _following_frag_in_hlink(self) -> CT_P:
+        """Following CT_P fragment when break occurs within a hyperlink.
+
+        Note this is a *partial-function* and raises when `lrpb` is not inside a
+        hyperlink.
+        """
+        if not self._is_in_hyperlink:
+            raise ValueError("only defined on a rendered page-break in a hyperlink")
+
+        # -- work on a clone `w:p` so our mutations don't persist --
+        p = copy.deepcopy(self._enclosing_p)
+
+        # -- get this `w:lastRenderedPageBreak` in the cloned `w:p` (not self) --
+        lrpb = self._first_lrpb_in_p(p)
+
+        # -- locate `w:hyperlink` in which this `w:lastRenderedPageBreak` is found --
+        hyperlink = lrpb._enclosing_hyperlink(lrpb)
+
+        # -- delete all w:p inner-content preceding the hyperlink --
+        for e in hyperlink.xpath("./preceding-sibling::*[not(self::w:pPr)]"):
+            p.remove(e)
+
+        # -- remove the whole hyperlink, it belongs to the preceding-fragment-p --
+        hyperlink.getparent().remove(hyperlink)
+
+        # -- that's it, return the remaining fragment of `w:p` clone --
+        return p
+
+    @lazyproperty
+    def _following_frag_in_run(self) -> CT_P:
+        """following CT_P fragment when break does not occur in a hyperlink.
+
+        Note this is a *partial-function* and raises when `lrpb` is inside a hyperlink.
+        """
+        if self._is_in_hyperlink:
+            raise ValueError("only defined on a rendered page-break not in a hyperlink")
+
+        # -- work on a clone `w:p` so our mutations don't persist --
+        p = copy.deepcopy(self._enclosing_p)
+
+        # -- get this `w:lastRenderedPageBreak` in the cloned `w:p` (not self) --
+        lrpb = self._first_lrpb_in_p(p)
+
+        # -- locate `w:r` in which this `w:lastRenderedPageBreak` is found --
+        enclosing_r = lrpb.xpath("./parent::w:r")[0]
+
+        # -- delete all w:p inner-content preceding that run (but not w:pPr) --
+        for e in enclosing_r.xpath("./preceding-sibling::*[not(self::w:pPr)]"):
+            p.remove(e)
+
+        # -- then remove all run inner-content preceding this lrpb in its run (but not
+        # -- the `w:rPr`) and also remove the page-break itself
+        for e in lrpb.xpath("./preceding-sibling::*[not(self::w:rPr)]"):
+            enclosing_r.remove(e)
+        enclosing_r.remove(lrpb)
+
+        return p
+
     @lazyproperty
     def _is_in_hyperlink(self) -> bool:
         """True when this page-break is embedded in a hyperlink run."""
diff --git a/src/docx/text/pagebreak.py b/src/docx/text/pagebreak.py
index 899d915e7..f3c16bc5c 100644
--- a/src/docx/text/pagebreak.py
+++ b/src/docx/text/pagebreak.py
@@ -24,6 +24,15 @@ class RenderedPageBreak(Parented):
     Note these are never inserted by `python-docx` because it has no rendering function.
     These are generally only useful for text-extraction of existing documents when
     `python-docx` is being used solely as a document "reader".
+
+    NOTE: a rendered page-break can occur within a hyperlink; consider a multi-word
+    hyperlink like "excellent Wikipedia article on LLMs" that happens to fall close to
+    the end of the last line on a page such that the page breaks between "Wikipedia" and
+    "article". In such a "page-breaks-in-hyperlink" case, THESE METHODS WILL "MOVE" THE
+    PAGE-BREAK to occur after the hyperlink, such that the entire hyperlink appears in
+    the paragraph returned by `.preceding_paragraph_fragment`. While this places the
+    "tail" text of the hyperlink on the "wrong" page, it avoids having two hyperlinks
+    each with a fragment of the actual text and pointing to the same address.
     """
 
     def __init__(
@@ -51,12 +60,7 @@ def preceding_paragraph_fragment(self) -> Paragraph | None:
         familiar container (`Paragraph`) to interrogate for the content preceding this
         page-break in the paragraph in which it occured.
 
-        Also note that a rendered page-break can occur within a hyperlink; consider a
-        multi-word hyperlink like "excellent Wikipedia article on LLMs" that happens to
-        fall at the end of the last line on a page. THIS METHOD WILL "MOVE" the
-        page-break to occur after such a hyperlink. While this places the "tail" text of
-        the hyperlink on the "wrong" page, it avoids having two hyperlinks each with a
-        fragment of the actual text and pointing to the same address.
+        Contains the entire hyperlink when this break occurs within a hyperlink.
         """
         if self._lastRenderedPageBreak.precedes_all_content:
             return None
@@ -64,3 +68,35 @@ def preceding_paragraph_fragment(self) -> Paragraph | None:
         from docx.text.paragraph import Paragraph
 
         return Paragraph(self._lastRenderedPageBreak.preceding_fragment_p, self._parent)
+
+    @property
+    def following_paragraph_fragment(self) -> Paragraph | None:
+        """A "loose" paragraph containing the content following this page-break.
+
+        HAS POTENTIALLY SURPRISING BEHAVIORS so read carefully to be sure this is what
+        you want. This is primarily targeted toward text-extraction use-cases for which
+        precisely associating text with the page it occurs on is important.
+
+        Compare `.preceding_paragraph_fragment` as these two are intended to be used
+        together.
+
+        This value is `None` when no content follows this page-break. This case is
+        unlikely to occur in practice because Word places even-paragraph-boundary
+        page-breaks on the paragraph *following* the page-break. Still, it is possible
+        and must be checked for. Returning `None` for this case avoids "inserting" an
+        extra, non-existent paragraph into the content stream. Note that content can
+        include DrawingML items like images or charts, not just text.
+
+        The returned paragraph *is divorced from the document body*. Any changes made to
+        it will not be reflected in the document. It is intended to provide a container
+        (`Paragraph`) with familiar properties and methods that can be used to
+        characterize the paragraph content following a mid-paragraph page-break.
+
+        Contains no portion of the hyperlink when this break occurs within a hyperlink.
+        """
+        if self._lastRenderedPageBreak.follows_all_content:
+            return None
+
+        from docx.text.paragraph import Paragraph
+
+        return Paragraph(self._lastRenderedPageBreak.following_fragment_p, self._parent)
diff --git a/tests/text/test_pagebreak.py b/tests/text/test_pagebreak.py
index 73060f6a3..6bb770619 100644
--- a/tests/text/test_pagebreak.py
+++ b/tests/text/test_pagebreak.py
@@ -4,6 +4,8 @@
 
 from typing import cast
 
+import pytest
+
 from docx import types as t
 from docx.oxml.text.paragraph import CT_P
 from docx.text.pagebreak import RenderedPageBreak
@@ -14,6 +16,17 @@
 class DescribeRenderedPageBreak:
     """Unit-test suite for the docx.text.pagebreak.RenderedPageBreak object."""
 
+    def it_raises_on_preceding_fragment_when_page_break_is_not_first_in_paragrah(
+        self, fake_parent: t.StoryChild
+    ):
+        p_cxml = 'w:p/(w:r/(w:t"abc",w:lastRenderedPageBreak,w:lastRenderedPageBreak))'
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[-1]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        with pytest.raises(ValueError, match="only defined on first rendered page-br"):
+            page_break.preceding_paragraph_fragment
+
     def it_produces_None_for_preceding_fragment_when_page_break_is_leading(
         self, fake_parent: t.StoryChild
     ):
@@ -66,3 +79,69 @@ def and_it_can_split_off_the_preceding_paragraph_content_when_in_a_hyperlink(
         expected_cxml = 'w:p/(w:pPr/w:ind,w:hyperlink/w:r/(w:t"foo",w:t"bar"))'
         assert preceding_fragment is not None
         assert preceding_fragment._p.xml == xml(expected_cxml)
+
+    def it_raises_on_following_fragment_when_page_break_is_not_first_in_paragrah(
+        self, fake_parent: t.StoryChild
+    ):
+        p_cxml = 'w:p/(w:r/(w:lastRenderedPageBreak,w:lastRenderedPageBreak,w:t"abc"))'
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[-1]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        with pytest.raises(ValueError, match="only defined on first rendered page-br"):
+            page_break.following_paragraph_fragment
+
+    def it_produces_None_for_following_fragment_when_page_break_is_trailing(
+        self, fake_parent: t.StoryChild
+    ):
+        """A page-break with no following content is "trailing"."""
+        p_cxml = 'w:p/(w:pPr/w:ind,w:r/(w:t"foo",w:t"bar",w:lastRenderedPageBreak))'
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[0]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        following_fragment = page_break.following_paragraph_fragment
+
+        assert following_fragment is None
+
+    def it_can_split_off_the_following_paragraph_content_when_in_a_run(
+        self, fake_parent: t.StoryChild
+    ):
+        p_cxml = (
+            "w:p/("
+            "  w:pPr/w:ind"
+            '  ,w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar")'
+            '  ,w:r/w:t"foo"'
+            ")"
+        )
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[0]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        following_fragment = page_break.following_paragraph_fragment
+
+        expected_cxml = 'w:p/(w:pPr/w:ind,w:r/w:t"bar",w:r/w:t"foo")'
+        assert following_fragment is not None
+        assert following_fragment._p.xml == xml(expected_cxml)
+
+    def and_it_can_split_off_the_following_paragraph_content_when_in_a_hyperlink(
+        self, fake_parent: t.StoryChild
+    ):
+        p_cxml = (
+            "w:p/("
+            "  w:pPr/w:ind"
+            '  ,w:hyperlink/w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar")'
+            '  ,w:r/w:t"baz"'
+            '  ,w:r/w:t"qux"'
+            ")"
+        )
+        p = cast(CT_P, element(p_cxml))
+        lrpb = p.lastRenderedPageBreaks[0]
+        page_break = RenderedPageBreak(lrpb, fake_parent)
+
+        following_fragment = page_break.following_paragraph_fragment
+
+        expected_cxml = 'w:p/(w:pPr/w:ind,w:r/w:t"baz",w:r/w:t"qux")'
+
+        assert following_fragment is not None
+        assert following_fragment._p.xml == xml(expected_cxml)

From e47dfa2ae49731a98c8118536b4959fc04fc6876 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 1 Oct 2023 15:59:39 -0700
Subject: [PATCH 282/367] docs: update docs with recent additions

---
 docs/api/text.rst | 14 ++++++++++++++
 docs/conf.py      |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/docs/api/text.rst b/docs/api/text.rst
index cc9b4892f..f76e3ba33 100644
--- a/docs/api/text.rst
+++ b/docs/api/text.rst
@@ -19,6 +19,13 @@ Text-related objects
    :members:
 
 
+|Hyperlink| objects
+-------------------
+
+.. autoclass:: docx.text.hyperlink.Hyperlink()
+   :members:
+
+
 |Run| objects
 -------------
 
@@ -33,6 +40,13 @@ Text-related objects
    :members:
 
 
+|RenderedPageBreak| objects
+---------------------------
+
+.. autoclass:: docx.text.pagebreak.RenderedPageBreak()
+   :members:
+
+
 |TabStop| objects
 -----------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 0190aba5d..db96ecf52 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -157,6 +157,8 @@
 
 .. |Relationships| replace:: :class:`._Relationships`
 
+.. |RenderedPageBreak| replace:: :class:`.RenderedPageBreak`
+
 .. |RGBColor| replace:: :class:`.RGBColor`
 
 .. |_Row| replace:: :class:`._Row`

From 5b3ee80ed950153afb0b59e6c8d9ac5a2e8c5c62 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 1 Oct 2023 17:08:58 -0700
Subject: [PATCH 283/367] release: prepare v1.0.0rc1 release

---
 HISTORY.rst           | 19 +++++++++++++++++++
 README.md             | 26 ++++++++++++++++++++++++++
 README.rst            | 10 ----------
 pyproject.toml        |  5 +++--
 requirements-test.txt |  1 -
 requirements.txt      |  1 +
 tox.ini               |  6 +-----
 7 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 README.md
 delete mode 100644 README.rst

diff --git a/HISTORY.rst b/HISTORY.rst
index 2b33a4d5d..c465665d1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,25 @@
 Release History
 ---------------
 
+1.0.0 (2023-10-01)
++++++++++++++++++++
+
+- Remove Python 2 support. Supported versions are 3.7+
+* Fix #85:   Paragraph.text includes hyperlink text
+* Add #1113: Hyperlink.address
+* Add Hyperlink.contains_page_break
+* Add Hyperlink.runs
+* Add Hyperlink.text
+* Add Paragraph.contains_page_break
+* Add Paragraph.hyperlinks
+* Add Paragraph.iter_inner_content()
+* Add Paragraph.rendered_page_breaks
+* Add RenderedPageBreak.following_paragraph_fragment
+* Add RenderedPageBreak.preceding_paragraph_fragment
+* Add Run.contains_page_break
+* Add Run.iter_inner_content()
+
+
 0.8.11 (2021-05-15)
 +++++++++++++++++++
 
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..c35cf0200
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+# python-docx
+
+*python-docx* is a Python library for reading, creating, and updating Microsoft Word 2007+ (.docx) files.
+
+## Installation
+
+```
+pip install python-docx
+```
+
+## Example
+
+```python
+>>> from docx import Document
+
+>>> document = Document()
+>>> document.add_paragraph("It was a dark and stormy night.")
+<docx.text.paragraph.Paragraph object at 0x10f19e760>
+>>> document.save("dark-and-stormy.docx")
+
+>>> document = Document("dark-and-stormy.docx")
+>>> document.paragraphs[0].text
+'It was a dark and stormy night.'
+```
+
+More information is available in the [python-docx documentation](https://python-docx.readthedocs.org/en/latest/)
diff --git a/README.rst b/README.rst
deleted file mode 100644
index afc1dadeb..000000000
--- a/README.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. image:: https://travis-ci.org/python-openxml/python-docx.svg?branch=master
-   :target: https://travis-ci.org/python-openxml/python-docx
-
-*python-docx* is a Python library for reading, creating, and updating Microsoft Word
-(.docx) files.
-
-More information is available in the `python-docx documentation`_.
-
-.. _`python-docx documentation`:
-   https://python-docx.readthedocs.org/en/latest/
diff --git a/pyproject.toml b/pyproject.toml
index 72591d894..1722272e1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,13 +21,14 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = [
-    "lxml>=2.3.2",
+    "lxml>=3.1.0",
+    "typing_extensions",
 ]
 description = "Create, read, and update Microsoft Word .docx files."
 dynamic = ["version"]
 keywords = ["docx", "office", "openxml", "word"]
 license = { text = "MIT" }
-readme = "README.rst"
+readme = "README.md"
 requires-python = ">=3.7"
 
 [project.urls]
diff --git a/requirements-test.txt b/requirements-test.txt
index 868eea2c9..85d9f6ba3 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -3,4 +3,3 @@ behave>=1.2.3
 pyparsing>=2.0.1
 pytest>=2.5
 ruff
-typing-extensions
diff --git a/requirements.txt b/requirements.txt
index 17b9696d6..a156cfe60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 lxml>=3.1.0
+typing-extensions
diff --git a/tox.ini b/tox.ini
index f8c0ce994..1c4e3aea7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,11 +2,7 @@
 envlist = py37, py38, py39, py310, py311
 
 [testenv]
-deps =
-    behave
-    lxml
-    pyparsing
-    pytest
+deps = -rrequirements-test.txt
 
 commands =
     py.test -qx

From 8122909dc64b4e33555a4ecd47894443f33a64d3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 7 Oct 2023 14:10:36 -0700
Subject: [PATCH 284/367] rfctr: rework enums so they type-check

Replace meta-programming with `enum.Enum` features built into Python 3
to support XML attribute mapping.

Also some random typing and docstring clean-up along the way.
---
 src/docx/enum/base.py     | 301 ++++---------------
 src/docx/enum/dml.py      | 152 +++++-----
 src/docx/enum/section.py  |  88 +++---
 src/docx/enum/shape.py    |  10 +-
 src/docx/enum/style.py    | 590 +++++++++++++++++++++++++++-----------
 src/docx/enum/table.py    | 175 +++++------
 src/docx/enum/text.py     | 503 +++++++++++++++++++-------------
 src/docx/oxml/section.py  |  27 +-
 src/docx/oxml/xmlchemy.py |  19 +-
 src/docx/section.py       | 117 ++++----
 src/docx/text/font.py     |   8 +-
 tests/test_enum.py        | 130 ++++-----
 tests/text/test_run.py    |   2 +-
 13 files changed, 1172 insertions(+), 950 deletions(-)

diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index 679174ac2..4c20af644 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -3,39 +3,81 @@
 from __future__ import annotations
 
 import enum
-import sys
 import textwrap
-from typing import Callable, Type
+from typing import Any, Dict, Type, TypeVar
 
-from docx.exceptions import InvalidXmlError
+from typing_extensions import Self
 
+_T = TypeVar("_T", bound="BaseXmlEnum")
 
-def alias(*aliases: str) -> Callable[..., Type[enum.Enum]]:
-    """Adds alternate name for an enumeration.
 
-    Decorating a class with @alias('FOO', 'BAR', ..) allows the class to be referenced
-    by each of the names provided as arguments.
+class BaseEnum(int, enum.Enum):
+    """Base class for Enums that do not map XML attr values.
+
+    The enum's value will be an integer, corresponding to the integer assigned the
+    corresponding member in the MS API enum of the same name.
     """
 
-    def decorator(cls):
-        # alias must be set in globals from caller's frame
-        caller = sys._getframe(1)
-        globals_dict = caller.f_globals
-        for alias in aliases:
-            globals_dict[alias] = cls
-        return cls
+    def __new__(cls, ms_api_value: int, docstr: str):
+        self = int.__new__(cls, ms_api_value)
+        self._value_ = ms_api_value
+        self.__doc__ = docstr.strip()
+        return self
+
+    def __str__(self):
+        """The symbolic name and string value of this member, e.g. 'MIDDLE (3)'."""
+        return f"{self.name} ({self.value})"
+
+
+class BaseXmlEnum(int, enum.Enum):
+    """Base class for Enums that also map XML attr values.
+
+    The enum's value will be an integer, corresponding to the integer assigned the
+    corresponding member in the MS API enum of the same name.
+    """
+
+    xml_value: str
+
+    def __new__(cls, ms_api_value: int, xml_value: str, docstr: str):
+        self = int.__new__(cls, ms_api_value)
+        self._value_ = ms_api_value
+        self.xml_value = xml_value
+        self.__doc__ = docstr.strip()
+        return self
+
+    def __str__(self):
+        """The symbolic name and string value of this member, e.g. 'MIDDLE (3)'."""
+        return f"{self.name} ({self.value})"
+
+    @classmethod
+    def from_xml(cls, xml_value: str | None) -> Self:
+        """Enumeration member corresponding to XML attribute value `xml_value`.
+
+        Example::
 
-    return decorator
+            >>> WD_PARAGRAPH_ALIGNMENT.from_xml("center")
+            WD_PARAGRAPH_ALIGNMENT.CENTER
 
+        """
+        member = next((member for member in cls if member.xml_value == xml_value), None)
+        if member is None:
+            raise ValueError(f"{cls.__name__} has no XML mapping for '{xml_value}'")
+        return member
 
-class _DocsPageFormatter(object):
+    @classmethod
+    def to_xml(cls: Type[_T], value: int | _T | None) -> str | None:
+        """XML value of this enum member, generally an XML attribute value."""
+        return cls(value).xml_value
+
+
+class DocsPageFormatter:
     """Generate an .rst doc page for an enumeration.
 
     Formats a RestructuredText documention page (string) for the enumeration class parts
     passed to the constructor. An immutable one-shot service object.
     """
 
-    def __init__(self, clsname, clsdict):
+    def __init__(self, clsname: str, clsdict: Dict[str, Any]):
         self._clsname = clsname
         self._clsdict = clsdict
 
@@ -67,10 +109,11 @@ def _intro_text(self):
 
         return textwrap.dedent(cls_docstring).strip()
 
-    def _member_def(self, member):
+    def _member_def(self, member: BaseEnum | BaseXmlEnum):
         """Return an individual member definition formatted as an RST glossary entry,
         wrapped to fit within 78 columns."""
-        member_docstring = textwrap.dedent(member.docstring).strip()
+        assert member.__doc__ is not None
+        member_docstring = textwrap.dedent(member.__doc__).strip()
         member_docstring = textwrap.fill(
             member_docstring,
             width=78,
@@ -100,223 +143,3 @@ def _page_title(self):
         double-backtics) and underlined with '=' characters."""
         title_underscore = "=" * (len(self._clsname) + 4)
         return "``%s``\n%s" % (self._clsname, title_underscore)
-
-
-class MetaEnumeration(type):
-    """The metaclass for Enumeration and its subclasses.
-
-    Adds a name for each named member and compiles state needed by the enumeration class
-    to respond to other attribute gets
-    """
-
-    def __new__(meta, clsname, bases, clsdict):
-        meta._add_enum_members(clsdict)
-        meta._collect_valid_settings(clsdict)
-        meta._generate_docs_page(clsname, clsdict)
-        return type.__new__(meta, clsname, bases, clsdict)
-
-    @classmethod
-    def _add_enum_members(meta, clsdict):
-        """Dispatch ``.add_to_enum()`` call to each member so it can do its thing to
-        properly add itself to the enumeration class.
-
-        This delegation allows member sub-classes to add specialized behaviors.
-        """
-        enum_members = clsdict["__members__"]
-        for member in enum_members:
-            member.add_to_enum(clsdict)
-
-    @classmethod
-    def _collect_valid_settings(meta, clsdict):
-        """Return a sequence containing the enumeration values that are valid assignment
-        values.
-
-        Return-only values are excluded.
-        """
-        enum_members = clsdict["__members__"]
-        valid_settings = []
-        for member in enum_members:
-            valid_settings.extend(member.valid_settings)
-        clsdict["_valid_settings"] = valid_settings
-
-    @classmethod
-    def _generate_docs_page(meta, clsname, clsdict):
-        """Return the RST documentation page for the enumeration."""
-        clsdict["__docs_rst__"] = _DocsPageFormatter(clsname, clsdict).page_str
-
-
-class EnumerationBase(object):
-    """Base class for all enumerations, used directly for enumerations requiring only
-    basic behavior.
-
-    It's __dict__ is used below in the Python 2+3 compatible metaclass definition.
-    """
-
-    __members__ = ()
-    __ms_name__ = ""
-
-    @classmethod
-    def validate(cls, value):
-        """Raise |ValueError| if `value` is not an assignable value."""
-        if value not in cls._valid_settings:
-            raise ValueError(
-                "%s not a member of %s enumeration" % (value, cls.__name__)
-            )
-
-
-Enumeration = MetaEnumeration("Enumeration", (object,), dict(EnumerationBase.__dict__))
-
-
-class XmlEnumeration(Enumeration):
-    """Provides ``to_xml()`` and ``from_xml()`` methods in addition to base enumeration
-    features."""
-
-    __members__ = ()
-    __ms_name__ = ""
-
-    @classmethod
-    def from_xml(cls, xml_val):
-        """Return the enumeration member corresponding to the XML value `xml_val`."""
-        if xml_val not in cls._xml_to_member:
-            raise InvalidXmlError(
-                "attribute value '%s' not valid for this type" % xml_val
-            )
-        return cls._xml_to_member[xml_val]
-
-    @classmethod
-    def to_xml(cls, enum_val):
-        """Return the XML value of the enumeration value `enum_val`."""
-        if enum_val not in cls._member_to_xml:
-            raise ValueError(
-                "value '%s' not in enumeration %s" % (enum_val, cls.__name__)
-            )
-        return cls._member_to_xml[enum_val]
-
-
-class EnumMember(object):
-    """Used in the enumeration class definition to define a member value and its
-    mappings."""
-
-    def __init__(self, name, value, docstring):
-        self._name = name
-        if isinstance(value, int):
-            value = EnumValue(name, value, docstring)
-        self._value = value
-        self._docstring = docstring
-
-    def add_to_enum(self, clsdict):
-        """Add a name to `clsdict` for this member."""
-        self.register_name(clsdict)
-
-    @property
-    def docstring(self):
-        """The description of this member."""
-        return self._docstring
-
-    @property
-    def name(self):
-        """The distinguishing name of this member within the enumeration class, e.g.
-        'MIDDLE' for MSO_VERTICAL_ANCHOR.MIDDLE, if this is a named member.
-
-        Otherwise the primitive value such as |None|, |True| or |False|.
-        """
-        return self._name
-
-    def register_name(self, clsdict):
-        """Add a member name to the class dict `clsdict` containing the value of this
-        member object.
-
-        Where the name of this object is None, do nothing; this allows out-of-band
-        values to be defined without adding a name to the class dict.
-        """
-        if self.name is None:
-            return
-        clsdict[self.name] = self.value
-
-    @property
-    def valid_settings(self):
-        """A sequence containing the values valid for assignment for this member.
-
-        May be zero, one, or more in number.
-        """
-        return (self._value,)
-
-    @property
-    def value(self):
-        """The enumeration value for this member, often an instance of EnumValue, but
-        may be a primitive value such as |None|."""
-        return self._value
-
-
-class EnumValue(int):
-    """A named enumeration value, providing __str__ and __doc__ string values for its
-    symbolic name and description, respectively.
-
-    Subclasses int, so behaves as a regular int unless the strings are asked for.
-    """
-
-    def __new__(cls, member_name, int_value, docstring):
-        return super(EnumValue, cls).__new__(cls, int_value)
-
-    def __init__(self, member_name, int_value, docstring):
-        super(EnumValue, self).__init__()
-        self._member_name = member_name
-        self._docstring = docstring
-
-    @property
-    def __doc__(self):
-        """The description of this enumeration member."""
-        return self._docstring.strip()
-
-    def __str__(self):
-        """The symbolic name and string value of this member, e.g. 'MIDDLE (3)'."""
-        return "%s (%d)" % (self._member_name, int(self))
-
-
-class ReturnValueOnlyEnumMember(EnumMember):
-    """Used to define a member of an enumeration that is only valid as a query result
-    and is not valid as a setting, e.g. MSO_VERTICAL_ANCHOR.MIXED (-2)"""
-
-    @property
-    def valid_settings(self):
-        """No settings are valid for a return-only value."""
-        return ()
-
-
-class XmlMappedEnumMember(EnumMember):
-    """Used to define a member whose value maps to an XML attribute value."""
-
-    def __init__(self, name, value, xml_value, docstring):
-        super(XmlMappedEnumMember, self).__init__(name, value, docstring)
-        self._xml_value = xml_value
-
-    def add_to_enum(self, clsdict):
-        """Compile XML mappings in addition to base add behavior."""
-        super(XmlMappedEnumMember, self).add_to_enum(clsdict)
-        self.register_xml_mapping(clsdict)
-
-    def register_xml_mapping(self, clsdict):
-        """Add XML mappings to the enumeration class state for this member."""
-        member_to_xml = self._get_or_add_member_to_xml(clsdict)
-        member_to_xml[self.value] = self.xml_value
-        xml_to_member = self._get_or_add_xml_to_member(clsdict)
-        xml_to_member[self.xml_value] = self.value
-
-    @property
-    def xml_value(self):
-        """The XML attribute value that corresponds to this enumeration value."""
-        return self._xml_value
-
-    @staticmethod
-    def _get_or_add_member_to_xml(clsdict):
-        """Add the enum -> xml value mapping to the enumeration class state."""
-        if "_member_to_xml" not in clsdict:
-            clsdict["_member_to_xml"] = {}
-        return clsdict["_member_to_xml"]
-
-    @staticmethod
-    def _get_or_add_xml_to_member(clsdict):
-        """Add the xml -> enum value mapping to the enumeration class state."""
-        if "_xml_to_member" not in clsdict:
-            clsdict["_xml_to_member"] = {}
-        return clsdict["_xml_to_member"]
diff --git a/src/docx/enum/dml.py b/src/docx/enum/dml.py
index 16237e70b..27c63a283 100644
--- a/src/docx/enum/dml.py
+++ b/src/docx/enum/dml.py
@@ -1,35 +1,33 @@
 """Enumerations used by DrawingML objects."""
 
-from .base import Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
+from .base import BaseEnum, BaseXmlEnum
 
 
-class MSO_COLOR_TYPE(Enumeration):
+class MSO_COLOR_TYPE(BaseEnum):
     """Specifies the color specification scheme.
 
     Example::
 
-    from docx.enum.dml import MSO_COLOR_TYPE
+        from docx.enum.dml import MSO_COLOR_TYPE
 
-    assert font.color.type == MSO_COLOR_TYPE.SCHEME
+        assert font.color.type == MSO_COLOR_TYPE.SCHEME
+
+    MS API name: `MsoColorType`
+
+    http://msdn.microsoft.com/en-us/library/office/ff864912(v=office.15).aspx
     """
 
-    __ms_name__ = "MsoColorType"
+    RGB = (1, "Color is specified by an |RGBColor| value.")
+    """Color is specified by an |RGBColor| value."""
 
-    __url__ = (
-        "http://msdn.microsoft.com/en-us/library/office/ff864912(v=office.15" ").aspx"
-    )
+    THEME = (2, "Color is one of the preset theme colors.")
+    """Color is one of the preset theme colors."""
 
-    __members__ = (
-        EnumMember("RGB", 1, "Color is specified by an |RGBColor| value."),
-        EnumMember("THEME", 2, "Color is one of the preset theme colors."),
-        EnumMember(
-            "AUTO", 101, "Color is determined automatically by the " "application."
-        ),
-    )
+    AUTO = (101, "Color is determined automatically by the application.")
+    """Color is determined automatically by the application."""
 
 
-@alias("MSO_THEME_COLOR")
-class MSO_THEME_COLOR_INDEX(XmlEnumeration):
+class MSO_THEME_COLOR_INDEX(BaseXmlEnum):
     """Indicates the Office theme color, one of those shown in the color gallery on the
     formatting ribbon.
 
@@ -37,69 +35,69 @@ class MSO_THEME_COLOR_INDEX(XmlEnumeration):
 
     Example::
 
-    from docx.enum.dml import MSO_THEME_COLOR
+        from docx.enum.dml import MSO_THEME_COLOR
+
+        font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
+
+    MS API name: `MsoThemeColorIndex`
 
-    font.color.theme_color = MSO_THEME_COLOR.ACCENT_1
+    http://msdn.microsoft.com/en-us/library/office/ff860782(v=office.15).aspx
     """
 
-    __ms_name__ = "MsoThemeColorIndex"
+    NOT_THEME_COLOR = (0, "UNMAPPED", "Indicates the color is not a theme color.")
+    """Indicates the color is not a theme color."""
 
-    __url__ = (
-        "http://msdn.microsoft.com/en-us/library/office/ff860782(v=office.15" ").aspx"
-    )
+    ACCENT_1 = (5, "accent1", "Specifies the Accent 1 theme color.")
+    """Specifies the Accent 1 theme color."""
+
+    ACCENT_2 = (6, "accent2", "Specifies the Accent 2 theme color.")
+    """Specifies the Accent 2 theme color."""
+
+    ACCENT_3 = (7, "accent3", "Specifies the Accent 3 theme color.")
+    """Specifies the Accent 3 theme color."""
+
+    ACCENT_4 = (8, "accent4", "Specifies the Accent 4 theme color.")
+    """Specifies the Accent 4 theme color."""
+
+    ACCENT_5 = (9, "accent5", "Specifies the Accent 5 theme color.")
+    """Specifies the Accent 5 theme color."""
+
+    ACCENT_6 = (10, "accent6", "Specifies the Accent 6 theme color.")
+    """Specifies the Accent 6 theme color."""
 
-    __members__ = (
-        EnumMember("NOT_THEME_COLOR", 0, "Indicates the color is not a theme color."),
-        XmlMappedEnumMember(
-            "ACCENT_1", 5, "accent1", "Specifies the Accent 1 theme color."
-        ),
-        XmlMappedEnumMember(
-            "ACCENT_2", 6, "accent2", "Specifies the Accent 2 theme color."
-        ),
-        XmlMappedEnumMember(
-            "ACCENT_3", 7, "accent3", "Specifies the Accent 3 theme color."
-        ),
-        XmlMappedEnumMember(
-            "ACCENT_4", 8, "accent4", "Specifies the Accent 4 theme color."
-        ),
-        XmlMappedEnumMember(
-            "ACCENT_5", 9, "accent5", "Specifies the Accent 5 theme color."
-        ),
-        XmlMappedEnumMember(
-            "ACCENT_6", 10, "accent6", "Specifies the Accent 6 theme color."
-        ),
-        XmlMappedEnumMember(
-            "BACKGROUND_1",
-            14,
-            "background1",
-            "Specifies the Background 1 " "theme color.",
-        ),
-        XmlMappedEnumMember(
-            "BACKGROUND_2",
-            16,
-            "background2",
-            "Specifies the Background 2 " "theme color.",
-        ),
-        XmlMappedEnumMember("DARK_1", 1, "dark1", "Specifies the Dark 1 theme color."),
-        XmlMappedEnumMember("DARK_2", 3, "dark2", "Specifies the Dark 2 theme color."),
-        XmlMappedEnumMember(
-            "FOLLOWED_HYPERLINK",
-            12,
-            "followedHyperlink",
-            "Specifies the " "theme color for a clicked hyperlink.",
-        ),
-        XmlMappedEnumMember(
-            "HYPERLINK",
-            11,
-            "hyperlink",
-            "Specifies the theme color for a " "hyperlink.",
-        ),
-        XmlMappedEnumMember(
-            "LIGHT_1", 2, "light1", "Specifies the Light 1 theme color."
-        ),
-        XmlMappedEnumMember(
-            "LIGHT_2", 4, "light2", "Specifies the Light 2 theme color."
-        ),
-        XmlMappedEnumMember("TEXT_1", 13, "text1", "Specifies the Text 1 theme color."),
-        XmlMappedEnumMember("TEXT_2", 15, "text2", "Specifies the Text 2 theme color."),
+    BACKGROUND_1 = (14, "background1", "Specifies the Background 1 theme color.")
+    """Specifies the Background 1 theme color."""
+
+    BACKGROUND_2 = (16, "background2", "Specifies the Background 2 theme color.")
+    """Specifies the Background 2 theme color."""
+
+    DARK_1 = (1, "dark1", "Specifies the Dark 1 theme color.")
+    """Specifies the Dark 1 theme color."""
+
+    DARK_2 = (3, "dark2", "Specifies the Dark 2 theme color.")
+    """Specifies the Dark 2 theme color."""
+
+    FOLLOWED_HYPERLINK = (
+        12,
+        "followedHyperlink",
+        "Specifies the theme color for a clicked hyperlink.",
     )
+    """Specifies the theme color for a clicked hyperlink."""
+
+    HYPERLINK = (11, "hyperlink", "Specifies the theme color for a hyperlink.")
+    """Specifies the theme color for a hyperlink."""
+
+    LIGHT_1 = (2, "light1", "Specifies the Light 1 theme color.")
+    """Specifies the Light 1 theme color."""
+
+    LIGHT_2 = (4, "light2", "Specifies the Light 2 theme color.")
+    """Specifies the Light 2 theme color."""
+
+    TEXT_1 = (13, "text1", "Specifies the Text 1 theme color.")
+    """Specifies the Text 1 theme color."""
+
+    TEXT_2 = (15, "text2", "Specifies the Text 2 theme color.")
+    """Specifies the Text 2 theme color."""
+
+
+MSO_THEME_COLOR = MSO_THEME_COLOR_INDEX
diff --git a/src/docx/enum/section.py b/src/docx/enum/section.py
index 583ceb999..982e19111 100644
--- a/src/docx/enum/section.py
+++ b/src/docx/enum/section.py
@@ -1,80 +1,86 @@
 """Enumerations related to the main document in WordprocessingML files."""
 
-from .base import XmlEnumeration, XmlMappedEnumMember, alias
+from .base import BaseXmlEnum
 
 
-@alias("WD_HEADER_FOOTER")
-class WD_HEADER_FOOTER_INDEX(XmlEnumeration):
+class WD_HEADER_FOOTER_INDEX(BaseXmlEnum):
     """Alias: **WD_HEADER_FOOTER**
 
     Specifies one of the three possible header/footer definitions for a section.
 
     For internal use only; not part of the python-docx API.
+
+    MS API name: `WdHeaderFooterIndex`
+    URL: https://docs.microsoft.com/en-us/office/vba/api/word.wdheaderfooterindex
     """
 
-    __ms_name__ = "WdHeaderFooterIndex"
+    PRIMARY = (1, "default", "Header for odd pages or all if no even header.")
+    """Header for odd pages or all if no even header."""
+
+    FIRST_PAGE = (2, "first", "Header for first page of section.")
+    """Header for first page of section."""
+
+    EVEN_PAGE = (3, "even", "Header for even pages of recto/verso section.")
+    """Header for even pages of recto/verso section."""
 
-    __url__ = "https://docs.microsoft.com/en-us/office/vba/api/word.wdheaderfooterindex"
 
-    __members__ = (
-        XmlMappedEnumMember(
-            "PRIMARY", 1, "default", "Header for odd pages or all if no even header."
-        ),
-        XmlMappedEnumMember(
-            "FIRST_PAGE", 2, "first", "Header for first page of section."
-        ),
-        XmlMappedEnumMember(
-            "EVEN_PAGE", 3, "even", "Header for even pages of recto/verso section."
-        ),
-    )
+WD_HEADER_FOOTER = WD_HEADER_FOOTER_INDEX
 
 
-@alias("WD_ORIENT")
-class WD_ORIENTATION(XmlEnumeration):
+class WD_ORIENTATION(BaseXmlEnum):
     """Alias: **WD_ORIENT**
 
     Specifies the page layout orientation.
 
     Example::
 
-    from docx.enum.section import WD_ORIENT
+        from docx.enum.section import WD_ORIENT
 
-    section = document.sections[-1] section.orientation = WD_ORIENT.LANDSCAPE
+        section = document.sections[-1] section.orientation = WD_ORIENT.LANDSCAPE
+
+    MS API name: `WdOrientation`
+    MS API URL: http://msdn.microsoft.com/en-us/library/office/ff837902.aspx
     """
 
-    __ms_name__ = "WdOrientation"
+    PORTRAIT = (0, "portrait", "Portrait orientation.")
+    """Portrait orientation."""
+
+    LANDSCAPE = (1, "landscape", "Landscape orientation.")
+    """Landscape orientation."""
 
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff837902.aspx"
 
-    __members__ = (
-        XmlMappedEnumMember("PORTRAIT", 0, "portrait", "Portrait orientation."),
-        XmlMappedEnumMember("LANDSCAPE", 1, "landscape", "Landscape orientation."),
-    )
+WD_ORIENT = WD_ORIENTATION
 
 
-@alias("WD_SECTION")
-class WD_SECTION_START(XmlEnumeration):
+class WD_SECTION_START(BaseXmlEnum):
     """Alias: **WD_SECTION**
 
     Specifies the start type of a section break.
 
     Example::
 
-    from docx.enum.section import WD_SECTION
+        from docx.enum.section import WD_SECTION
 
-    section = document.sections[0] section.start_type = WD_SECTION.NEW_PAGE
+        section = document.sections[0] section.start_type = WD_SECTION.NEW_PAGE
+
+    MS API name: `WdSectionStart`
+    MS API URL: http://msdn.microsoft.com/en-us/library/office/ff840975.aspx
     """
 
-    __ms_name__ = "WdSectionStart"
+    CONTINUOUS = (0, "continuous", "Continuous section break.")
+    """Continuous section break."""
+
+    NEW_COLUMN = (1, "nextColumn", "New column section break.")
+    """New column section break."""
+
+    NEW_PAGE = (2, "nextPage", "New page section break.")
+    """New page section break."""
+
+    EVEN_PAGE = (3, "evenPage", "Even pages section break.")
+    """Even pages section break."""
+
+    ODD_PAGE = (4, "oddPage", "Section begins on next odd page.")
+    """Section begins on next odd page."""
 
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff840975.aspx"
 
-    __members__ = (
-        XmlMappedEnumMember("CONTINUOUS", 0, "continuous", "Continuous section break."),
-        XmlMappedEnumMember("NEW_COLUMN", 1, "nextColumn", "New column section break."),
-        XmlMappedEnumMember("NEW_PAGE", 2, "nextPage", "New page section break."),
-        XmlMappedEnumMember("EVEN_PAGE", 3, "evenPage", "Even pages section break."),
-        XmlMappedEnumMember(
-            "ODD_PAGE", 4, "oddPage", "Section begins on next odd page."
-        ),
-    )
+WD_SECTION = WD_SECTION_START
diff --git a/src/docx/enum/shape.py b/src/docx/enum/shape.py
index 6b49ee8f0..ed086c38d 100644
--- a/src/docx/enum/shape.py
+++ b/src/docx/enum/shape.py
@@ -1,9 +1,13 @@
 """Enumerations related to DrawingML shapes in WordprocessingML files."""
 
+import enum
 
-class WD_INLINE_SHAPE_TYPE(object):
-    """Corresponds to WdInlineShapeType enumeration http://msdn.microsoft.com/en-
-    us/library/office/ff192587.aspx."""
+
+class WD_INLINE_SHAPE_TYPE(enum.Enum):
+    """Corresponds to WdInlineShapeType enumeration.
+
+    http://msdn.microsoft.com/en-us/library/office/ff192587.aspx.
+    """
 
     CHART = 12
     LINKED_PICTURE = 4
diff --git a/src/docx/enum/style.py b/src/docx/enum/style.py
index f7a8a16e0..d2474611d 100644
--- a/src/docx/enum/style.py
+++ b/src/docx/enum/style.py
@@ -1,182 +1,452 @@
 """Enumerations related to styles."""
 
-from .base import EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
+from .base import BaseEnum, BaseXmlEnum
 
 
-@alias("WD_STYLE")
-class WD_BUILTIN_STYLE(XmlEnumeration):
+class WD_BUILTIN_STYLE(BaseEnum):
     """Alias: **WD_STYLE**
 
     Specifies a built-in Microsoft Word style.
 
     Example::
 
-    from docx import Document from docx.enum.style import WD_STYLE
+        from docx import Document
+        from docx.enum.style import WD_STYLE
 
-    document = Document() styles = document.styles style = styles[WD_STYLE.BODY_TEXT]
+        document = Document()
+        styles = document.styles
+        style = styles[WD_STYLE.BODY_TEXT]
+
+
+    MS API name: `WdBuiltinStyle`
+
+    http://msdn.microsoft.com/en-us/library/office/ff835210.aspx
     """
 
-    __ms_name__ = "WdBuiltinStyle"
-
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff835210.aspx"
-
-    __members__ = (
-        EnumMember("BLOCK_QUOTATION", -85, "Block Text."),
-        EnumMember("BODY_TEXT", -67, "Body Text."),
-        EnumMember("BODY_TEXT_2", -81, "Body Text 2."),
-        EnumMember("BODY_TEXT_3", -82, "Body Text 3."),
-        EnumMember("BODY_TEXT_FIRST_INDENT", -78, "Body Text First Indent."),
-        EnumMember("BODY_TEXT_FIRST_INDENT_2", -79, "Body Text First Indent 2."),
-        EnumMember("BODY_TEXT_INDENT", -68, "Body Text Indent."),
-        EnumMember("BODY_TEXT_INDENT_2", -83, "Body Text Indent 2."),
-        EnumMember("BODY_TEXT_INDENT_3", -84, "Body Text Indent 3."),
-        EnumMember("BOOK_TITLE", -265, "Book Title."),
-        EnumMember("CAPTION", -35, "Caption."),
-        EnumMember("CLOSING", -64, "Closing."),
-        EnumMember("COMMENT_REFERENCE", -40, "Comment Reference."),
-        EnumMember("COMMENT_TEXT", -31, "Comment Text."),
-        EnumMember("DATE", -77, "Date."),
-        EnumMember("DEFAULT_PARAGRAPH_FONT", -66, "Default Paragraph Font."),
-        EnumMember("EMPHASIS", -89, "Emphasis."),
-        EnumMember("ENDNOTE_REFERENCE", -43, "Endnote Reference."),
-        EnumMember("ENDNOTE_TEXT", -44, "Endnote Text."),
-        EnumMember("ENVELOPE_ADDRESS", -37, "Envelope Address."),
-        EnumMember("ENVELOPE_RETURN", -38, "Envelope Return."),
-        EnumMember("FOOTER", -33, "Footer."),
-        EnumMember("FOOTNOTE_REFERENCE", -39, "Footnote Reference."),
-        EnumMember("FOOTNOTE_TEXT", -30, "Footnote Text."),
-        EnumMember("HEADER", -32, "Header."),
-        EnumMember("HEADING_1", -2, "Heading 1."),
-        EnumMember("HEADING_2", -3, "Heading 2."),
-        EnumMember("HEADING_3", -4, "Heading 3."),
-        EnumMember("HEADING_4", -5, "Heading 4."),
-        EnumMember("HEADING_5", -6, "Heading 5."),
-        EnumMember("HEADING_6", -7, "Heading 6."),
-        EnumMember("HEADING_7", -8, "Heading 7."),
-        EnumMember("HEADING_8", -9, "Heading 8."),
-        EnumMember("HEADING_9", -10, "Heading 9."),
-        EnumMember("HTML_ACRONYM", -96, "HTML Acronym."),
-        EnumMember("HTML_ADDRESS", -97, "HTML Address."),
-        EnumMember("HTML_CITE", -98, "HTML Cite."),
-        EnumMember("HTML_CODE", -99, "HTML Code."),
-        EnumMember("HTML_DFN", -100, "HTML Definition."),
-        EnumMember("HTML_KBD", -101, "HTML Keyboard."),
-        EnumMember("HTML_NORMAL", -95, "Normal (Web)."),
-        EnumMember("HTML_PRE", -102, "HTML Preformatted."),
-        EnumMember("HTML_SAMP", -103, "HTML Sample."),
-        EnumMember("HTML_TT", -104, "HTML Typewriter."),
-        EnumMember("HTML_VAR", -105, "HTML Variable."),
-        EnumMember("HYPERLINK", -86, "Hyperlink."),
-        EnumMember("HYPERLINK_FOLLOWED", -87, "Followed Hyperlink."),
-        EnumMember("INDEX_1", -11, "Index 1."),
-        EnumMember("INDEX_2", -12, "Index 2."),
-        EnumMember("INDEX_3", -13, "Index 3."),
-        EnumMember("INDEX_4", -14, "Index 4."),
-        EnumMember("INDEX_5", -15, "Index 5."),
-        EnumMember("INDEX_6", -16, "Index 6."),
-        EnumMember("INDEX_7", -17, "Index 7."),
-        EnumMember("INDEX_8", -18, "Index 8."),
-        EnumMember("INDEX_9", -19, "Index 9."),
-        EnumMember("INDEX_HEADING", -34, "Index Heading"),
-        EnumMember("INTENSE_EMPHASIS", -262, "Intense Emphasis."),
-        EnumMember("INTENSE_QUOTE", -182, "Intense Quote."),
-        EnumMember("INTENSE_REFERENCE", -264, "Intense Reference."),
-        EnumMember("LINE_NUMBER", -41, "Line Number."),
-        EnumMember("LIST", -48, "List."),
-        EnumMember("LIST_2", -51, "List 2."),
-        EnumMember("LIST_3", -52, "List 3."),
-        EnumMember("LIST_4", -53, "List 4."),
-        EnumMember("LIST_5", -54, "List 5."),
-        EnumMember("LIST_BULLET", -49, "List Bullet."),
-        EnumMember("LIST_BULLET_2", -55, "List Bullet 2."),
-        EnumMember("LIST_BULLET_3", -56, "List Bullet 3."),
-        EnumMember("LIST_BULLET_4", -57, "List Bullet 4."),
-        EnumMember("LIST_BULLET_5", -58, "List Bullet 5."),
-        EnumMember("LIST_CONTINUE", -69, "List Continue."),
-        EnumMember("LIST_CONTINUE_2", -70, "List Continue 2."),
-        EnumMember("LIST_CONTINUE_3", -71, "List Continue 3."),
-        EnumMember("LIST_CONTINUE_4", -72, "List Continue 4."),
-        EnumMember("LIST_CONTINUE_5", -73, "List Continue 5."),
-        EnumMember("LIST_NUMBER", -50, "List Number."),
-        EnumMember("LIST_NUMBER_2", -59, "List Number 2."),
-        EnumMember("LIST_NUMBER_3", -60, "List Number 3."),
-        EnumMember("LIST_NUMBER_4", -61, "List Number 4."),
-        EnumMember("LIST_NUMBER_5", -62, "List Number 5."),
-        EnumMember("LIST_PARAGRAPH", -180, "List Paragraph."),
-        EnumMember("MACRO_TEXT", -46, "Macro Text."),
-        EnumMember("MESSAGE_HEADER", -74, "Message Header."),
-        EnumMember("NAV_PANE", -90, "Document Map."),
-        EnumMember("NORMAL", -1, "Normal."),
-        EnumMember("NORMAL_INDENT", -29, "Normal Indent."),
-        EnumMember("NORMAL_OBJECT", -158, "Normal (applied to an object)."),
-        EnumMember("NORMAL_TABLE", -106, "Normal (applied within a table)."),
-        EnumMember("NOTE_HEADING", -80, "Note Heading."),
-        EnumMember("PAGE_NUMBER", -42, "Page Number."),
-        EnumMember("PLAIN_TEXT", -91, "Plain Text."),
-        EnumMember("QUOTE", -181, "Quote."),
-        EnumMember("SALUTATION", -76, "Salutation."),
-        EnumMember("SIGNATURE", -65, "Signature."),
-        EnumMember("STRONG", -88, "Strong."),
-        EnumMember("SUBTITLE", -75, "Subtitle."),
-        EnumMember("SUBTLE_EMPHASIS", -261, "Subtle Emphasis."),
-        EnumMember("SUBTLE_REFERENCE", -263, "Subtle Reference."),
-        EnumMember("TABLE_COLORFUL_GRID", -172, "Colorful Grid."),
-        EnumMember("TABLE_COLORFUL_LIST", -171, "Colorful List."),
-        EnumMember("TABLE_COLORFUL_SHADING", -170, "Colorful Shading."),
-        EnumMember("TABLE_DARK_LIST", -169, "Dark List."),
-        EnumMember("TABLE_LIGHT_GRID", -161, "Light Grid."),
-        EnumMember("TABLE_LIGHT_GRID_ACCENT_1", -175, "Light Grid Accent 1."),
-        EnumMember("TABLE_LIGHT_LIST", -160, "Light List."),
-        EnumMember("TABLE_LIGHT_LIST_ACCENT_1", -174, "Light List Accent 1."),
-        EnumMember("TABLE_LIGHT_SHADING", -159, "Light Shading."),
-        EnumMember("TABLE_LIGHT_SHADING_ACCENT_1", -173, "Light Shading Accent 1."),
-        EnumMember("TABLE_MEDIUM_GRID_1", -166, "Medium Grid 1."),
-        EnumMember("TABLE_MEDIUM_GRID_2", -167, "Medium Grid 2."),
-        EnumMember("TABLE_MEDIUM_GRID_3", -168, "Medium Grid 3."),
-        EnumMember("TABLE_MEDIUM_LIST_1", -164, "Medium List 1."),
-        EnumMember("TABLE_MEDIUM_LIST_1_ACCENT_1", -178, "Medium List 1 Accent 1."),
-        EnumMember("TABLE_MEDIUM_LIST_2", -165, "Medium List 2."),
-        EnumMember("TABLE_MEDIUM_SHADING_1", -162, "Medium Shading 1."),
-        EnumMember(
-            "TABLE_MEDIUM_SHADING_1_ACCENT_1", -176, "Medium Shading 1 Accent 1."
-        ),
-        EnumMember("TABLE_MEDIUM_SHADING_2", -163, "Medium Shading 2."),
-        EnumMember(
-            "TABLE_MEDIUM_SHADING_2_ACCENT_1", -177, "Medium Shading 2 Accent 1."
-        ),
-        EnumMember("TABLE_OF_AUTHORITIES", -45, "Table of Authorities."),
-        EnumMember("TABLE_OF_FIGURES", -36, "Table of Figures."),
-        EnumMember("TITLE", -63, "Title."),
-        EnumMember("TOAHEADING", -47, "TOA Heading."),
-        EnumMember("TOC_1", -20, "TOC 1."),
-        EnumMember("TOC_2", -21, "TOC 2."),
-        EnumMember("TOC_3", -22, "TOC 3."),
-        EnumMember("TOC_4", -23, "TOC 4."),
-        EnumMember("TOC_5", -24, "TOC 5."),
-        EnumMember("TOC_6", -25, "TOC 6."),
-        EnumMember("TOC_7", -26, "TOC 7."),
-        EnumMember("TOC_8", -27, "TOC 8."),
-        EnumMember("TOC_9", -28, "TOC 9."),
-    )
-
-
-class WD_STYLE_TYPE(XmlEnumeration):
+    BLOCK_QUOTATION = (-85, "Block Text.")
+    """Block Text."""
+
+    BODY_TEXT = (-67, "Body Text.")
+    """Body Text."""
+
+    BODY_TEXT_2 = (-81, "Body Text 2.")
+    """Body Text 2."""
+
+    BODY_TEXT_3 = (-82, "Body Text 3.")
+    """Body Text 3."""
+
+    BODY_TEXT_FIRST_INDENT = (-78, "Body Text First Indent.")
+    """Body Text First Indent."""
+
+    BODY_TEXT_FIRST_INDENT_2 = (-79, "Body Text First Indent 2.")
+    """Body Text First Indent 2."""
+
+    BODY_TEXT_INDENT = (-68, "Body Text Indent.")
+    """Body Text Indent."""
+
+    BODY_TEXT_INDENT_2 = (-83, "Body Text Indent 2.")
+    """Body Text Indent 2."""
+
+    BODY_TEXT_INDENT_3 = (-84, "Body Text Indent 3.")
+    """Body Text Indent 3."""
+
+    BOOK_TITLE = (-265, "Book Title.")
+    """Book Title."""
+
+    CAPTION = (-35, "Caption.")
+    """Caption."""
+
+    CLOSING = (-64, "Closing.")
+    """Closing."""
+
+    COMMENT_REFERENCE = (-40, "Comment Reference.")
+    """Comment Reference."""
+
+    COMMENT_TEXT = (-31, "Comment Text.")
+    """Comment Text."""
+
+    DATE = (-77, "Date.")
+    """Date."""
+
+    DEFAULT_PARAGRAPH_FONT = (-66, "Default Paragraph Font.")
+    """Default Paragraph Font."""
+
+    EMPHASIS = (-89, "Emphasis.")
+    """Emphasis."""
+
+    ENDNOTE_REFERENCE = (-43, "Endnote Reference.")
+    """Endnote Reference."""
+
+    ENDNOTE_TEXT = (-44, "Endnote Text.")
+    """Endnote Text."""
+
+    ENVELOPE_ADDRESS = (-37, "Envelope Address.")
+    """Envelope Address."""
+
+    ENVELOPE_RETURN = (-38, "Envelope Return.")
+    """Envelope Return."""
+
+    FOOTER = (-33, "Footer.")
+    """Footer."""
+
+    FOOTNOTE_REFERENCE = (-39, "Footnote Reference.")
+    """Footnote Reference."""
+
+    FOOTNOTE_TEXT = (-30, "Footnote Text.")
+    """Footnote Text."""
+
+    HEADER = (-32, "Header.")
+    """Header."""
+
+    HEADING_1 = (-2, "Heading 1.")
+    """Heading 1."""
+
+    HEADING_2 = (-3, "Heading 2.")
+    """Heading 2."""
+
+    HEADING_3 = (-4, "Heading 3.")
+    """Heading 3."""
+
+    HEADING_4 = (-5, "Heading 4.")
+    """Heading 4."""
+
+    HEADING_5 = (-6, "Heading 5.")
+    """Heading 5."""
+
+    HEADING_6 = (-7, "Heading 6.")
+    """Heading 6."""
+
+    HEADING_7 = (-8, "Heading 7.")
+    """Heading 7."""
+
+    HEADING_8 = (-9, "Heading 8.")
+    """Heading 8."""
+
+    HEADING_9 = (-10, "Heading 9.")
+    """Heading 9."""
+
+    HTML_ACRONYM = (-96, "HTML Acronym.")
+    """HTML Acronym."""
+
+    HTML_ADDRESS = (-97, "HTML Address.")
+    """HTML Address."""
+
+    HTML_CITE = (-98, "HTML Cite.")
+    """HTML Cite."""
+
+    HTML_CODE = (-99, "HTML Code.")
+    """HTML Code."""
+
+    HTML_DFN = (-100, "HTML Definition.")
+    """HTML Definition."""
+
+    HTML_KBD = (-101, "HTML Keyboard.")
+    """HTML Keyboard."""
+
+    HTML_NORMAL = (-95, "Normal (Web).")
+    """Normal (Web)."""
+
+    HTML_PRE = (-102, "HTML Preformatted.")
+    """HTML Preformatted."""
+
+    HTML_SAMP = (-103, "HTML Sample.")
+    """HTML Sample."""
+
+    HTML_TT = (-104, "HTML Typewriter.")
+    """HTML Typewriter."""
+
+    HTML_VAR = (-105, "HTML Variable.")
+    """HTML Variable."""
+
+    HYPERLINK = (-86, "Hyperlink.")
+    """Hyperlink."""
+
+    HYPERLINK_FOLLOWED = (-87, "Followed Hyperlink.")
+    """Followed Hyperlink."""
+
+    INDEX_1 = (-11, "Index 1.")
+    """Index 1."""
+
+    INDEX_2 = (-12, "Index 2.")
+    """Index 2."""
+
+    INDEX_3 = (-13, "Index 3.")
+    """Index 3."""
+
+    INDEX_4 = (-14, "Index 4.")
+    """Index 4."""
+
+    INDEX_5 = (-15, "Index 5.")
+    """Index 5."""
+
+    INDEX_6 = (-16, "Index 6.")
+    """Index 6."""
+
+    INDEX_7 = (-17, "Index 7.")
+    """Index 7."""
+
+    INDEX_8 = (-18, "Index 8.")
+    """Index 8."""
+
+    INDEX_9 = (-19, "Index 9.")
+    """Index 9."""
+
+    INDEX_HEADING = (-34, "Index Heading")
+    """Index Heading"""
+
+    INTENSE_EMPHASIS = (-262, "Intense Emphasis.")
+    """Intense Emphasis."""
+
+    INTENSE_QUOTE = (-182, "Intense Quote.")
+    """Intense Quote."""
+
+    INTENSE_REFERENCE = (-264, "Intense Reference.")
+    """Intense Reference."""
+
+    LINE_NUMBER = (-41, "Line Number.")
+    """Line Number."""
+
+    LIST = (-48, "List.")
+    """List."""
+
+    LIST_2 = (-51, "List 2.")
+    """List 2."""
+
+    LIST_3 = (-52, "List 3.")
+    """List 3."""
+
+    LIST_4 = (-53, "List 4.")
+    """List 4."""
+
+    LIST_5 = (-54, "List 5.")
+    """List 5."""
+
+    LIST_BULLET = (-49, "List Bullet.")
+    """List Bullet."""
+
+    LIST_BULLET_2 = (-55, "List Bullet 2.")
+    """List Bullet 2."""
+
+    LIST_BULLET_3 = (-56, "List Bullet 3.")
+    """List Bullet 3."""
+
+    LIST_BULLET_4 = (-57, "List Bullet 4.")
+    """List Bullet 4."""
+
+    LIST_BULLET_5 = (-58, "List Bullet 5.")
+    """List Bullet 5."""
+
+    LIST_CONTINUE = (-69, "List Continue.")
+    """List Continue."""
+
+    LIST_CONTINUE_2 = (-70, "List Continue 2.")
+    """List Continue 2."""
+
+    LIST_CONTINUE_3 = (-71, "List Continue 3.")
+    """List Continue 3."""
+
+    LIST_CONTINUE_4 = (-72, "List Continue 4.")
+    """List Continue 4."""
+
+    LIST_CONTINUE_5 = (-73, "List Continue 5.")
+    """List Continue 5."""
+
+    LIST_NUMBER = (-50, "List Number.")
+    """List Number."""
+
+    LIST_NUMBER_2 = (-59, "List Number 2.")
+    """List Number 2."""
+
+    LIST_NUMBER_3 = (-60, "List Number 3.")
+    """List Number 3."""
+
+    LIST_NUMBER_4 = (-61, "List Number 4.")
+    """List Number 4."""
+
+    LIST_NUMBER_5 = (-62, "List Number 5.")
+    """List Number 5."""
+
+    LIST_PARAGRAPH = (-180, "List Paragraph.")
+    """List Paragraph."""
+
+    MACRO_TEXT = (-46, "Macro Text.")
+    """Macro Text."""
+
+    MESSAGE_HEADER = (-74, "Message Header.")
+    """Message Header."""
+
+    NAV_PANE = (-90, "Document Map.")
+    """Document Map."""
+
+    NORMAL = (-1, "Normal.")
+    """Normal."""
+
+    NORMAL_INDENT = (-29, "Normal Indent.")
+    """Normal Indent."""
+
+    NORMAL_OBJECT = (-158, "Normal (applied to an object).")
+    """Normal (applied to an object)."""
+
+    NORMAL_TABLE = (-106, "Normal (applied within a table).")
+    """Normal (applied within a table)."""
+
+    NOTE_HEADING = (-80, "Note Heading.")
+    """Note Heading."""
+
+    PAGE_NUMBER = (-42, "Page Number.")
+    """Page Number."""
+
+    PLAIN_TEXT = (-91, "Plain Text.")
+    """Plain Text."""
+
+    QUOTE = (-181, "Quote.")
+    """Quote."""
+
+    SALUTATION = (-76, "Salutation.")
+    """Salutation."""
+
+    SIGNATURE = (-65, "Signature.")
+    """Signature."""
+
+    STRONG = (-88, "Strong.")
+    """Strong."""
+
+    SUBTITLE = (-75, "Subtitle.")
+    """Subtitle."""
+
+    SUBTLE_EMPHASIS = (-261, "Subtle Emphasis.")
+    """Subtle Emphasis."""
+
+    SUBTLE_REFERENCE = (-263, "Subtle Reference.")
+    """Subtle Reference."""
+
+    TABLE_COLORFUL_GRID = (-172, "Colorful Grid.")
+    """Colorful Grid."""
+
+    TABLE_COLORFUL_LIST = (-171, "Colorful List.")
+    """Colorful List."""
+
+    TABLE_COLORFUL_SHADING = (-170, "Colorful Shading.")
+    """Colorful Shading."""
+
+    TABLE_DARK_LIST = (-169, "Dark List.")
+    """Dark List."""
+
+    TABLE_LIGHT_GRID = (-161, "Light Grid.")
+    """Light Grid."""
+
+    TABLE_LIGHT_GRID_ACCENT_1 = (-175, "Light Grid Accent 1.")
+    """Light Grid Accent 1."""
+
+    TABLE_LIGHT_LIST = (-160, "Light List.")
+    """Light List."""
+
+    TABLE_LIGHT_LIST_ACCENT_1 = (-174, "Light List Accent 1.")
+    """Light List Accent 1."""
+
+    TABLE_LIGHT_SHADING = (-159, "Light Shading.")
+    """Light Shading."""
+
+    TABLE_LIGHT_SHADING_ACCENT_1 = (-173, "Light Shading Accent 1.")
+    """Light Shading Accent 1."""
+
+    TABLE_MEDIUM_GRID_1 = (-166, "Medium Grid 1.")
+    """Medium Grid 1."""
+
+    TABLE_MEDIUM_GRID_2 = (-167, "Medium Grid 2.")
+    """Medium Grid 2."""
+
+    TABLE_MEDIUM_GRID_3 = (-168, "Medium Grid 3.")
+    """Medium Grid 3."""
+
+    TABLE_MEDIUM_LIST_1 = (-164, "Medium List 1.")
+    """Medium List 1."""
+
+    TABLE_MEDIUM_LIST_1_ACCENT_1 = (-178, "Medium List 1 Accent 1.")
+    """Medium List 1 Accent 1."""
+
+    TABLE_MEDIUM_LIST_2 = (-165, "Medium List 2.")
+    """Medium List 2."""
+
+    TABLE_MEDIUM_SHADING_1 = (-162, "Medium Shading 1.")
+    """Medium Shading 1."""
+
+    TABLE_MEDIUM_SHADING_1_ACCENT_1 = (-176, "Medium Shading 1 Accent 1.")
+    """Medium Shading 1 Accent 1."""
+
+    TABLE_MEDIUM_SHADING_2 = (-163, "Medium Shading 2.")
+    """Medium Shading 2."""
+
+    TABLE_MEDIUM_SHADING_2_ACCENT_1 = (-177, "Medium Shading 2 Accent 1.")
+    """Medium Shading 2 Accent 1."""
+
+    TABLE_OF_AUTHORITIES = (-45, "Table of Authorities.")
+    """Table of Authorities."""
+
+    TABLE_OF_FIGURES = (-36, "Table of Figures.")
+    """Table of Figures."""
+
+    TITLE = (-63, "Title.")
+    """Title."""
+
+    TOAHEADING = (-47, "TOA Heading.")
+    """TOA Heading."""
+
+    TOC_1 = (-20, "TOC 1.")
+    """TOC 1."""
+
+    TOC_2 = (-21, "TOC 2.")
+    """TOC 2."""
+
+    TOC_3 = (-22, "TOC 3.")
+    """TOC 3."""
+
+    TOC_4 = (-23, "TOC 4.")
+    """TOC 4."""
+
+    TOC_5 = (-24, "TOC 5.")
+    """TOC 5."""
+
+    TOC_6 = (-25, "TOC 6.")
+    """TOC 6."""
+
+    TOC_7 = (-26, "TOC 7.")
+    """TOC 7."""
+
+    TOC_8 = (-27, "TOC 8.")
+    """TOC 8."""
+
+    TOC_9 = (-28, "TOC 9.")
+    """TOC 9."""
+
+
+WD_STYLE = WD_BUILTIN_STYLE
+
+
+class WD_STYLE_TYPE(BaseXmlEnum):
     """Specifies one of the four style types: paragraph, character, list, or table.
 
     Example::
 
-    from docx import Document from docx.enum.style import WD_STYLE_TYPE
+        from docx import Document
+        from docx.enum.style import WD_STYLE_TYPE
+
+        styles = Document().styles
+        assert styles[0].type == WD_STYLE_TYPE.PARAGRAPH
 
-    styles = Document().styles assert styles[0].type == WD_STYLE_TYPE.PARAGRAPH
+    MS API name: `WdStyleType`
+
+    http://msdn.microsoft.com/en-us/library/office/ff196870.aspx
     """
 
-    __ms_name__ = "WdStyleType"
+    CHARACTER = (2, "character", "Character style.")
+    """Character style."""
+
+    LIST = (4, "numbering", "List style.")
+    """List style."""
 
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff196870.aspx"
+    PARAGRAPH = (1, "paragraph", "Paragraph style.")
+    """Paragraph style."""
 
-    __members__ = (
-        XmlMappedEnumMember("CHARACTER", 2, "character", "Character style."),
-        XmlMappedEnumMember("LIST", 4, "numbering", "List style."),
-        XmlMappedEnumMember("PARAGRAPH", 1, "paragraph", "Paragraph style."),
-        XmlMappedEnumMember("TABLE", 3, "table", "Table style."),
-    )
+    TABLE = (3, "table", "Table style.")
+    """Table style."""
diff --git a/src/docx/enum/table.py b/src/docx/enum/table.py
index be8fe7050..eb1eb9dc0 100644
--- a/src/docx/enum/table.py
+++ b/src/docx/enum/table.py
@@ -1,135 +1,136 @@
 """Enumerations related to tables in WordprocessingML files."""
 
-from .base import Enumeration, EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
+from docx.enum.base import BaseEnum, BaseXmlEnum
 
 
-@alias("WD_ALIGN_VERTICAL")
-class WD_CELL_VERTICAL_ALIGNMENT(XmlEnumeration):
+class WD_CELL_VERTICAL_ALIGNMENT(BaseXmlEnum):
     """Alias: **WD_ALIGN_VERTICAL**
 
     Specifies the vertical alignment of text in one or more cells of a table.
 
     Example::
 
-    from docx.enum.table import WD_ALIGN_VERTICAL
+        from docx.enum.table import WD_ALIGN_VERTICAL
 
-    table = document.add_table(3, 3) table.cell(0, 0).vertical_alignment =
-    WD_ALIGN_VERTICAL.BOTTOM
+        table = document.add_table(3, 3)
+        table.cell(0, 0).vertical_alignment = WD_ALIGN_VERTICAL.BOTTOM
+
+    MS API name: `WdCellVerticalAlignment`
+
+    https://msdn.microsoft.com/en-us/library/office/ff193345.aspx
     """
 
-    __ms_name__ = "WdCellVerticalAlignment"
-
-    __url__ = "https://msdn.microsoft.com/en-us/library/office/ff193345.aspx"
-
-    __members__ = (
-        XmlMappedEnumMember(
-            "TOP", 0, "top", "Text is aligned to the top border of the cell."
-        ),
-        XmlMappedEnumMember(
-            "CENTER", 1, "center", "Text is aligned to the center of the cel" "l."
-        ),
-        XmlMappedEnumMember(
-            "BOTTOM",
-            3,
-            "bottom",
-            "Text is aligned to the bottom border of " "the cell.",
-        ),
-        XmlMappedEnumMember(
-            "BOTH",
-            101,
-            "both",
-            "This is an option in the OpenXml spec, but"
-            " not in Word itself. It's not clear what Word behavior this se"
-            "tting produces. If you find out please let us know and we'll u"
-            "pdate this documentation. Otherwise, probably best to avoid thi"
-            "s option.",
-        ),
+    TOP = (0, "top", "Text is aligned to the top border of the cell.")
+    """Text is aligned to the top border of the cell."""
+
+    CENTER = (1, "center", "Text is aligned to the center of the cell.")
+    """Text is aligned to the center of the cell."""
+
+    BOTTOM = (3, "bottom", "Text is aligned to the bottom border of the cell.")
+    """Text is aligned to the bottom border of the cell."""
+
+    BOTH = (
+        101,
+        "both",
+        "This is an option in the OpenXml spec, but not in Word itself. It's not"
+        " clear what Word behavior this setting produces. If you find out please"
+        " let us know and we'll update this documentation. Otherwise, probably best"
+        " to avoid this option.",
     )
+    """This is an option in the OpenXml spec, but not in Word itself.
 
+    It's not clear what Word behavior this setting produces. If you find out please let
+    us know and we'll update this documentation. Otherwise, probably best to avoid this
+    option.
+    """
 
-@alias("WD_ROW_HEIGHT")
-class WD_ROW_HEIGHT_RULE(XmlEnumeration):
+
+WD_ALIGN_VERTICAL = WD_CELL_VERTICAL_ALIGNMENT
+
+
+class WD_ROW_HEIGHT_RULE(BaseXmlEnum):
     """Alias: **WD_ROW_HEIGHT**
 
     Specifies the rule for determining the height of a table row
 
     Example::
 
-    from docx.enum.table import WD_ROW_HEIGHT_RULE
+        from docx.enum.table import WD_ROW_HEIGHT_RULE
+
+        table = document.add_table(3, 3)
+        table.rows[0].height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+
+    MS API name: `WdRowHeightRule`
 
-    table = document.add_table(3, 3) table.rows[0].height_rule =
-    WD_ROW_HEIGHT_RULE.EXACTLY
+    https://msdn.microsoft.com/en-us/library/office/ff193620.aspx
     """
 
-    __ms_name__ = "WdRowHeightRule"
-
-    __url__ = "https://msdn.microsoft.com/en-us/library/office/ff193620.aspx"
-
-    __members__ = (
-        XmlMappedEnumMember(
-            "AUTO",
-            0,
-            "auto",
-            "The row height is adjusted to accommodate th"
-            "e tallest value in the row.",
-        ),
-        XmlMappedEnumMember(
-            "AT_LEAST",
-            1,
-            "atLeast",
-            "The row height is at least a minimum " "specified value.",
-        ),
-        XmlMappedEnumMember("EXACTLY", 2, "exact", "The row height is an exact value."),
+    AUTO = (
+        0,
+        "auto",
+        "The row height is adjusted to accommodate the tallest value in the row.",
     )
+    """The row height is adjusted to accommodate the tallest value in the row."""
 
+    AT_LEAST = (1, "atLeast", "The row height is at least a minimum specified value.")
+    """The row height is at least a minimum specified value."""
 
-class WD_TABLE_ALIGNMENT(XmlEnumeration):
+    EXACTLY = (2, "exact", "The row height is an exact value.")
+    """The row height is an exact value."""
+
+
+WD_ROW_HEIGHT = WD_ROW_HEIGHT_RULE
+
+
+class WD_TABLE_ALIGNMENT(BaseXmlEnum):
     """Specifies table justification type.
 
     Example::
 
-    from docx.enum.table import WD_TABLE_ALIGNMENT
+        from docx.enum.table import WD_TABLE_ALIGNMENT
+
+        table = document.add_table(3, 3)
+        table.alignment = WD_TABLE_ALIGNMENT.CENTER
+
+    MS API name: `WdRowAlignment`
 
-    table = document.add_table(3, 3) table.alignment = WD_TABLE_ALIGNMENT.CENTER
+    http://office.microsoft.com/en-us/word-help/HV080607259.aspx
     """
 
-    __ms_name__ = "WdRowAlignment"
+    LEFT = (0, "left", "Left-aligned")
+    """Left-aligned"""
 
-    __url__ = " http://office.microsoft.com/en-us/word-help/HV080607259.aspx"
+    CENTER = (1, "center", "Center-aligned.")
+    """Center-aligned."""
 
-    __members__ = (
-        XmlMappedEnumMember("LEFT", 0, "left", "Left-aligned"),
-        XmlMappedEnumMember("CENTER", 1, "center", "Center-aligned."),
-        XmlMappedEnumMember("RIGHT", 2, "right", "Right-aligned."),
-    )
+    RIGHT = (2, "right", "Right-aligned.")
+    """Right-aligned."""
 
 
-class WD_TABLE_DIRECTION(Enumeration):
+class WD_TABLE_DIRECTION(BaseEnum):
     """Specifies the direction in which an application orders cells in the specified
     table or row.
 
     Example::
 
-    from docx.enum.table import WD_TABLE_DIRECTION
+        from docx.enum.table import WD_TABLE_DIRECTION
+
+        table = document.add_table(3, 3)
+        table.direction = WD_TABLE_DIRECTION.RTL
+
+    MS API name: `WdTableDirection`
 
-    table = document.add_table(3, 3) table.direction = WD_TABLE_DIRECTION.RTL
+    http://msdn.microsoft.com/en-us/library/ff835141.aspx
     """
 
-    __ms_name__ = "WdTableDirection"
-
-    __url__ = " http://msdn.microsoft.com/en-us/library/ff835141.aspx"
-
-    __members__ = (
-        EnumMember(
-            "LTR",
-            0,
-            "The table or row is arranged with the first column "
-            "in the leftmost position.",
-        ),
-        EnumMember(
-            "RTL",
-            1,
-            "The table or row is arranged with the first column "
-            "in the rightmost position.",
-        ),
+    LTR = (
+        0,
+        "The table or row is arranged with the first column in the leftmost position.",
+    )
+    """The table or row is arranged with the first column in the leftmost position."""
+
+    RTL = (
+        1,
+        "The table or row is arranged with the first column in the rightmost position.",
     )
+    """The table or row is arranged with the first column in the rightmost position."""
diff --git a/src/docx/enum/text.py b/src/docx/enum/text.py
index 2c9d25e37..99e776fea 100644
--- a/src/docx/enum/text.py
+++ b/src/docx/enum/text.py
@@ -1,79 +1,83 @@
 """Enumerations related to text in WordprocessingML files."""
 
+from __future__ import annotations
+
 import enum
-from typing import ClassVar
 
-from docx.enum.base import EnumMember, XmlEnumeration, XmlMappedEnumMember, alias
+from docx.enum.base import BaseXmlEnum
 
 
-@alias("WD_ALIGN_PARAGRAPH")
-class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
+class WD_PARAGRAPH_ALIGNMENT(BaseXmlEnum):
     """Alias: **WD_ALIGN_PARAGRAPH**
 
     Specifies paragraph justification type.
 
     Example::
 
-    from docx.enum.text import WD_ALIGN_PARAGRAPH
+        from docx.enum.text import WD_ALIGN_PARAGRAPH
 
-    paragraph = document.add_paragraph() paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
+        paragraph = document.add_paragraph()
+        paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
     """
 
-    __ms_name__ = "WdParagraphAlignment"
-
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff835817.aspx"
-
-    __members__ = (
-        XmlMappedEnumMember("LEFT", 0, "left", "Left-aligned"),
-        XmlMappedEnumMember("CENTER", 1, "center", "Center-aligned."),
-        XmlMappedEnumMember("RIGHT", 2, "right", "Right-aligned."),
-        XmlMappedEnumMember("JUSTIFY", 3, "both", "Fully justified."),
-        XmlMappedEnumMember(
-            "DISTRIBUTE",
-            4,
-            "distribute",
-            "Paragraph characters are distrib"
-            "uted to fill the entire width of the paragraph.",
-        ),
-        XmlMappedEnumMember(
-            "JUSTIFY_MED",
-            5,
-            "mediumKashida",
-            "Justified with a medium character compression ratio.",
-        ),
-        XmlMappedEnumMember(
-            "JUSTIFY_HI",
-            7,
-            "highKashida",
-            "Justified with a high character compression ratio.",
-        ),
-        XmlMappedEnumMember(
-            "JUSTIFY_LOW",
-            8,
-            "lowKashida",
-            "Justified with a low character compression ratio.",
-        ),
-        XmlMappedEnumMember(
-            "THAI_JUSTIFY",
-            9,
-            "thaiDistribute",
-            "Justified according to Thai formatting layout.",
-        ),
+    LEFT = (0, "left", "Left-aligned")
+    """Left-aligned"""
+
+    CENTER = (1, "center", "Center-aligned.")
+    """Center-aligned."""
+
+    RIGHT = (2, "right", "Right-aligned.")
+    """Right-aligned."""
+
+    JUSTIFY = (3, "both", "Fully justified.")
+    """Fully justified."""
+
+    DISTRIBUTE = (
+        4,
+        "distribute",
+        "Paragraph characters are distributed to fill entire width of paragraph.",
+    )
+    """Paragraph characters are distributed to fill entire width of paragraph."""
+
+    JUSTIFY_MED = (
+        5,
+        "mediumKashida",
+        "Justified with a medium character compression ratio.",
+    )
+    """Justified with a medium character compression ratio."""
+
+    JUSTIFY_HI = (
+        7,
+        "highKashida",
+        "Justified with a high character compression ratio.",
+    )
+    """Justified with a high character compression ratio."""
+
+    JUSTIFY_LOW = (8, "lowKashida", "Justified with a low character compression ratio.")
+    """Justified with a low character compression ratio."""
+
+    THAI_JUSTIFY = (
+        9,
+        "thaiDistribute",
+        "Justified according to Thai formatting layout.",
     )
+    """Justified according to Thai formatting layout."""
 
 
 WD_ALIGN_PARAGRAPH = WD_PARAGRAPH_ALIGNMENT
 
 
-class WD_BREAK_TYPE(object):
-    """Corresponds to WdBreakType enumeration http://msdn.microsoft.com/en-
-    us/library/office/ff195905.aspx."""
+class WD_BREAK_TYPE(enum.Enum):
+    """Corresponds to WdBreakType enumeration.
+
+    http://msdn.microsoft.com/en-us/library/office/ff195905.aspx.
+    """
 
     COLUMN = 8
     LINE = 6
     LINE_CLEAR_LEFT = 9
     LINE_CLEAR_RIGHT = 10
-    LINE_CLEAR_ALL = 11  # added for consistency, not in MS version
+    LINE_CLEAR_ALL = 11  # -- added for consistency, not in MS version --
     PAGE = 7
     SECTION_CONTINUOUS = 3
     SECTION_EVEN_PAGE = 4
@@ -85,186 +89,279 @@ class WD_BREAK_TYPE(object):
 WD_BREAK = WD_BREAK_TYPE
 
 
-@alias("WD_COLOR")
-class WD_COLOR_INDEX(XmlEnumeration):
+class WD_COLOR_INDEX(BaseXmlEnum):
     """Specifies a standard preset color to apply.
 
     Used for font highlighting and perhaps other applications.
+
+    * MS API name: `WdColorIndex`
+    * URL: https://msdn.microsoft.com/EN-US/library/office/ff195343.aspx
     """
 
-    __ms_name__ = "WdColorIndex"
-
-    __url__ = "https://msdn.microsoft.com/EN-US/library/office/ff195343.aspx"
-
-    __members__ = (
-        XmlMappedEnumMember(
-            None, None, None, "Color is inherited from the style hierarchy."
-        ),
-        XmlMappedEnumMember(
-            "AUTO", 0, "default", "Automatic color. Default; usually black."
-        ),
-        XmlMappedEnumMember("BLACK", 1, "black", "Black color."),
-        XmlMappedEnumMember("BLUE", 2, "blue", "Blue color"),
-        XmlMappedEnumMember("BRIGHT_GREEN", 4, "green", "Bright green color."),
-        XmlMappedEnumMember("DARK_BLUE", 9, "darkBlue", "Dark blue color."),
-        XmlMappedEnumMember("DARK_RED", 13, "darkRed", "Dark red color."),
-        XmlMappedEnumMember("DARK_YELLOW", 14, "darkYellow", "Dark yellow color."),
-        XmlMappedEnumMember("GRAY_25", 16, "lightGray", "25% shade of gray color."),
-        XmlMappedEnumMember("GRAY_50", 15, "darkGray", "50% shade of gray color."),
-        XmlMappedEnumMember("GREEN", 11, "darkGreen", "Green color."),
-        XmlMappedEnumMember("PINK", 5, "magenta", "Pink color."),
-        XmlMappedEnumMember("RED", 6, "red", "Red color."),
-        XmlMappedEnumMember("TEAL", 10, "darkCyan", "Teal color."),
-        XmlMappedEnumMember("TURQUOISE", 3, "cyan", "Turquoise color."),
-        XmlMappedEnumMember("VIOLET", 12, "darkMagenta", "Violet color."),
-        XmlMappedEnumMember("WHITE", 8, "white", "White color."),
-        XmlMappedEnumMember("YELLOW", 7, "yellow", "Yellow color."),
-    )
+    INHERITED = (-1, None, "Color is inherited from the style hierarchy.")
+    """Color is inherited from the style hierarchy."""
+
+    AUTO = (0, "default", "Automatic color. Default; usually black.")
+    """Automatic color. Default; usually black."""
+
+    BLACK = (1, "black", "Black color.")
+    """Black color."""
+
+    BLUE = (2, "blue", "Blue color")
+    """Blue color"""
+
+    BRIGHT_GREEN = (4, "green", "Bright green color.")
+    """Bright green color."""
+
+    DARK_BLUE = (9, "darkBlue", "Dark blue color.")
+    """Dark blue color."""
+
+    DARK_RED = (13, "darkRed", "Dark red color.")
+    """Dark red color."""
 
+    DARK_YELLOW = (14, "darkYellow", "Dark yellow color.")
+    """Dark yellow color."""
 
-class WD_LINE_SPACING(XmlEnumeration):
+    GRAY_25 = (16, "lightGray", "25% shade of gray color.")
+    """25% shade of gray color."""
+
+    GRAY_50 = (15, "darkGray", "50% shade of gray color.")
+    """50% shade of gray color."""
+
+    GREEN = (11, "darkGreen", "Green color.")
+    """Green color."""
+
+    PINK = (5, "magenta", "Pink color.")
+    """Pink color."""
+
+    RED = (6, "red", "Red color.")
+    """Red color."""
+
+    TEAL = (10, "darkCyan", "Teal color.")
+    """Teal color."""
+
+    TURQUOISE = (3, "cyan", "Turquoise color.")
+    """Turquoise color."""
+
+    VIOLET = (12, "darkMagenta", "Violet color.")
+    """Violet color."""
+
+    WHITE = (8, "white", "White color.")
+    """White color."""
+
+    YELLOW = (7, "yellow", "Yellow color.")
+    """Yellow color."""
+
+
+WD_COLOR = WD_COLOR_INDEX
+
+
+class WD_LINE_SPACING(BaseXmlEnum):
     """Specifies a line spacing format to be applied to a paragraph.
 
     Example::
 
-    from docx.enum.text import WD_LINE_SPACING
+        from docx.enum.text import WD_LINE_SPACING
+
+        paragraph = document.add_paragraph()
+        paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
 
-    paragraph = document.add_paragraph() paragraph.line_spacing_rule =
-    WD_LINE_SPACING.EXACTLY
+
+    MS API name: `WdLineSpacing`
+
+    URL: http://msdn.microsoft.com/en-us/library/office/ff844910.aspx
     """
 
-    __ms_name__ = "WdLineSpacing"
-
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff844910.aspx"
-
-    __members__ = (
-        EnumMember("ONE_POINT_FIVE", 1, "Space-and-a-half line spacing."),
-        XmlMappedEnumMember(
-            "AT_LEAST",
-            3,
-            "atLeast",
-            "Line spacing is always at least the s"
-            "pecified amount. The amount is specified separately.",
-        ),
-        EnumMember("DOUBLE", 2, "Double spaced."),
-        XmlMappedEnumMember(
-            "EXACTLY",
-            4,
-            "exact",
-            "Line spacing is exactly the specified am"
-            "ount. The amount is specified separately.",
-        ),
-        XmlMappedEnumMember(
-            "MULTIPLE",
-            5,
-            "auto",
-            "Line spacing is specified as a multiple "
-            "of line heights. Changing the font size will change the line sp"
-            "acing proportionately.",
-        ),
-        EnumMember("SINGLE", 0, "Single spaced (default)."),
-    )
+    SINGLE = (0, "UNMAPPED", "Single spaced (default).")
+    """Single spaced (default)."""
 
+    ONE_POINT_FIVE = (1, "UNMAPPED", "Space-and-a-half line spacing.")
+    """Space-and-a-half line spacing."""
 
-class WD_TAB_ALIGNMENT(XmlEnumeration):
-    """Specifies the tab stop alignment to apply."""
+    DOUBLE = (2, "UNMAPPED", "Double spaced.")
+    """Double spaced."""
 
-    __ms_name__ = "WdTabAlignment"
+    AT_LEAST = (
+        3,
+        "atLeast",
+        "Minimum line spacing is specified amount. Amount is specified separately.",
+    )
+    """Minimum line spacing is specified amount. Amount is specified separately."""
 
-    __url__ = "https://msdn.microsoft.com/EN-US/library/office/ff195609.aspx"
+    EXACTLY = (
+        4,
+        "exact",
+        "Line spacing is exactly specified amount. Amount is specified separately.",
+    )
+    """Line spacing is exactly specified amount. Amount is specified separately."""
 
-    __members__ = (
-        XmlMappedEnumMember("LEFT", 0, "left", "Left-aligned."),
-        XmlMappedEnumMember("CENTER", 1, "center", "Center-aligned."),
-        XmlMappedEnumMember("RIGHT", 2, "right", "Right-aligned."),
-        XmlMappedEnumMember("DECIMAL", 3, "decimal", "Decimal-aligned."),
-        XmlMappedEnumMember("BAR", 4, "bar", "Bar-aligned."),
-        XmlMappedEnumMember("LIST", 6, "list", "List-aligned. (deprecated)"),
-        XmlMappedEnumMember("CLEAR", 101, "clear", "Clear an inherited tab stop."),
-        XmlMappedEnumMember("END", 102, "end", "Right-aligned.  (deprecated)"),
-        XmlMappedEnumMember("NUM", 103, "num", "Left-aligned.  (deprecated)"),
-        XmlMappedEnumMember("START", 104, "start", "Left-aligned.  (deprecated)"),
+    MULTIPLE = (
+        5,
+        "auto",
+        "Line spacing is specified as multiple of line heights. Changing font size"
+        " will change line spacing proportionately.",
     )
+    """Line spacing is specified as multiple of line heights. Changing font size will
+       change the line spacing proportionately."""
+
 
+class WD_TAB_ALIGNMENT(BaseXmlEnum):
+    """Specifies the tab stop alignment to apply.
 
-class WD_TAB_LEADER(XmlEnumeration):
-    """Specifies the character to use as the leader with formatted tabs."""
+    MS API name: `WdTabAlignment`
+
+    URL: https://msdn.microsoft.com/EN-US/library/office/ff195609.aspx
+    """
 
-    SPACES: ClassVar[enum.Enum]
+    LEFT = (0, "left", "Left-aligned.")
+    """Left-aligned."""
 
-    __ms_name__ = "WdTabLeader"
+    CENTER = (1, "center", "Center-aligned.")
+    """Center-aligned."""
 
-    __url__ = "https://msdn.microsoft.com/en-us/library/office/ff845050.aspx"
+    RIGHT = (2, "right", "Right-aligned.")
+    """Right-aligned."""
 
-    __members__ = (
-        XmlMappedEnumMember("SPACES", 0, "none", "Spaces. Default."),
-        XmlMappedEnumMember("DOTS", 1, "dot", "Dots."),
-        XmlMappedEnumMember("DASHES", 2, "hyphen", "Dashes."),
-        XmlMappedEnumMember("LINES", 3, "underscore", "Double lines."),
-        XmlMappedEnumMember("HEAVY", 4, "heavy", "A heavy line."),
-        XmlMappedEnumMember("MIDDLE_DOT", 5, "middleDot", "A vertically-centered dot."),
+    DECIMAL = (3, "decimal", "Decimal-aligned.")
+    """Decimal-aligned."""
+
+    BAR = (4, "bar", "Bar-aligned.")
+    """Bar-aligned."""
+
+    LIST = (6, "list", "List-aligned. (deprecated)")
+    """List-aligned. (deprecated)"""
+
+    CLEAR = (101, "clear", "Clear an inherited tab stop.")
+    """Clear an inherited tab stop."""
+
+    END = (102, "end", "Right-aligned.  (deprecated)")
+    """Right-aligned.  (deprecated)"""
+
+    NUM = (103, "num", "Left-aligned.  (deprecated)")
+    """Left-aligned.  (deprecated)"""
+
+    START = (104, "start", "Left-aligned.  (deprecated)")
+    """Left-aligned.  (deprecated)"""
+
+
+class WD_TAB_LEADER(BaseXmlEnum):
+    """Specifies the character to use as the leader with formatted tabs.
+
+    MS API name: `WdTabLeader`
+
+    URL: https://msdn.microsoft.com/en-us/library/office/ff845050.aspx
+    """
+
+    SPACES = (0, "none", "Spaces. Default.")
+    """Spaces. Default."""
+
+    DOTS = (1, "dot", "Dots.")
+    """Dots."""
+
+    DASHES = (2, "hyphen", "Dashes.")
+    """Dashes."""
+
+    LINES = (3, "underscore", "Double lines.")
+    """Double lines."""
+
+    HEAVY = (4, "heavy", "A heavy line.")
+    """A heavy line."""
+
+    MIDDLE_DOT = (5, "middleDot", "A vertically-centered dot.")
+    """A vertically-centered dot."""
+
+
+class WD_UNDERLINE(BaseXmlEnum):
+    """Specifies the style of underline applied to a run of characters.
+
+    MS API name: `WdUnderline`
+
+    URL: http://msdn.microsoft.com/en-us/library/office/ff822388.aspx
+    """
+
+    INHERITED = (-1, None, "Inherit underline setting from containing paragraph.")
+    """Inherit underline setting from containing paragraph."""
+
+    NONE = (
+        0,
+        "none",
+        "No underline.\n\nThis setting overrides any inherited underline value, so can"
+        " be used to remove underline from a run that inherits underlining from its"
+        " containing paragraph. Note this is not the same as assigning |None| to"
+        " Run.underline. |None| is a valid assignment value, but causes the run to"
+        " inherit its underline value. Assigning `WD_UNDERLINE.NONE` causes"
+        " underlining to be unconditionally turned off.",
     )
+    """No underline.
 
+    This setting overrides any inherited underline value, so can be used to remove
+    underline from a run that inherits underlining from its containing paragraph. Note
+    this is not the same as assigning |None| to Run.underline. |None| is a valid
+    assignment value, but causes the run to inherit its underline value. Assigning
+    ``WD_UNDERLINE.NONE`` causes underlining to be unconditionally turned off.
+    """
 
-class WD_UNDERLINE(XmlEnumeration):
-    """Specifies the style of underline applied to a run of characters."""
-
-    __ms_name__ = "WdUnderline"
-
-    __url__ = "http://msdn.microsoft.com/en-us/library/office/ff822388.aspx"
-
-    __members__ = (
-        XmlMappedEnumMember(
-            None, None, None, "Inherit underline setting from containing par" "agraph."
-        ),
-        XmlMappedEnumMember(
-            "NONE",
-            0,
-            "none",
-            "No underline. This setting overrides any inh"
-            "erited underline value, so can be used to remove underline from"
-            " a run that inherits underlining from its containing paragraph."
-            " Note this is not the same as assigning |None| to Run.underline"
-            ". |None| is a valid assignment value, but causes the run to inh"
-            "erit its underline value. Assigning ``WD_UNDERLINE.NONE`` cause"
-            "s underlining to be unconditionally turned off.",
-        ),
-        XmlMappedEnumMember(
-            "SINGLE",
-            1,
-            "single",
-            "A single line. Note that this setting is"
-            "write-only in the sense that |True| (rather than ``WD_UNDERLINE"
-            ".SINGLE``) is returned for a run having this setting.",
-        ),
-        XmlMappedEnumMember("WORDS", 2, "words", "Underline individual words only."),
-        XmlMappedEnumMember("DOUBLE", 3, "double", "A double line."),
-        XmlMappedEnumMember("DOTTED", 4, "dotted", "Dots."),
-        XmlMappedEnumMember("THICK", 6, "thick", "A single thick line."),
-        XmlMappedEnumMember("DASH", 7, "dash", "Dashes."),
-        XmlMappedEnumMember("DOT_DASH", 9, "dotDash", "Alternating dots and dashes."),
-        XmlMappedEnumMember(
-            "DOT_DOT_DASH", 10, "dotDotDash", "An alternating dot-dot-dash p" "attern."
-        ),
-        XmlMappedEnumMember("WAVY", 11, "wave", "A single wavy line."),
-        XmlMappedEnumMember("DOTTED_HEAVY", 20, "dottedHeavy", "Heavy dots."),
-        XmlMappedEnumMember("DASH_HEAVY", 23, "dashedHeavy", "Heavy dashes."),
-        XmlMappedEnumMember(
-            "DOT_DASH_HEAVY",
-            25,
-            "dashDotHeavy",
-            "Alternating heavy dots an" "d heavy dashes.",
-        ),
-        XmlMappedEnumMember(
-            "DOT_DOT_DASH_HEAVY",
-            26,
-            "dashDotDotHeavy",
-            "An alternating hea" "vy dot-dot-dash pattern.",
-        ),
-        XmlMappedEnumMember("WAVY_HEAVY", 27, "wavyHeavy", "A heavy wavy line."),
-        XmlMappedEnumMember("DASH_LONG", 39, "dashLong", "Long dashes."),
-        XmlMappedEnumMember("WAVY_DOUBLE", 43, "wavyDouble", "A double wavy line."),
-        XmlMappedEnumMember(
-            "DASH_LONG_HEAVY", 55, "dashLongHeavy", "Long heavy dashes."
-        ),
+    SINGLE = (
+        1,
+        "single",
+        "A single line.\n\nNote that this setting is write-only in the sense that"
+        " |True| (rather than `WD_UNDERLINE.SINGLE`) is returned for a run having"
+        " this setting.",
     )
+    """A single line.
+
+    Note that this setting is write-only in the sense that |True|
+    (rather than ``WD_UNDERLINE.SINGLE``) is returned for a run having this setting.
+    """
+
+    WORDS = (2, "words", "Underline individual words only.")
+    """Underline individual words only."""
+
+    DOUBLE = (3, "double", "A double line.")
+    """A double line."""
+
+    DOTTED = (4, "dotted", "Dots.")
+    """Dots."""
+
+    THICK = (6, "thick", "A single thick line.")
+    """A single thick line."""
+
+    DASH = (7, "dash", "Dashes.")
+    """Dashes."""
+
+    DOT_DASH = (9, "dotDash", "Alternating dots and dashes.")
+    """Alternating dots and dashes."""
+
+    DOT_DOT_DASH = (10, "dotDotDash", "An alternating dot-dot-dash pattern.")
+    """An alternating dot-dot-dash pattern."""
+
+    WAVY = (11, "wave", "A single wavy line.")
+    """A single wavy line."""
+
+    DOTTED_HEAVY = (20, "dottedHeavy", "Heavy dots.")
+    """Heavy dots."""
+
+    DASH_HEAVY = (23, "dashedHeavy", "Heavy dashes.")
+    """Heavy dashes."""
+
+    DOT_DASH_HEAVY = (25, "dashDotHeavy", "Alternating heavy dots and heavy dashes.")
+    """Alternating heavy dots and heavy dashes."""
+
+    DOT_DOT_DASH_HEAVY = (
+        26,
+        "dashDotDotHeavy",
+        "An alternating heavy dot-dot-dash pattern.",
+    )
+    """An alternating heavy dot-dot-dash pattern."""
+
+    WAVY_HEAVY = (27, "wavyHeavy", "A heavy wavy line.")
+    """A heavy wavy line."""
+
+    DASH_LONG = (39, "dashLong", "Long dashes.")
+    """Long dashes."""
+
+    WAVY_DOUBLE = (43, "wavyDouble", "A double wavy line.")
+    """A double wavy line."""
+
+    DASH_LONG_HEAVY = (55, "dashLongHeavy", "Long heavy dashes.")
+    """Long heavy dashes."""
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index 75d80eeb1..2937880ba 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -1,6 +1,9 @@
 """Section-related custom element classes."""
 
+from __future__ import annotations
+
 from copy import deepcopy
+from typing import TYPE_CHECKING
 
 from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION_START
 from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure, XsdString
@@ -12,6 +15,9 @@
     ZeroOrOne,
 )
 
+if TYPE_CHECKING:
+    from docx.shared import Length
+
 
 class CT_HdrFtr(BaseOxmlElement):
     """`w:hdr` and `w:ftr`, the root element for header and footer part respectively."""
@@ -78,7 +84,9 @@ class CT_SectPr(BaseOxmlElement):
     footerReference = ZeroOrMore("w:footerReference", successors=_tag_seq)
     type = ZeroOrOne("w:type", successors=_tag_seq[3:])
     pgSz = ZeroOrOne("w:pgSz", successors=_tag_seq[4:])
-    pgMar = ZeroOrOne("w:pgMar", successors=_tag_seq[5:])
+    pgMar: CT_PageMar | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:pgMar", successors=_tag_seq[5:]
+    )
     titlePg = ZeroOrOne("w:titlePg", successors=_tag_seq[14:])
     del _tag_seq
 
@@ -103,10 +111,11 @@ def add_headerReference(self, type_, rId):
         return headerReference
 
     @property
-    def bottom_margin(self):
-        """The value of the ``w:bottom`` attribute in the ``<w:pgMar>`` child element,
-        as a |Length| object, or |None| if either the element or the attribute is not
-        present."""
+    def bottom_margin(self) -> Length | None:
+        """Value of the `w:bottom` attr of `<w:pgMar>` child element, as |Length|.
+
+        |None| when either the element or the attribute is not present.
+        """
         pgMar = self.pgMar
         if pgMar is None:
             return None
@@ -160,7 +169,7 @@ def get_headerReference(self, type_):
         return matching_headerReferences[0]
 
     @property
-    def gutter(self):
+    def gutter(self) -> Length | None:
         """The value of the ``w:gutter`` attribute in the ``<w:pgMar>`` child element,
         as a |Length| object, or |None| if either the element or the attribute is not
         present."""
@@ -175,7 +184,7 @@ def gutter(self, value):
         pgMar.gutter = value
 
     @property
-    def header(self):
+    def header(self) -> Length | None:
         """The value of the ``w:header`` attribute in the ``<w:pgMar>`` child element,
         as a |Length| object, or |None| if either the element or the attribute is not
         present."""
@@ -190,7 +199,7 @@ def header(self, value):
         pgMar.header = value
 
     @property
-    def left_margin(self):
+    def left_margin(self) -> Length | None:
         """The value of the ``w:left`` attribute in the ``<w:pgMar>`` child element, as
         a |Length| object, or |None| if either the element or the attribute is not
         present."""
@@ -302,7 +311,7 @@ def start_type(self, value):
         type.val = value
 
     @property
-    def titlePg_val(self):
+    def titlePg_val(self) -> bool:
         """Value of `w:titlePg/@val` or |None| if not present."""
         titlePg = self.titlePg
         if titlePg is None:
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 5d5050a82..0e97ce965 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Callable, Dict, List, Tuple
+from typing import Any, Callable, Dict, List, Tuple, Type, TypeVar
 
 from lxml import etree
 from lxml.etree import ElementBase
@@ -80,14 +80,19 @@ def _parse_line(cls, line):
         return front, attrs, close, text
 
 
+_T = TypeVar("_T")
+
+
 class MetaOxmlElement(type):
     """Metaclass for BaseOxmlElement."""
 
-    def __new__(cls, clsname: str, bases: Tuple[type, ...], clsdict: Dict[str, Any]):
+    def __new__(
+        cls: Type[_T],clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]
+    ) -> _T:
         bases = (*bases, etree.ElementBase)
-        return super().__new__(cls, clsname, bases, clsdict)
+        return super().__new__(cls, clsname, bases, namespace)
 
-    def __init__(cls, clsname: str, bases: Tuple[type, ...], clsdict: Dict[str, Any]):
+    def __init__(cls, clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]):
         dispatchable = (
             OneAndOnlyOne,
             OneOrMore,
@@ -97,7 +102,7 @@ def __init__(cls, clsname: str, bases: Tuple[type, ...], clsdict: Dict[str, Any]
             ZeroOrOne,
             ZeroOrOneChoice,
         )
-        for key, value in clsdict.items():
+        for key, value in namespace.items():
             if isinstance(value, dispatchable):
                 value.populate_class_members(cls, key)
 
@@ -665,9 +670,7 @@ def xml(self) -> str:
         """
         return serialize_for_reading(self)
 
-    def xpath(  # pyright: ignore[reportIncompatibleMethodOverride]
-        self, xpath_str: str
-    ) -> Any:
+    def xpath(self, xpath_str: str) -> Any:
         """Override of `lxml` _Element.xpath() method.
 
         Provides standard Open XML namespace mapping (`nsmap`) in centralized location.
diff --git a/src/docx/section.py b/src/docx/section.py
index ccae91975..61bdbb2f1 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -1,37 +1,17 @@
 """The |Section| object and related proxy classes."""
 
-from collections.abc import Sequence
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Sequence
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_HEADER_FOOTER
 from docx.shared import lazyproperty
 
-
-class Sections(Sequence):
-    """Sequence of |Section| objects corresponding to the sections in the document.
-
-    Supports ``len()``, iteration, and indexed access.
-    """
-
-    def __init__(self, document_elm, document_part):
-        super(Sections, self).__init__()
-        self._document_elm = document_elm
-        self._document_part = document_part
-
-    def __getitem__(self, key):
-        if isinstance(key, slice):
-            return [
-                Section(sectPr, self._document_part)
-                for sectPr in self._document_elm.sectPr_lst[key]
-            ]
-        return Section(self._document_elm.sectPr_lst[key], self._document_part)
-
-    def __iter__(self):
-        for sectPr in self._document_elm.sectPr_lst:
-            yield Section(sectPr, self._document_part)
-
-    def __len__(self):
-        return len(self._document_elm.sectPr_lst)
+if TYPE_CHECKING:
+    from docx.oxml.section import CT_SectPr
+    from docx.parts.document import DocumentPart
+    from docx.shared import Length
 
 
 class Section(object):
@@ -40,23 +20,26 @@ class Section(object):
     Also provides access to headers and footers.
     """
 
-    def __init__(self, sectPr, document_part):
+    def __init__(self, sectPr: CT_SectPr, document_part: DocumentPart):
         super(Section, self).__init__()
         self._sectPr = sectPr
         self._document_part = document_part
 
     @property
-    def bottom_margin(self):
-        """|Length| object representing the bottom margin for all pages in this section
-        in English Metric Units."""
+    def bottom_margin(self) -> Length | None:
+        """Read/write. Bottom margin for pages in this section, in EMU.
+
+        `None` when no bottom margin has been specified. Assigning |None| removes any
+        bottom-margin setting.
+        """
         return self._sectPr.bottom_margin
 
     @bottom_margin.setter
-    def bottom_margin(self, value):
+    def bottom_margin(self, value: int | Length | None):
         self._sectPr.bottom_margin = value
 
     @property
-    def different_first_page_header_footer(self):
+    def different_first_page_header_footer(self) -> bool:
         """True if this section displays a distinct first-page header and footer.
 
         Read/write. The definition of the first-page header and footer are accessed
@@ -65,7 +48,7 @@ def different_first_page_header_footer(self):
         return self._sectPr.titlePg_val
 
     @different_first_page_header_footer.setter
-    def different_first_page_header_footer(self, value):
+    def different_first_page_header_footer(self, value: bool):
         self._sectPr.titlePg_val = value
 
     @property
@@ -114,30 +97,32 @@ def footer(self):
         return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.PRIMARY)
 
     @property
-    def footer_distance(self):
-        """|Length| object representing the distance from the bottom edge of the page to
-        the bottom edge of the footer.
+    def footer_distance(self) -> Length | None:
+        """Distance from bottom edge of page to bottom edge of the footer.
 
-        |None| if no setting is present in the XML.
+        Read/write. |None| if no setting is present in the XML.
         """
         return self._sectPr.footer
 
     @footer_distance.setter
-    def footer_distance(self, value):
+    def footer_distance(self, value: int | Length | None):
         self._sectPr.footer = value
 
     @property
-    def gutter(self):
-        """|Length| object representing the page gutter size in English Metric Units for
-        all pages in this section.
+    def gutter(self) -> Length | None:
+        """|Length| object representing page gutter size in English Metric Units.
+
+        Read/write. The page gutter is extra spacing added to the `inner` margin to
+        ensure even margins after page binding. Generally only used in book-bound
+        documents with double-sided and facing pages.
+
+        This setting applies to all pages in this section.
 
-        The page gutter is extra spacing added to the `inner` margin to ensure even
-        margins after page binding.
         """
         return self._sectPr.gutter
 
     @gutter.setter
-    def gutter(self, value):
+    def gutter(self, value: int | Length | None):
         self._sectPr.gutter = value
 
     @lazyproperty
@@ -150,7 +135,7 @@ def header(self):
         return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.PRIMARY)
 
     @property
-    def header_distance(self):
+    def header_distance(self) -> Length | None:
         """|Length| object representing the distance from the top edge of the page to
         the top edge of the header.
 
@@ -159,17 +144,17 @@ def header_distance(self):
         return self._sectPr.header
 
     @header_distance.setter
-    def header_distance(self, value):
+    def header_distance(self, value: int | Length | None):
         self._sectPr.header = value
 
     @property
-    def left_margin(self):
+    def left_margin(self) -> Length | None:
         """|Length| object representing the left margin for all pages in this section in
         English Metric Units."""
         return self._sectPr.left_margin
 
     @left_margin.setter
-    def left_margin(self, value):
+    def left_margin(self, value: int | Length | None):
         self._sectPr.left_margin = value
 
     @property
@@ -184,9 +169,10 @@ def orientation(self, value):
         self._sectPr.orientation = value
 
     @property
-    def page_height(self):
-        """Total page height used for this section, inclusive of all edge spacing values
-        such as margins.
+    def page_height(self) -> Length | None:
+        """Total page height used for this section.
+
+        This value is inclusive of all edge spacing values such as margins.
 
         Page orientation is taken into account, so for example, its expected value would
         be ``Inches(8.5)`` for letter-sized paper when orientation is landscape.
@@ -243,6 +229,33 @@ def top_margin(self, value):
         self._sectPr.top_margin = value
 
 
+class Sections(Sequence[Section]):
+    """Sequence of |Section| objects corresponding to the sections in the document.
+
+    Supports ``len()``, iteration, and indexed access.
+    """
+
+    def __init__(self, document_elm, document_part):
+        super(Sections, self).__init__()
+        self._document_elm = document_elm
+        self._document_part = document_part
+
+    def __getitem__(self, key):
+        if isinstance(key, slice):
+            return [
+                Section(sectPr, self._document_part)
+                for sectPr in self._document_elm.sectPr_lst[key]
+            ]
+        return Section(self._document_elm.sectPr_lst[key], self._document_part)
+
+    def __iter__(self):
+        for sectPr in self._document_elm.sectPr_lst:
+            yield Section(sectPr, self._document_part)
+
+    def __len__(self):
+        return len(self._document_elm.sectPr_lst)
+
+
 class _BaseHeaderFooter(BlockItemContainer):
     """Base class for header and footer classes."""
 
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index 7a15eb7c1..c7c514d40 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -1,7 +1,8 @@
 """Font-related proxy objects."""
 
-from ..dml.color import ColorFormat
-from ..shared import ElementProxy
+from docx.dml.color import ColorFormat
+from docx.enum.text import WD_UNDERLINE
+from docx.shared import ElementProxy
 
 
 class Font(ElementProxy):
@@ -359,7 +360,8 @@ def underline(self):
         rPr = self._element.rPr
         if rPr is None:
             return None
-        return rPr.u_val
+        val = rPr.u_val
+        return None if val == WD_UNDERLINE.INHERITED else val
 
     @underline.setter
     def underline(self, value):
diff --git a/tests/test_enum.py b/tests/test_enum.py
index 51f95f2d8..1b8a14f5b 100644
--- a/tests/test_enum.py
+++ b/tests/test_enum.py
@@ -5,94 +5,90 @@
 assertions on those.
 """
 
+import enum
+
 import pytest
 
-from docx.enum.base import (
-    Enumeration,
-    EnumMember,
-    ReturnValueOnlyEnumMember,
-    XmlEnumeration,
-    XmlMappedEnumMember,
-    alias,
-)
+from docx.enum.base import BaseXmlEnum
+
+
+class SomeXmlAttr(BaseXmlEnum):
+    """SomeXmlAttr docstring."""
+
+    FOO = (1, "foo", "Do foo instead of bar.")
+    """Do foo instead of bar."""
 
+    BAR = (2, "bar", "Do bar instead of foo.")
+    """Do bar instead of foo."""
 
-@alias("BARFOO")
-class FOOBAR(Enumeration):
-    """
-    Enumeration docstring
-    """
+    BAZ = (3, None, "Maps to the value assumed when the attribute is omitted.")
+    """Maps to the value assumed when the attribute is omitted."""
 
-    __ms_name__ = "MsoFoobar"
 
-    __url__ = "http://msdn.microsoft.com/foobar.aspx"
+class DescribeBaseXmlEnum:
+    """Unit-test suite for `docx.enum.base.BaseXmlEnum`."""
 
-    __members__ = (
-        EnumMember(None, None, "No setting/remove setting"),
-        EnumMember("READ_WRITE", 1, "Readable and settable"),
-        ReturnValueOnlyEnumMember("READ_ONLY", -2, "Return value only"),
-    )
+    def it_is_an_instance_of_EnumMeta_just_like_a_regular_Enum(self):
+        assert type(SomeXmlAttr) is enum.EnumMeta
 
+    def it_has_the_same_repr_as_a_regular_Enum(self):
+        assert repr(SomeXmlAttr) == "<enum 'SomeXmlAttr'>"
 
-@alias("XML-FU")
-class XMLFOO(XmlEnumeration):
-    """
-    XmlEnumeration docstring
-    """
+    def it_has_an_MRO_that_goes_through_the_base_class_int_and_Enum(self):
+        assert SomeXmlAttr.__mro__ == (
+            SomeXmlAttr,
+            BaseXmlEnum,
+            int,
+            enum.Enum,
+            object,
+        ), f"got: {SomeXmlAttr.__mro__}"
 
-    __ms_name__ = "MsoXmlFoobar"
+    def it_knows_the_XML_value_for_each_member_by_the_member_instance(self):
+        assert SomeXmlAttr.to_xml(SomeXmlAttr.FOO) == "foo"
 
-    __url__ = "http://msdn.microsoft.com/msoxmlfoobar.aspx"
+    def it_knows_the_XML_value_for_each_member_by_the_member_value(self):
+        assert SomeXmlAttr.to_xml(2) == "bar"
 
-    __members__ = (
-        XmlMappedEnumMember(None, None, None, "No setting"),
-        XmlMappedEnumMember("XML_RW", 42, "attrVal", "Read/write setting"),
-        ReturnValueOnlyEnumMember("RO", -2, "Return value only;"),
-    )
+    def but_it_raises_when_there_is_no_such_member(self):
+        with pytest.raises(ValueError, match="42 is not a valid SomeXmlAttr"):
+            SomeXmlAttr.to_xml(42)
 
+    def it_can_find_the_member_from_the_XML_attr_value(self):
+        assert SomeXmlAttr.from_xml("bar") == SomeXmlAttr.BAR
 
-class DescribeEnumeration(object):
-    def it_has_the_right_metaclass(self):
-        assert type(FOOBAR).__name__ == "MetaEnumeration"
+    def and_it_can_find_the_member_from_None_when_a_member_maps_that(self):
+        assert SomeXmlAttr.from_xml(None) == SomeXmlAttr.BAZ
 
-    def it_provides_an_EnumValue_instance_for_each_named_member(self):
-        with pytest.raises(AttributeError):
-            getattr(FOOBAR, "None")
-        for obj in (FOOBAR.READ_WRITE, FOOBAR.READ_ONLY):
-            assert type(obj).__name__ == "EnumValue"
+    def but_it_raises_when_there_is_no_such_mapped_XML_value(self):
+        with pytest.raises(
+            ValueError, match="SomeXmlAttr has no XML mapping for 'baz'"
+        ):
+            SomeXmlAttr.from_xml("baz")
 
-    def it_provides_the_enumeration_value_for_each_named_member(self):
-        assert FOOBAR.READ_WRITE == 1
-        assert FOOBAR.READ_ONLY == -2
 
-    def it_knows_if_a_setting_is_valid(self):
-        FOOBAR.validate(None)
-        FOOBAR.validate(FOOBAR.READ_WRITE)
-        with pytest.raises(ValueError, match="foobar not a member of FOOBAR enumerat"):
-            FOOBAR.validate("foobar")
-        with pytest.raises(ValueError, match=r"READ_ONLY \(-2\) not a member of FOOB"):
-            FOOBAR.validate(FOOBAR.READ_ONLY)
+class DescribeBaseXmlEnumMembers:
+    """Unit-test suite for `docx.enum.base.BaseXmlEnum`."""
 
-    def it_can_be_referred_to_by_a_convenience_alias_if_defined(self):
-        assert BARFOO is FOOBAR  # noqa
+    def it_is_an_instance_of_its_XmlEnum_subtype_class(self):
+        assert type(SomeXmlAttr.FOO) is SomeXmlAttr
 
+    def it_has_the_default_Enum_repr(self):
+        assert repr(SomeXmlAttr.BAR) == "<SomeXmlAttr.BAR: 2>"
 
-class DescribeEnumValue(object):
-    def it_provides_its_symbolic_name_as_its_string_value(self):
-        assert ("%s" % FOOBAR.READ_WRITE) == "READ_WRITE (1)"
+    def but_its_str_value_is_customized(self):
+        assert str(SomeXmlAttr.FOO) == "FOO (1)"
 
-    def it_provides_its_description_as_its_docstring(self):
-        assert FOOBAR.READ_ONLY.__doc__ == "Return value only"
+    def its_value_is_the_same_int_as_its_corresponding_MS_API_enum_member(self):
+        assert SomeXmlAttr.FOO.value == 1
 
+    def its_name_is_its_member_name_the_same_as_a_regular_Enum(self):
+        assert SomeXmlAttr.FOO.name == "FOO"
 
-class DescribeXmlEnumeration(object):
-    def it_knows_the_XML_value_for_each_of_its_xml_members(self):
-        assert XMLFOO.to_xml(XMLFOO.XML_RW) == "attrVal"
-        assert XMLFOO.to_xml(42) == "attrVal"
-        with pytest.raises(ValueError, match=r"value 'RO \(-2\)' not in enumeration "):
-            XMLFOO.to_xml(XMLFOO.RO)
+    def it_has_an_individual_member_specific_docstring(self):
+        assert SomeXmlAttr.FOO.__doc__ == "Do foo instead of bar."
 
-    def it_can_map_each_of_its_xml_members_from_the_XML_value(self):
-        assert XMLFOO.from_xml(None) is None
-        assert XMLFOO.from_xml("attrVal") == XMLFOO.XML_RW
-        assert str(XMLFOO.from_xml("attrVal")) == "XML_RW (42)"
+    def it_is_equivalent_to_its_int_value(self):
+        assert SomeXmlAttr.FOO == 1
+        assert SomeXmlAttr.FOO != 2
+        assert SomeXmlAttr.BAR == 2
+        assert SomeXmlAttr.BAR != 1
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 6705595a0..3ab71f482 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -101,7 +101,7 @@ def it_can_change_its_underline_type(self, underline_set_fixture):
 
     def it_raises_on_assign_invalid_underline_type(self, underline_raise_fixture):
         run, underline = underline_raise_fixture
-        with pytest.raises(ValueError, match="' not in enumeration WD_UNDERLINE"):
+        with pytest.raises(ValueError, match=" is not a valid WD_UNDERLINE"):
             run.underline = underline
 
     def it_provides_access_to_its_font(self, font_fixture):

From 58c24536fed3461e7cf52b828c18dd2316122c7a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 7 Oct 2023 23:37:56 -0700
Subject: [PATCH 285/367] rfctr: Section type-checks clean

---
 docs/user/sections.rst     |  17 +-
 pyproject.toml             |   2 +-
 src/docx/opc/part.py       |   2 +-
 src/docx/oxml/section.py   | 213 +++++++----
 src/docx/oxml/shared.py    |  11 +-
 src/docx/oxml/text/font.py |  39 +-
 src/docx/oxml/xmlchemy.py  |   4 +-
 src/docx/parts/document.py |   6 +-
 src/docx/section.py        | 121 ++++---
 src/docx/text/font.py      |  11 +-
 src/docx/text/run.py       |   2 +-
 tests/test_section.py      | 724 +++++++++++++++++++------------------
 tests/text/test_font.py    |  34 +-
 tests/text/test_run.py     |  16 +-
 14 files changed, 669 insertions(+), 533 deletions(-)

diff --git a/docs/user/sections.rst b/docs/user/sections.rst
index 502ea584a..895021874 100644
--- a/docs/user/sections.rst
+++ b/docs/user/sections.rst
@@ -3,15 +3,14 @@
 Working with Sections
 =====================
 
-Word supports the notion of a `section`, a division of a document having the
-same page layout settings, such as margins and page orientation. This is how,
-for example, a document can contain some pages in portrait layout and others in
-landscape.
-
-Most Word documents have only the single section that comes by default and
-further, most of those have no reason to change the default margins or other
-page layout. But when you `do` need to change the page layout, you'll need
-to understand sections to get it done.
+Word supports the notion of a `section`, a division of a document having the same page
+layout settings, such as margins and page orientation. This is how, for example, a
+document can contain some pages in portrait layout and others in landscape. Each section
+also defines the headers and footers that apply to the pages of that section.
+
+Most Word documents have only the single section that comes by default and further, most
+of those have no reason to change the default margins or other page layout. But when you
+`do` need to change the page layout, you'll need to understand sections to get it done.
 
 
 Accessing sections
diff --git a/pyproject.toml b/pyproject.toml
index 1722272e1..dc9884a9b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,7 +53,7 @@ norecursedirs = [
 ]
 python_files = ["test_*.py"]
 python_classes = ["Test", "Describe"]
-python_functions = ["it_", "they_", "and_it_", "but_it_"]
+python_functions = ["it_", "its_", "they_", "and_", "but_"]
 
 [tool.ruff]
 exclude = []
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index e8cf4a3d3..655ea5fa7 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -55,7 +55,7 @@ def content_type(self):
         """Content type of this part."""
         return self._content_type
 
-    def drop_rel(self, rId):
+    def drop_rel(self, rId: str):
         """Remove the relationship identified by `rId` if its reference count is less
         than 2.
 
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index 2937880ba..394033e18 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -3,9 +3,10 @@
 from __future__ import annotations
 
 from copy import deepcopy
-from typing import TYPE_CHECKING
+from typing import Callable
 
 from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION_START
+from docx.oxml.shared import CT_OnOff
 from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure, XsdString
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
@@ -14,9 +15,7 @@
     ZeroOrMore,
     ZeroOrOne,
 )
-
-if TYPE_CHECKING:
-    from docx.shared import Length
+from docx.shared import Length
 
 
 class CT_HdrFtr(BaseOxmlElement):
@@ -29,35 +28,70 @@ class CT_HdrFtr(BaseOxmlElement):
 class CT_HdrFtrRef(BaseOxmlElement):
     """`w:headerReference` and `w:footerReference` elements."""
 
-    type_ = RequiredAttribute("w:type", WD_HEADER_FOOTER)
-    rId = RequiredAttribute("r:id", XsdString)
+    type_: WD_HEADER_FOOTER = (
+        RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+            "w:type", WD_HEADER_FOOTER
+        )
+    )
+    rId: str = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "r:id", XsdString
+    )
 
 
 class CT_PageMar(BaseOxmlElement):
     """``<w:pgMar>`` element, defining page margins."""
 
-    top = OptionalAttribute("w:top", ST_SignedTwipsMeasure)
-    right = OptionalAttribute("w:right", ST_TwipsMeasure)
-    bottom = OptionalAttribute("w:bottom", ST_SignedTwipsMeasure)
-    left = OptionalAttribute("w:left", ST_TwipsMeasure)
-    header = OptionalAttribute("w:header", ST_TwipsMeasure)
-    footer = OptionalAttribute("w:footer", ST_TwipsMeasure)
-    gutter = OptionalAttribute("w:gutter", ST_TwipsMeasure)
+    top: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:top", ST_SignedTwipsMeasure
+    )
+    right: Length | None = OptionalAttribute(  # pyright: ignore
+        "w:right", ST_TwipsMeasure
+    )
+    bottom: Length | None = OptionalAttribute(  # pyright: ignore
+        "w:bottom", ST_SignedTwipsMeasure
+    )
+    left: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:left", ST_TwipsMeasure
+    )
+    header: Length | None = OptionalAttribute(  # pyright: ignore
+        "w:header", ST_TwipsMeasure
+    )
+    footer: Length | None = OptionalAttribute(  # pyright: ignore
+        "w:footer", ST_TwipsMeasure
+    )
+    gutter: Length | None = OptionalAttribute(  # pyright: ignore
+        "w:gutter", ST_TwipsMeasure
+    )
 
 
 class CT_PageSz(BaseOxmlElement):
     """``<w:pgSz>`` element, defining page dimensions and orientation."""
 
-    w = OptionalAttribute("w:w", ST_TwipsMeasure)
-    h = OptionalAttribute("w:h", ST_TwipsMeasure)
-    orient = OptionalAttribute(
-        "w:orient", WD_ORIENTATION, default=WD_ORIENTATION.PORTRAIT
+    w: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:w", ST_TwipsMeasure
+    )
+    h: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:h", ST_TwipsMeasure
+    )
+    orient: WD_ORIENTATION = (
+        OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+            "w:orient", WD_ORIENTATION, default=WD_ORIENTATION.PORTRAIT
+        )
     )
 
 
 class CT_SectPr(BaseOxmlElement):
     """`w:sectPr` element, the container element for section properties."""
 
+    get_or_add_pgMar: Callable[[], CT_PageMar]
+    get_or_add_pgSz: Callable[[], CT_PageSz]
+    get_or_add_titlePg: Callable[[], CT_OnOff]
+    get_or_add_type: Callable[[], CT_SectType]
+    _add_footerReference: Callable[[], CT_HdrFtrRef]
+    _add_headerReference: Callable[[], CT_HdrFtrRef]
+    _remove_titlePg: Callable[[], None]
+    _remove_type: Callable[[], None]
+
     _tag_seq = (
         "w:footnotePr",
         "w:endnotePr",
@@ -82,15 +116,21 @@ class CT_SectPr(BaseOxmlElement):
     )
     headerReference = ZeroOrMore("w:headerReference", successors=_tag_seq)
     footerReference = ZeroOrMore("w:footerReference", successors=_tag_seq)
-    type = ZeroOrOne("w:type", successors=_tag_seq[3:])
-    pgSz = ZeroOrOne("w:pgSz", successors=_tag_seq[4:])
+    type: CT_SectType | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:type", successors=_tag_seq[3:]
+    )
+    pgSz: CT_PageSz | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:pgSz", successors=_tag_seq[4:]
+    )
     pgMar: CT_PageMar | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
         "w:pgMar", successors=_tag_seq[5:]
     )
-    titlePg = ZeroOrOne("w:titlePg", successors=_tag_seq[14:])
+    titlePg: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:titlePg", successors=_tag_seq[14:]
+    )
     del _tag_seq
 
-    def add_footerReference(self, type_, rId):
+    def add_footerReference(self, type_: WD_HEADER_FOOTER, rId: str) -> CT_HdrFtrRef:
         """Return newly added CT_HdrFtrRef element of `type_` with `rId`.
 
         The element tag is `w:footerReference`.
@@ -100,7 +140,7 @@ def add_footerReference(self, type_, rId):
         footerReference.rId = rId
         return footerReference
 
-    def add_headerReference(self, type_, rId):
+    def add_headerReference(self, type_: WD_HEADER_FOOTER, rId: str) -> CT_HdrFtrRef:
         """Return newly added CT_HdrFtrRef element of `type_` with `rId`.
 
         The element tag is `w:headerReference`.
@@ -122,36 +162,43 @@ def bottom_margin(self) -> Length | None:
         return pgMar.bottom
 
     @bottom_margin.setter
-    def bottom_margin(self, value):
+    def bottom_margin(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.bottom = value
+        pgMar.bottom = (
+            value if value is None or isinstance(value, Length) else Length(value)
+        )
 
-    def clone(self):
+    def clone(self) -> CT_SectPr:
         """Return an exact duplicate of this ``<w:sectPr>`` element tree suitable for
         use in adding a section break.
 
         All rsid* attributes are removed from the root ``<w:sectPr>`` element.
         """
-        clone_sectPr = deepcopy(self)
-        clone_sectPr.attrib.clear()
-        return clone_sectPr
+        cloned_sectPr = deepcopy(self)
+        cloned_sectPr.attrib.clear()
+        return cloned_sectPr
 
     @property
-    def footer(self):
-        """The value of the ``w:footer`` attribute in the ``<w:pgMar>`` child element,
+    def footer(self) -> Length | None:
+        """Distance from bottom edge of page to bottom edge of the footer.
+
+        This is the value of the `w:footer` attribute in the `w:pgMar` child element,
         as a |Length| object, or |None| if either the element or the attribute is not
-        present."""
+        present.
+        """
         pgMar = self.pgMar
         if pgMar is None:
             return None
         return pgMar.footer
 
     @footer.setter
-    def footer(self, value):
+    def footer(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.footer = value
+        pgMar.footer = (
+            value if value is None or isinstance(value, Length) else Length(value)
+        )
 
-    def get_footerReference(self, type_):
+    def get_footerReference(self, type_: WD_HEADER_FOOTER) -> CT_HdrFtrRef | None:
         """Return footerReference element of `type_` or None if not present."""
         path = "./w:footerReference[@w:type='%s']" % WD_HEADER_FOOTER.to_xml(type_)
         footerReferences = self.xpath(path)
@@ -159,7 +206,7 @@ def get_footerReference(self, type_):
             return None
         return footerReferences[0]
 
-    def get_headerReference(self, type_):
+    def get_headerReference(self, type_: WD_HEADER_FOOTER) -> CT_HdrFtrRef | None:
         """Return headerReference element of `type_` or None if not present."""
         matching_headerReferences = self.xpath(
             "./w:headerReference[@w:type='%s']" % WD_HEADER_FOOTER.to_xml(type_)
@@ -179,24 +226,30 @@ def gutter(self) -> Length | None:
         return pgMar.gutter
 
     @gutter.setter
-    def gutter(self, value):
+    def gutter(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.gutter = value
+        pgMar.gutter = (
+            value if value is None or isinstance(value, Length) else Length(value)
+        )
 
     @property
     def header(self) -> Length | None:
-        """The value of the ``w:header`` attribute in the ``<w:pgMar>`` child element,
-        as a |Length| object, or |None| if either the element or the attribute is not
-        present."""
+        """Distance from top edge of page to top edge of header.
+
+        This value comes from the `w:header` attribute on the `w:pgMar` child element.
+        |None| if either the element or the attribute is not present.
+        """
         pgMar = self.pgMar
         if pgMar is None:
             return None
         return pgMar.header
 
     @header.setter
-    def header(self, value):
+    def header(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.header = value
+        pgMar.header = (
+            value if value is None or isinstance(value, Length) else Length(value)
+        )
 
     @property
     def left_margin(self) -> Length | None:
@@ -209,76 +262,90 @@ def left_margin(self) -> Length | None:
         return pgMar.left
 
     @left_margin.setter
-    def left_margin(self, value):
+    def left_margin(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.left = value
+        pgMar.left = (
+            value if value is None or isinstance(value, Length) else Length(value)
+        )
 
     @property
-    def orientation(self):
-        """The member of the ``WD_ORIENTATION`` enumeration corresponding to the value
-        of the ``orient`` attribute of the ``<w:pgSz>`` child element, or
-        ``WD_ORIENTATION.PORTRAIT`` if not present."""
+    def orientation(self) -> WD_ORIENTATION:
+        """`WD_ORIENTATION` member indicating page-orientation for this section.
+
+        This is the value of the `orient` attribute on the `w:pgSz` child, or
+        `WD_ORIENTATION.PORTRAIT` if not present.
+        """
         pgSz = self.pgSz
         if pgSz is None:
             return WD_ORIENTATION.PORTRAIT
         return pgSz.orient
 
     @orientation.setter
-    def orientation(self, value):
+    def orientation(self, value: WD_ORIENTATION | None):
         pgSz = self.get_or_add_pgSz()
-        pgSz.orient = value
+        pgSz.orient = value if value else WD_ORIENTATION.PORTRAIT
 
     @property
-    def page_height(self):
-        """Value in EMU of the ``h`` attribute of the ``<w:pgSz>`` child element, or
-        |None| if not present."""
+    def page_height(self) -> Length | None:
+        """Value in EMU of the `h` attribute of the `w:pgSz` child element.
+
+        |None| if not present.
+        """
         pgSz = self.pgSz
         if pgSz is None:
             return None
         return pgSz.h
 
     @page_height.setter
-    def page_height(self, value):
+    def page_height(self, value: Length | None):
         pgSz = self.get_or_add_pgSz()
         pgSz.h = value
 
     @property
-    def page_width(self):
-        """Value in EMU of the ``w`` attribute of the ``<w:pgSz>`` child element, or
-        |None| if not present."""
+    def page_width(self) -> Length | None:
+        """Value in EMU of the ``w`` attribute of the ``<w:pgSz>`` child element.
+
+        |None| if not present.
+        """
         pgSz = self.pgSz
         if pgSz is None:
             return None
         return pgSz.w
 
     @page_width.setter
-    def page_width(self, value):
+    def page_width(self, value: Length | None):
         pgSz = self.get_or_add_pgSz()
         pgSz.w = value
 
     @property
-    def preceding_sectPr(self):
+    def preceding_sectPr(self) -> CT_SectPr | None:
         """SectPr immediately preceding this one or None if this is the first."""
-        # ---[1] predicate returns list of zero or one value---
+        # -- [1] predicate returns list of zero or one value --
         preceding_sectPrs = self.xpath("./preceding::w:sectPr[1]")
         return preceding_sectPrs[0] if len(preceding_sectPrs) > 0 else None
 
-    def remove_footerReference(self, type_):
+    def remove_footerReference(self, type_: WD_HEADER_FOOTER) -> str:
         """Return rId of w:footerReference child of `type_` after removing it."""
         footerReference = self.get_footerReference(type_)
+        if footerReference is None:
+            # -- should never happen, but to satisfy type-check and just in case --
+            raise ValueError("CT_SectPr has no footer reference")
         rId = footerReference.rId
         self.remove(footerReference)
         return rId
 
-    def remove_headerReference(self, type_):
+    def remove_headerReference(self, type_: WD_HEADER_FOOTER):
         """Return rId of w:headerReference child of `type_` after removing it."""
         headerReference = self.get_headerReference(type_)
+        if headerReference is None:
+            # -- should never happen, but to satisfy type-check and just in case --
+            raise ValueError("CT_SectPr has no header reference")
         rId = headerReference.rId
         self.remove(headerReference)
         return rId
 
     @property
-    def right_margin(self):
+    def right_margin(self) -> Length | None:
         """The value of the ``w:right`` attribute in the ``<w:pgMar>`` child element, as
         a |Length| object, or |None| if either the element or the attribute is not
         present."""
@@ -288,12 +355,12 @@ def right_margin(self):
         return pgMar.right
 
     @right_margin.setter
-    def right_margin(self, value):
+    def right_margin(self, value: Length | None):
         pgMar = self.get_or_add_pgMar()
         pgMar.right = value
 
     @property
-    def start_type(self):
+    def start_type(self) -> WD_SECTION_START:
         """The member of the ``WD_SECTION_START`` enumeration corresponding to the value
         of the ``val`` attribute of the ``<w:type>`` child element, or
         ``WD_SECTION_START.NEW_PAGE`` if not present."""
@@ -303,7 +370,7 @@ def start_type(self):
         return type.val
 
     @start_type.setter
-    def start_type(self, value):
+    def start_type(self, value: WD_SECTION_START | None):
         if value is None or value is WD_SECTION_START.NEW_PAGE:
             self._remove_type()
             return
@@ -312,21 +379,21 @@ def start_type(self, value):
 
     @property
     def titlePg_val(self) -> bool:
-        """Value of `w:titlePg/@val` or |None| if not present."""
+        """Value of `w:titlePg/@val` or |False| if `./w:titlePg` is not present."""
         titlePg = self.titlePg
         if titlePg is None:
             return False
         return titlePg.val
 
     @titlePg_val.setter
-    def titlePg_val(self, value):
+    def titlePg_val(self, value: bool | None):
         if value in [None, False]:
             self._remove_titlePg()
         else:
-            self.get_or_add_titlePg().val = value
+            self.get_or_add_titlePg().val = True
 
     @property
-    def top_margin(self):
+    def top_margin(self) -> Length | None:
         """The value of the ``w:top`` attribute in the ``<w:pgMar>`` child element, as a
         |Length| object, or |None| if either the element or the attribute is not
         present."""
@@ -336,7 +403,7 @@ def top_margin(self):
         return pgMar.top
 
     @top_margin.setter
-    def top_margin(self, value):
+    def top_margin(self, value: Length | None):
         pgMar = self.get_or_add_pgMar()
         pgMar.top = value
 
@@ -344,4 +411,6 @@ def top_margin(self, value):
 class CT_SectType(BaseOxmlElement):
     """``<w:sectType>`` element, defining the section start type."""
 
-    val = OptionalAttribute("w:val", WD_SECTION_START)
+    val: WD_SECTION_START | None = (  # pyright: ignore[reportGeneralTypeIssues]
+        OptionalAttribute("w:val", WD_SECTION_START)
+    )
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index d2b2aa24a..d979c638b 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -21,10 +21,15 @@ def new(cls, nsptagname, val):
 
 
 class CT_OnOff(BaseOxmlElement):
-    """Used for ``<w:b>``, ``<w:i>`` elements and others, containing a bool-ish string
-    in its ``val`` attribute, xsd:boolean plus 'on' and 'off'."""
+    """Used for `w:b`, `w:i` elements and others.
 
-    val = OptionalAttribute("w:val", ST_OnOff, default=True)
+    Contains a bool-ish string in its `val` attribute, xsd:boolean plus "on" and
+    "off". Defaults to `True`, so `<w:b>` for example means "bold is turned on".
+    """
+
+    val: bool = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:val", ST_OnOff, default=True
+    )
 
 
 class CT_String(BaseOxmlElement):
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 78b395d03..c6d9e93b4 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -1,5 +1,9 @@
 """Custom element classes related to run properties (font)."""
 
+from __future__ import annotations
+
+from typing import Callable
+
 from docx.enum.dml import MSO_THEME_COLOR
 from docx.enum.text import WD_COLOR, WD_UNDERLINE
 from docx.oxml.ns import nsdecls, qn
@@ -48,6 +52,9 @@ class CT_HpsMeasure(BaseOxmlElement):
 class CT_RPr(BaseOxmlElement):
     """``<w:rPr>`` element, containing the properties for a run."""
 
+    _add_u: Callable[[], CT_Underline]
+    _remove_u: Callable[[], None]
+
     _tag_seq = (
         "w:rStyle",
         "w:rFonts",
@@ -110,7 +117,9 @@ class CT_RPr(BaseOxmlElement):
     color = ZeroOrOne("w:color", successors=_tag_seq[19:])
     sz = ZeroOrOne("w:sz", successors=_tag_seq[24:])
     highlight = ZeroOrOne("w:highlight", successors=_tag_seq[26:])
-    u = ZeroOrOne("w:u", successors=_tag_seq[27:])
+    u: CT_Underline | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:u", successors=_tag_seq[27:]
+    )
     vertAlign = ZeroOrOne("w:vertAlign", successors=_tag_seq[32:])
     rtl = ZeroOrOne("w:rtl", successors=_tag_seq[33:])
     cs = ZeroOrOne("w:cs", successors=_tag_seq[34:])
@@ -265,15 +274,19 @@ def sz_val(self, value):
         sz.val = value
 
     @property
-    def u_val(self):
-        """Value of `w:u/@val`, or None if not present."""
+    def u_val(self) -> bool | WD_UNDERLINE | None:
+        """Value of `w:u/@val`, or None if not present.
+
+        Values `WD_UNDERLINE.SINGLE` and `WD_UNDERLINE.NONE` are mapped to `True` and
+        `False` respectively.
+        """
         u = self.u
         if u is None:
             return None
         return u.val
 
     @u_val.setter
-    def u_val(self, value):
+    def u_val(self, value: bool | WD_UNDERLINE | None):
         self._remove_u()
         if value is not None:
             self._add_u().val = value
@@ -298,18 +311,22 @@ class CT_Underline(BaseOxmlElement):
     """``<w:u>`` element, specifying the underlining style for a run."""
 
     @property
-    def val(self):
+    def val(self) -> bool | WD_UNDERLINE | None:
         """The underline type corresponding to the ``w:val`` attribute value."""
         val = self.get(qn("w:val"))
         underline = WD_UNDERLINE.from_xml(val)
-        if underline == WD_UNDERLINE.SINGLE:
-            return True
-        if underline == WD_UNDERLINE.NONE:
-            return False
-        return underline
+        return (
+            None
+            if underline == WD_UNDERLINE.INHERITED
+            else True
+            if underline == WD_UNDERLINE.SINGLE
+            else False
+            if underline == WD_UNDERLINE.NONE
+            else underline
+        )
 
     @val.setter
-    def val(self, value):
+    def val(self, value: bool | WD_UNDERLINE | None):
         # works fine without these two mappings, but only because True == 1
         # and False == 0, which happen to match the mapping for WD_UNDERLINE
         # .SINGLE and .NONE respectively.
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 0e97ce965..a0d870409 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -87,7 +87,7 @@ class MetaOxmlElement(type):
     """Metaclass for BaseOxmlElement."""
 
     def __new__(
-        cls: Type[_T],clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]
+        cls: Type[_T], clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]
     ) -> _T:
         bases = (*bases, etree.ElementBase)
         return super().__new__(cls, clsname, bases, namespace)
@@ -623,9 +623,11 @@ class BaseOxmlElement(metaclass=MetaOxmlElement):
     Adds standardized behavior to all classes in one place.
     """
 
+    attrib: Dict[str, str]
     append: Callable[[ElementBase], None]
     find: Callable[[str], ElementBase | None]
     findall: Callable[[str], List[ElementBase]]
+    get: Callable[[str], str | None]
     getparent: Callable[[], BaseOxmlElement]
     insert: Callable[[int, BaseOxmlElement], None]
     remove: Callable[[BaseOxmlElement], None]
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index c877e5a57..ec3bf3785 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -43,11 +43,11 @@ def document(self):
         """A |Document| object providing access to the content of this document."""
         return Document(self._element, self)
 
-    def drop_header_part(self, rId):
+    def drop_header_part(self, rId: str) -> None:
         """Remove related header part identified by `rId`."""
         self.drop_rel(rId)
 
-    def footer_part(self, rId):
+    def footer_part(self, rId: str):
         """Return |FooterPart| related by `rId`."""
         return self.related_parts[rId]
 
@@ -69,7 +69,7 @@ def get_style_id(self, style_or_name, style_type):
         """
         return self.styles.get_style_id(style_or_name, style_type)
 
-    def header_part(self, rId):
+    def header_part(self, rId: str):
         """Return |HeaderPart| related by `rId`."""
         return self.related_parts[rId]
 
diff --git a/src/docx/section.py b/src/docx/section.py
index 61bdbb2f1..7e96dacd4 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -2,13 +2,16 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Sequence
+from typing import TYPE_CHECKING, Iterator, List, Sequence, overload
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_HEADER_FOOTER
+from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from docx.enum.section import WD_ORIENTATION, WD_SECTION_START
+    from docx.oxml.document import CT_Document
     from docx.oxml.section import CT_SectPr
     from docx.parts.document import DocumentPart
     from docx.shared import Length
@@ -52,7 +55,7 @@ def different_first_page_header_footer(self, value: bool):
         self._sectPr.titlePg_val = value
 
     @property
-    def even_page_footer(self):
+    def even_page_footer(self) -> _Footer:
         """|_Footer| object defining footer content for even pages.
 
         The content of this footer definition is ignored unless the document setting
@@ -61,7 +64,7 @@ def even_page_footer(self):
         return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.EVEN_PAGE)
 
     @property
-    def even_page_header(self):
+    def even_page_header(self) -> _Header:
         """|_Header| object defining header content for even pages.
 
         The content of this header definition is ignored unless the document setting
@@ -70,7 +73,7 @@ def even_page_header(self):
         return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.EVEN_PAGE)
 
     @property
-    def first_page_footer(self):
+    def first_page_footer(self) -> _Footer:
         """|_Footer| object defining footer content for the first page of this section.
 
         The content of this footer definition is ignored unless the property
@@ -79,7 +82,7 @@ def first_page_footer(self):
         return _Footer(self._sectPr, self._document_part, WD_HEADER_FOOTER.FIRST_PAGE)
 
     @property
-    def first_page_header(self):
+    def first_page_header(self) -> _Header:
         """|_Header| object defining header content for the first page of this section.
 
         The content of this header definition is ignored unless the property
@@ -88,7 +91,7 @@ def first_page_header(self):
         return _Header(self._sectPr, self._document_part, WD_HEADER_FOOTER.FIRST_PAGE)
 
     @lazyproperty
-    def footer(self):
+    def footer(self) -> _Footer:
         """|_Footer| object representing default page footer for this section.
 
         The default footer is used for odd-numbered pages when separate odd/even footers
@@ -126,7 +129,7 @@ def gutter(self, value: int | Length | None):
         self._sectPr.gutter = value
 
     @lazyproperty
-    def header(self):
+    def header(self) -> _Header:
         """|_Header| object representing default page header for this section.
 
         The default header is used for odd-numbered pages when separate odd/even headers
@@ -136,10 +139,10 @@ def header(self):
 
     @property
     def header_distance(self) -> Length | None:
-        """|Length| object representing the distance from the top edge of the page to
-        the top edge of the header.
+        """Distance from top edge of page to top edge of header.
 
-        |None| if no setting is present in the XML.
+        Read/write. |None| if no setting is present in the XML. Assigning |None| causes
+        default value to be used.
         """
         return self._sectPr.header
 
@@ -158,14 +161,15 @@ def left_margin(self, value: int | Length | None):
         self._sectPr.left_margin = value
 
     @property
-    def orientation(self):
-        """Member of the :ref:`WdOrientation` enumeration specifying the page
-        orientation for this section, one of ``WD_ORIENT.PORTRAIT`` or
-        ``WD_ORIENT.LANDSCAPE``."""
+    def orientation(self) -> WD_ORIENTATION:
+        """:ref:`WdOrientation` member specifying page orientation for this section.
+
+        One of ``WD_ORIENT.PORTRAIT`` or ``WD_ORIENT.LANDSCAPE``.
+        """
         return self._sectPr.orientation
 
     @orientation.setter
-    def orientation(self, value):
+    def orientation(self, value: WD_ORIENTATION | None):
         self._sectPr.orientation = value
 
     @property
@@ -174,58 +178,62 @@ def page_height(self) -> Length | None:
 
         This value is inclusive of all edge spacing values such as margins.
 
-        Page orientation is taken into account, so for example, its expected value would
-        be ``Inches(8.5)`` for letter-sized paper when orientation is landscape.
+        Page orientation is taken into account, so for example, its expected value
+        would be ``Inches(8.5)`` for letter-sized paper when orientation is landscape.
         """
         return self._sectPr.page_height
 
     @page_height.setter
-    def page_height(self, value):
+    def page_height(self, value: Length | None):
         self._sectPr.page_height = value
 
     @property
-    def page_width(self):
-        """Total page width used for this section, inclusive of all edge spacing values
-        such as margins.
+    def page_width(self) -> Length | None:
+        """Total page width used for this section.
 
-        Page orientation is taken into account, so for example, its expected value would
-        be ``Inches(11)`` for letter-sized paper when orientation is landscape.
+        This value is like "paper size" and includes all edge spacing values such as
+        margins.
+
+        Page orientation is taken into account, so for example, its expected value
+        would be ``Inches(11)`` for letter-sized paper when orientation is landscape.
         """
         return self._sectPr.page_width
 
     @page_width.setter
-    def page_width(self, value):
+    def page_width(self, value: Length | None):
         self._sectPr.page_width = value
 
     @property
-    def right_margin(self):
+    def right_margin(self) -> Length | None:
         """|Length| object representing the right margin for all pages in this section
         in English Metric Units."""
         return self._sectPr.right_margin
 
     @right_margin.setter
-    def right_margin(self, value):
+    def right_margin(self, value: Length | None):
         self._sectPr.right_margin = value
 
     @property
-    def start_type(self):
-        """The member of the :ref:`WdSectionStart` enumeration corresponding to the
-        initial break behavior of this section, e.g. ``WD_SECTION.ODD_PAGE`` if the
-        section should begin on the next odd page."""
+    def start_type(self) -> WD_SECTION_START:
+        """Type of page-break (if any) inserted at the start of this section.
+
+        For exmple, ``WD_SECTION_START.ODD_PAGE`` if the section should begin on the
+        next odd page, possibly inserting two page-breaks instead of one.
+        """
         return self._sectPr.start_type
 
     @start_type.setter
-    def start_type(self, value):
+    def start_type(self, value: WD_SECTION_START | None):
         self._sectPr.start_type = value
 
     @property
-    def top_margin(self):
+    def top_margin(self) -> Length | None:
         """|Length| object representing the top margin for all pages in this section in
         English Metric Units."""
         return self._sectPr.top_margin
 
     @top_margin.setter
-    def top_margin(self, value):
+    def top_margin(self, value: Length | None):
         self._sectPr.top_margin = value
 
 
@@ -235,12 +243,20 @@ class Sections(Sequence[Section]):
     Supports ``len()``, iteration, and indexed access.
     """
 
-    def __init__(self, document_elm, document_part):
+    def __init__(self, document_elm: CT_Document, document_part: DocumentPart):
         super(Sections, self).__init__()
         self._document_elm = document_elm
         self._document_part = document_part
 
-    def __getitem__(self, key):
+    @overload
+    def __getitem__(self, key: int) -> Section:
+        ...
+
+    @overload
+    def __getitem__(self, key: slice) -> List[Section]:
+        ...
+
+    def __getitem__(self, key: int | slice) -> Section | List[Section]:
         if isinstance(key, slice):
             return [
                 Section(sectPr, self._document_part)
@@ -248,24 +264,29 @@ def __getitem__(self, key):
             ]
         return Section(self._document_elm.sectPr_lst[key], self._document_part)
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Section]:
         for sectPr in self._document_elm.sectPr_lst:
             yield Section(sectPr, self._document_part)
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._document_elm.sectPr_lst)
 
 
 class _BaseHeaderFooter(BlockItemContainer):
     """Base class for header and footer classes."""
 
-    def __init__(self, sectPr, document_part, header_footer_index):
+    def __init__(
+        self,
+        sectPr: CT_SectPr,
+        document_part: DocumentPart,
+        header_footer_index: WD_HEADER_FOOTER,
+    ):
         self._sectPr = sectPr
         self._document_part = document_part
         self._hdrftr_index = header_footer_index
 
     @property
-    def is_linked_to_previous(self):
+    def is_linked_to_previous(self) -> bool:
         """``True`` if this header/footer uses the definition from the prior section.
 
         ``False`` if this header/footer has an explicit definition.
@@ -279,7 +300,7 @@ def is_linked_to_previous(self):
         return not self._has_definition
 
     @is_linked_to_previous.setter
-    def is_linked_to_previous(self, value):
+    def is_linked_to_previous(self, value: bool) -> None:
         new_state = bool(value)
         # ---do nothing when value is not being changed---
         if new_state == self.is_linked_to_previous:
@@ -290,7 +311,7 @@ def is_linked_to_previous(self, value):
             self._add_definition()
 
     @property
-    def part(self):
+    def part(self) -> HeaderPart | FooterPart:
         """The |HeaderPart| or |FooterPart| for this header/footer.
 
         This overrides `BlockItemContainer.part` and is required to support image
@@ -300,16 +321,16 @@ def part(self):
         # ---not an interface property, even though public
         return self._get_or_add_definition()
 
-    def _add_definition(self):
+    def _add_definition(self) -> HeaderPart | FooterPart:
         """Return newly-added header/footer part."""
         raise NotImplementedError("must be implemented by each subclass")
 
     @property
-    def _definition(self):
+    def _definition(self) -> HeaderPart | FooterPart:
         """|HeaderPart| or |FooterPart| object containing header/footer content."""
         raise NotImplementedError("must be implemented by each subclass")
 
-    def _drop_definition(self):
+    def _drop_definition(self) -> None:
         """Remove header/footer part containing the definition of this header/footer."""
         raise NotImplementedError("must be implemented by each subclass")
 
@@ -318,7 +339,7 @@ def _element(self):
         """`w:hdr` or `w:ftr` element, root of header/footer part."""
         return self._get_or_add_definition().element
 
-    def _get_or_add_definition(self):
+    def _get_or_add_definition(self) -> HeaderPart | FooterPart:
         """Return HeaderPart or FooterPart object for this section.
 
         If this header/footer inherits its content, the part for the prior header/footer
@@ -339,12 +360,12 @@ def _get_or_add_definition(self):
         return self._add_definition()
 
     @property
-    def _has_definition(self):
+    def _has_definition(self) -> bool:
         """True if this header/footer has a related part containing its definition."""
         raise NotImplementedError("must be implemented by each subclass")
 
     @property
-    def _prior_headerfooter(self):
+    def _prior_headerfooter(self) -> _Header | _Footer | None:
         """|_Header| or |_Footer| proxy on prior sectPr element.
 
         Returns None if this is first section.
@@ -362,7 +383,7 @@ class _Footer(_BaseHeaderFooter):
     leave an empty paragraph above the newly added one.
     """
 
-    def _add_definition(self):
+    def _add_definition(self) -> FooterPart:
         """Return newly-added footer part."""
         footer_part, rId = self._document_part.add_footer_part()
         self._sectPr.add_footerReference(self._hdrftr_index, rId)
@@ -372,6 +393,8 @@ def _add_definition(self):
     def _definition(self):
         """|FooterPart| object containing content of this footer."""
         footerReference = self._sectPr.get_footerReference(self._hdrftr_index)
+        # -- currently this is never called when `._has_definition` evaluates False --
+        assert footerReference is not None
         return self._document_part.footer_part(footerReference.rId)
 
     def _drop_definition(self):
@@ -416,6 +439,8 @@ def _add_definition(self):
     def _definition(self):
         """|HeaderPart| object containing content of this header."""
         headerReference = self._sectPr.get_headerReference(self._hdrftr_index)
+        # -- currently this is never called when `._has_definition` evaluates False --
+        assert headerReference is not None
         return self._document_part.header_part(headerReference.rId)
 
     def _drop_definition(self):
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index c7c514d40..728f2331c 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -1,5 +1,7 @@
 """Font-related proxy objects."""
 
+from __future__ import annotations
+
 from docx.dml.color import ColorFormat
 from docx.enum.text import WD_UNDERLINE
 from docx.shared import ElementProxy
@@ -348,9 +350,10 @@ def superscript(self, value):
         rPr.superscript = value
 
     @property
-    def underline(self):
-        """The underline style for this |Font|, one of |None|, |True|, |False|, or a
-        value from :ref:`WdUnderline`.
+    def underline(self) -> bool | WD_UNDERLINE | None:
+        """The underline style for this |Font|.
+
+        The value is one of |None|, |True|, |False|, or a member of :ref:`WdUnderline`.
 
         |None| indicates the font inherits its underline value from the style hierarchy.
         |False| indicates no underline. |True| indicates single underline. The values
@@ -364,7 +367,7 @@ def underline(self):
         return None if val == WD_UNDERLINE.INHERITED else val
 
     @underline.setter
-    def underline(self, value):
+    def underline(self, value: bool | WD_UNDERLINE | None):
         rPr = self._element.get_or_add_rPr()
         rPr.u_val = value
 
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 4a01aebc5..55ad85cdc 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -31,7 +31,7 @@ def __init__(self, r: CT_R, parent: t.StoryChild):
         super(Run, self).__init__(parent)
         self._r = self._element = self.element = r
 
-    def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):  # pyright: ignore
+    def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):
         """Add a break element of `break_type` to this run.
 
         `break_type` can take the values `WD_BREAK.LINE`, `WD_BREAK.PAGE`, and
diff --git a/tests/test_section.py b/tests/test_section.py
index a810eb418..4eb1f9192 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -1,28 +1,49 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for the docx.section module."""
 
+from __future__ import annotations
+
+from typing import cast
+
 import pytest
 
-from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENT, WD_SECTION
+from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION
+from docx.oxml.document import CT_Document
+from docx.oxml.section import CT_SectPr
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.section import Section, Sections, _BaseHeaderFooter, _Footer, _Header
-from docx.shared import Inches
+from docx.shared import Inches, Length
 
 from .unitutil.cxml import element, xml
-from .unitutil.mock import call, class_mock, instance_mock, method_mock, property_mock
-
-
-class DescribeSections(object):
-    def it_knows_how_many_sections_it_contains(self):
-        sections = Sections(
-            element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)"), None
+from .unitutil.mock import (
+    FixtureRequest,
+    Mock,
+    call,
+    class_mock,
+    instance_mock,
+    method_mock,
+    property_mock,
+)
+
+
+class DescribeSections:
+    """Unit-test suite for `docx.section.Sections`."""
+
+    def it_knows_how_many_sections_it_contains(self, document_part_: Mock):
+        document_elm = cast(
+            CT_Document, element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)")
         )
+        sections = Sections(document_elm, document_part_)
         assert len(sections) == 2
 
     def it_can_iterate_over_its_Section_instances(
-        self, Section_, section_, document_part_
+        self, Section_: Mock, section_: Mock, document_part_: Mock
     ):
-        document_elm = element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)")
+        document_elm = cast(
+            CT_Document, element("w:document/w:body/(w:p/w:pPr/w:sectPr, w:sectPr)")
+        )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
         sections = Sections(document_elm, document_part_)
@@ -36,10 +57,13 @@ def it_can_iterate_over_its_Section_instances(
         assert section_lst == [section_, section_]
 
     def it_can_access_its_Section_instances_by_index(
-        self, Section_, section_, document_part_
+        self, Section_: Mock, section_: Mock, document_part_: Mock
     ):
-        document_elm = element(
-            "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
+        document_elm = cast(
+            CT_Document,
+            element(
+                "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
+            ),
         )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
@@ -55,10 +79,13 @@ def it_can_access_its_Section_instances_by_index(
         assert section_lst == [section_, section_, section_]
 
     def it_can_access_its_Section_instances_by_slice(
-        self, Section_, section_, document_part_
+        self, Section_: Mock, section_: Mock, document_part_: Mock
     ):
-        document_elm = element(
-            "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
+        document_elm = cast(
+            CT_Document,
+            element(
+                "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
+            ),
         )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
@@ -75,43 +102,65 @@ def it_can_access_its_Section_instances_by_slice(
     # fixture components ---------------------------------------------
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def Section_(self, request):
+    def Section_(self, request: FixtureRequest):
         return class_mock(request, "docx.section.Section")
 
     @pytest.fixture
-    def section_(self, request):
+    def section_(self, request: FixtureRequest):
         return instance_mock(request, Section)
 
 
-class DescribeSection(object):
+class DescribeSection:
+    """Unit-test suite for `docx.section.Section`."""
+
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [
+            ("w:sectPr", False),
+            ("w:sectPr/w:titlePg", True),
+            ("w:sectPr/w:titlePg{w:val=0}", False),
+            ("w:sectPr/w:titlePg{w:val=1}", True),
+            ("w:sectPr/w:titlePg{w:val=true}", True),
+        ],
+    )
     def it_knows_when_it_displays_a_distinct_first_page_header(
-        self, diff_first_header_get_fixture
+        self, sectPr_cxml: str, expected_value: bool, document_part_: Mock
     ):
-        sectPr, expected_value = diff_first_header_get_fixture
-        section = Section(sectPr, None)
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        section = Section(sectPr, document_part_)
 
         different_first_page_header_footer = section.different_first_page_header_footer
 
         assert different_first_page_header_footer is expected_value
 
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "value", "expected_cxml"),
+        [
+            ("w:sectPr", True, "w:sectPr/w:titlePg"),
+            ("w:sectPr/w:titlePg", False, "w:sectPr"),
+            ("w:sectPr/w:titlePg{w:val=1}", True, "w:sectPr/w:titlePg"),
+            ("w:sectPr/w:titlePg{w:val=off}", False, "w:sectPr"),
+        ],
+    )
     def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
-        self, diff_first_header_set_fixture
+        self, sectPr_cxml: str, value: bool, expected_cxml: str, document_part_: Mock
     ):
-        sectPr, value, expected_xml = diff_first_header_set_fixture
-        section = Section(sectPr, None)
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        expected_xml = xml(expected_cxml)
+        section = Section(sectPr, document_part_)
 
         section.different_first_page_header_footer = value
 
         assert sectPr.xml == expected_xml
 
     def it_provides_access_to_its_even_page_footer(
-        self, document_part_, _Footer_, footer_
+        self, document_part_: Mock, _Footer_: Mock, footer_: Mock
     ):
-        sectPr = element("w:sectPr")
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
         _Footer_.return_value = footer_
         section = Section(sectPr, document_part_)
 
@@ -123,9 +172,9 @@ def it_provides_access_to_its_even_page_footer(
         assert footer is footer_
 
     def it_provides_access_to_its_even_page_header(
-        self, document_part_, _Header_, header_
+        self, document_part_: Mock, _Header_: Mock, header_: Mock
     ):
-        sectPr = element("w:sectPr")
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
         _Header_.return_value = header_
         section = Section(sectPr, document_part_)
 
@@ -137,9 +186,9 @@ def it_provides_access_to_its_even_page_header(
         assert header is header_
 
     def it_provides_access_to_its_first_page_footer(
-        self, document_part_, _Footer_, footer_
+        self, document_part_: Mock, _Footer_: Mock, footer_: Mock
     ):
-        sectPr = element("w:sectPr")
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
         _Footer_.return_value = footer_
         section = Section(sectPr, document_part_)
 
@@ -151,9 +200,9 @@ def it_provides_access_to_its_first_page_footer(
         assert footer is footer_
 
     def it_provides_access_to_its_first_page_header(
-        self, document_part_, _Header_, header_
+        self, document_part_: Mock, _Header_: Mock, header_: Mock
     ):
-        sectPr = element("w:sectPr")
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
         _Header_.return_value = header_
         section = Section(sectPr, document_part_)
 
@@ -165,9 +214,9 @@ def it_provides_access_to_its_first_page_header(
         assert header is header_
 
     def it_provides_access_to_its_default_footer(
-        self, document_part_, _Footer_, footer_
+        self, document_part_: Mock, _Footer_: Mock, footer_: Mock
     ):
-        sectPr = element("w:sectPr")
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
         _Footer_.return_value = footer_
         section = Section(sectPr, document_part_)
 
@@ -179,9 +228,9 @@ def it_provides_access_to_its_default_footer(
         assert footer is footer_
 
     def it_provides_access_to_its_default_header(
-        self, document_part_, _Header_, header_
+        self, document_part_: Mock, _Header_: Mock, header_: Mock
     ):
-        sectPr = element("w:sectPr")
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
         _Header_.return_value = header_
         section = Section(sectPr, document_part_)
 
@@ -192,118 +241,178 @@ def it_provides_access_to_its_default_header(
         )
         assert header is header_
 
-    def it_knows_its_start_type(self, start_type_get_fixture):
-        sectPr, expected_start_type = start_type_get_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [
+            ("w:sectPr", WD_SECTION.NEW_PAGE),
+            ("w:sectPr/w:type", WD_SECTION.NEW_PAGE),
+            ("w:sectPr/w:type{w:val=continuous}", WD_SECTION.CONTINUOUS),
+            ("w:sectPr/w:type{w:val=nextPage}", WD_SECTION.NEW_PAGE),
+            ("w:sectPr/w:type{w:val=oddPage}", WD_SECTION.ODD_PAGE),
+            ("w:sectPr/w:type{w:val=evenPage}", WD_SECTION.EVEN_PAGE),
+            ("w:sectPr/w:type{w:val=nextColumn}", WD_SECTION.NEW_COLUMN),
+        ],
+    )
+    def it_knows_its_start_type(
+        self, sectPr_cxml: str, expected_value: WD_SECTION, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        section = Section(sectPr, document_part_)
 
         start_type = section.start_type
 
-        assert start_type is expected_start_type
+        assert start_type is expected_value
 
-    def it_can_change_its_start_type(self, start_type_set_fixture):
-        sectPr, new_start_type, expected_xml = start_type_set_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "value", "expected_cxml"),
+        [
+            (
+                "w:sectPr/w:type{w:val=oddPage}",
+                WD_SECTION.EVEN_PAGE,
+                "w:sectPr/w:type{w:val=evenPage}",
+            ),
+            ("w:sectPr/w:type{w:val=nextPage}", None, "w:sectPr"),
+            ("w:sectPr", None, "w:sectPr"),
+            ("w:sectPr/w:type{w:val=continuous}", WD_SECTION.NEW_PAGE, "w:sectPr"),
+            ("w:sectPr/w:type", WD_SECTION.NEW_PAGE, "w:sectPr"),
+            (
+                "w:sectPr/w:type",
+                WD_SECTION.NEW_COLUMN,
+                "w:sectPr/w:type{w:val=nextColumn}",
+            ),
+        ],
+    )
+    def it_can_change_its_start_type(
+        self,
+        sectPr_cxml: str,
+        value: WD_SECTION | None,
+        expected_cxml: str,
+        document_part_: Mock,
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        expected_xml = xml(expected_cxml)
+        section = Section(sectPr, document_part_)
 
-        section.start_type = new_start_type
+        section.start_type = value
 
         assert section._sectPr.xml == expected_xml
 
-    def it_knows_its_page_width(self, page_width_get_fixture):
-        sectPr, expected_page_width = page_width_get_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [
+            ("w:sectPr/w:pgSz{w:w=1440}", Inches(1)),
+            ("w:sectPr/w:pgSz", None),
+            ("w:sectPr", None),
+        ],
+    )
+    def it_knows_its_page_width(
+        self, sectPr_cxml: str, expected_value: Length | None, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        section = Section(sectPr, document_part_)
 
         page_width = section.page_width
 
-        assert page_width == expected_page_width
+        assert page_width == expected_value
 
-    def it_can_change_its_page_width(self, page_width_set_fixture):
-        sectPr, new_page_width, expected_xml = page_width_set_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("value", "expected_cxml"),
+        [
+            (None, "w:sectPr/w:pgSz"),
+            (Inches(4), "w:sectPr/w:pgSz{w:w=5760}"),
+        ],
+    )
+    def it_can_change_its_page_width(
+        self,
+        value: Length | None,
+        expected_cxml: str,
+        document_part_: Mock,
+    ):
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
+        expected_xml = xml(expected_cxml)
+        section = Section(sectPr, document_part_)
 
-        section.page_width = new_page_width
+        section.page_width = value
 
         assert section._sectPr.xml == expected_xml
 
-    def it_knows_its_page_height(self, page_height_get_fixture):
-        sectPr, expected_page_height = page_height_get_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [
+            ("w:sectPr/w:pgSz{w:h=2880}", Inches(2)),
+            ("w:sectPr/w:pgSz", None),
+            ("w:sectPr", None),
+        ],
+    )
+    def it_knows_its_page_height(
+        self, sectPr_cxml: str, expected_value: Length | None, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        section = Section(sectPr, document_part_)
 
         page_height = section.page_height
 
-        assert page_height == expected_page_height
+        assert page_height == expected_value
 
-    def it_can_change_its_page_height(self, page_height_set_fixture):
-        sectPr, new_page_height, expected_xml = page_height_set_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("value", "expected_cxml"),
+        [
+            (None, "w:sectPr/w:pgSz"),
+            (Inches(2), "w:sectPr/w:pgSz{w:h=2880}"),
+        ],
+    )
+    def it_can_change_its_page_height(
+        self, value: Length | None, expected_cxml: str, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
+        expected_xml = xml(expected_cxml)
+        section = Section(sectPr, document_part_)
 
-        section.page_height = new_page_height
+        section.page_height = value
 
         assert section._sectPr.xml == expected_xml
 
-    def it_knows_its_page_orientation(self, orientation_get_fixture):
-        sectPr, expected_orientation = orientation_get_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [
+            ("w:sectPr/w:pgSz{w:orient=landscape}", WD_ORIENTATION.LANDSCAPE),
+            ("w:sectPr/w:pgSz{w:orient=portrait}", WD_ORIENTATION.PORTRAIT),
+            ("w:sectPr/w:pgSz", WD_ORIENTATION.PORTRAIT),
+            ("w:sectPr", WD_ORIENTATION.PORTRAIT),
+        ],
+    )
+    def it_knows_its_page_orientation(
+        self, sectPr_cxml: str, expected_value: WD_ORIENTATION, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        section = Section(sectPr, document_part_)
 
         orientation = section.orientation
 
-        assert orientation is expected_orientation
-
-    def it_can_change_its_orientation(self, orientation_set_fixture):
-        sectPr, new_orientation, expected_xml = orientation_set_fixture
-        section = Section(sectPr, None)
-
-        section.orientation = new_orientation
-
-        assert section._sectPr.xml == expected_xml
-
-    def it_knows_its_page_margins(self, margins_get_fixture):
-        sectPr, margin_prop_name, expected_value = margins_get_fixture
-        section = Section(sectPr, None)
-
-        value = getattr(section, margin_prop_name)
+        assert orientation is expected_value
 
-        assert value == expected_value
-
-    def it_can_change_its_page_margins(self, margins_set_fixture):
-        sectPr, margin_prop_name, new_value, expected_xml = margins_set_fixture
-        section = Section(sectPr, None)
+    @pytest.mark.parametrize(
+        ("value", "expected_cxml"),
+        [
+            (WD_ORIENTATION.LANDSCAPE, "w:sectPr/w:pgSz{w:orient=landscape}"),
+            (WD_ORIENTATION.PORTRAIT, "w:sectPr/w:pgSz"),
+            (None, "w:sectPr/w:pgSz"),
+        ],
+    )
+    def it_can_change_its_orientation(
+        self, value: WD_ORIENTATION | None, expected_cxml: str, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
+        expected_xml = xml(expected_cxml)
+        section = Section(sectPr, document_part_)
 
-        setattr(section, margin_prop_name, new_value)
+        section.orientation = value
 
         assert section._sectPr.xml == expected_xml
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
-            ("w:sectPr", False),
-            ("w:sectPr/w:titlePg", True),
-            ("w:sectPr/w:titlePg{w:val=0}", False),
-            ("w:sectPr/w:titlePg{w:val=1}", True),
-            ("w:sectPr/w:titlePg{w:val=true}", True),
-        ]
-    )
-    def diff_first_header_get_fixture(self, request):
-        sectPr_cxml, expected_value = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_value
-
-    @pytest.fixture(
-        params=[
-            ("w:sectPr", True, "w:sectPr/w:titlePg"),
-            ("w:sectPr/w:titlePg", False, "w:sectPr"),
-            ("w:sectPr/w:titlePg{w:val=1}", True, "w:sectPr/w:titlePg"),
-            ("w:sectPr/w:titlePg{w:val=off}", False, "w:sectPr"),
-        ]
-    )
-    def diff_first_header_set_fixture(self, request):
-        sectPr_cxml, value, expected_cxml = request.param
-        sectPr = element(sectPr_cxml)
-        expected_xml = xml(expected_cxml)
-        return sectPr, value, expected_xml
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "margin_prop_name", "expected_value"),
+        [
             ("w:sectPr/w:pgMar{w:left=120}", "left_margin", 76200),
             ("w:sectPr/w:pgMar{w:right=240}", "right_margin", 152400),
             ("w:sectPr/w:pgMar{w:top=-360}", "top_margin", -228600),
@@ -313,15 +422,25 @@ def diff_first_header_set_fixture(self, request):
             ("w:sectPr/w:pgMar{w:footer=840}", "footer_distance", 533400),
             ("w:sectPr/w:pgMar", "left_margin", None),
             ("w:sectPr", "top_margin", None),
-        ]
+        ],
     )
-    def margins_get_fixture(self, request):
-        sectPr_cxml, margin_prop_name, expected_value = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, margin_prop_name, expected_value
+    def it_knows_its_page_margins(
+        self,
+        sectPr_cxml: str,
+        margin_prop_name: str,
+        expected_value: int | None,
+        document_part_: Mock,
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        section = Section(sectPr, document_part_)
+
+        value = getattr(section, margin_prop_name)
+
+        assert value == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "margin_prop_name", "value", "expected_cxml"),
+        [
             ("w:sectPr", "left_margin", Inches(1), "w:sectPr/w:pgMar{w:left=1440}"),
             ("w:sectPr", "right_margin", Inches(0.5), "w:sectPr/w:pgMar{w:right=720}"),
             ("w:sectPr", "top_margin", Inches(-0.25), "w:sectPr/w:pgMar{w:top=-360}"),
@@ -351,185 +470,102 @@ def margins_get_fixture(self, request):
                 Inches(0.6),
                 "w:sectPr/w:pgMar{w:top=864}",
             ),
-        ]
+        ],
     )
-    def margins_set_fixture(self, request):
-        sectPr_cxml, property_name, new_value, expected_cxml = request.param
-        sectPr = element(sectPr_cxml)
-        expected_xml = xml(expected_cxml)
-        return sectPr, property_name, new_value, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:sectPr/w:pgSz{w:orient=landscape}", WD_ORIENT.LANDSCAPE),
-            ("w:sectPr/w:pgSz{w:orient=portrait}", WD_ORIENT.PORTRAIT),
-            ("w:sectPr/w:pgSz", WD_ORIENT.PORTRAIT),
-            ("w:sectPr", WD_ORIENT.PORTRAIT),
-        ]
-    )
-    def orientation_get_fixture(self, request):
-        sectPr_cxml, expected_orientation = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_orientation
-
-    @pytest.fixture(
-        params=[
-            (WD_ORIENT.LANDSCAPE, "w:sectPr/w:pgSz{w:orient=landscape}"),
-            (WD_ORIENT.PORTRAIT, "w:sectPr/w:pgSz"),
-            (None, "w:sectPr/w:pgSz"),
-        ]
-    )
-    def orientation_set_fixture(self, request):
-        new_orientation, expected_cxml = request.param
-        sectPr = element("w:sectPr")
-        expected_xml = xml(expected_cxml)
-        return sectPr, new_orientation, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:sectPr/w:pgSz{w:h=2880}", Inches(2)),
-            ("w:sectPr/w:pgSz", None),
-            ("w:sectPr", None),
-        ]
-    )
-    def page_height_get_fixture(self, request):
-        sectPr_cxml, expected_page_height = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_page_height
-
-    @pytest.fixture(
-        params=[
-            (None, "w:sectPr/w:pgSz"),
-            (Inches(2), "w:sectPr/w:pgSz{w:h=2880}"),
-        ]
-    )
-    def page_height_set_fixture(self, request):
-        new_page_height, expected_cxml = request.param
-        sectPr = element("w:sectPr")
-        expected_xml = xml(expected_cxml)
-        return sectPr, new_page_height, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:sectPr/w:pgSz{w:w=1440}", Inches(1)),
-            ("w:sectPr/w:pgSz", None),
-            ("w:sectPr", None),
-        ]
-    )
-    def page_width_get_fixture(self, request):
-        sectPr_cxml, expected_page_width = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_page_width
-
-    @pytest.fixture(
-        params=[
-            (None, "w:sectPr/w:pgSz"),
-            (Inches(4), "w:sectPr/w:pgSz{w:w=5760}"),
-        ]
-    )
-    def page_width_set_fixture(self, request):
-        new_page_width, expected_cxml = request.param
-        sectPr = element("w:sectPr")
+    def it_can_change_its_page_margins(
+        self,
+        sectPr_cxml: str,
+        margin_prop_name: str,
+        value: Length | None,
+        expected_cxml: str,
+        document_part_: Mock,
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
         expected_xml = xml(expected_cxml)
-        return sectPr, new_page_width, expected_xml
+        section = Section(sectPr, document_part_)
 
-    @pytest.fixture(
-        params=[
-            ("w:sectPr", WD_SECTION.NEW_PAGE),
-            ("w:sectPr/w:type", WD_SECTION.NEW_PAGE),
-            ("w:sectPr/w:type{w:val=continuous}", WD_SECTION.CONTINUOUS),
-            ("w:sectPr/w:type{w:val=nextPage}", WD_SECTION.NEW_PAGE),
-            ("w:sectPr/w:type{w:val=oddPage}", WD_SECTION.ODD_PAGE),
-            ("w:sectPr/w:type{w:val=evenPage}", WD_SECTION.EVEN_PAGE),
-            ("w:sectPr/w:type{w:val=nextColumn}", WD_SECTION.NEW_COLUMN),
-        ]
-    )
-    def start_type_get_fixture(self, request):
-        sectPr_cxml, expected_start_type = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_start_type
+        setattr(section, margin_prop_name, value)
 
-    @pytest.fixture(
-        params=[
-            (
-                "w:sectPr/w:type{w:val=oddPage}",
-                WD_SECTION.EVEN_PAGE,
-                "w:sectPr/w:type{w:val=evenPage}",
-            ),
-            ("w:sectPr/w:type{w:val=nextPage}", None, "w:sectPr"),
-            ("w:sectPr", None, "w:sectPr"),
-            ("w:sectPr/w:type{w:val=continuous}", WD_SECTION.NEW_PAGE, "w:sectPr"),
-            ("w:sectPr/w:type", WD_SECTION.NEW_PAGE, "w:sectPr"),
-            (
-                "w:sectPr/w:type",
-                WD_SECTION.NEW_COLUMN,
-                "w:sectPr/w:type{w:val=nextColumn}",
-            ),
-        ]
-    )
-    def start_type_set_fixture(self, request):
-        initial_cxml, new_start_type, expected_cxml = request.param
-        sectPr = element(initial_cxml)
-        expected_xml = xml(expected_cxml)
-        return sectPr, new_start_type, expected_xml
+        assert section._sectPr.xml == expected_xml
 
-    # fixture components ---------------------------------------------
+    # -- fixtures-----------------------------------------------------
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def _Footer_(self, request):
+    def _Footer_(self, request: FixtureRequest):
         return class_mock(request, "docx.section._Footer")
 
     @pytest.fixture
-    def footer_(self, request):
+    def footer_(self, request: FixtureRequest):
         return instance_mock(request, _Footer)
 
     @pytest.fixture
-    def _Header_(self, request):
+    def _Header_(self, request: FixtureRequest):
         return class_mock(request, "docx.section._Header")
 
     @pytest.fixture
-    def header_(self, request):
+    def header_(self, request: FixtureRequest):
         return instance_mock(request, _Header)
 
 
-class Describe_BaseHeaderFooter(object):
+class Describe_BaseHeaderFooter:
+    """Unit-test suite for `docx.section._BaseHeaderFooter`."""
+
+    @pytest.mark.parametrize(
+        ("has_definition", "expected_value"), [(False, True), (True, False)]
+    )
     def it_knows_when_its_linked_to_the_previous_header_or_footer(
-        self, is_linked_get_fixture, _has_definition_prop_
+        self, has_definition: bool, expected_value: bool, _has_definition_prop_: Mock
     ):
-        has_definition, expected_value = is_linked_get_fixture
         _has_definition_prop_.return_value = has_definition
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
         is_linked = header.is_linked_to_previous
 
         assert is_linked is expected_value
 
+    @pytest.mark.parametrize(
+        ("has_definition", "value", "drop_calls", "add_calls"),
+        [
+            (False, True, 0, 0),
+            (True, False, 0, 0),
+            (True, True, 1, 0),
+            (False, False, 0, 1),
+        ],
+    )
     def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
         self,
-        is_linked_set_fixture,
-        _has_definition_prop_,
-        _drop_definition_,
-        _add_definition_,
+        has_definition: bool,
+        value: bool,
+        drop_calls: int,
+        add_calls: int,
+        _has_definition_prop_: Mock,
+        _drop_definition_: Mock,
+        _add_definition_: Mock,
     ):
-        has_definition, new_value, drop_calls, add_calls = is_linked_set_fixture
         _has_definition_prop_.return_value = has_definition
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
-        header.is_linked_to_previous = new_value
+        header.is_linked_to_previous = value
 
         assert _drop_definition_.call_args_list == [call(header)] * drop_calls
         assert _add_definition_.call_args_list == [call(header)] * add_calls
 
     def it_provides_access_to_the_header_or_footer_part_for_BlockItemContainer(
-        self, _get_or_add_definition_, header_part_
+        self, _get_or_add_definition_: Mock, header_part_: Mock
     ):
         # ---this override fulfills part of the BlockItemContainer subclass interface---
         _get_or_add_definition_.return_value = header_part_
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
         header_part = header.part
 
@@ -537,12 +573,14 @@ def it_provides_access_to_the_header_or_footer_part_for_BlockItemContainer(
         assert header_part is header_part_
 
     def it_provides_access_to_the_hdr_or_ftr_element_to_help(
-        self, _get_or_add_definition_, header_part_
+        self, _get_or_add_definition_: Mock, header_part_: Mock
     ):
         hdr = element("w:hdr")
         _get_or_add_definition_.return_value = header_part_
         header_part_.element = hdr
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
         hdr_elm = header._element
 
@@ -550,11 +588,13 @@ def it_provides_access_to_the_hdr_or_ftr_element_to_help(
         assert hdr_elm is hdr
 
     def it_gets_the_definition_when_it_has_one(
-        self, _has_definition_prop_, _definition_prop_, header_part_
+        self, _has_definition_prop_: Mock, _definition_prop_: Mock, header_part_: Mock
     ):
         _has_definition_prop_.return_value = True
         _definition_prop_.return_value = header_part_
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
         header_part = header._get_or_add_definition()
 
@@ -562,15 +602,17 @@ def it_gets_the_definition_when_it_has_one(
 
     def but_it_gets_the_prior_definition_when_it_is_linked(
         self,
-        _has_definition_prop_,
-        _prior_headerfooter_prop_,
-        prior_headerfooter_,
-        header_part_,
+        _has_definition_prop_: Mock,
+        _prior_headerfooter_prop_: Mock,
+        prior_headerfooter_: Mock,
+        header_part_: Mock,
     ):
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = prior_headerfooter_
         prior_headerfooter_._get_or_add_definition.return_value = header_part_
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
         header_part = header._get_or_add_definition()
 
@@ -579,77 +621,64 @@ def but_it_gets_the_prior_definition_when_it_is_linked(
 
     def and_it_adds_a_definition_when_it_is_linked_and_the_first_section(
         self,
-        _has_definition_prop_,
-        _prior_headerfooter_prop_,
-        _add_definition_,
-        header_part_,
+        _has_definition_prop_: Mock,
+        _prior_headerfooter_prop_: Mock,
+        _add_definition_: Mock,
+        header_part_: Mock,
     ):
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = None
         _add_definition_.return_value = header_part_
-        header = _BaseHeaderFooter(None, None, None)
+        header = _BaseHeaderFooter(
+            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
+        )
 
         header_part = header._get_or_add_definition()
 
         _add_definition_.assert_called_once_with(header)
         assert header_part is header_part_
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(params=[(False, True), (True, False)])
-    def is_linked_get_fixture(self, request):
-        has_definition, expected_value = request.param
-        return has_definition, expected_value
-
-    @pytest.fixture(
-        params=[
-            (False, True, 0, 0),
-            (True, False, 0, 0),
-            (True, True, 1, 0),
-            (False, False, 0, 1),
-        ]
-    )
-    def is_linked_set_fixture(self, request):
-        has_definition, new_value, drop_calls, add_calls = request.param
-        return has_definition, new_value, drop_calls, add_calls
-
-    # fixture components ---------------------------------------------
+    # -- fixture -----------------------------------------------------
 
     @pytest.fixture
-    def _add_definition_(self, request):
+    def _add_definition_(self, request: FixtureRequest):
         return method_mock(request, _BaseHeaderFooter, "_add_definition")
 
     @pytest.fixture
-    def _definition_prop_(self, request):
+    def _definition_prop_(self, request: FixtureRequest):
         return property_mock(request, _BaseHeaderFooter, "_definition")
 
     @pytest.fixture
-    def _drop_definition_(self, request):
+    def _drop_definition_(self, request: FixtureRequest):
         return method_mock(request, _BaseHeaderFooter, "_drop_definition")
 
     @pytest.fixture
-    def _get_or_add_definition_(self, request):
+    def _get_or_add_definition_(self, request: FixtureRequest):
         return method_mock(request, _BaseHeaderFooter, "_get_or_add_definition")
 
     @pytest.fixture
-    def _has_definition_prop_(self, request):
+    def _has_definition_prop_(self, request: FixtureRequest):
         return property_mock(request, _BaseHeaderFooter, "_has_definition")
 
     @pytest.fixture
-    def header_part_(self, request):
+    def header_part_(self, request: FixtureRequest):
         return instance_mock(request, HeaderPart)
 
     @pytest.fixture
-    def prior_headerfooter_(self, request):
+    def prior_headerfooter_(self, request: FixtureRequest):
         return instance_mock(request, _BaseHeaderFooter)
 
     @pytest.fixture
-    def _prior_headerfooter_prop_(self, request):
+    def _prior_headerfooter_prop_(self, request: FixtureRequest):
         return property_mock(request, _BaseHeaderFooter, "_prior_headerfooter")
 
 
-class Describe_Footer(object):
-    def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
+class Describe_Footer:
+    """Unit-test suite for `docx.section._Footer`."""
+
+    def it_can_add_a_footer_part_to_help(
+        self, document_part_: Mock, footer_part_: Mock
+    ):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_footer_part.return_value = footer_part_, "rId3"
         footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
@@ -663,7 +692,7 @@ def it_can_add_a_footer_part_to_help(self, document_part_, footer_part_):
         assert footer_part is footer_part_
 
     def it_provides_access_to_its_footer_part_to_help(
-        self, document_part_, footer_part_
+        self, document_part_: Mock, footer_part_: Mock
     ):
         sectPr = element("w:sectPr/w:footerReference{w:type=even,r:id=rId3}")
         document_part_.footer_part.return_value = footer_part_
@@ -674,7 +703,7 @@ def it_provides_access_to_its_footer_part_to_help(
         document_part_.footer_part.assert_called_once_with("rId3")
         assert footer_part is footer_part_
 
-    def it_can_drop_the_related_footer_part_to_help(self, document_part_):
+    def it_can_drop_the_related_footer_part_to_help(self, document_part_: Mock):
         sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=first,r:id=rId42}")
         footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
 
@@ -683,16 +712,22 @@ def it_can_drop_the_related_footer_part_to_help(self, document_part_):
         assert sectPr.xml == xml("w:sectPr{r:a=b}")
         document_part_.drop_rel.assert_called_once_with("rId42")
 
-    def it_knows_when_it_has_a_definition_to_help(self, has_definition_fixture):
-        sectPr, expected_value = has_definition_fixture
-        footer = _Footer(sectPr, None, WD_HEADER_FOOTER.PRIMARY)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [("w:sectPr", False), ("w:sectPr/w:footerReference{w:type=default}", True)],
+    )
+    def it_knows_when_it_has_a_definition_to_help(
+        self, sectPr_cxml: str, expected_value: bool, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
         has_definition = footer._has_definition
 
         assert has_definition is expected_value
 
     def it_provides_access_to_the_prior_Footer_to_help(
-        self, request, document_part_, footer_
+        self, request: FixtureRequest, document_part_: Mock, footer_: Mock
     ):
         doc_elm = element("w:document/(w:sectPr,w:sectPr)")
         prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
@@ -708,7 +743,7 @@ def it_provides_access_to_the_prior_Footer_to_help(
         assert prior_footer is footer_
 
     def but_it_returns_None_when_its_the_first_footer(self):
-        doc_elm = element("w:document/w:sectPr")
+        doc_elm = cast(CT_Document, element("w:document/w:sectPr"))
         sectPr = doc_elm[0]
         footer = _Footer(sectPr, None, None)
 
@@ -716,36 +751,25 @@ def but_it_returns_None_when_its_the_first_footer(self):
 
         assert prior_footer is None
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
-            ("w:sectPr", False),
-            ("w:sectPr/w:footerReference{w:type=default}", True),
-        ]
-    )
-    def has_definition_fixture(self, request):
-        sectPr_cxml, expected_value = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_value
-
-    # fixture components ---------------------------------------------
+    # -- fixtures ----------------------------------------------------
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def footer_(self, request):
+    def footer_(self, request: FixtureRequest):
         return instance_mock(request, _Footer)
 
     @pytest.fixture
-    def footer_part_(self, request):
+    def footer_part_(self, request: FixtureRequest):
         return instance_mock(request, FooterPart)
 
 
-class Describe_Header(object):
-    def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
+class Describe_Header:
+    def it_can_add_a_header_part_to_help(
+        self, document_part_: Mock, header_part_: Mock
+    ):
         sectPr = element("w:sectPr{r:a=b}")
         document_part_.add_header_part.return_value = header_part_, "rId3"
         header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
@@ -759,7 +783,7 @@ def it_can_add_a_header_part_to_help(self, document_part_, header_part_):
         assert header_part is header_part_
 
     def it_provides_access_to_its_header_part_to_help(
-        self, document_part_, header_part_
+        self, document_part_: Mock, header_part_: Mock
     ):
         sectPr = element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}")
         document_part_.header_part.return_value = header_part_
@@ -770,7 +794,7 @@ def it_provides_access_to_its_header_part_to_help(
         document_part_.header_part.assert_called_once_with("rId8")
         assert header_part is header_part_
 
-    def it_can_drop_the_related_header_part_to_help(self, document_part_):
+    def it_can_drop_the_related_header_part_to_help(self, document_part_: Mock):
         sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=even,r:id=rId42}")
         header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
 
@@ -779,16 +803,22 @@ def it_can_drop_the_related_header_part_to_help(self, document_part_):
         assert sectPr.xml == xml("w:sectPr{r:a=b}")
         document_part_.drop_header_part.assert_called_once_with("rId42")
 
-    def it_knows_when_it_has_a_header_part_to_help(self, has_definition_fixture):
-        sectPr, expected_value = has_definition_fixture
-        header = _Header(sectPr, None, WD_HEADER_FOOTER.FIRST_PAGE)
+    @pytest.mark.parametrize(
+        ("sectPr_cxml", "expected_value"),
+        [("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=first}", True)],
+    )
+    def it_knows_when_it_has_a_header_part_to_help(
+        self, sectPr_cxml: str, expected_value: bool, document_part_: Mock
+    ):
+        sectPr = cast(CT_SectPr, element(sectPr_cxml))
+        header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
 
         has_definition = header._has_definition
 
         assert has_definition is expected_value
 
     def it_provides_access_to_the_prior_Header_to_help(
-        self, request, document_part_, header_
+        self, request, document_part_: Mock, header_: Mock
     ):
         doc_elm = element("w:document/(w:sectPr,w:sectPr)")
         prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
@@ -812,26 +842,16 @@ def but_it_returns_None_when_its_the_first_header(self):
 
         assert prior_header is None
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[("w:sectPr", False), ("w:sectPr/w:headerReference{w:type=first}", True)]
-    )
-    def has_definition_fixture(self, request):
-        sectPr_cxml, expected_value = request.param
-        sectPr = element(sectPr_cxml)
-        return sectPr, expected_value
-
-    # fixture components ---------------------------------------------
+    # -- fixtures-----------------------------------------------------
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def header_(self, request):
+    def header_(self, request: FixtureRequest):
         return instance_mock(request, _Header)
 
     @pytest.fixture
-    def header_part_(self, request):
+    def header_part_(self, request: FixtureRequest):
         return instance_mock(request, HeaderPart)
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index d37c4252c..a17b2f1bd 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -1,5 +1,7 @@
 """Test suite for the docx.text.run module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.dml.color import ColorFormat
@@ -63,8 +65,21 @@ def it_can_change_whether_it_is_superscript(self, superscript_set_fixture):
         font.superscript = value
         assert font._element.xml == expected_xml
 
-    def it_knows_its_underline_type(self, underline_get_fixture):
-        font, expected_value = underline_get_fixture
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", None),
+            ("w:r/w:rPr/w:u", None),
+            ("w:r/w:rPr/w:u{w:val=single}", True),
+            ("w:r/w:rPr/w:u{w:val=none}", False),
+            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
+            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
+        ],
+    )
+    def it_knows_its_underline_type(
+        self, r_cxml: str, expected_value: WD_UNDERLINE | bool | None
+    ):
+        font = Font(element(r_cxml), None)
         assert font.underline is expected_value
 
     def it_can_change_its_underline_type(self, underline_set_fixture):
@@ -381,21 +396,6 @@ def superscript_set_fixture(self, request):
         expected_xml = xml(expected_r_cxml)
         return font, value, expected_xml
 
-    @pytest.fixture(
-        params=[
-            ("w:r", None),
-            ("w:r/w:rPr/w:u", None),
-            ("w:r/w:rPr/w:u{w:val=single}", True),
-            ("w:r/w:rPr/w:u{w:val=none}", False),
-            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
-            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
-        ]
-    )
-    def underline_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        run = Font(element(r_cxml), None)
-        return run, expected_value
-
     @pytest.fixture(
         params=[
             ("w:r", True, "w:r/w:rPr/w:u{w:val=single}"),
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 3ab71f482..775d0b424 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, cast
+from typing import Any, List, cast
 
 import pytest
 
@@ -99,10 +99,12 @@ def it_can_change_its_underline_type(self, underline_set_fixture):
         run.underline = underline
         assert run._r.xml == expected_xml
 
-    def it_raises_on_assign_invalid_underline_type(self, underline_raise_fixture):
-        run, underline = underline_raise_fixture
+    @pytest.mark.parametrize("invalid_value", ["foobar", 42, "single"])
+    def it_raises_on_assign_invalid_underline_value(self, invalid_value: Any):
+        r = cast(CT_R, element("w:r/w:rPr"))
+        run = Run(r, None)
         with pytest.raises(ValueError, match=" is not a valid WD_UNDERLINE"):
-            run.underline = underline
+            run.underline = invalid_value
 
     def it_provides_access_to_its_font(self, font_fixture):
         run, Font_, font_ = font_fixture
@@ -369,12 +371,6 @@ def underline_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, new_underline, expected_xml
 
-    @pytest.fixture(params=["foobar", 42, "single"])
-    def underline_raise_fixture(self, request):
-        invalid_underline_setting = request.param
-        run = Run(element("w:r/w:rPr"), None)
-        return run, invalid_underline_setting
-
     # fixture components ---------------------------------------------
 
     @pytest.fixture

From b61b63b8267d3e51cc069cacd274dd23d309bf77 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 8 Oct 2023 12:28:28 -0700
Subject: [PATCH 286/367] rfctr: Paragraph type-checks clean

---
 src/docx/opc/part.py            | 26 ++++++++++++++++-----
 src/docx/oxml/__init__.py       |  7 +++---
 src/docx/oxml/shared.py         | 18 ++++++++++-----
 src/docx/oxml/styles.py         | 40 +++++++++++++++++++--------------
 src/docx/oxml/text/paragraph.py | 12 ++++++----
 src/docx/oxml/text/parfmt.py    | 27 +++++++++++++++-------
 src/docx/oxml/xmlchemy.py       |  1 +
 src/docx/parts/document.py      | 18 +++++++++++----
 src/docx/parts/story.py         | 21 +++++++++++++----
 src/docx/parts/styles.py        |  8 ++++++-
 src/docx/shared.py              | 26 ++++++++++++++++++---
 src/docx/styles/__init__.py     | 10 ++++++---
 src/docx/styles/style.py        | 22 ++++++++++++------
 src/docx/styles/styles.py       | 29 ++++++++++++++++--------
 src/docx/text/paragraph.py      | 12 +++++-----
 15 files changed, 198 insertions(+), 79 deletions(-)

diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index 655ea5fa7..a7cd19d61 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -1,11 +1,18 @@
 """Open Packaging Convention (OPC) objects related to package parts."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
 from docx.opc.rel import Relationships
 from docx.opc.shared import cls_method_fn, lazyproperty
 from docx.oxml.parser import parse_xml
 
+if TYPE_CHECKING:
+    from docx.opc.package import OpcPackage
+
 
 class Part(object):
     """Base class for package parts.
@@ -14,7 +21,13 @@ class Part(object):
     to implement specific part behaviors.
     """
 
-    def __init__(self, partname, content_type, blob=None, package=None):
+    def __init__(
+        self,
+        partname: str,
+        content_type: str,
+        blob: bytes | None = None,
+        package: OpcPackage | None = None,
+    ):
         super(Part, self).__init__()
         self._partname = partname
         self._content_type = content_type
@@ -96,7 +109,7 @@ def partname(self, partname):
             raise TypeError(tmpl % type(partname).__name__)
         self._partname = partname
 
-    def part_related_by(self, reltype):
+    def part_related_by(self, reltype: str) -> Part:
         """Return part to which this part has a relationship of `reltype`.
 
         Raises |KeyError| if no such relationship is found and |ValueError| if more than
@@ -105,9 +118,12 @@ def part_related_by(self, reltype):
         """
         return self.rels.part_with_reltype(reltype)
 
-    def relate_to(self, target, reltype, is_external=False):
-        """Return rId key of relationship of `reltype` to `target`, from an existing
-        relationship if there is one, otherwise a newly created one."""
+    def relate_to(self, target: Part, reltype: str, is_external: bool = False) -> str:
+        """Return rId key of relationship of `reltype` to `target`.
+
+        The returned `rId` is from an existing relationship if there is one, otherwise a
+        new relationship is created.
+        """
         if is_external:
             return self.rels.get_or_add_ext_rel(reltype, target)
         else:
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 53cbd5601..e72e4c5cd 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -21,6 +21,7 @@
     CT_ShapeProperties,
     CT_Transform2D,
 )
+from docx.oxml.shared import CT_DecimalNumber, CT_OnOff, CT_String
 from docx.oxml.text.hyperlink import CT_Hyperlink
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.oxml.text.run import (
@@ -68,13 +69,13 @@
 register_element_cls("w:t", CT_Text)
 
 # ---------------------------------------------------------------------------
-# other custom element class mappings
-
-from .shared import CT_DecimalNumber, CT_OnOff, CT_String  # noqa
+# header/footer-related mappings
 
 register_element_cls("w:evenAndOddHeaders", CT_OnOff)
 register_element_cls("w:titlePg", CT_OnOff)
 
+# ---------------------------------------------------------------------------
+# other custom element class mappings
 
 from .coreprops import CT_CoreProperties  # noqa
 
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index d979c638b..1774560ac 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -1,5 +1,9 @@
 """Objects shared by modules in the docx.oxml subpackage."""
 
+from __future__ import annotations
+
+from typing import cast
+
 from docx.oxml.ns import qn
 from docx.oxml.parser import OxmlElement
 from docx.oxml.simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
@@ -33,15 +37,19 @@ class CT_OnOff(BaseOxmlElement):
 
 
 class CT_String(BaseOxmlElement):
-    """Used for ``<w:pStyle>`` and ``<w:tblStyle>`` elements and others, containing a
-    style name in its ``val`` attribute."""
+    """Used for `w:pStyle` and `w:tblStyle` elements and others.
+
+    In those cases, it containing a style name in its `val` attribute.
+    """
 
-    val = RequiredAttribute("w:val", ST_String)
+    val: str = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:val", ST_String
+    )
 
     @classmethod
-    def new(cls, nsptagname, val):
+    def new(cls, nsptagname: str, val: str):
         """Return a new ``CT_String`` element with tagname `nsptagname` and ``val``
         attribute set to `val`."""
-        elm = OxmlElement(nsptagname)
+        elm = cast(CT_String, OxmlElement(nsptagname))
         elm.val = val
         return elm
diff --git a/src/docx/oxml/styles.py b/src/docx/oxml/styles.py
index 486110848..e0a3eaeaf 100644
--- a/src/docx/oxml/styles.py
+++ b/src/docx/oxml/styles.py
@@ -1,5 +1,7 @@
 """Custom element classes related to the styles part."""
 
+from __future__ import annotations
+
 from docx.enum.style import WD_STYLE_TYPE
 from docx.oxml.simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
 from docx.oxml.xmlchemy import (
@@ -126,8 +128,14 @@ class CT_Style(BaseOxmlElement):
     rPr = ZeroOrOne("w:rPr", successors=_tag_seq[18:])
     del _tag_seq
 
-    type = OptionalAttribute("w:type", WD_STYLE_TYPE)
-    styleId = OptionalAttribute("w:styleId", ST_String)
+    type: WD_STYLE_TYPE | None = (
+        OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+            "w:type", WD_STYLE_TYPE
+        )
+    )
+    styleId: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:styleId", ST_String
+    )
     default = OptionalAttribute("w:default", ST_OnOff)
     customStyle = OptionalAttribute("w:customStyle", ST_OnOff)
 
@@ -293,23 +301,21 @@ def default_for(self, style_type):
         # spec calls for last default in document order
         return default_styles_for_type[-1]
 
-    def get_by_id(self, styleId):
-        """Return the ``<w:style>`` child element having ``styleId`` attribute matching
-        `styleId`, or |None| if not found."""
-        xpath = 'w:style[@w:styleId="%s"]' % styleId
-        try:
-            return self.xpath(xpath)[0]
-        except IndexError:
-            return None
+    def get_by_id(self, styleId: str) -> CT_Style | None:
+        """`w:style` child where @styleId = `styleId`.
 
-    def get_by_name(self, name):
-        """Return the ``<w:style>`` child element having ``<w:name>`` child element with
-        value `name`, or |None| if not found."""
+        |None| if not found.
+        """
+        xpath = f'w:style[@w:styleId="{styleId}"]'
+        return next(iter(self.xpath(xpath)), None)
+
+    def get_by_name(self, name: str) -> CT_Style | None:
+        """`w:style` child with `w:name` grandchild having value `name`.
+
+        |None| if not found.
+        """
         xpath = 'w:style[w:name/@w:val="%s"]' % name
-        try:
-            return self.xpath(xpath)[0]
-        except IndexError:
-            return None
+        return next(iter(self.xpath(xpath)), None)
 
     def _iter_styles(self):
         """Generate each of the `w:style` child elements in document order."""
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index 21384285f..f771dd74f 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -1,14 +1,17 @@
+# pyright: reportPrivateUsage=false
+
 """Custom element classes related to paragraphs (CT_P)."""
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, List
+from typing import TYPE_CHECKING, Callable, List, cast
 
 from docx.oxml.parser import OxmlElement
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore, ZeroOrOne
 
 if TYPE_CHECKING:
     from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+    from docx.oxml.section import CT_SectPr
     from docx.oxml.text.hyperlink import CT_Hyperlink
     from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
     from docx.oxml.text.parfmt import CT_PPr
@@ -18,6 +21,7 @@
 class CT_P(BaseOxmlElement):
     """`<w:p>` element, containing the properties and text for a paragraph."""
 
+    add_r: Callable[[], CT_R]
     get_or_add_pPr: Callable[[], CT_PPr]
     hyperlink_lst: List[CT_Hyperlink]
     r_lst: List[CT_R]
@@ -28,7 +32,7 @@ class CT_P(BaseOxmlElement):
 
     def add_p_before(self) -> CT_P:
         """Return a new `<w:p>` element inserted directly prior to this one."""
-        new_p = OxmlElement("w:p")
+        new_p = cast(CT_P, OxmlElement("w:p"))
         self.addprevious(new_p)
         return new_p
 
@@ -66,7 +70,7 @@ def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
             "./w:r/w:lastRenderedPageBreak | ./w:hyperlink/w:r/w:lastRenderedPageBreak"
         )
 
-    def set_sectPr(self, sectPr):
+    def set_sectPr(self, sectPr: CT_SectPr):
         """Unconditionally replace or add `sectPr` as grandchild in correct sequence."""
         pPr = self.get_or_add_pPr()
         pPr._remove_sectPr()
@@ -84,7 +88,7 @@ def style(self) -> str | None:
         return pPr.style
 
     @style.setter
-    def style(self, style):
+    def style(self, style: str | None):
         pPr = self.get_or_add_pPr()
         pPr.style = style
 
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index 74c2504ab..49ea01003 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING, Callable
+
 from docx.enum.text import (
     WD_ALIGN_PARAGRAPH,
     WD_LINE_SPACING,
@@ -18,6 +20,10 @@
 )
 from docx.shared import Length
 
+if TYPE_CHECKING:
+    from docx.oxml.section import CT_SectPr
+    from docx.oxml.shared import CT_String
+
 
 class CT_Ind(BaseOxmlElement):
     """``<w:ind>`` element, specifying paragraph indentation."""
@@ -37,6 +43,11 @@ class CT_Jc(BaseOxmlElement):
 class CT_PPr(BaseOxmlElement):
     """``<w:pPr>`` element, containing the properties for a paragraph."""
 
+    get_or_add_pStyle: Callable[[], CT_String]
+    _insert_sectPr: Callable[[CT_SectPr], None]
+    _remove_pStyle: Callable[[], None]
+    _remove_sectPr: Callable[[], None]
+
     _tag_seq = (
         "w:pStyle",
         "w:keepNext",
@@ -75,7 +86,9 @@ class CT_PPr(BaseOxmlElement):
         "w:sectPr",
         "w:pPrChange",
     )
-    pStyle = ZeroOrOne("w:pStyle", successors=_tag_seq[1:])
+    pStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:pStyle", successors=_tag_seq[1:]
+    )
     keepNext = ZeroOrOne("w:keepNext", successors=_tag_seq[2:])
     keepLines = ZeroOrOne("w:keepLines", successors=_tag_seq[3:])
     pageBreakBefore = ZeroOrOne("w:pageBreakBefore", successors=_tag_seq[4:])
@@ -273,20 +286,18 @@ def spacing_lineRule(self, value):
         self.get_or_add_spacing().lineRule = value
 
     @property
-    def style(self):
-        """String contained in <w:pStyle> child, or None if that element is not
-        present."""
+    def style(self) -> str | None:
+        """String contained in `./w:pStyle/@val`, or None if child is not present."""
         pStyle = self.pStyle
         if pStyle is None:
             return None
         return pStyle.val
 
     @style.setter
-    def style(self, style):
-        """Set val attribute of <w:pStyle> child element to `style`, adding a new
-        element if necessary.
+    def style(self, style: str | None):
+        """Set `./w:pStyle/@val` `style`, adding a new element if necessary.
 
-        If `style` is |None|, remove the <w:pStyle> element if present.
+        If `style` is |None|, remove `./w:pStyle` when present.
         """
         if style is None:
             self._remove_pStyle()
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index a0d870409..350e72aa8 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -623,6 +623,7 @@ class BaseOxmlElement(metaclass=MetaOxmlElement):
     Adds standardized behavior to all classes in one place.
     """
 
+    addprevious: Callable[[BaseOxmlElement], None]
     attrib: Dict[str, str]
     append: Callable[[ElementBase], None]
     find: Callable[[str], ElementBase | None]
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index ec3bf3785..a157764b9 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -1,6 +1,11 @@
 """|DocumentPart| and closely related objects."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
+
 from docx.document import Document
+from docx.enum.style import WD_STYLE_TYPE
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
@@ -10,6 +15,9 @@
 from docx.shape import InlineShapes
 from docx.shared import lazyproperty
 
+if TYPE_CHECKING:
+    from docx.styles.style import BaseStyle
+
 
 class DocumentPart(StoryPart):
     """Main document part of a WordprocessingML (WML) package, aka a .docx file.
@@ -51,7 +59,7 @@ def footer_part(self, rId: str):
         """Return |FooterPart| related by `rId`."""
         return self.related_parts[rId]
 
-    def get_style(self, style_id, style_type):
+    def get_style(self, style_id: str | None, style_type: WD_STYLE_TYPE) -> BaseStyle:
         """Return the style in this document matching `style_id`.
 
         Returns the default style for `style_type` if `style_id` is |None| or does not
@@ -124,14 +132,16 @@ def _settings_part(self):
             return settings_part
 
     @property
-    def _styles_part(self):
+    def _styles_part(self) -> StylesPart:
         """Instance of |StylesPart| for this document.
 
         Creates an empty styles part if one is not present.
         """
         try:
-            return self.part_related_by(RT.STYLES)
+            return cast(StylesPart, self.part_related_by(RT.STYLES))
         except KeyError:
-            styles_part = StylesPart.default(self.package)
+            package = self.package
+            assert package is not None
+            styles_part = StylesPart.default(package)
             self.relate_to(styles_part, RT.STYLES)
             return styles_part
diff --git a/src/docx/parts/story.py b/src/docx/parts/story.py
index 41d365c49..012c812f6 100644
--- a/src/docx/parts/story.py
+++ b/src/docx/parts/story.py
@@ -1,10 +1,19 @@
 """|StoryPart| and related objects."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
 from docx.oxml.shape import CT_Inline
 from docx.shared import lazyproperty
 
+if TYPE_CHECKING:
+    from docx.enum.style import WD_STYLE_TYPE
+    from docx.parts.document import DocumentPart
+    from docx.styles.style import BaseStyle
+
 
 class StoryPart(XmlPart):
     """Base class for story parts.
@@ -26,7 +35,7 @@ def get_or_add_image(self, image_descriptor):
         rId = self.relate_to(image_part, RT.IMAGE)
         return rId, image_part.image
 
-    def get_style(self, style_id, style_type):
+    def get_style(self, style_id: str | None, style_type: WD_STYLE_TYPE) -> BaseStyle:
         """Return the style in this document matching `style_id`.
 
         Returns the default style for `style_type` if `style_id` is |None| or does not
@@ -34,7 +43,9 @@ def get_style(self, style_id, style_type):
         """
         return self._document_part.get_style(style_id, style_type)
 
-    def get_style_id(self, style_or_name, style_type):
+    def get_style_id(
+        self, style_or_name: BaseStyle | str | None, style_type: WD_STYLE_TYPE
+    ) -> str | None:
         """Return str style_id for `style_or_name` of `style_type`.
 
         Returns |None| if the style resolves to the default style for `style_type` or if
@@ -69,6 +80,8 @@ def next_id(self):
         return max(used_ids) + 1
 
     @lazyproperty
-    def _document_part(self):
+    def _document_part(self) -> DocumentPart:
         """|DocumentPart| object for this package."""
-        return self.package.main_document_part
+        package = self.package
+        assert package is not None
+        return package.main_document_part
diff --git a/src/docx/parts/styles.py b/src/docx/parts/styles.py
index 9016163ab..dffa762ef 100644
--- a/src/docx/parts/styles.py
+++ b/src/docx/parts/styles.py
@@ -1,6 +1,9 @@
 """Provides StylesPart and related objects."""
 
+from __future__ import annotations
+
 import os
+from typing import TYPE_CHECKING
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
@@ -8,13 +11,16 @@
 from docx.oxml.parser import parse_xml
 from docx.styles.styles import Styles
 
+if TYPE_CHECKING:
+    from docx.opc.package import OpcPackage
+
 
 class StylesPart(XmlPart):
     """Proxy for the styles.xml part containing style definitions for a document or
     glossary."""
 
     @classmethod
-    def default(cls, package):
+    def default(cls, package: OpcPackage) -> StylesPart:
         """Return a newly created styles part, containing a default set of elements."""
         partname = PackURI("/word/styles.xml")
         content_type = CT.WML_STYLES
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 83e064098..40dfb369d 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -7,6 +7,7 @@
 
 if TYPE_CHECKING:
     from docx.oxml.xmlchemy import BaseOxmlElement
+    from docx.parts.story import StoryPart
 
 
 class Length(int):
@@ -267,7 +268,7 @@ class ElementProxy(object):
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    def __init__(self, element: "BaseOxmlElement", parent=None):
+    def __init__(self, element: BaseOxmlElement, parent=None):
         self._element = element
         self._parent = parent
 
@@ -299,7 +300,7 @@ def part(self):
         return self._parent.part
 
 
-class Parented(object):
+class Parented:
     """Provides common services for document elements that occur below a part but may
     occasionally require an ancestor object to provide a service, such as add or drop a
     relationship.
@@ -308,7 +309,6 @@ class Parented(object):
     """
 
     def __init__(self, parent):
-        super(Parented, self).__init__()
         self._parent = parent
 
     @property
@@ -317,6 +317,26 @@ def part(self):
         return self._parent.part
 
 
+class StoryChild:
+    """A document element within a story part.
+
+    Story parts include DocumentPart and Header/FooterPart and can contain block items
+    (paragraphs and tables). These occasionally require an ancestor object to provide
+    access to part-level or package-level items like styles or images or to add or drop
+    a relationship.
+
+    Provides `self._parent` attribute to subclasses.
+    """
+
+    def __init__(self, parent: StoryChild):
+        self._parent = parent
+
+    @property
+    def part(self) -> StoryPart:
+        """The package part containing this object."""
+        return self._parent.part
+
+
 class TextAccumulator:
     """Accepts `str` fragments and joins them together, in order, on `.pop().
 
diff --git a/src/docx/styles/__init__.py b/src/docx/styles/__init__.py
index b6b09e0ca..514eee908 100644
--- a/src/docx/styles/__init__.py
+++ b/src/docx/styles/__init__.py
@@ -1,5 +1,9 @@
 """Sub-package module for docx.styles sub-package."""
 
+from __future__ import annotations
+
+from typing import Dict
+
 
 class BabelFish(object):
     """Translates special-case style names from UI name (e.g. Heading 1) to
@@ -20,17 +24,17 @@ class BabelFish(object):
         ("Heading 9", "heading 9"),
     )
 
-    internal_style_names = dict(style_aliases)
+    internal_style_names: Dict[str, str] = dict(style_aliases)
     ui_style_names = {item[1]: item[0] for item in style_aliases}
 
     @classmethod
-    def ui2internal(cls, ui_style_name):
+    def ui2internal(cls, ui_style_name: str) -> str:
         """Return the internal style name corresponding to `ui_style_name`, such as
         'heading 1' for 'Heading 1'."""
         return cls.internal_style_names.get(ui_style_name, ui_style_name)
 
     @classmethod
-    def internal2ui(cls, internal_style_name):
+    def internal2ui(cls, internal_style_name: str) -> str:
         """Return the user interface style name corresponding to `internal_style_name`,
         such as 'Heading 1' for 'heading 1'."""
         return cls.ui_style_names.get(internal_style_name, internal_style_name)
diff --git a/src/docx/styles/style.py b/src/docx/styles/style.py
index 6ca4ba8df..aa175ea80 100644
--- a/src/docx/styles/style.py
+++ b/src/docx/styles/style.py
@@ -1,16 +1,20 @@
 """Style object hierarchy."""
 
+from __future__ import annotations
+
+from typing import Type
+
 from docx.enum.style import WD_STYLE_TYPE
+from docx.oxml.styles import CT_Style
 from docx.shared import ElementProxy
 from docx.styles import BabelFish
 from docx.text.font import Font
 from docx.text.parfmt import ParagraphFormat
 
 
-def StyleFactory(style_elm):
-    """Return a style object of the appropriate |BaseStyle| subclass, according to the
-    type of `style_elm`."""
-    style_cls = {
+def StyleFactory(style_elm: CT_Style) -> BaseStyle:
+    """Return `Style` object of appropriate |BaseStyle| subclass for `style_elm`."""
+    style_cls: Type[BaseStyle] = {
         WD_STYLE_TYPE.PARAGRAPH: ParagraphStyle,
         WD_STYLE_TYPE.CHARACTER: CharacterStyle,
         WD_STYLE_TYPE.TABLE: _TableStyle,
@@ -27,6 +31,10 @@ class BaseStyle(ElementProxy):
     These properties and methods are inherited by all style objects.
     """
 
+    def __init__(self, style_elm: CT_Style):
+        super().__init__(style_elm)
+        self._style_elm = style_elm
+
     @property
     def builtin(self):
         """Read-only.
@@ -117,13 +125,13 @@ def quick_style(self, value):
         self._element.qFormat_val = value
 
     @property
-    def style_id(self):
+    def style_id(self) -> str:
         """The unique key name (string) for this style.
 
         This value is subject to rewriting by Word and should generally not be changed
         unless you are familiar with the internals involved.
         """
-        return self._element.styleId
+        return self._style_elm.styleId
 
     @style_id.setter
     def style_id(self, value):
@@ -133,7 +141,7 @@ def style_id(self, value):
     def type(self):
         """Member of :ref:`WdStyleType` corresponding to the type of this style, e.g.
         ``WD_STYLE_TYPE.PARAGRAPH``."""
-        type = self._element.type
+        type = self._style_elm.type
         if type is None:
             return WD_STYLE_TYPE.PARAGRAPH
         return type
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index c9b8d47fb..98a56e520 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -1,7 +1,11 @@
 """Styles object, container for all objects in the styles part."""
 
+from __future__ import annotations
+
 from warnings import warn
 
+from docx.enum.style import WD_STYLE_TYPE
+from docx.oxml.styles import CT_Styles
 from docx.shared import ElementProxy
 from docx.styles import BabelFish
 from docx.styles.latent import LatentStyles
@@ -15,12 +19,16 @@ class Styles(ElementProxy):
     and dictionary-style access by style name.
     """
 
+    def __init__(self, styles: CT_Styles):
+        super().__init__(styles)
+        self._element = styles
+
     def __contains__(self, name):
         """Enables `in` operator on style name."""
         internal_name = BabelFish.ui2internal(name)
         return any(style.name_val == internal_name for style in self._element.style_lst)
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str):
         """Enables dictionary-style access by UI name.
 
         Lookup by style id is deprecated, triggers a warning, and will be removed in a
@@ -59,7 +67,7 @@ def add_style(self, name, style_type, builtin=False):
         style = self._element.add_style_of_type(style_name, style_type, builtin)
         return StyleFactory(style)
 
-    def default(self, style_type):
+    def default(self, style_type: WD_STYLE_TYPE):
         """Return the default style for `style_type` or |None| if no default is defined
         for that type (not common)."""
         style = self._element.default_for(style_type)
@@ -67,7 +75,7 @@ def default(self, style_type):
             return None
         return StyleFactory(style)
 
-    def get_by_id(self, style_id, style_type):
+    def get_by_id(self, style_id: str | None, style_type: WD_STYLE_TYPE):
         """Return the style of `style_type` matching `style_id`.
 
         Returns the default for `style_type` if `style_id` is not found or is |None|, or
@@ -99,18 +107,20 @@ def latent_styles(self):
         those defaults for a particular named latent style."""
         return LatentStyles(self._element.get_or_add_latentStyles())
 
-    def _get_by_id(self, style_id, style_type):
+    def _get_by_id(self, style_id: str | None, style_type: WD_STYLE_TYPE):
         """Return the style of `style_type` matching `style_id`.
 
         Returns the default for `style_type` if `style_id` is not found or if the style
         having `style_id` is not of `style_type`.
         """
-        style = self._element.get_by_id(style_id)
+        style = self._element.get_by_id(style_id) if style_id else None
         if style is None or style.type != style_type:
             return self.default(style_type)
         return StyleFactory(style)
 
-    def _get_style_id_from_name(self, style_name, style_type):
+    def _get_style_id_from_name(
+        self, style_name: str, style_type: WD_STYLE_TYPE
+    ) -> str | None:
         """Return the id of the style of `style_type` corresponding to `style_name`.
 
         Returns |None| if that style is the default style for `style_type`. Raises
@@ -119,9 +129,10 @@ def _get_style_id_from_name(self, style_name, style_type):
         """
         return self._get_style_id_from_style(self[style_name], style_type)
 
-    def _get_style_id_from_style(self, style, style_type):
-        """Return the id of `style`, or |None| if it is the default style of
-        `style_type`.
+    def _get_style_id_from_style(
+        self, style: BaseStyle, style_type: WD_STYLE_TYPE
+    ) -> str | None:
+        """Id of `style`, or |None| if it is the default style of `style_type`.
 
         Raises |ValueError| if style is not of `style_type`.
         """
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 72b0174d0..2425f1d6e 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -2,16 +2,15 @@
 
 from __future__ import annotations
 
-from typing import Iterator, List
+from typing import Iterator, List, cast
 
 from typing_extensions import Self
 
-from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
 from docx.oxml.text.paragraph import CT_P
 from docx.oxml.text.run import CT_R
-from docx.shared import Parented
+from docx.shared import StoryChild
 from docx.styles.style import CharacterStyle, ParagraphStyle
 from docx.text.hyperlink import Hyperlink
 from docx.text.pagebreak import RenderedPageBreak
@@ -19,10 +18,10 @@
 from docx.text.run import Run
 
 
-class Paragraph(Parented):
+class Paragraph(StoryChild):
     """Proxy object wrapping a `<w:p>` element."""
 
-    def __init__(self, p: CT_P, parent: t.StoryChild):
+    def __init__(self, p: CT_P, parent: StoryChild):
         super(Paragraph, self).__init__(parent)
         self._p = self._element = p
 
@@ -141,7 +140,8 @@ def style(self) -> ParagraphStyle | None:
         its effective value the default paragraph style for the document.
         """
         style_id = self._p.style
-        return self.part.get_style(style_id, WD_STYLE_TYPE.PARAGRAPH)
+        style = self.part.get_style(style_id, WD_STYLE_TYPE.PARAGRAPH)
+        return cast(ParagraphStyle, style)
 
     @style.setter
     def style(self, style_or_name: str | ParagraphStyle | None):

From ac26854ca7e8689fdcaed00e69181af09b4c9a10 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 8 Oct 2023 17:41:47 -0700
Subject: [PATCH 287/367] rfctr: Run type-checks clean

---
 src/docx/image/image.py      | 62 +++++++++++++---------
 src/docx/opc/part.py         |  4 +-
 src/docx/oxml/__init__.py    |  2 +
 src/docx/oxml/shape.py       | 23 +++++++--
 src/docx/oxml/simpletypes.py | 42 ++++++++-------
 src/docx/oxml/text/font.py   | 34 ++++++++-----
 src/docx/oxml/text/run.py    | 28 ++++++----
 src/docx/oxml/xmlchemy.py    | 99 +++++++++++++++++++++++-------------
 src/docx/package.py          | 10 ++--
 src/docx/parts/image.py      |  8 ++-
 src/docx/parts/story.py      | 20 +++++---
 src/docx/shared.py           |  8 +--
 src/docx/text/font.py        | 14 ++++-
 src/docx/text/run.py         | 79 +++++++++++++++++-----------
 src/docx/types.py            | 19 +++++++
 tests/text/test_run.py       | 49 +++++++++---------
 16 files changed, 322 insertions(+), 179 deletions(-)

diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 2e5286f6f..2d2f2c97d 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -4,26 +4,31 @@
 them in a document.
 """
 
+from __future__ import annotations
+
 import hashlib
 import io
 import os
+from typing import IO, Tuple
+
+from typing_extensions import Self
 
 from docx.image.exceptions import UnrecognizedImageError
-from docx.shared import Emu, Inches, lazyproperty
+from docx.shared import Emu, Inches, Length, lazyproperty
 
 
-class Image(object):
+class Image:
     """Graphical image stream such as JPEG, PNG, or GIF with properties and methods
     required by ImagePart."""
 
-    def __init__(self, blob, filename, image_header):
+    def __init__(self, blob: bytes, filename: str, image_header: BaseImageHeader):
         super(Image, self).__init__()
         self._blob = blob
         self._filename = filename
         self._image_header = image_header
 
     @classmethod
-    def from_blob(cls, blob):
+    def from_blob(cls, blob: bytes) -> Self:
         """Return a new |Image| subclass instance parsed from the image binary contained
         in `blob`."""
         stream = io.BytesIO(blob)
@@ -73,17 +78,17 @@ def filename(self):
         return self._filename
 
     @property
-    def px_width(self):
+    def px_width(self) -> int:
         """The horizontal pixel dimension of the image."""
         return self._image_header.px_width
 
     @property
-    def px_height(self):
+    def px_height(self) -> int:
         """The vertical pixel dimension of the image."""
         return self._image_header.px_height
 
     @property
-    def horz_dpi(self):
+    def horz_dpi(self) -> int:
         """Integer dots per inch for the width of this image.
 
         Defaults to 72 when not present in the file, as is often the case.
@@ -91,7 +96,7 @@ def horz_dpi(self):
         return self._image_header.horz_dpi
 
     @property
-    def vert_dpi(self):
+    def vert_dpi(self) -> int:
         """Integer dots per inch for the height of this image.
 
         Defaults to 72 when not present in the file, as is often the case.
@@ -99,34 +104,40 @@ def vert_dpi(self):
         return self._image_header.vert_dpi
 
     @property
-    def width(self):
+    def width(self) -> Inches:
         """A |Length| value representing the native width of the image, calculated from
         the values of `px_width` and `horz_dpi`."""
         return Inches(self.px_width / self.horz_dpi)
 
     @property
-    def height(self):
+    def height(self) -> Inches:
         """A |Length| value representing the native height of the image, calculated from
         the values of `px_height` and `vert_dpi`."""
         return Inches(self.px_height / self.vert_dpi)
 
-    def scaled_dimensions(self, width=None, height=None):
-        """Return a (cx, cy) 2-tuple representing the native dimensions of this image
-        scaled by applying the following rules to `width` and `height`.
-
-        If both `width` and `height` are specified, the return value is (`width`,
-        `height`); no scaling is performed. If only one is specified, it is used to
-        compute a scaling factor that is then applied to the unspecified dimension,
-        preserving the aspect ratio of the image. If both `width` and `height` are
-        |None|, the native dimensions are returned. The native dimensions are calculated
-        using the dots-per-inch (dpi) value embedded in the image, defaulting to 72 dpi
-        if no value is specified, as is often the case. The returned values are both
-        |Length| objects.
+    def scaled_dimensions(
+        self, width: int | None = None, height: int | None = None
+    ) -> Tuple[Length, Length]:
+        """(cx, cy) pair representing scaled dimensions of this image.
+
+        The native dimensions of the image are scaled by applying the following rules to
+        the `width` and `height` arguments.
+
+        * If both `width` and `height` are specified, the return value is (`width`,
+        `height`); no scaling is performed.
+        * If only one is specified, it is used to compute a scaling factor that is then
+        applied to the unspecified dimension, preserving the aspect ratio of the image.
+        * If both `width` and `height` are |None|, the native dimensions are returned.
+
+        The native dimensions are calculated using the dots-per-inch (dpi) value
+        embedded in the image, defaulting to 72 dpi if no value is specified, as is
+        often the case. The returned values are both |Length| objects.
         """
         if width is None and height is None:
             return self.width, self.height
 
         if width is None:
+            assert height is not None
             scaling_factor = float(height) / float(self.height)
             width = round(self.width * scaling_factor)
 
@@ -142,7 +153,12 @@ def sha1(self):
         return hashlib.sha1(self._blob).hexdigest()
 
     @classmethod
-    def _from_stream(cls, stream, blob, filename=None):
+    def _from_stream(
+        cls,
+        stream: IO[bytes],
+        blob: bytes,
+        filename: str | None = None,
+    ) -> Image:
         """Return an instance of the |Image| subclass corresponding to the format of the
         image in `stream`."""
         image_header = _ImageHeaderFactory(stream)
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index a7cd19d61..ed52f54cb 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -11,7 +11,7 @@
 from docx.oxml.parser import parse_xml
 
 if TYPE_CHECKING:
-    from docx.opc.package import OpcPackage
+    from docx.package import Package
 
 
 class Part(object):
@@ -26,7 +26,7 @@ def __init__(
         partname: str,
         content_type: str,
         blob: bytes | None = None,
-        package: OpcPackage | None = None,
+        package: Package | None = None,
     ):
         super(Part, self).__init__()
         self._partname = partname
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index e72e4c5cd..bf8d00962 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -8,6 +8,7 @@
 from docx.oxml.drawing import CT_Drawing
 from docx.oxml.parser import register_element_cls
 from docx.oxml.shape import (
+    CT_Anchor,
     CT_Blip,
     CT_BlipFillProperties,
     CT_GraphicalObject,
@@ -48,6 +49,7 @@
 register_element_cls("pic:pic", CT_Picture)
 register_element_cls("pic:spPr", CT_ShapeProperties)
 register_element_cls("w:drawing", CT_Drawing)
+register_element_cls("wp:anchor", CT_Anchor)
 register_element_cls("wp:docPr", CT_NonVisualDrawingProps)
 register_element_cls("wp:extent", CT_PositiveSize2D)
 register_element_cls("wp:inline", CT_Inline)
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index f9ae2d9af..05c96697a 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from docx.oxml.ns import nsdecls
 from docx.oxml.parser import parse_xml
 from docx.oxml.simpletypes import (
@@ -20,6 +22,13 @@
     ZeroOrOne,
 )
 
+if TYPE_CHECKING:
+    from docx.shared import Length
+
+
+class CT_Anchor(BaseOxmlElement):
+    """`<wp:anchor>` element, container for a "floating" shape."""
+
 
 class CT_Blip(BaseOxmlElement):
     """``<a:blip>`` element, specifies image source and adjustments such as alpha and
@@ -49,14 +58,14 @@ class CT_GraphicalObjectData(BaseOxmlElement):
 
 
 class CT_Inline(BaseOxmlElement):
-    """``<w:inline>`` element, container for an inline shape."""
+    """`<wp:inline>` element, container for an inline shape."""
 
     extent = OneAndOnlyOne("wp:extent")
     docPr = OneAndOnlyOne("wp:docPr")
     graphic = OneAndOnlyOne("a:graphic")
 
     @classmethod
-    def new(cls, cx, cy, shape_id, pic):
+    def new(cls, cx: Length, cy: Length, shape_id: int, pic: CT_Picture) -> CT_Inline:
         """Return a new ``<wp:inline>`` element populated with the values passed as
         parameters."""
         inline = parse_xml(cls._inline_xml())
@@ -71,9 +80,13 @@ def new(cls, cx, cy, shape_id, pic):
         return inline
 
     @classmethod
-    def new_pic_inline(cls, shape_id, rId, filename, cx, cy):
-        """Return a new `wp:inline` element containing the `pic:pic` element specified
-        by the argument values."""
+    def new_pic_inline(
+        cls, shape_id: int, rId: str, filename: str, cx: Length, cy: Length
+    ) -> CT_Inline:
+        """Create `wp:inline` element containing a `pic:pic` element.
+
+        The contents of the `pic:pic` element is taken from the argument values.
+        """
         pic_id = 0  # Word doesn't seem to use this, but does not omit it
         pic = CT_Picture.new(pic_id, filename, rId, cx, cy)
         inline = cls.new(cx, cy, shape_id, pic)
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index e0c609959..1d63dfa38 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -5,14 +5,23 @@
 schema.
 """
 
-from ..exceptions import InvalidXmlError
-from ..shared import Emu, Pt, RGBColor, Twips
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from docx.exceptions import InvalidXmlError
+from docx.shared import Emu, Pt, RGBColor, Twips
+
+if TYPE_CHECKING:
+    from docx import types as t
 
 
 class BaseSimpleType(object):
+    """Base class for simple-types."""
+
     @classmethod
-    def from_xml(cls, str_value):
-        return cls.convert_from_xml(str_value)
+    def from_xml(cls, xml_value: str):
+        return cls.convert_from_xml(xml_value)
 
     @classmethod
     def to_xml(cls, value):
@@ -20,6 +29,10 @@ def to_xml(cls, value):
         str_value = cls.convert_to_xml(value)
         return str_value
 
+    @classmethod
+    def convert_from_xml(cls, str_value: str) -> t.AbstractSimpleTypeMember:
+        return int(str_value)
+
     @classmethod
     def validate_int(cls, value):
         if not isinstance(value, int):
@@ -35,15 +48,10 @@ def validate_int_in_range(cls, value, min_inclusive, max_inclusive):
             )
 
     @classmethod
-    def validate_string(cls, value):
-        if isinstance(value, str):
-            return value
-        try:
-            if isinstance(value, basestring):
-                return value
-        except NameError:  # means we're on Python 3
-            pass
-        raise TypeError("value must be a string, got %s" % type(value))
+    def validate_string(cls, value: Any) -> str:
+        if not isinstance(value, str):
+            raise TypeError("value must be a string, got %s" % type(value))
+        return value
 
 
 class BaseIntType(BaseSimpleType):
@@ -62,15 +70,15 @@ def validate(cls, value):
 
 class BaseStringType(BaseSimpleType):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> str:
         return str_value
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(cls, value: str) -> str:
         return value
 
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: str):
         cls.validate_string(value)
 
 
@@ -160,7 +168,7 @@ def validate(cls, value):
 
 class ST_BrClear(XsdString):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: str) -> None:
         cls.validate_string(value)
         valid_values = ("none", "left", "right", "all")
         if value not in valid_values:
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index c6d9e93b4..0ca22576a 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from typing import TYPE_CHECKING, Callable
 
 from docx.enum.dml import MSO_THEME_COLOR
 from docx.enum.text import WD_COLOR, WD_UNDERLINE
@@ -21,6 +21,9 @@
     ZeroOrOne,
 )
 
+if TYPE_CHECKING:
+    from docx.oxml.shared import CT_OnOff, CT_String
+
 
 class CT_Color(BaseOxmlElement):
     """`w:color` element, specifying the color of a font and perhaps other objects."""
@@ -53,7 +56,9 @@ class CT_RPr(BaseOxmlElement):
     """``<w:rPr>`` element, containing the properties for a run."""
 
     _add_u: Callable[[], CT_Underline]
+    _add_rStyle: Callable[..., CT_String]
     _remove_u: Callable[[], None]
+    _remove_rStyle: Callable[[], None]
 
     _tag_seq = (
         "w:rStyle",
@@ -96,9 +101,13 @@ class CT_RPr(BaseOxmlElement):
         "w:specVanish",
         "w:oMath",
     )
-    rStyle = ZeroOrOne("w:rStyle", successors=_tag_seq[1:])
+    rStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:rStyle", successors=_tag_seq[1:]
+    )
     rFonts = ZeroOrOne("w:rFonts", successors=_tag_seq[2:])
-    b = ZeroOrOne("w:b", successors=_tag_seq[3:])
+    b: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:b", successors=_tag_seq[3:]
+    )
     bCs = ZeroOrOne("w:bCs", successors=_tag_seq[4:])
     i = ZeroOrOne("w:i", successors=_tag_seq[5:])
     iCs = ZeroOrOne("w:iCs", successors=_tag_seq[6:])
@@ -185,20 +194,18 @@ def rFonts_hAnsi(self, value):
         rFonts.hAnsi = value
 
     @property
-    def style(self):
-        """String contained in <w:rStyle> child, or None if that element is not
-        present."""
+    def style(self) -> str | None:
+        """String in `./w:rStyle/@val`, or None if `w:rStyle` is not present."""
         rStyle = self.rStyle
         if rStyle is None:
             return None
         return rStyle.val
 
     @style.setter
-    def style(self, style):
-        """Set val attribute of <w:rStyle> child element to `style`, adding a new
-        element if necessary.
+    def style(self, style: str | None) -> None:
+        """Set `./w:rStyle/@val` to `style`, adding the `w:rStyle` element if necessary.
 
-        If `style` is |None|, remove the <w:rStyle> element if present.
+        If `style` is |None|, remove `w:rStyle` element if present.
         """
         if style is None:
             self._remove_rStyle()
@@ -291,15 +298,14 @@ def u_val(self, value: bool | WD_UNDERLINE | None):
         if value is not None:
             self._add_u().val = value
 
-    def _get_bool_val(self, name):
-        """Return the value of the boolean child element having `name`, e.g. 'b', 'i',
-        and 'smallCaps'."""
+    def _get_bool_val(self, name: str) -> bool | None:
+        """Value of boolean child with `name`, e.g. "w:b", "w:i", and "w:smallCaps"."""
         element = getattr(self, name)
         if element is None:
             return None
         return element.val
 
-    def _set_bool_val(self, name, value):
+    def _set_bool_val(self, name: str, value: bool | None):
         if value is None:
             getattr(self, "_remove_%s" % name)()
             return
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index c995bfbbb..66c3537e1 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -12,7 +12,9 @@
 from docx.shared import TextAccumulator
 
 if TYPE_CHECKING:
+    from docx.oxml.shape import CT_Anchor, CT_Inline
     from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
+    from docx.oxml.text.parfmt import CT_TabStop
 
 # ------------------------------------------------------------------------------------
 # Run-level elements
@@ -22,10 +24,12 @@ class CT_R(BaseOxmlElement):
     """`<w:r>` element, containing the properties and text for a run."""
 
     add_br: Callable[[], CT_Br]
+    add_tab: Callable[[], CT_TabStop]
     get_or_add_rPr: Callable[[], CT_RPr]
+    _add_drawing: Callable[[], CT_Drawing]
     _add_t: Callable[..., CT_Text]
 
-    rPr = ZeroOrOne("w:rPr")
+    rPr: CT_RPr | None = ZeroOrOne("w:rPr")  # pyright: ignore[reportGeneralTypeIssues]
     br = ZeroOrMore("w:br")
     cr = ZeroOrMore("w:cr")
     drawing = ZeroOrMore("w:drawing")
@@ -39,7 +43,7 @@ def add_t(self, text: str) -> CT_Text:
             t.set(qn("xml:space"), "preserve")
         return t
 
-    def add_drawing(self, inline_or_anchor):
+    def add_drawing(self, inline_or_anchor: CT_Inline | CT_Anchor) -> CT_Drawing:
         """Return newly appended `CT_Drawing` (`w:drawing`) child element.
 
         The `w:drawing` element has `inline_or_anchor` as its child.
@@ -48,11 +52,11 @@ def add_drawing(self, inline_or_anchor):
         drawing.append(inline_or_anchor)
         return drawing
 
-    def clear_content(self):
+    def clear_content(self) -> None:
         """Remove all child elements except a `w:rPr` element if present."""
-        content_child_elms = self[1:] if self.rPr is not None else self[:]
-        for child in content_child_elms:
-            self.remove(child)
+        # -- remove all run inner-content except a `w:rPr` when present. --
+        for e in self.xpath("./*[not(self::w:rPr)]"):
+            self.remove(e)
 
     @property
     def inner_content_items(self) -> List[str | CT_Drawing | CT_LastRenderedPageBreak]:
@@ -100,7 +104,7 @@ def style(self) -> str | None:
         return rPr.style
 
     @style.setter
-    def style(self, style):
+    def style(self, style: str | None):
         """Set character style of this `w:r` element to `style`.
 
         If `style` is None, remove the style element.
@@ -120,7 +124,7 @@ def text(self) -> str:
             for e in self.xpath("w:br | w:cr | w:noBreakHyphen | w:ptab | w:t | w:tab")
         )
 
-    @text.setter
+    @text.setter  # pyright: ignore[reportIncompatibleVariableOverride]
     def text(self, text: str):
         self.clear_content()
         _RunContentAppender.append_to_run_from_text(self, text)
@@ -140,7 +144,9 @@ class CT_Br(BaseOxmlElement):
     type: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
         "w:type", ST_BrType, default="textWrapping"
     )
-    clear = OptionalAttribute("w:clear", ST_BrClear)
+    clear: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:clear", ST_BrClear
+    )
 
     def __str__(self) -> str:
         """Text equivalent of this element. Actual value depends on break type.
@@ -236,7 +242,7 @@ class _RunContentAppender(object):
 
     def __init__(self, r: CT_R):
         self._r = r
-        self._bfr = []
+        self._bfr: List[str] = []
 
     @classmethod
     def append_to_run_from_text(cls, r: CT_R, text: str):
@@ -270,4 +276,4 @@ def flush(self):
         text = "".join(self._bfr)
         if text:
             self._r.add_t(text)
-        del self._bfr[:]
+        self._bfr.clear()
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 350e72aa8..075a4c842 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Callable, Dict, List, Tuple, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Tuple, Type, TypeVar
 
 from lxml import etree
 from lxml.etree import ElementBase
@@ -12,6 +12,9 @@
 from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
 from docx.shared import lazyproperty
 
+if TYPE_CHECKING:
+    from docx import types as t
+
 
 def serialize_for_reading(element):
     """Serialize `element` to human-readable XML suitable for tests.
@@ -108,15 +111,19 @@ def __init__(cls, clsname: str, bases: Tuple[type, ...], namespace: Dict[str, An
 
 
 class BaseAttribute(object):
-    """Base class for OptionalAttribute and RequiredAttribute, providing common
-    methods."""
+    """Base class for OptionalAttribute and RequiredAttribute.
+
+    Provides common methods.
+    """
 
-    def __init__(self, attr_name, simple_type):
+    def __init__(self, attr_name: str, simple_type: Type[t.AbstractSimpleType]):
         super(BaseAttribute, self).__init__()
         self._attr_name = attr_name
         self._simple_type = simple_type
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: Type[BaseOxmlElement], prop_name: str
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._prop_name = prop_name
@@ -137,24 +144,53 @@ def _clark_name(self):
             return qn(self._attr_name)
         return self._attr_name
 
+    @property
+    def _getter(self) -> Callable[[BaseOxmlElement], t.AbstractSimpleTypeMember]:
+        ...
+
+    @property
+    def _setter(
+        self,
+    ) -> Callable[[BaseOxmlElement, t.AbstractSimpleTypeMember | None], None]:
+        ...
+
 
 class OptionalAttribute(BaseAttribute):
     """Defines an optional attribute on a custom element class.
 
     An optional attribute returns a default value when not present for reading. When
-    assigned |None|, the attribute is removed.
+    assigned |None|, the attribute is removed, but still returns the default value when
+    one is specified.
     """
 
-    def __init__(self, attr_name, simple_type, default=None):
+    def __init__(
+        self,
+        attr_name: str,
+        simple_type: Type[t.AbstractSimpleType],
+        default: t.AbstractSimpleTypeMember | None = None,
+    ):
         super(OptionalAttribute, self).__init__(attr_name, simple_type)
         self._default = default
 
     @property
-    def _getter(self):
-        """Return a function object suitable for the "get" side of the attribute
-        property descriptor."""
+    def _docstring(self):
+        """String to use as `__doc__` attribute of attribute property."""
+        return (
+            f"{self._simple_type.__name__} type-converted value of"
+            f" ``{self._attr_name}`` attribute, or |None| (or specified default"
+            f" value) if not present. Assigning the default value causes the"
+            f" attribute to be removed from the element."
+        )
 
-        def get_attr_value(obj):
+    @property
+    def _getter(
+        self,
+    ) -> Callable[[BaseOxmlElement], str | bool | t.AbstractSimpleTypeMember]:
+        """Function suitable for `__get__()` method on attribute property descriptor."""
+
+        def get_attr_value(
+            obj: BaseOxmlElement,
+        ) -> str | bool | t.AbstractSimpleTypeMember:
             attr_str_value = obj.get(self._clark_name)
             if attr_str_value is None:
                 return self._default
@@ -164,22 +200,12 @@ def get_attr_value(obj):
         return get_attr_value
 
     @property
-    def _docstring(self):
-        """Return the string to use as the ``__doc__`` attribute of the property for
-        this attribute."""
-        return (
-            "%s type-converted value of ``%s`` attribute, or |None| (or spec"
-            "ified default value) if not present. Assigning the default valu"
-            "e causes the attribute to be removed from the element."
-            % (self._simple_type.__name__, self._attr_name)
-        )
+    def _setter(self) -> Callable[[BaseOxmlElement, t.AbstractSimpleTypeMember], None]:
+        """Function suitable for `__set__()` method on attribute property descriptor."""
 
-    @property
-    def _setter(self):
-        """Return a function object suitable for the "set" side of the attribute
-        property descriptor."""
-
-        def set_attr_value(obj, value):
+        def set_attr_value(
+            obj: BaseOxmlElement, value: t.AbstractSimpleTypeMember | None
+        ):
             if value is None or value == self._default:
                 if self._clark_name in obj.attrib:
                     del obj.attrib[self._clark_name]
@@ -200,6 +226,15 @@ class RequiredAttribute(BaseAttribute):
     simple type of the attribute.
     """
 
+    @property
+    def _docstring(self):
+        """Return the string to use as the ``__doc__`` attribute of the property for
+        this attribute."""
+        return "%s type-converted value of ``%s`` attribute." % (
+            self._simple_type.__name__,
+            self._attr_name,
+        )
+
     @property
     def _getter(self):
         """Return a function object suitable for the "get" side of the attribute
@@ -217,15 +252,6 @@ def get_attr_value(obj):
         get_attr_value.__doc__ = self._docstring
         return get_attr_value
 
-    @property
-    def _docstring(self):
-        """Return the string to use as the ``__doc__`` attribute of the property for
-        this attribute."""
-        return "%s type-converted value of ``%s`` attribute." % (
-            self._simple_type.__name__,
-            self._attr_name,
-        )
-
     @property
     def _setter(self):
         """Return a function object suitable for the "set" side of the attribute
@@ -625,13 +651,14 @@ class BaseOxmlElement(metaclass=MetaOxmlElement):
 
     addprevious: Callable[[BaseOxmlElement], None]
     attrib: Dict[str, str]
-    append: Callable[[ElementBase], None]
+    append: Callable[[BaseOxmlElement], None]
     find: Callable[[str], ElementBase | None]
     findall: Callable[[str], List[ElementBase]]
     get: Callable[[str], str | None]
     getparent: Callable[[], BaseOxmlElement]
     insert: Callable[[int, BaseOxmlElement], None]
     remove: Callable[[BaseOxmlElement], None]
+    set: Callable[[str, str], None]
     tag: str
     text: str | None
 
diff --git a/src/docx/package.py b/src/docx/package.py
index 27a1da937..89ae47a09 100644
--- a/src/docx/package.py
+++ b/src/docx/package.py
@@ -1,5 +1,9 @@
 """WordprocessingML Package class and related objects."""
 
+from __future__ import annotations
+
+from typing import IO
+
 from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.package import OpcPackage
@@ -18,7 +22,7 @@ def after_unmarshal(self):
         """
         self._gather_image_parts()
 
-    def get_or_add_image_part(self, image_descriptor):
+    def get_or_add_image_part(self, image_descriptor: str | IO[bytes]) -> ImagePart:
         """Return |ImagePart| containing image specified by `image_descriptor`.
 
         The image-part is newly created if a matching one is not already present in the
@@ -27,7 +31,7 @@ def get_or_add_image_part(self, image_descriptor):
         return self.image_parts.get_or_add_image_part(image_descriptor)
 
     @lazyproperty
-    def image_parts(self):
+    def image_parts(self) -> ImageParts:
         """|ImageParts| collection object for this package."""
         return ImageParts()
 
@@ -61,7 +65,7 @@ def __len__(self):
     def append(self, item):
         self._image_parts.append(item)
 
-    def get_or_add_image_part(self, image_descriptor):
+    def get_or_add_image_part(self, image_descriptor: str | IO[bytes]) -> ImagePart:
         """Return |ImagePart| object containing image identified by `image_descriptor`.
 
         The image-part is newly created if a matching one is not present in the
diff --git a/src/docx/parts/image.py b/src/docx/parts/image.py
index d93c47922..e4580df74 100644
--- a/src/docx/parts/image.py
+++ b/src/docx/parts/image.py
@@ -1,5 +1,7 @@
 """The proxy class for an image part, and related objects."""
 
+from __future__ import annotations
+
 import hashlib
 
 from docx.image.image import Image
@@ -13,7 +15,9 @@ class ImagePart(Part):
     Corresponds to the target part of a relationship with type RELATIONSHIP_TYPE.IMAGE.
     """
 
-    def __init__(self, partname, content_type, blob, image=None):
+    def __init__(
+        self, partname: str, content_type: str, blob: bytes, image: Image | None = None
+    ):
         super(ImagePart, self).__init__(partname, content_type, blob)
         self._image = image
 
@@ -54,7 +58,7 @@ def from_image(cls, image, partname):
         return ImagePart(partname, image.content_type, image.blob, image)
 
     @property
-    def image(self):
+    def image(self) -> Image:
         if self._image is None:
             self._image = Image.from_blob(self.blob)
         return self._image
diff --git a/src/docx/parts/story.py b/src/docx/parts/story.py
index 012c812f6..b5c8ac882 100644
--- a/src/docx/parts/story.py
+++ b/src/docx/parts/story.py
@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import IO, TYPE_CHECKING, Tuple
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
 from docx.oxml.shape import CT_Inline
-from docx.shared import lazyproperty
+from docx.shared import Length, lazyproperty
 
 if TYPE_CHECKING:
     from docx.enum.style import WD_STYLE_TYPE
+    from docx.image.image import Image
     from docx.parts.document import DocumentPart
     from docx.styles.style import BaseStyle
 
@@ -23,7 +24,7 @@ class StoryPart(XmlPart):
     `.add_paragraph()`, `.add_table()` etc.
     """
 
-    def get_or_add_image(self, image_descriptor):
+    def get_or_add_image(self, image_descriptor: str | IO[bytes]) -> Tuple[str, Image]:
         """Return (rId, image) pair for image identified by `image_descriptor`.
 
         `rId` is the str key (often like "rId7") for the relationship between this story
@@ -31,7 +32,9 @@ def get_or_add_image(self, image_descriptor):
         `image` is an |Image| instance providing access to the properties of the image,
         such as dimensions and image type.
         """
-        image_part = self._package.get_or_add_image_part(image_descriptor)
+        package = self._package
+        assert package is not None
+        image_part = package.get_or_add_image_part(image_descriptor)
         rId = self.relate_to(image_part, RT.IMAGE)
         return rId, image_part.image
 
@@ -54,7 +57,12 @@ def get_style_id(
         """
         return self._document_part.get_style_id(style_or_name, style_type)
 
-    def new_pic_inline(self, image_descriptor, width, height):
+    def new_pic_inline(
+        self,
+        image_descriptor: str | IO[bytes],
+        width: Length | None = None,
+        height: Length | None = None,
+    ) -> CT_Inline:
         """Return a newly-created `w:inline` element.
 
         The element contains the image specified by `image_descriptor` and is scaled
@@ -66,7 +74,7 @@ def new_pic_inline(self, image_descriptor, width, height):
         return CT_Inline.new_pic_inline(shape_id, rId, filename, cx, cy)
 
     @property
-    def next_id(self):
+    def next_id(self) -> int:
         """Next available positive integer id value in this story XML document.
 
         The value is determined by incrementing the maximum existing id value. Gaps in
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 40dfb369d..53a000d6f 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -268,7 +268,7 @@ class ElementProxy(object):
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    def __init__(self, element: BaseOxmlElement, parent=None):
+    def __init__(self, element: BaseOxmlElement, parent: Any | None = None):
         self._element = element
         self._parent = parent
 
@@ -321,9 +321,9 @@ class StoryChild:
     """A document element within a story part.
 
     Story parts include DocumentPart and Header/FooterPart and can contain block items
-    (paragraphs and tables). These occasionally require an ancestor object to provide
-    access to part-level or package-level items like styles or images or to add or drop
-    a relationship.
+    (paragraphs and tables). Items from the block-item subtree occasionally require an
+    ancestor object to provide access to part-level or package-level items like styles
+    or images or to add or drop a relationship.
 
     Provides `self._parent` attribute to subclasses.
     """
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index 728f2331c..8b4470a34 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -2,15 +2,25 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING, Any
+
 from docx.dml.color import ColorFormat
 from docx.enum.text import WD_UNDERLINE
 from docx.shared import ElementProxy
 
+if TYPE_CHECKING:
+    from docx.oxml.text.run import CT_R
+
 
 class Font(ElementProxy):
-    """Proxy object wrapping the parent of a ``<w:rPr>`` element and providing access to
+    """Proxy object for parent of a `<w:rPr>` element and providing access to
     character properties such as font name, font size, bold, and subscript."""
 
+    def __init__(self, r: CT_R, parent: Any | None = None):
+        super().__init__(r, parent)
+        self._element = r
+        self._r = r
+
     @property
     def all_caps(self):
         """Read/write.
@@ -384,7 +394,7 @@ def web_hidden(self):
     def web_hidden(self, value):
         self._set_bool_prop("webHidden", value)
 
-    def _get_bool_prop(self, name):
+    def _get_bool_prop(self, name: str) -> bool | None:
         """Return the value of boolean child of `w:rPr` having `name`."""
         rPr = self._element.rPr
         if rPr is None:
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 55ad85cdc..d79b583aa 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -2,23 +2,26 @@
 
 from __future__ import annotations
 
-from typing import IO, Iterator
+from typing import IO, TYPE_CHECKING, Iterator, cast
 
-from docx import types as t
 from docx.drawing import Drawing
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK
 from docx.oxml.drawing import CT_Drawing
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
-from docx.oxml.text.run import CT_R, CT_Text
 from docx.shape import InlineShape
-from docx.shared import Length, Parented
+from docx.shared import StoryChild
 from docx.styles.style import CharacterStyle
 from docx.text.font import Font
 from docx.text.pagebreak import RenderedPageBreak
 
+if TYPE_CHECKING:
+    from docx.enum.text import WD_UNDERLINE
+    from docx.oxml.text.run import CT_R, CT_Text
+    from docx.shared import Length
 
-class Run(Parented):
+
+class Run(StoryChild):
     """Proxy object wrapping `<w:r>` element.
 
     Several of the properties on Run take a tri-state value, |True|, |False|, or |None|.
@@ -27,8 +30,8 @@ class Run(Parented):
     the style hierarchy.
     """
 
-    def __init__(self, r: CT_R, parent: t.StoryChild):
-        super(Run, self).__init__(parent)
+    def __init__(self, r: CT_R, parent: StoryChild):
+        super().__init__(parent)
         self._r = self._element = self.element = r
 
     def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):
@@ -58,11 +61,14 @@ def add_picture(
         width: Length | None = None,
         height: Length | None = None,
     ) -> InlineShape:
-        """Return an |InlineShape| instance containing the image identified by
-        `image_path_or_stream`, added to the end of this run.
+        """Return |InlineShape| containing image identified by `image_path_or_stream`.
+
+        The picture is added to the end of this run.
 
         `image_path_or_stream` can be a path (a string) or a file-like object containing
-        a binary image. If neither width nor height is specified, the picture appears at
+        a binary image.
+
+        If neither width nor height is specified, the picture appears at
         its native size. If only one is specified, it is used to compute a scaling
         factor that is then applied to the unspecified dimension, preserving the aspect
         ratio of the image. The native size of the picture is calculated using the dots-
@@ -73,10 +79,10 @@ def add_picture(
         self._r.add_drawing(inline)
         return InlineShape(inline)
 
-    def add_tab(self):
+    def add_tab(self) -> None:
         """Add a ``<w:tab/>`` element at the end of the run, which Word interprets as a
         tab character."""
-        self._r._add_tab()
+        self._r.add_tab()
 
     def add_text(self, text: str):
         """Returns a newly appended |_Text| object (corresponding to a new ``<w:t>``
@@ -89,15 +95,17 @@ def add_text(self, text: str):
         return _Text(t)
 
     @property
-    def bold(self) -> bool:
-        """Read/write.
+    def bold(self) -> bool | None:
+        """Read/write tri-state value.
 
-        Causes the text of the run to appear in bold.
+        When |True|, causes the text of the run to appear in bold face. When |False|,
+        the text unconditionally appears non-bold. When |None| the bold setting for this
+        run is inherited from the style hierarchy.
         """
         return self.font.bold
 
     @bold.setter
-    def bold(self, value: bool):
+    def bold(self, value: bool | None):
         self.font.bold = value
 
     def clear(self):
@@ -122,21 +130,23 @@ def contains_page_break(self) -> bool:
         return bool(self._r.lastRenderedPageBreaks)
 
     @property
-    def font(self):
+    def font(self) -> Font:
         """The |Font| object providing access to the character formatting properties for
         this run, such as font name and size."""
         return Font(self._element)
 
     @property
-    def italic(self) -> bool:
+    def italic(self) -> bool | None:
         """Read/write tri-state value.
 
-        When |True|, causes the text of the run to appear in italics.
+        When |True|, causes the text of the run to appear in italics. When |False|, the
+        text unconditionally appears non-italic. When |None| the italic setting for this
+        run is inherited from the style hierarchy.
         """
         return self.font.italic
 
     @italic.setter
-    def italic(self, value: bool):
+    def italic(self, value: bool | None):
         self.font.italic = value
 
     def iter_inner_content(self) -> Iterator[str | Drawing | RenderedPageBreak]:
@@ -165,16 +175,18 @@ def iter_inner_content(self) -> Iterator[str | Drawing | RenderedPageBreak]:
                 yield Drawing(item, self)
 
     @property
-    def style(self) -> CharacterStyle | None:
+    def style(self) -> CharacterStyle:
         """Read/write.
 
-        A |_CharacterStyle| object representing the character style applied to this run.
+        A |CharacterStyle| object representing the character style applied to this run.
         The default character style for the document (often `Default Character Font`) is
         returned if the run has no directly-applied character style. Setting this
         property to |None| removes any directly-applied character style.
         """
         style_id = self._r.style
-        return self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
+        return cast(
+            CharacterStyle, self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
+        )
 
     @style.setter
     def style(self, style_or_name: str | CharacterStyle | None):
@@ -204,17 +216,22 @@ def text(self, text: str):
         self._r.text = text
 
     @property
-    def underline(self) -> bool:
-        """The underline style for this |Run|, one of |None|, |True|, |False|, or a
-        value from :ref:`WdUnderline`.
+    def underline(self) -> bool | WD_UNDERLINE | None:
+        """The underline style for this |Run|.
+
+        Value is one of |None|, |True|, |False|, or a member of :ref:`WdUnderline`.
 
         A value of |None| indicates the run has no directly-applied underline value and
         so will inherit the underline value of its containing paragraph. Assigning
-        |None| to this property removes any directly-applied underline value. A value of
-        |False| indicates a directly-applied setting of no underline, overriding any
-        inherited value. A value of |True| indicates single underline. The values from
-        :ref:`WdUnderline` are used to specify other outline styles such as double,
-        wavy, and dotted.
+        |None| to this property removes any directly-applied underline value.
+
+        A value of |False| indicates a directly-applied setting of no underline,
+        overriding any inherited value.
+
+        A value of |True| indicates single underline.
+
+        The values from :ref:`WdUnderline` are used to specify other outline styles such
+        as double, wavy, and dotted.
         """
         return self.font.underline
 
diff --git a/src/docx/types.py b/src/docx/types.py
index 6097f740c..9f5b7dae7 100644
--- a/src/docx/types.py
+++ b/src/docx/types.py
@@ -7,6 +7,25 @@
 from docx.parts.story import StoryPart
 
 
+class AbstractSimpleTypeMember(Protocol):
+    """A simple-type member is a valid value for a simple-type.
+
+    The name *simple-type* comes from the ISO spec which refers to XML attribute value
+    types as simple types and gives those the prefix `ST_` in the XML Schema. Many are
+    enumerations but that is not strictly required.
+    """
+
+
+class AbstractSimpleType(Protocol):
+    """A simple-type can provide XML attribute value mapping."""
+
+    @classmethod
+    def from_xml(cls, xml_value: str) -> AbstractSimpleTypeMember: ...
+
+    @classmethod
+    def to_xml(cls, value: AbstractSimpleTypeMember) -> str: ...
+
+
 class StoryChild(Protocol):
     """An object that can fulfill the `parent` role in a `Parented` class.
 
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 775d0b424..68976e874 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -1,3 +1,5 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for the docx.text.run module."""
 
 from __future__ import annotations
@@ -157,11 +159,31 @@ def it_can_add_a_picture(self, add_picture_fixture):
         InlineShape_.assert_called_once_with(inline)
         assert picture is picture_
 
-    def it_can_remove_its_content_but_keep_formatting(self, clear_fixture):
-        run, expected_xml = clear_fixture
-        _run = run.clear()
+    @pytest.mark.parametrize(
+        ("initial_r_cxml", "expected_cxml"),
+        [
+            ("w:r", "w:r"),
+            ('w:r/w:t"foo"', "w:r"),
+            ("w:r/w:br", "w:r"),
+            ("w:r/w:rPr", "w:r/w:rPr"),
+            ('w:r/(w:rPr, w:t"foo")', "w:r/w:rPr"),
+            (
+                'w:r/(w:rPr/(w:b, w:i), w:t"foo", w:cr, w:t"bar")',
+                "w:r/w:rPr/(w:b, w:i)",
+            ),
+        ]
+    )
+    def it_can_remove_its_content_but_keep_formatting(
+        self, initial_r_cxml: str, expected_cxml: str
+    ):
+        r = cast(CT_R, element(initial_r_cxml))
+        run = Run(r, None)  # pyright: ignore[reportGeneralTypeIssues]
+        expected_xml = xml(expected_cxml)
+
+        cleared_run = run.clear()
+
         assert run._r.xml == expected_xml
-        assert _run is run
+        assert cleared_run is run
 
     @pytest.mark.parametrize(
         ("r_cxml", "expected_text"),
@@ -260,25 +282,6 @@ def bool_prop_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return run, bool_prop_name, value, expected_xml
 
-    @pytest.fixture(
-        params=[
-            ("w:r", "w:r"),
-            ('w:r/w:t"foo"', "w:r"),
-            ("w:r/w:br", "w:r"),
-            ("w:r/w:rPr", "w:r/w:rPr"),
-            ('w:r/(w:rPr, w:t"foo")', "w:r/w:rPr"),
-            (
-                'w:r/(w:rPr/(w:b, w:i), w:t"foo", w:cr, w:t"bar")',
-                "w:r/w:rPr/(w:b, w:i)",
-            ),
-        ]
-    )
-    def clear_fixture(self, request):
-        initial_r_cxml, expected_cxml = request.param
-        run = Run(element(initial_r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, expected_xml
-
     @pytest.fixture
     def font_fixture(self, Font_, font_):
         run = Run(element("w:r"), None)

From 44f9ede23ab62c10dd0c5a2e51b52fb132a7b9bc Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 8 Oct 2023 21:05:51 -0700
Subject: [PATCH 288/367] rfctr: Font type-checks clean

---
 src/docx/oxml/simpletypes.py |  10 +-
 src/docx/oxml/text/font.py   | 153 +++++++------
 src/docx/oxml/xmlchemy.py    |  10 +-
 src/docx/text/font.py        | 165 +++++++------
 src/docx/types.py            |  19 --
 tests/text/test_font.py      | 432 ++++++++++++++++++-----------------
 6 files changed, 409 insertions(+), 380 deletions(-)

diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index 1d63dfa38..10e683f15 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -14,6 +14,7 @@
 
 if TYPE_CHECKING:
     from docx import types as t
+    from docx.shared import Length
 
 
 class BaseSimpleType(object):
@@ -245,13 +246,13 @@ class ST_HpsMeasure(XsdUnsignedLong):
     """Half-point measure, e.g. 24.0 represents 12.0 points."""
 
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> Length:
         if "m" in str_value or "n" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Pt(int(str_value) / 2.0)
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(cls, value: int | Length) -> str:
         emu = Emu(value)
         half_points = int(emu.pt * 2)
         return str(half_points)
@@ -343,7 +344,7 @@ def convert_to_xml(cls, value):
 
 class ST_UniversalMeasure(BaseSimpleType):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> Emu:
         float_part, units_part = str_value[:-2], str_value[-2:]
         quantity = float(float_part)
         multiplier = {
@@ -354,8 +355,7 @@ def convert_from_xml(cls, str_value):
             "pc": 152400,
             "pi": 152400,
         }[units_part]
-        emu_value = Emu(int(round(quantity * multiplier)))
-        return emu_value
+        return Emu(int(round(quantity * multiplier)))
 
 
 class ST_VerticalAlignRun(XsdStringEnumeration):
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 0ca22576a..0e183cf65 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -5,8 +5,8 @@
 from typing import TYPE_CHECKING, Callable
 
 from docx.enum.dml import MSO_THEME_COLOR
-from docx.enum.text import WD_COLOR, WD_UNDERLINE
-from docx.oxml.ns import nsdecls, qn
+from docx.enum.text import WD_COLOR_INDEX, WD_UNDERLINE
+from docx.oxml.ns import nsdecls
 from docx.oxml.parser import parse_xml
 from docx.oxml.simpletypes import (
     ST_HexColor,
@@ -23,6 +23,7 @@
 
 if TYPE_CHECKING:
     from docx.oxml.shared import CT_OnOff, CT_String
+    from docx.shared import Length
 
 
 class CT_Color(BaseOxmlElement):
@@ -33,32 +34,50 @@ class CT_Color(BaseOxmlElement):
 
 
 class CT_Fonts(BaseOxmlElement):
-    """``<w:rFonts>`` element, specifying typeface name for the various language
-    types."""
+    """`<w:rFonts>` element.
 
-    ascii = OptionalAttribute("w:ascii", ST_String)
-    hAnsi = OptionalAttribute("w:hAnsi", ST_String)
+    Specifies typeface name for the various language types.
+    """
+
+    ascii: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:ascii", ST_String
+    )
+    hAnsi: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:hAnsi", ST_String
+    )
 
 
 class CT_Highlight(BaseOxmlElement):
     """`w:highlight` element, specifying font highlighting/background color."""
 
-    val = RequiredAttribute("w:val", WD_COLOR)
+    val: WD_COLOR_INDEX = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:val", WD_COLOR_INDEX
+    )
 
 
 class CT_HpsMeasure(BaseOxmlElement):
-    """Used for ``<w:sz>`` element and others, specifying font size in half-points."""
+    """Used for `<w:sz>` element and others, specifying font size in half-points."""
 
-    val = RequiredAttribute("w:val", ST_HpsMeasure)
+    val: Length = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:val", ST_HpsMeasure
+    )
 
 
 class CT_RPr(BaseOxmlElement):
-    """``<w:rPr>`` element, containing the properties for a run."""
+    """`<w:rPr>` element, containing the properties for a run."""
 
-    _add_u: Callable[[], CT_Underline]
+    get_or_add_highlight: Callable[[], CT_Highlight]
+    get_or_add_rFonts: Callable[[], CT_Fonts]
+    get_or_add_sz: Callable[[], CT_HpsMeasure]
+    get_or_add_vertAlign: Callable[[], CT_VerticalAlignRun]
     _add_rStyle: Callable[..., CT_String]
-    _remove_u: Callable[[], None]
+    _add_u: Callable[[], CT_Underline]
+    _remove_highlight: Callable[[], None]
+    _remove_rFonts: Callable[[], None]
     _remove_rStyle: Callable[[], None]
+    _remove_sz: Callable[[], None]
+    _remove_u: Callable[[], None]
+    _remove_vertAlign: Callable[[], None]
 
     _tag_seq = (
         "w:rStyle",
@@ -104,7 +123,9 @@ class CT_RPr(BaseOxmlElement):
     rStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
         "w:rStyle", successors=_tag_seq[1:]
     )
-    rFonts = ZeroOrOne("w:rFonts", successors=_tag_seq[2:])
+    rFonts: CT_Fonts | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:rFonts", successors=_tag_seq[2:]
+    )
     b: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
         "w:b", successors=_tag_seq[3:]
     )
@@ -124,12 +145,22 @@ class CT_RPr(BaseOxmlElement):
     vanish = ZeroOrOne("w:vanish", successors=_tag_seq[17:])
     webHidden = ZeroOrOne("w:webHidden", successors=_tag_seq[18:])
     color = ZeroOrOne("w:color", successors=_tag_seq[19:])
-    sz = ZeroOrOne("w:sz", successors=_tag_seq[24:])
-    highlight = ZeroOrOne("w:highlight", successors=_tag_seq[26:])
+    sz: CT_HpsMeasure | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:sz", successors=_tag_seq[24:]
+    )
+    highlight: CT_Highlight | None = (
+        ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+            "w:highlight", successors=_tag_seq[26:]
+        )
+    )
     u: CT_Underline | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
         "w:u", successors=_tag_seq[27:]
     )
-    vertAlign = ZeroOrOne("w:vertAlign", successors=_tag_seq[32:])
+    vertAlign: CT_VerticalAlignRun | None = (
+        ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+            "w:vertAlign", successors=_tag_seq[32:]
+        )
+    )
     rtl = ZeroOrOne("w:rtl", successors=_tag_seq[33:])
     cs = ZeroOrOne("w:cs", successors=_tag_seq[34:])
     specVanish = ZeroOrOne("w:specVanish", successors=_tag_seq[38:])
@@ -141,16 +172,18 @@ def _new_color(self):
         return parse_xml('<w:color %s w:val="000000"/>' % nsdecls("w"))
 
     @property
-    def highlight_val(self):
-        """Value of `w:highlight/@val` attribute, specifying a font's highlight color,
-        or `None` if the text is not highlighted."""
+    def highlight_val(self) -> WD_COLOR_INDEX | None:
+        """Value of `./w:highlight/@val`.
+
+        Specifies font's highlight color, or `None` if the text is not highlighted.
+        """
         highlight = self.highlight
         if highlight is None:
             return None
         return highlight.val
 
     @highlight_val.setter
-    def highlight_val(self, value):
+    def highlight_val(self, value: WD_COLOR_INDEX | None) -> None:
         if value is None:
             self._remove_highlight()
             return
@@ -158,7 +191,7 @@ def highlight_val(self, value):
         highlight.val = value
 
     @property
-    def rFonts_ascii(self):
+    def rFonts_ascii(self) -> str | None:
         """The value of `w:rFonts/@w:ascii` or |None| if not present.
 
         Represents the assigned typeface name. The rFonts element also specifies other
@@ -171,7 +204,7 @@ def rFonts_ascii(self):
         return rFonts.ascii
 
     @rFonts_ascii.setter
-    def rFonts_ascii(self, value):
+    def rFonts_ascii(self, value: str | None) -> None:
         if value is None:
             self._remove_rFonts()
             return
@@ -179,7 +212,7 @@ def rFonts_ascii(self, value):
         rFonts.ascii = value
 
     @property
-    def rFonts_hAnsi(self):
+    def rFonts_hAnsi(self) -> str | None:
         """The value of `w:rFonts/@w:hAnsi` or |None| if not present."""
         rFonts = self.rFonts
         if rFonts is None:
@@ -187,7 +220,7 @@ def rFonts_hAnsi(self):
         return rFonts.hAnsi
 
     @rFonts_hAnsi.setter
-    def rFonts_hAnsi(self, value):
+    def rFonts_hAnsi(self, value: str | None):
         if value is None and self.rFonts is None:
             return
         rFonts = self.get_or_add_rFonts()
@@ -215,8 +248,8 @@ def style(self, style: str | None) -> None:
             self.rStyle.val = style
 
     @property
-    def subscript(self):
-        """|True| if `w:vertAlign/@w:val` is 'subscript'.
+    def subscript(self) -> bool | None:
+        """|True| if `./w:vertAlign/@w:val` is "subscript".
 
         |False| if `w:vertAlign/@w:val` contains any other value. |None| if
         `w:vertAlign` is not present.
@@ -229,18 +262,20 @@ def subscript(self):
         return False
 
     @subscript.setter
-    def subscript(self, value):
+    def subscript(self, value: bool | None) -> None:
         if value is None:
             self._remove_vertAlign()
         elif bool(value) is True:
             self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUBSCRIPT
-        elif self.vertAlign is None:
-            return
-        elif self.vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
+        # -- assert bool(value) is False --
+        elif (
+            self.vertAlign is not None
+            and self.vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT
+        ):
             self._remove_vertAlign()
 
     @property
-    def superscript(self):
+    def superscript(self) -> bool | None:
         """|True| if `w:vertAlign/@w:val` is 'superscript'.
 
         |False| if `w:vertAlign/@w:val` contains any other value. |None| if
@@ -254,18 +289,20 @@ def superscript(self):
         return False
 
     @superscript.setter
-    def superscript(self, value):
+    def superscript(self, value: bool | None):
         if value is None:
             self._remove_vertAlign()
         elif bool(value) is True:
             self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUPERSCRIPT
-        elif self.vertAlign is None:
-            return
-        elif self.vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
+        # -- assert bool(value) is False --
+        elif (
+            self.vertAlign is not None
+            and self.vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT
+        ):
             self._remove_vertAlign()
 
     @property
-    def sz_val(self):
+    def sz_val(self) -> Length | None:
         """The value of `w:sz/@w:val` or |None| if not present."""
         sz = self.sz
         if sz is None:
@@ -273,7 +310,7 @@ def sz_val(self):
         return sz.val
 
     @sz_val.setter
-    def sz_val(self, value):
+    def sz_val(self, value: Length | None):
         if value is None:
             self._remove_sz()
             return
@@ -281,7 +318,7 @@ def sz_val(self, value):
         sz.val = value
 
     @property
-    def u_val(self) -> bool | WD_UNDERLINE | None:
+    def u_val(self) -> WD_UNDERLINE | None:
         """Value of `w:u/@val`, or None if not present.
 
         Values `WD_UNDERLINE.SINGLE` and `WD_UNDERLINE.NONE` are mapped to `True` and
@@ -293,7 +330,7 @@ def u_val(self) -> bool | WD_UNDERLINE | None:
         return u.val
 
     @u_val.setter
-    def u_val(self, value: bool | WD_UNDERLINE | None):
+    def u_val(self, value: WD_UNDERLINE | None):
         self._remove_u()
         if value is not None:
             self._add_u().val = value
@@ -314,38 +351,18 @@ def _set_bool_val(self, name: str, value: bool | None):
 
 
 class CT_Underline(BaseOxmlElement):
-    """``<w:u>`` element, specifying the underlining style for a run."""
+    """`<w:u>` element, specifying the underlining style for a run."""
 
-    @property
-    def val(self) -> bool | WD_UNDERLINE | None:
-        """The underline type corresponding to the ``w:val`` attribute value."""
-        val = self.get(qn("w:val"))
-        underline = WD_UNDERLINE.from_xml(val)
-        return (
-            None
-            if underline == WD_UNDERLINE.INHERITED
-            else True
-            if underline == WD_UNDERLINE.SINGLE
-            else False
-            if underline == WD_UNDERLINE.NONE
-            else underline
+    val: WD_UNDERLINE | None = (
+        OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+            "w:val", WD_UNDERLINE
         )
-
-    @val.setter
-    def val(self, value: bool | WD_UNDERLINE | None):
-        # works fine without these two mappings, but only because True == 1
-        # and False == 0, which happen to match the mapping for WD_UNDERLINE
-        # .SINGLE and .NONE respectively.
-        if value is True:
-            value = WD_UNDERLINE.SINGLE
-        elif value is False:
-            value = WD_UNDERLINE.NONE
-
-        val = WD_UNDERLINE.to_xml(value)
-        self.set(qn("w:val"), val)
+    )
 
 
 class CT_VerticalAlignRun(BaseOxmlElement):
-    """``<w:vertAlign>`` element, specifying subscript or superscript."""
+    """`<w:vertAlign>` element, specifying subscript or superscript."""
 
-    val = RequiredAttribute("w:val", ST_VerticalAlignRun)
+    val: str = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:val", ST_VerticalAlignRun
+    )
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 075a4c842..2d4150de6 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -14,6 +14,8 @@
 
 if TYPE_CHECKING:
     from docx import types as t
+    from docx.enum.base import BaseXmlEnum
+    from docx.oxml.simpletypes import BaseSimpleType
 
 
 def serialize_for_reading(element):
@@ -116,7 +118,9 @@ class BaseAttribute(object):
     Provides common methods.
     """
 
-    def __init__(self, attr_name: str, simple_type: Type[t.AbstractSimpleType]):
+    def __init__(
+        self, attr_name: str, simple_type: Type[BaseXmlEnum] | Type[BaseSimpleType]
+    ):
         super(BaseAttribute, self).__init__()
         self._attr_name = attr_name
         self._simple_type = simple_type
@@ -166,8 +170,8 @@ class OptionalAttribute(BaseAttribute):
     def __init__(
         self,
         attr_name: str,
-        simple_type: Type[t.AbstractSimpleType],
-        default: t.AbstractSimpleTypeMember | None = None,
+        simple_type: Type[BaseXmlEnum] | Type[BaseSimpleType],
+        default: BaseXmlEnum | BaseSimpleType | None = None,
     ):
         super(OptionalAttribute, self).__init__(attr_name, simple_type)
         self._default = default
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index 8b4470a34..acd60795b 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -6,10 +6,12 @@
 
 from docx.dml.color import ColorFormat
 from docx.enum.text import WD_UNDERLINE
-from docx.shared import ElementProxy
+from docx.shared import ElementProxy, Emu
 
 if TYPE_CHECKING:
+    from docx.enum.text import WD_COLOR_INDEX
     from docx.oxml.text.run import CT_R
+    from docx.shared import Length
 
 
 class Font(ElementProxy):
@@ -22,7 +24,7 @@ def __init__(self, r: CT_R, parent: Any | None = None):
         self._r = r
 
     @property
-    def all_caps(self):
+    def all_caps(self) -> bool | None:
         """Read/write.
 
         Causes text in this font to appear in capital letters.
@@ -30,11 +32,11 @@ def all_caps(self):
         return self._get_bool_prop("caps")
 
     @all_caps.setter
-    def all_caps(self, value):
+    def all_caps(self, value: bool | None) -> None:
         self._set_bool_prop("caps", value)
 
     @property
-    def bold(self):
+    def bold(self) -> bool | None:
         """Read/write.
 
         Causes text in this font to appear in bold.
@@ -42,7 +44,7 @@ def bold(self):
         return self._get_bool_prop("b")
 
     @bold.setter
-    def bold(self, value):
+    def bold(self, value: bool | None) -> None:
         self._set_bool_prop("b", value)
 
     @property
@@ -52,7 +54,7 @@ def color(self):
         return ColorFormat(self._element)
 
     @property
-    def complex_script(self):
+    def complex_script(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the characters in the run to be treated as complex script
@@ -61,11 +63,11 @@ def complex_script(self):
         return self._get_bool_prop("cs")
 
     @complex_script.setter
-    def complex_script(self, value):
+    def complex_script(self, value: bool | None) -> None:
         self._set_bool_prop("cs", value)
 
     @property
-    def cs_bold(self):
+    def cs_bold(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the complex script characters in the run to be displayed in
@@ -74,11 +76,11 @@ def cs_bold(self):
         return self._get_bool_prop("bCs")
 
     @cs_bold.setter
-    def cs_bold(self, value):
+    def cs_bold(self, value: bool | None) -> None:
         self._set_bool_prop("bCs", value)
 
     @property
-    def cs_italic(self):
+    def cs_italic(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the complex script characters in the run to be displayed in
@@ -87,11 +89,11 @@ def cs_italic(self):
         return self._get_bool_prop("iCs")
 
     @cs_italic.setter
-    def cs_italic(self, value):
+    def cs_italic(self, value: bool | None) -> None:
         self._set_bool_prop("iCs", value)
 
     @property
-    def double_strike(self):
+    def double_strike(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the text in the run to appear with double strikethrough.
@@ -99,11 +101,11 @@ def double_strike(self):
         return self._get_bool_prop("dstrike")
 
     @double_strike.setter
-    def double_strike(self, value):
+    def double_strike(self, value: bool | None) -> None:
         self._set_bool_prop("dstrike", value)
 
     @property
-    def emboss(self):
+    def emboss(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the text in the run to appear as if raised off the page in
@@ -112,11 +114,11 @@ def emboss(self):
         return self._get_bool_prop("emboss")
 
     @emboss.setter
-    def emboss(self, value):
+    def emboss(self, value: bool | None) -> None:
         self._set_bool_prop("emboss", value)
 
     @property
-    def hidden(self):
+    def hidden(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the text in the run to be hidden from display, unless
@@ -125,25 +127,24 @@ def hidden(self):
         return self._get_bool_prop("vanish")
 
     @hidden.setter
-    def hidden(self, value):
+    def hidden(self, value: bool | None) -> None:
         self._set_bool_prop("vanish", value)
 
     @property
-    def highlight_color(self):
-        """A member of :ref:`WdColorIndex` indicating the color of highlighting applied,
-        or `None` if no highlighting is applied."""
+    def highlight_color(self) -> WD_COLOR_INDEX | None:
+        """Color of highlighing applied or |None| if not highlighted."""
         rPr = self._element.rPr
         if rPr is None:
             return None
         return rPr.highlight_val
 
     @highlight_color.setter
-    def highlight_color(self, value):
+    def highlight_color(self, value: WD_COLOR_INDEX | None):
         rPr = self._element.get_or_add_rPr()
         rPr.highlight_val = value
 
     @property
-    def italic(self):
+    def italic(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the text of the run to appear in italics. |None| indicates
@@ -152,11 +153,11 @@ def italic(self):
         return self._get_bool_prop("i")
 
     @italic.setter
-    def italic(self, value):
+    def italic(self, value: bool | None) -> None:
         self._set_bool_prop("i", value)
 
     @property
-    def imprint(self):
+    def imprint(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, causes the text in the run to appear as if pressed into the page.
@@ -164,11 +165,11 @@ def imprint(self):
         return self._get_bool_prop("imprint")
 
     @imprint.setter
-    def imprint(self, value):
+    def imprint(self, value: bool | None) -> None:
         self._set_bool_prop("imprint", value)
 
     @property
-    def math(self):
+    def math(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, specifies this run contains WML that should be handled as though it
@@ -177,15 +178,15 @@ def math(self):
         return self._get_bool_prop("oMath")
 
     @math.setter
-    def math(self, value):
+    def math(self, value: bool | None) -> None:
         self._set_bool_prop("oMath", value)
 
     @property
-    def name(self):
-        """Get or set the typeface name for this |Font| instance, causing the text it
-        controls to appear in the named font, if a matching font is found.
+    def name(self) -> str | None:
+        """The typeface name for this |Font|.
 
-        |None| indicates the typeface is inherited from the style hierarchy.
+        Causes the text it controls to appear in the named font, if a matching font is
+        found. |None| indicates the typeface is inherited from the style hierarchy.
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -193,13 +194,13 @@ def name(self):
         return rPr.rFonts_ascii
 
     @name.setter
-    def name(self, value):
+    def name(self, value: str | None) -> None:
         rPr = self._element.get_or_add_rPr()
         rPr.rFonts_ascii = value
         rPr.rFonts_hAnsi = value
 
     @property
-    def no_proof(self):
+    def no_proof(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, specifies that the contents of this run should not report any
@@ -208,11 +209,11 @@ def no_proof(self):
         return self._get_bool_prop("noProof")
 
     @no_proof.setter
-    def no_proof(self, value):
+    def no_proof(self, value: bool | None) -> None:
         self._set_bool_prop("noProof", value)
 
     @property
-    def outline(self):
+    def outline(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True| causes the characters in the run to appear as if they have an
@@ -222,11 +223,11 @@ def outline(self):
         return self._get_bool_prop("outline")
 
     @outline.setter
-    def outline(self, value):
+    def outline(self, value: bool | None) -> None:
         self._set_bool_prop("outline", value)
 
     @property
-    def rtl(self):
+    def rtl(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True| causes the text in the run to have right-to-left characteristics.
@@ -234,11 +235,11 @@ def rtl(self):
         return self._get_bool_prop("rtl")
 
     @rtl.setter
-    def rtl(self, value):
+    def rtl(self, value: bool | None) -> None:
         self._set_bool_prop("rtl", value)
 
     @property
-    def shadow(self):
+    def shadow(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True| causes the text in the run to appear as if each character has a
@@ -247,18 +248,24 @@ def shadow(self):
         return self._get_bool_prop("shadow")
 
     @shadow.setter
-    def shadow(self, value):
+    def shadow(self, value: bool | None) -> None:
         self._set_bool_prop("shadow", value)
 
     @property
-    def size(self):
-        """Read/write |Length| value or |None|, indicating the font height in English
-        Metric Units (EMU). |None| indicates the font size should be inherited from the
-        style hierarchy. |Length| is a subclass of |int| having properties for
-        convenient conversion into points or other length units. The
-        :class:`docx.shared.Pt` class allows convenient specification of point values::
-
-        >> font.size = Pt(24) >> font.size 304800 >> font.size.pt 24.0
+    def size(self) -> Length | None:
+        """Font height in English Metric Units (EMU).
+
+        |None| indicates the font size should be inherited from the style hierarchy.
+        |Length| is a subclass of |int| having properties for convenient conversion into
+        points or other length units. The :class:`docx.shared.Pt` class allows
+        convenient specification of point values::
+
+            >>> font.size = Pt(24)
+            >>> font.size
+            304800
+            >>> font.size.pt
+            24.0
+
         """
         rPr = self._element.rPr
         if rPr is None:
@@ -266,12 +273,12 @@ def size(self):
         return rPr.sz_val
 
     @size.setter
-    def size(self, emu):
+    def size(self, emu: int | Length | None) -> None:
         rPr = self._element.get_or_add_rPr()
-        rPr.sz_val = emu
+        rPr.sz_val = None if emu is None else Emu(emu)
 
     @property
-    def small_caps(self):
+    def small_caps(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True| causes the lowercase characters in the run to appear as capital
@@ -280,11 +287,11 @@ def small_caps(self):
         return self._get_bool_prop("smallCaps")
 
     @small_caps.setter
-    def small_caps(self, value):
+    def small_caps(self, value: bool | None) -> None:
         self._set_bool_prop("smallCaps", value)
 
     @property
-    def snap_to_grid(self):
+    def snap_to_grid(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True| causes the run to use the document grid characters per line settings
@@ -293,11 +300,11 @@ def snap_to_grid(self):
         return self._get_bool_prop("snapToGrid")
 
     @snap_to_grid.setter
-    def snap_to_grid(self, value):
+    def snap_to_grid(self, value: bool | None) -> None:
         self._set_bool_prop("snapToGrid", value)
 
     @property
-    def spec_vanish(self):
+    def spec_vanish(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, specifies that the given run shall always behave as if it is
@@ -308,11 +315,11 @@ def spec_vanish(self):
         return self._get_bool_prop("specVanish")
 
     @spec_vanish.setter
-    def spec_vanish(self, value):
+    def spec_vanish(self, value: bool | None) -> None:
         self._set_bool_prop("specVanish", value)
 
     @property
-    def strike(self):
+    def strike(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True| causes the text in the run to appear with a single horizontal line
@@ -321,11 +328,11 @@ def strike(self):
         return self._get_bool_prop("strike")
 
     @strike.setter
-    def strike(self, value):
+    def strike(self, value: bool | None) -> None:
         self._set_bool_prop("strike", value)
 
     @property
-    def subscript(self):
+    def subscript(self) -> bool | None:
         """Boolean indicating whether the characters in this |Font| appear as subscript.
 
         |None| indicates the subscript/subscript value is inherited from the style
@@ -337,12 +344,12 @@ def subscript(self):
         return rPr.subscript
 
     @subscript.setter
-    def subscript(self, value):
+    def subscript(self, value: bool | None) -> None:
         rPr = self._element.get_or_add_rPr()
         rPr.subscript = value
 
     @property
-    def superscript(self):
+    def superscript(self) -> bool | None:
         """Boolean indicating whether the characters in this |Font| appear as
         superscript.
 
@@ -355,7 +362,7 @@ def superscript(self):
         return rPr.superscript
 
     @superscript.setter
-    def superscript(self, value):
+    def superscript(self, value: bool | None) -> None:
         rPr = self._element.get_or_add_rPr()
         rPr.superscript = value
 
@@ -374,15 +381,33 @@ def underline(self) -> bool | WD_UNDERLINE | None:
         if rPr is None:
             return None
         val = rPr.u_val
-        return None if val == WD_UNDERLINE.INHERITED else val
+        return (
+            None
+            if val == WD_UNDERLINE.INHERITED
+            else True
+            if val == WD_UNDERLINE.SINGLE
+            else False
+            if val == WD_UNDERLINE.NONE
+            else val
+        )
 
     @underline.setter
-    def underline(self, value: bool | WD_UNDERLINE | None):
+    def underline(self, value: bool | WD_UNDERLINE | None) -> None:
         rPr = self._element.get_or_add_rPr()
-        rPr.u_val = value
+        # -- works fine without these two mappings, but only because True == 1 and
+        # -- False == 0, which happen to match the mapping for WD_UNDERLINE.SINGLE
+        # -- and .NONE respectively.
+        val = (
+            WD_UNDERLINE.SINGLE
+            if value is True
+            else WD_UNDERLINE.NONE
+            if value is False
+            else value
+        )
+        rPr.u_val = val
 
     @property
-    def web_hidden(self):
+    def web_hidden(self) -> bool | None:
         """Read/write tri-state value.
 
         When |True|, specifies that the contents of this run shall be hidden when the
@@ -391,7 +416,7 @@ def web_hidden(self):
         return self._get_bool_prop("webHidden")
 
     @web_hidden.setter
-    def web_hidden(self, value):
+    def web_hidden(self, value: bool | None) -> None:
         self._set_bool_prop("webHidden", value)
 
     def _get_bool_prop(self, name: str) -> bool | None:
@@ -399,9 +424,9 @@ def _get_bool_prop(self, name: str) -> bool | None:
         rPr = self._element.rPr
         if rPr is None:
             return None
-        return rPr._get_bool_val(name)
+        return rPr._get_bool_val(name)  # pyright: ignore[reportPrivateUsage]
 
-    def _set_bool_prop(self, name, value):
+    def _set_bool_prop(self, name: str, value: bool | None):
         """Assign `value` to the boolean child `name` of `w:rPr`."""
         rPr = self._element.get_or_add_rPr()
-        rPr._set_bool_val(name, value)
+        rPr._set_bool_val(name, value)  # pyright: ignore[reportPrivateUsage]
diff --git a/src/docx/types.py b/src/docx/types.py
index 9f5b7dae7..6097f740c 100644
--- a/src/docx/types.py
+++ b/src/docx/types.py
@@ -7,25 +7,6 @@
 from docx.parts.story import StoryPart
 
 
-class AbstractSimpleTypeMember(Protocol):
-    """A simple-type member is a valid value for a simple-type.
-
-    The name *simple-type* comes from the ISO spec which refers to XML attribute value
-    types as simple types and gives those the prefix `ST_` in the XML Schema. Many are
-    enumerations but that is not strictly required.
-    """
-
-
-class AbstractSimpleType(Protocol):
-    """A simple-type can provide XML attribute value mapping."""
-
-    @classmethod
-    def from_xml(cls, xml_value: str) -> AbstractSimpleTypeMember: ...
-
-    @classmethod
-    def to_xml(cls, value: AbstractSimpleTypeMember) -> str: ...
-
-
 class StoryChild(Protocol):
     """An object that can fulfill the `parent` role in a `Parented` class.
 
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index a17b2f1bd..fa927b6c8 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -1,105 +1,114 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for the docx.text.run module."""
 
 from __future__ import annotations
 
+from typing import cast
+
 import pytest
+from _pytest.fixtures import FixtureRequest
 
 from docx.dml.color import ColorFormat
 from docx.enum.text import WD_COLOR, WD_UNDERLINE
-from docx.shared import Pt
+from docx.oxml.text.run import CT_R
+from docx.shared import Length, Pt
 from docx.text.font import Font
 
 from ..unitutil.cxml import element, xml
-from ..unitutil.mock import class_mock, instance_mock
+from ..unitutil.mock import Mock, class_mock, instance_mock
 
 
 class DescribeFont(object):
-    def it_provides_access_to_its_color_object(self, color_fixture):
-        font, color_, ColorFormat_ = color_fixture
+    """Unit-test suite for `docx.text.font.Font`."""
+
+    def it_provides_access_to_its_color_object(self, ColorFormat_: Mock, color_: Mock):
+        r = cast(CT_R, element("w:r"))
+        font = Font(r)
+
         color = font.color
+
         ColorFormat_.assert_called_once_with(font.element)
         assert color is color_
 
-    def it_knows_its_typeface_name(self, name_get_fixture):
-        font, expected_value = name_get_fixture
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:rFonts", None),
+            ("w:r/w:rPr/w:rFonts{w:ascii=Arial}", "Arial"),
+        ],
+    )
+    def it_knows_its_typeface_name(self, r_cxml: str, expected_value: str | None):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
         assert font.name == expected_value
 
-    def it_can_change_its_typeface_name(self, name_set_fixture):
-        font, value, expected_xml = name_set_fixture
-        font.name = value
-        assert font._element.xml == expected_xml
-
-    def it_knows_its_size(self, size_get_fixture):
-        font, expected_value = size_get_fixture
-        assert font.size == expected_value
-
-    def it_can_change_its_size(self, size_set_fixture):
-        font, value, expected_xml = size_set_fixture
-        font.size = value
-        assert font._element.xml == expected_xml
-
-    def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
-        font, prop_name, expected_state = bool_prop_get_fixture
-        assert getattr(font, prop_name) == expected_state
-
-    def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
-        font, prop_name, value, expected_xml = bool_prop_set_fixture
-        setattr(font, prop_name, value)
-        assert font._element.xml == expected_xml
-
-    def it_knows_whether_it_is_subscript(self, subscript_get_fixture):
-        font, expected_value = subscript_get_fixture
-        assert font.subscript == expected_value
-
-    def it_can_change_whether_it_is_subscript(self, subscript_set_fixture):
-        font, value, expected_xml = subscript_set_fixture
-        font.subscript = value
-        assert font._element.xml == expected_xml
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "expected_r_cxml"),
+        [
+            ("w:r", "Foo", "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}"),
+            ("w:r/w:rPr", "Foo", "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}"),
+            (
+                "w:r/w:rPr/w:rFonts{w:hAnsi=Foo}",
+                "Bar",
+                "w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}",
+            ),
+            (
+                "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}",
+                "Bar",
+                "w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}",
+            ),
+        ],
+    )
+    def it_can_change_its_typeface_name(
+        self, r_cxml: str, value: str, expected_r_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        expected_xml = xml(expected_r_cxml)
 
-    def it_knows_whether_it_is_superscript(self, superscript_get_fixture):
-        font, expected_value = superscript_get_fixture
-        assert font.superscript == expected_value
+        font.name = value
 
-    def it_can_change_whether_it_is_superscript(self, superscript_set_fixture):
-        font, value, expected_xml = superscript_set_fixture
-        font.superscript = value
         assert font._element.xml == expected_xml
 
     @pytest.mark.parametrize(
         ("r_cxml", "expected_value"),
         [
             ("w:r", None),
-            ("w:r/w:rPr/w:u", None),
-            ("w:r/w:rPr/w:u{w:val=single}", True),
-            ("w:r/w:rPr/w:u{w:val=none}", False),
-            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
-            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:sz{w:val=28}", Pt(14)),
         ],
     )
-    def it_knows_its_underline_type(
-        self, r_cxml: str, expected_value: WD_UNDERLINE | bool | None
-    ):
-        font = Font(element(r_cxml), None)
-        assert font.underline is expected_value
+    def it_knows_its_size(self, r_cxml: str, expected_value: Length | None):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        assert font.size == expected_value
 
-    def it_can_change_its_underline_type(self, underline_set_fixture):
-        font, underline, expected_xml = underline_set_fixture
-        font.underline = underline
-        assert font._element.xml == expected_xml
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "expected_r_cxml"),
+        [
+            ("w:r", Pt(12), "w:r/w:rPr/w:sz{w:val=24}"),
+            ("w:r/w:rPr", Pt(12), "w:r/w:rPr/w:sz{w:val=24}"),
+            ("w:r/w:rPr/w:sz{w:val=24}", Pt(18), "w:r/w:rPr/w:sz{w:val=36}"),
+            ("w:r/w:rPr/w:sz{w:val=36}", None, "w:r/w:rPr"),
+        ],
+    )
+    def it_can_change_its_size(
+        self, r_cxml: str, value: Length | None, expected_r_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        expected_xml = xml(expected_r_cxml)
 
-    def it_knows_its_highlight_color(self, highlight_get_fixture):
-        font, expected_value = highlight_get_fixture
-        assert font.highlight_color is expected_value
+        font.size = value
 
-    def it_can_change_its_highlight_color(self, highlight_set_fixture):
-        font, highlight_color, expected_xml = highlight_set_fixture
-        font.highlight_color = highlight_color
         assert font._element.xml == expected_xml
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "bool_prop_name", "expected_value"),
+        [
             ("w:r/w:rPr", "all_caps", None),
             ("w:r/w:rPr/w:caps", "all_caps", True),
             ("w:r/w:rPr/w:caps{w:val=on}", "all_caps", True),
@@ -124,15 +133,18 @@ def it_can_change_its_highlight_color(self, highlight_set_fixture):
             ("w:r/w:rPr/w:specVanish{w:val=off}", "spec_vanish", False),
             ("w:r/w:rPr/w:strike{w:val=1}", "strike", True),
             ("w:r/w:rPr/w:webHidden{w:val=0}", "web_hidden", False),
-        ]
+        ],
     )
-    def bool_prop_get_fixture(self, request):
-        r_cxml, bool_prop_name, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, bool_prop_name, expected_value
+    def it_knows_its_bool_prop_states(
+        self, r_cxml: str, bool_prop_name: str, expected_value: bool | None
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        assert getattr(font, bool_prop_name) == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "prop_name", "value", "expected_cxml"),
+        [
             # nothing to True, False, and None ---------------------------
             ("w:r", "all_caps", True, "w:r/w:rPr/w:caps"),
             ("w:r", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
@@ -189,129 +201,39 @@ def bool_prop_get_fixture(self, request):
                 False,
                 "w:r/w:rPr/w:webHidden{w:val=0}",
             ),
-        ]
-    )
-    def bool_prop_set_fixture(self, request):
-        r_cxml, prop_name, value, expected_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_cxml)
-        return font, prop_name, value, expected_xml
-
-    @pytest.fixture
-    def color_fixture(self, ColorFormat_, color_):
-        font = Font(element("w:r"))
-        return font, color_, ColorFormat_
-
-    @pytest.fixture(
-        params=[
-            ("w:r", None),
-            ("w:r/w:rPr", None),
-            ("w:r/w:rPr/w:highlight{w:val=default}", WD_COLOR.AUTO),
-            ("w:r/w:rPr/w:highlight{w:val=blue}", WD_COLOR.BLUE),
-        ]
-    )
-    def highlight_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml), None)
-        return font, expected_value
-
-    @pytest.fixture(
-        params=[
-            ("w:r", WD_COLOR.AUTO, "w:r/w:rPr/w:highlight{w:val=default}"),
-            ("w:r/w:rPr", WD_COLOR.BRIGHT_GREEN, "w:r/w:rPr/w:highlight{w:val=green}"),
-            (
-                "w:r/w:rPr/w:highlight{w:val=green}",
-                WD_COLOR.YELLOW,
-                "w:r/w:rPr/w:highlight{w:val=yellow}",
-            ),
-            ("w:r/w:rPr/w:highlight{w:val=yellow}", None, "w:r/w:rPr"),
-            ("w:r/w:rPr", None, "w:r/w:rPr"),
-            ("w:r", None, "w:r/w:rPr"),
-        ]
+        ],
     )
-    def highlight_set_fixture(self, request):
-        r_cxml, value, expected_cxml = request.param
-        font = Font(element(r_cxml), None)
+    def it_can_change_its_bool_prop_settings(
+        self, r_cxml: str, prop_name: str, value: bool | None, expected_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
         expected_xml = xml(expected_cxml)
-        return font, value, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:r", None),
-            ("w:r/w:rPr", None),
-            ("w:r/w:rPr/w:rFonts", None),
-            ("w:r/w:rPr/w:rFonts{w:ascii=Arial}", "Arial"),
-        ]
-    )
-    def name_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
 
-    @pytest.fixture(
-        params=[
-            ("w:r", "Foo", "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}"),
-            ("w:r/w:rPr", "Foo", "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}"),
-            (
-                "w:r/w:rPr/w:rFonts{w:hAnsi=Foo}",
-                "Bar",
-                "w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}",
-            ),
-            (
-                "w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}",
-                "Bar",
-                "w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}",
-            ),
-        ]
-    )
-    def name_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:r", None),
-            ("w:r/w:rPr", None),
-            ("w:r/w:rPr/w:sz{w:val=28}", Pt(14)),
-        ]
-    )
-    def size_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
+        setattr(font, prop_name, value)
 
-    @pytest.fixture(
-        params=[
-            ("w:r", Pt(12), "w:r/w:rPr/w:sz{w:val=24}"),
-            ("w:r/w:rPr", Pt(12), "w:r/w:rPr/w:sz{w:val=24}"),
-            ("w:r/w:rPr/w:sz{w:val=24}", Pt(18), "w:r/w:rPr/w:sz{w:val=36}"),
-            ("w:r/w:rPr/w:sz{w:val=36}", None, "w:r/w:rPr"),
-        ]
-    )
-    def size_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
-        expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
+        assert font._element.xml == expected_xml
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
             ("w:r", None),
             ("w:r/w:rPr", None),
             ("w:r/w:rPr/w:vertAlign{w:val=baseline}", False),
             ("w:r/w:rPr/w:vertAlign{w:val=subscript}", True),
             ("w:r/w:rPr/w:vertAlign{w:val=superscript}", False),
-        ]
+        ],
     )
-    def subscript_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
+    def it_knows_whether_it_is_subscript(
+        self, r_cxml: str, expected_value: bool | None
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        assert font.subscript == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "expected_r_cxml"),
+        [
             ("w:r", True, "w:r/w:rPr/w:vertAlign{w:val=subscript}"),
             ("w:r", False, "w:r/w:rPr"),
             ("w:r", None, "w:r/w:rPr"),
@@ -338,30 +260,39 @@ def subscript_get_fixture(self, request):
                 True,
                 "w:r/w:rPr/w:vertAlign{w:val=subscript}",
             ),
-        ]
+        ],
     )
-    def subscript_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
+    def it_can_change_whether_it_is_subscript(
+        self, r_cxml: str, value: bool | None, expected_r_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
         expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
 
-    @pytest.fixture(
-        params=[
+        font.subscript = value
+
+        assert font._element.xml == expected_xml
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
             ("w:r", None),
             ("w:r/w:rPr", None),
             ("w:r/w:rPr/w:vertAlign{w:val=baseline}", False),
             ("w:r/w:rPr/w:vertAlign{w:val=subscript}", False),
             ("w:r/w:rPr/w:vertAlign{w:val=superscript}", True),
-        ]
+        ],
     )
-    def superscript_get_fixture(self, request):
-        r_cxml, expected_value = request.param
-        font = Font(element(r_cxml))
-        return font, expected_value
+    def it_knows_whether_it_is_superscript(
+        self, r_cxml: str, expected_value: bool | None
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        assert font.superscript == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "expected_r_cxml"),
+        [
             ("w:r", True, "w:r/w:rPr/w:vertAlign{w:val=superscript}"),
             ("w:r", False, "w:r/w:rPr"),
             ("w:r", None, "w:r/w:rPr"),
@@ -388,16 +319,40 @@ def superscript_get_fixture(self, request):
                 True,
                 "w:r/w:rPr/w:vertAlign{w:val=superscript}",
             ),
-        ]
+        ],
     )
-    def superscript_set_fixture(self, request):
-        r_cxml, value, expected_r_cxml = request.param
-        font = Font(element(r_cxml))
+    def it_can_change_whether_it_is_superscript(
+        self, r_cxml: str, value: bool | None, expected_r_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
         expected_xml = xml(expected_r_cxml)
-        return font, value, expected_xml
 
-    @pytest.fixture(
-        params=[
+        font.superscript = value
+
+        assert font._element.xml == expected_xml
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", None),
+            ("w:r/w:rPr/w:u", None),
+            ("w:r/w:rPr/w:u{w:val=single}", True),
+            ("w:r/w:rPr/w:u{w:val=none}", False),
+            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
+            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
+        ],
+    )
+    def it_knows_its_underline_type(
+        self, r_cxml: str, expected_value: WD_UNDERLINE | bool | None
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        assert font.underline is expected_value
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "expected_r_cxml"),
+        [
             ("w:r", True, "w:r/w:rPr/w:u{w:val=single}"),
             ("w:r", False, "w:r/w:rPr/w:u{w:val=none}"),
             ("w:r", None, "w:r/w:rPr"),
@@ -416,20 +371,67 @@ def superscript_set_fixture(self, request):
                 WD_UNDERLINE.DOTTED,
                 "w:r/w:rPr/w:u{w:val=dotted}",
             ),
-        ]
+        ],
     )
-    def underline_set_fixture(self, request):
-        initial_r_cxml, value, expected_cxml = request.param
-        run = Font(element(initial_r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, value, expected_xml
+    def it_can_change_its_underline_type(
+        self, r_cxml: str, value: bool | None, expected_r_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        expected_xml = xml(expected_r_cxml)
+
+        font.underline = value
+
+        assert font._element.xml == expected_xml
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:highlight{w:val=default}", WD_COLOR.AUTO),
+            ("w:r/w:rPr/w:highlight{w:val=blue}", WD_COLOR.BLUE),
+        ],
+    )
+    def it_knows_its_highlight_color(
+        self, r_cxml: str, expected_value: WD_COLOR | None
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        assert font.highlight_color is expected_value
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "expected_r_cxml"),
+        [
+            ("w:r", WD_COLOR.AUTO, "w:r/w:rPr/w:highlight{w:val=default}"),
+            ("w:r/w:rPr", WD_COLOR.BRIGHT_GREEN, "w:r/w:rPr/w:highlight{w:val=green}"),
+            (
+                "w:r/w:rPr/w:highlight{w:val=green}",
+                WD_COLOR.YELLOW,
+                "w:r/w:rPr/w:highlight{w:val=yellow}",
+            ),
+            ("w:r/w:rPr/w:highlight{w:val=yellow}", None, "w:r/w:rPr"),
+            ("w:r/w:rPr", None, "w:r/w:rPr"),
+            ("w:r", None, "w:r/w:rPr"),
+        ],
+    )
+    def it_can_change_its_highlight_color(
+        self, r_cxml: str, value: WD_COLOR | None, expected_r_cxml: str
+    ):
+        r = cast(CT_R, element(r_cxml))
+        font = Font(r)
+        expected_xml = xml(expected_r_cxml)
+
+        font.highlight_color = value
+
+        assert font._element.xml == expected_xml
 
-    # fixture components ---------------------------------------------
+    # -- fixtures ----------------------------------------------------
 
     @pytest.fixture
-    def color_(self, request):
+    def color_(self, request: FixtureRequest):
         return instance_mock(request, ColorFormat)
 
     @pytest.fixture
-    def ColorFormat_(self, request, color_):
+    def ColorFormat_(self, request: FixtureRequest, color_: Mock):
         return class_mock(request, "docx.text.font.ColorFormat", return_value=color_)

From 12a6bb8d32f35fe34f02b713cf7380752fd748a8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 8 Oct 2023 21:17:15 -0700
Subject: [PATCH 289/367] rfctr: remove obsolete inherit-from-`object`

---
 src/docx/enum/__init__.py         |  2 +-
 src/docx/image/constants.py       | 10 +++++-----
 src/docx/image/helpers.py         |  2 +-
 src/docx/image/image.py           |  2 +-
 src/docx/image/jpeg.py            |  8 ++++----
 src/docx/image/png.py             |  8 ++++----
 src/docx/image/tiff.py            |  8 ++++----
 src/docx/opc/constants.py         |  8 ++++----
 src/docx/opc/coreprops.py         |  2 +-
 src/docx/opc/package.py           |  4 ++--
 src/docx/opc/part.py              |  4 ++--
 src/docx/opc/phys_pkg.py          |  4 ++--
 src/docx/opc/pkgreader.py         | 10 +++++-----
 src/docx/opc/pkgwriter.py         |  4 ++--
 src/docx/opc/rel.py               |  2 +-
 src/docx/oxml/simpletypes.py      |  2 +-
 src/docx/oxml/text/run.py         |  2 +-
 src/docx/oxml/xmlchemy.py         |  4 ++--
 src/docx/package.py               |  2 +-
 src/docx/parts/numbering.py       |  2 +-
 src/docx/section.py               |  2 +-
 src/docx/shape.py                 |  2 +-
 src/docx/shared.py                |  2 +-
 src/docx/styles/__init__.py       |  2 +-
 src/docx/text/run.py              |  2 +-
 tests/dml/test_color.py           |  2 +-
 tests/image/test_bmp.py           |  2 +-
 tests/image/test_gif.py           |  2 +-
 tests/image/test_helpers.py       |  2 +-
 tests/image/test_image.py         |  6 +++---
 tests/image/test_jpeg.py          | 22 +++++++++++-----------
 tests/image/test_png.py           | 16 ++++++++--------
 tests/image/test_tiff.py          | 20 ++++++++++----------
 tests/opc/parts/test_coreprops.py |  2 +-
 tests/opc/test_coreprops.py       |  2 +-
 tests/opc/test_oxml.py            | 10 +++++-----
 tests/opc/test_package.py         |  4 ++--
 tests/opc/test_packuri.py         |  2 +-
 tests/opc/test_part.py            |  8 ++++----
 tests/opc/test_phys_pkg.py        |  8 ++++----
 tests/opc/test_pkgreader.py       | 10 +++++-----
 tests/opc/test_pkgwriter.py       |  4 ++--
 tests/opc/test_rel.py             |  4 ++--
 tests/opc/unitdata/rels.py        |  4 ++--
 tests/oxml/parts/test_document.py |  2 +-
 tests/oxml/test__init__.py        |  8 ++++----
 tests/oxml/test_ns.py             |  2 +-
 tests/oxml/test_styles.py         |  2 +-
 tests/oxml/test_table.py          |  4 ++--
 tests/oxml/test_xmlchemy.py       | 22 +++++++++++-----------
 tests/parts/test_document.py      |  2 +-
 tests/parts/test_hdrftr.py        |  4 ++--
 tests/parts/test_image.py         |  2 +-
 tests/parts/test_numbering.py     |  4 ++--
 tests/parts/test_settings.py      |  2 +-
 tests/parts/test_story.py         |  2 +-
 tests/parts/test_styles.py        |  2 +-
 tests/styles/test_latent.py       |  4 ++--
 tests/styles/test_style.py        |  8 ++++----
 tests/styles/test_styles.py       |  2 +-
 tests/test_api.py                 |  2 +-
 tests/test_blkcntnr.py            |  2 +-
 tests/test_document.py            |  4 ++--
 tests/test_package.py             |  4 ++--
 tests/test_settings.py            |  2 +-
 tests/test_shape.py               |  4 ++--
 tests/test_shared.py              |  6 +++---
 tests/test_table.py               | 12 ++++++------
 tests/text/test_font.py           |  2 +-
 tests/text/test_paragraph.py      |  2 +-
 tests/text/test_parfmt.py         |  2 +-
 tests/text/test_run.py            |  4 ++--
 tests/text/test_tabstops.py       |  4 ++--
 tests/unitdata.py                 |  2 +-
 tests/unitutil/cxml.py            |  2 +-
 75 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/src/docx/enum/__init__.py b/src/docx/enum/__init__.py
index c0ba1a5a3..bfab52d36 100644
--- a/src/docx/enum/__init__.py
+++ b/src/docx/enum/__init__.py
@@ -1,7 +1,7 @@
 """Enumerations used in python-docx."""
 
 
-class Enumeration(object):
+class Enumeration:
     @classmethod
     def from_xml(cls, xml_val):
         return cls._xml_to_idx[xml_val]
diff --git a/src/docx/image/constants.py b/src/docx/image/constants.py
index 65286c647..729a828b2 100644
--- a/src/docx/image/constants.py
+++ b/src/docx/image/constants.py
@@ -1,7 +1,7 @@
 """Constants specific the the image sub-package."""
 
 
-class JPEG_MARKER_CODE(object):
+class JPEG_MARKER_CODE:
     """JPEG marker codes."""
 
     TEM = b"\x01"
@@ -97,7 +97,7 @@ def is_standalone(cls, marker_code):
         return marker_code in cls.STANDALONE_MARKERS
 
 
-class MIME_TYPE(object):
+class MIME_TYPE:
     """Image content types."""
 
     BMP = "image/bmp"
@@ -107,7 +107,7 @@ class MIME_TYPE(object):
     TIFF = "image/tiff"
 
 
-class PNG_CHUNK_TYPE(object):
+class PNG_CHUNK_TYPE:
     """PNG chunk type names."""
 
     IHDR = "IHDR"
@@ -115,7 +115,7 @@ class PNG_CHUNK_TYPE(object):
     IEND = "IEND"
 
 
-class TIFF_FLD_TYPE(object):
+class TIFF_FLD_TYPE:
     """Tag codes for TIFF Image File Directory (IFD) entries."""
 
     BYTE = 1
@@ -136,7 +136,7 @@ class TIFF_FLD_TYPE(object):
 TIFF_FLD = TIFF_FLD_TYPE
 
 
-class TIFF_TAG(object):
+class TIFF_TAG:
     """Tag codes for TIFF Image File Directory (IFD) entries."""
 
     IMAGE_WIDTH = 0x0100
diff --git a/src/docx/image/helpers.py b/src/docx/image/helpers.py
index 8532a2e58..647b30851 100644
--- a/src/docx/image/helpers.py
+++ b/src/docx/image/helpers.py
@@ -6,7 +6,7 @@
 LITTLE_ENDIAN = "<"
 
 
-class StreamReader(object):
+class StreamReader:
     """Wraps a file-like object to provide access to structured data from a binary file.
 
     Byte-order is configurable. `base_offset` is added to any base value provided to
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 2d2f2c97d..945432872 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -185,7 +185,7 @@ def read_32(stream):
     raise UnrecognizedImageError
 
 
-class BaseImageHeader(object):
+class BaseImageHeader:
     """Base class for image header subclasses like |Jpeg| and |Tiff|."""
 
     def __init__(self, px_width, px_height, horz_dpi, vert_dpi):
diff --git a/src/docx/image/jpeg.py b/src/docx/image/jpeg.py
index 92770e948..b0114a998 100644
--- a/src/docx/image/jpeg.py
+++ b/src/docx/image/jpeg.py
@@ -61,7 +61,7 @@ def from_stream(cls, stream):
         return cls(px_width, px_height, horz_dpi, vert_dpi)
 
 
-class _JfifMarkers(object):
+class _JfifMarkers:
     """Sequence of markers in a JPEG file, perhaps truncated at first SOS marker for
     performance reasons."""
 
@@ -125,7 +125,7 @@ def sof(self):
         raise KeyError("no start of frame (SOFn) marker in image")
 
 
-class _MarkerParser(object):
+class _MarkerParser:
     """Service class that knows how to parse a JFIF stream and iterate over its
     markers."""
 
@@ -152,7 +152,7 @@ def iter_markers(self):
             start = segment_offset + marker.segment_length
 
 
-class _MarkerFinder(object):
+class _MarkerFinder:
     """Service class that knows how to find the next JFIF marker in a stream."""
 
     def __init__(self, stream):
@@ -239,7 +239,7 @@ def _MarkerFactory(marker_code, stream, offset):
     return marker_cls.from_stream(stream, marker_code, offset)
 
 
-class _Marker(object):
+class _Marker:
     """Base class for JFIF marker classes.
 
     Represents a marker and its segment occuring in a JPEG byte stream.
diff --git a/src/docx/image/png.py b/src/docx/image/png.py
index bfbbaf30d..dd3cf819e 100644
--- a/src/docx/image/png.py
+++ b/src/docx/image/png.py
@@ -32,7 +32,7 @@ def from_stream(cls, stream):
         return cls(px_width, px_height, horz_dpi, vert_dpi)
 
 
-class _PngParser(object):
+class _PngParser:
     """Parses a PNG image stream to extract the image properties found in its chunks."""
 
     def __init__(self, chunks):
@@ -89,7 +89,7 @@ def _dpi(units_specifier, px_per_unit):
         return 72
 
 
-class _Chunks(object):
+class _Chunks:
     """Collection of the chunks parsed from a PNG image stream."""
 
     def __init__(self, chunk_iterable):
@@ -126,7 +126,7 @@ def _find_first(self, match):
         return None
 
 
-class _ChunkParser(object):
+class _ChunkParser:
     """Extracts chunks from a PNG image stream."""
 
     def __init__(self, stream_rdr):
@@ -176,7 +176,7 @@ def _ChunkFactory(chunk_type, stream_rdr, offset):
     return chunk_cls.from_offset(chunk_type, stream_rdr, offset)
 
 
-class _Chunk(object):
+class _Chunk:
     """Base class for specific chunk types.
 
     Also serves as the default chunk type.
diff --git a/src/docx/image/tiff.py b/src/docx/image/tiff.py
index 4e09db15d..b84d9f10f 100644
--- a/src/docx/image/tiff.py
+++ b/src/docx/image/tiff.py
@@ -34,7 +34,7 @@ def from_stream(cls, stream):
         return cls(px_width, px_height, horz_dpi, vert_dpi)
 
 
-class _TiffParser(object):
+class _TiffParser:
     """Parses a TIFF image stream to extract the image properties found in its main
     image file directory (IFD)"""
 
@@ -119,7 +119,7 @@ def _make_stream_reader(cls, stream):
         return StreamReader(stream, endian)
 
 
-class _IfdEntries(object):
+class _IfdEntries:
     """Image File Directory for a TIFF image, having mapping (dict) semantics allowing
     "tag" values to be retrieved by tag code."""
 
@@ -149,7 +149,7 @@ def get(self, tag_code, default=None):
         return self._entries.get(tag_code, default)
 
 
-class _IfdParser(object):
+class _IfdParser:
     """Service object that knows how to extract directory entries from an Image File
     Directory (IFD)"""
 
@@ -186,7 +186,7 @@ def _IfdEntryFactory(stream_rdr, offset):
     return EntryCls.from_stream(stream_rdr, offset)
 
 
-class _IfdEntry(object):
+class _IfdEntry:
     """Base class for IFD entry classes.
 
     Subclasses are differentiated by value type, e.g. ASCII, long int, etc.
diff --git a/src/docx/opc/constants.py b/src/docx/opc/constants.py
index 48e32e0ce..89d3c16cc 100644
--- a/src/docx/opc/constants.py
+++ b/src/docx/opc/constants.py
@@ -4,7 +4,7 @@
 """
 
 
-class CONTENT_TYPE(object):
+class CONTENT_TYPE:
     """Content type URIs (like MIME-types) that specify a part's format."""
 
     BMP = "image/bmp"
@@ -251,7 +251,7 @@ class CONTENT_TYPE(object):
     X_WMF = "image/x-wmf"
 
 
-class NAMESPACE(object):
+class NAMESPACE:
     """Constant values for OPC XML namespaces."""
 
     DML_WORDPROCESSING_DRAWING = (
@@ -265,14 +265,14 @@ class NAMESPACE(object):
     WML_MAIN = "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
 
 
-class RELATIONSHIP_TARGET_MODE(object):
+class RELATIONSHIP_TARGET_MODE:
     """Open XML relationship target modes."""
 
     EXTERNAL = "External"
     INTERNAL = "Internal"
 
 
-class RELATIONSHIP_TYPE(object):
+class RELATIONSHIP_TYPE:
     AUDIO = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio"
     A_F_CHUNK = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk"
diff --git a/src/docx/opc/coreprops.py b/src/docx/opc/coreprops.py
index 26e73fef6..2fd9a75c8 100644
--- a/src/docx/opc/coreprops.py
+++ b/src/docx/opc/coreprops.py
@@ -4,7 +4,7 @@
 """
 
 
-class CoreProperties(object):
+class CoreProperties:
     """Corresponds to part named ``/docProps/core.xml``, containing the core document
     properties for this document package."""
 
diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index 671c585de..b5bdc0e7c 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -10,7 +10,7 @@
 from docx.opc.shared import lazyproperty
 
 
-class OpcPackage(object):
+class OpcPackage:
     """Main API class for |python-opc|.
 
     A new instance is constructed by calling the :meth:`open` class method with a path
@@ -164,7 +164,7 @@ def _core_properties_part(self):
             return core_properties_part
 
 
-class Unmarshaller(object):
+class Unmarshaller:
     """Hosts static methods for unmarshalling a package from a |PackageReader|."""
 
     @staticmethod
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index ed52f54cb..ad9abf7c9 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -14,7 +14,7 @@
     from docx.package import Package
 
 
-class Part(object):
+class Part:
     """Base class for package parts.
 
     Provides common properties and methods, but intended to be subclassed in client code
@@ -154,7 +154,7 @@ def _rel_ref_count(self, rId):
         return len([_rId for _rId in rIds if _rId == rId])
 
 
-class PartFactory(object):
+class PartFactory:
     """Provides a way for client code to specify a subclass of |Part| to be constructed
     by |Unmarshaller| based on its content type and/or a custom callable.
 
diff --git a/src/docx/opc/phys_pkg.py b/src/docx/opc/phys_pkg.py
index 71c096278..5ec32237c 100644
--- a/src/docx/opc/phys_pkg.py
+++ b/src/docx/opc/phys_pkg.py
@@ -7,7 +7,7 @@
 from docx.opc.packuri import CONTENT_TYPES_URI
 
 
-class PhysPkgReader(object):
+class PhysPkgReader:
     """Factory for physical package reader objects."""
 
     def __new__(cls, pkg_file):
@@ -25,7 +25,7 @@ def __new__(cls, pkg_file):
         return super(PhysPkgReader, cls).__new__(reader_cls)
 
 
-class PhysPkgWriter(object):
+class PhysPkgWriter:
     """Factory for physical package writer objects."""
 
     def __new__(cls, pkg_file):
diff --git a/src/docx/opc/pkgreader.py b/src/docx/opc/pkgreader.py
index b5459a61e..f00e7b5f0 100644
--- a/src/docx/opc/pkgreader.py
+++ b/src/docx/opc/pkgreader.py
@@ -7,7 +7,7 @@
 from docx.opc.shared import CaseInsensitiveDict
 
 
-class PackageReader(object):
+class PackageReader:
     """Provides access to the contents of a zip-format OPC package via its
     :attr:`serialized_parts` and :attr:`pkg_srels` attributes."""
 
@@ -87,7 +87,7 @@ def _walk_phys_parts(phys_reader, srels, visited_partnames=None):
                 yield (partname, blob, reltype, srels)
 
 
-class _ContentTypeMap(object):
+class _ContentTypeMap:
     """Value type providing dictionary semantics for looking up content type by part
     name, e.g. ``content_type = cti['/ppt/presentation.xml']``."""
 
@@ -131,7 +131,7 @@ def _add_override(self, partname, content_type):
         self._overrides[partname] = content_type
 
 
-class _SerializedPart(object):
+class _SerializedPart:
     """Value object for an OPC package part.
 
     Provides access to the partname, content type, blob, and serialized relationships
@@ -168,7 +168,7 @@ def srels(self):
         return self._srels
 
 
-class _SerializedRelationship(object):
+class _SerializedRelationship:
     """Value object representing a serialized relationship in an OPC package.
 
     Serialized, in this case, means any target part is referred to via its partname
@@ -231,7 +231,7 @@ def target_partname(self):
         return self._target_partname
 
 
-class _SerializedRelationships(object):
+class _SerializedRelationships:
     """Read-only sequence of |_SerializedRelationship| instances corresponding to the
     relationships item XML passed to constructor."""
 
diff --git a/src/docx/opc/pkgwriter.py b/src/docx/opc/pkgwriter.py
index 5506373be..75af6ac75 100644
--- a/src/docx/opc/pkgwriter.py
+++ b/src/docx/opc/pkgwriter.py
@@ -12,7 +12,7 @@
 from docx.opc.spec import default_content_types
 
 
-class PackageWriter(object):
+class PackageWriter:
     """Writes a zip-format OPC package to `pkg_file`, where `pkg_file` can be either a
     path to a zip file (a string) or a file-like object.
 
@@ -52,7 +52,7 @@ def _write_pkg_rels(phys_writer, pkg_rels):
         phys_writer.write(PACKAGE_URI.rels_uri, pkg_rels.xml)
 
 
-class _ContentTypesItem(object):
+class _ContentTypesItem:
     """Service class that composes a content types item ([Content_Types].xml) based on a
     list of parts.
 
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index 3155e2c6b..efac5e06b 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -108,7 +108,7 @@ def _next_rId(self):
                 return rId_candidate
 
 
-class _Relationship(object):
+class _Relationship:
     """Value object for relationship to part."""
 
     def __init__(self, rId: str, reltype, target, baseURI, external=False):
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index 10e683f15..4e8d91cba 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -17,7 +17,7 @@
     from docx.shared import Length
 
 
-class BaseSimpleType(object):
+class BaseSimpleType:
     """Base class for simple-types."""
 
     @classmethod
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 66c3537e1..f17d33845 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -231,7 +231,7 @@ def __str__(self) -> str:
 # Utility
 
 
-class _RunContentAppender(object):
+class _RunContentAppender:
     """Translates a Python string into run content elements appended in a `w:r` element.
 
     Contiguous sequences of regular characters are appended in a single `<w:t>` element.
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 2d4150de6..2ea985abc 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -112,7 +112,7 @@ def __init__(cls, clsname: str, bases: Tuple[type, ...], namespace: Dict[str, An
                 value.populate_class_members(cls, key)
 
 
-class BaseAttribute(object):
+class BaseAttribute:
     """Base class for OptionalAttribute and RequiredAttribute.
 
     Provides common methods.
@@ -268,7 +268,7 @@ def set_attr_value(obj, value):
         return set_attr_value
 
 
-class _BaseChildElement(object):
+class _BaseChildElement:
     """Base class for the child element classes corresponding to varying cardinalities,
     such as ZeroOrOne and ZeroOrMore."""
 
diff --git a/src/docx/package.py b/src/docx/package.py
index 89ae47a09..12a166bf3 100644
--- a/src/docx/package.py
+++ b/src/docx/package.py
@@ -47,7 +47,7 @@ def _gather_image_parts(self):
             self.image_parts.append(rel.target_part)
 
 
-class ImageParts(object):
+class ImageParts:
     """Collection of |ImagePart| objects corresponding to images in the package."""
 
     def __init__(self):
diff --git a/src/docx/parts/numbering.py b/src/docx/parts/numbering.py
index 31ba05e99..54a430c1b 100644
--- a/src/docx/parts/numbering.py
+++ b/src/docx/parts/numbering.py
@@ -21,7 +21,7 @@ def numbering_definitions(self):
         return _NumberingDefinitions(self._element)
 
 
-class _NumberingDefinitions(object):
+class _NumberingDefinitions:
     """Collection of |_NumberingDefinition| instances corresponding to the ``<w:num>``
     elements in a numbering part."""
 
diff --git a/src/docx/section.py b/src/docx/section.py
index 7e96dacd4..08cc36e9a 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -17,7 +17,7 @@
     from docx.shared import Length
 
 
-class Section(object):
+class Section:
     """Document section, providing access to section and page setup settings.
 
     Also provides access to headers and footers.
diff --git a/src/docx/shape.py b/src/docx/shape.py
index bc7818693..b91ecbf64 100644
--- a/src/docx/shape.py
+++ b/src/docx/shape.py
@@ -38,7 +38,7 @@ def _inline_lst(self):
         return body.xpath(xpath)
 
 
-class InlineShape(object):
+class InlineShape:
     """Proxy for an ``<wp:inline>`` element, representing the container for an inline
     graphical object."""
 
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 53a000d6f..304fce4a4 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -260,7 +260,7 @@ def write_only_property(f):
     return property(fset=f, doc=docstring)
 
 
-class ElementProxy(object):
+class ElementProxy:
     """Base class for lxml element proxy classes.
 
     An element proxy class is one whose primary responsibilities are fulfilled by
diff --git a/src/docx/styles/__init__.py b/src/docx/styles/__init__.py
index 514eee908..6358baf33 100644
--- a/src/docx/styles/__init__.py
+++ b/src/docx/styles/__init__.py
@@ -5,7 +5,7 @@
 from typing import Dict
 
 
-class BabelFish(object):
+class BabelFish:
     """Translates special-case style names from UI name (e.g. Heading 1) to
     internal/styles.xml name (e.g. heading 1) and back."""
 
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index d79b583aa..ec0e6c757 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -240,7 +240,7 @@ def underline(self, value: bool):
         self.font.underline = value
 
 
-class _Text(object):
+class _Text:
     """Proxy object wrapping `<w:t>` element."""
 
     def __init__(self, t_elm: CT_Text):
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index a461650f5..ea848e7d6 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -9,7 +9,7 @@
 from ..unitutil.cxml import element, xml
 
 
-class DescribeColorFormat(object):
+class DescribeColorFormat:
     def it_knows_its_color_type(self, type_fixture):
         color_format, expected_value = type_fixture
         assert color_format.type == expected_value
diff --git a/tests/image/test_bmp.py b/tests/image/test_bmp.py
index ed49db386..15b322b66 100644
--- a/tests/image/test_bmp.py
+++ b/tests/image/test_bmp.py
@@ -10,7 +10,7 @@
 from ..unitutil.mock import ANY, initializer_mock
 
 
-class DescribeBmp(object):
+class DescribeBmp:
     def it_can_construct_from_a_bmp_stream(self, Bmp__init__):
         cx, cy, horz_dpi, vert_dpi = 26, 43, 200, 96
         bytes_ = (
diff --git a/tests/image/test_gif.py b/tests/image/test_gif.py
index 3af8cfd9f..a533da04d 100644
--- a/tests/image/test_gif.py
+++ b/tests/image/test_gif.py
@@ -10,7 +10,7 @@
 from ..unitutil.mock import ANY, initializer_mock
 
 
-class DescribeGif(object):
+class DescribeGif:
     def it_can_construct_from_a_gif_stream(self, Gif__init__):
         cx, cy = 42, 24
         bytes_ = b"filler\x2A\x00\x18\x00"
diff --git a/tests/image/test_helpers.py b/tests/image/test_helpers.py
index 8d3db4760..9192564dc 100644
--- a/tests/image/test_helpers.py
+++ b/tests/image/test_helpers.py
@@ -8,7 +8,7 @@
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 
 
-class DescribeStreamReader(object):
+class DescribeStreamReader:
     def it_can_read_a_string_of_specified_len_at_offset(self, read_str_fixture):
         stream_rdr, expected_string = read_str_fixture
         s = stream_rdr.read_str(6, 2)
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index addbe61fc..bd5ed0903 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -26,7 +26,7 @@
 )
 
 
-class DescribeImage(object):
+class DescribeImage:
     def it_can_construct_from_an_image_blob(
         self, blob_, BytesIO_, _from_stream_, stream_, image_
     ):
@@ -266,7 +266,7 @@ def width_prop_(self, request):
         return property_mock(request, Image, "width")
 
 
-class Describe_ImageHeaderFactory(object):
+class Describe_ImageHeaderFactory:
     def it_constructs_the_right_class_for_a_given_image_stream(self, call_fixture):
         stream, expected_class = call_fixture
         image_header = _ImageHeaderFactory(stream)
@@ -300,7 +300,7 @@ def call_fixture(self, request):
         return image_stream, expected_class
 
 
-class DescribeBaseImageHeader(object):
+class DescribeBaseImageHeader:
     def it_defines_content_type_as_an_abstract_property(self):
         base_image_header = BaseImageHeader(None, None, None, None)
         with pytest.raises(NotImplementedError):
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index d18fbc234..a558e1d4e 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -31,7 +31,7 @@
 )
 
 
-class DescribeJpeg(object):
+class DescribeJpeg:
     def it_knows_its_content_type(self):
         jpeg = Jpeg(None, None, None, None)
         assert jpeg.content_type == MIME_TYPE.JPEG
@@ -40,7 +40,7 @@ def it_knows_its_default_ext(self):
         jpeg = Jpeg(None, None, None, None)
         assert jpeg.default_ext == "jpg"
 
-    class DescribeExif(object):
+    class DescribeExif:
         def it_can_construct_from_an_exif_stream(self, from_exif_fixture):
             # fixture ----------------------
             stream_, _JfifMarkers_, cx, cy, horz_dpi, vert_dpi = from_exif_fixture
@@ -54,7 +54,7 @@ def it_can_construct_from_an_exif_stream(self, from_exif_fixture):
             assert exif.horz_dpi == horz_dpi
             assert exif.vert_dpi == vert_dpi
 
-    class DescribeJfif(object):
+    class DescribeJfif:
         def it_can_construct_from_a_jfif_stream(self, from_jfif_fixture):
             stream_, _JfifMarkers_, cx, cy, horz_dpi, vert_dpi = from_jfif_fixture
             jfif = Jfif.from_stream(stream_)
@@ -102,7 +102,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_JfifMarkers(object):
+class Describe_JfifMarkers:
     def it_can_construct_from_a_jfif_stream(
         self, stream_, _MarkerParser_, _JfifMarkers__init_, soi_, app0_, sof_, sos_
     ):
@@ -228,7 +228,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_Marker(object):
+class Describe_Marker:
     def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
         stream, marker_code, offset, _Marker__init_, length = from_stream_fixture
 
@@ -256,7 +256,7 @@ def _Marker__init_(self, request):
         return initializer_mock(request, _Marker)
 
 
-class Describe_App0Marker(object):
+class Describe_App0Marker:
     def it_can_construct_from_a_stream_and_offset(self, _App0Marker__init_):
         bytes_ = b"\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.APP0, 0, 16
@@ -294,7 +294,7 @@ def dpi_fixture(self, request):
         return density_units, x_density, y_density, horz_dpi, vert_dpi
 
 
-class Describe_App1Marker(object):
+class Describe_App1Marker:
     def it_can_construct_from_a_stream_and_offset(
         self, _App1Marker__init_, _tiff_from_exif_segment_
     ):
@@ -388,7 +388,7 @@ def _tiff_from_exif_segment_(self, request, tiff_):
         )
 
 
-class Describe_SofMarker(object):
+class Describe_SofMarker:
     def it_can_construct_from_a_stream_and_offset(self, request, _SofMarker__init_):
         bytes_ = b"\x00\x11\x00\x00\x2A\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.SOF0, 0, 17
@@ -414,7 +414,7 @@ def _SofMarker__init_(self, request):
         return initializer_mock(request, _SofMarker)
 
 
-class Describe_MarkerFactory(object):
+class Describe_MarkerFactory:
     def it_constructs_the_appropriate_marker_object(self, call_fixture):
         marker_code, stream_, offset_, marker_cls_ = call_fixture
         marker = _MarkerFactory(marker_code, stream_, offset_)
@@ -478,7 +478,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_MarkerFinder(object):
+class Describe_MarkerFinder:
     def it_can_construct_from_a_stream(self, stream_, _MarkerFinder__init_):
         marker_finder = _MarkerFinder.from_stream(stream_)
 
@@ -520,7 +520,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_MarkerParser(object):
+class Describe_MarkerParser:
     def it_can_construct_from_a_jfif_stream(
         self, stream_, StreamReader_, _MarkerParser__init_, stream_reader_
     ):
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index dce3aec95..61e7fdbed 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -29,7 +29,7 @@
 )
 
 
-class DescribePng(object):
+class DescribePng:
     def it_can_construct_from_a_png_stream(
         self, stream_, _PngParser_, png_parser_, Png__init__
     ):
@@ -76,7 +76,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_PngParser(object):
+class Describe_PngParser:
     def it_can_parse_the_headers_of_a_PNG_stream(
         self, stream_, _Chunks_, _PngParser__init_, chunks_
     ):
@@ -156,7 +156,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_Chunks(object):
+class Describe_Chunks:
     def it_can_construct_from_a_stream(
         self, stream_, _ChunkParser_, chunk_parser_, _Chunks__init_
     ):
@@ -234,7 +234,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_ChunkParser(object):
+class Describe_ChunkParser:
     def it_can_construct_from_a_stream(
         self, stream_, StreamReader_, stream_rdr_, _ChunkParser__init_
     ):
@@ -328,7 +328,7 @@ def stream_rdr_(self, request):
         return instance_mock(request, StreamReader)
 
 
-class Describe_ChunkFactory(object):
+class Describe_ChunkFactory:
     def it_constructs_the_appropriate_Chunk_subclass(self, call_fixture):
         chunk_type, stream_rdr_, offset, chunk_cls_ = call_fixture
         chunk = _ChunkFactory(chunk_type, stream_rdr_, offset)
@@ -389,7 +389,7 @@ def stream_rdr_(self, request):
         return instance_mock(request, StreamReader)
 
 
-class Describe_Chunk(object):
+class Describe_Chunk:
     def it_can_construct_from_a_stream_and_offset(self):
         chunk_type = "fOOB"
         chunk = _Chunk.from_offset(chunk_type, None, None)
@@ -397,7 +397,7 @@ def it_can_construct_from_a_stream_and_offset(self):
         assert chunk.type_name == chunk_type
 
 
-class Describe_IHDRChunk(object):
+class Describe_IHDRChunk:
     def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
         stream_rdr, offset, px_width, px_height = from_offset_fixture
         ihdr_chunk = _IHDRChunk.from_offset(None, stream_rdr, offset)
@@ -415,7 +415,7 @@ def from_offset_fixture(self):
         return stream_rdr, offset, px_width, px_height
 
 
-class Describe_pHYsChunk(object):
+class Describe_pHYsChunk:
     def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
         stream_rdr, offset = from_offset_fixture[:2]
         horz_px_per_unit, vert_px_per_unit = from_offset_fixture[2:4]
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index 08027ac1d..b7f37afe5 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -31,7 +31,7 @@
 )
 
 
-class DescribeTiff(object):
+class DescribeTiff:
     def it_can_construct_from_a_tiff_stream(
         self, stream_, _TiffParser_, tiff_parser_, Tiff__init_
     ):
@@ -79,7 +79,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_TiffParser(object):
+class Describe_TiffParser:
     def it_can_parse_the_properties_from_a_tiff_stream(
         self,
         stream_,
@@ -201,7 +201,7 @@ def _TiffParser__init_(self, request):
         return initializer_mock(request, _TiffParser)
 
 
-class Describe_IfdEntries(object):
+class Describe_IfdEntries:
     def it_can_construct_from_a_stream_and_offset(
         self,
         stream_,
@@ -261,7 +261,7 @@ def stream_(self, request):
         return instance_mock(request, io.BytesIO)
 
 
-class Describe_IfdParser(object):
+class Describe_IfdParser:
     def it_can_iterate_through_the_directory_entries_in_an_IFD(self, iter_fixture):
         (
             ifd_parser,
@@ -304,7 +304,7 @@ def iter_fixture(self, _IfdEntryFactory_, ifd_entry_, ifd_entry_2_):
         return (ifd_parser, _IfdEntryFactory_, stream_rdr, offsets, expected_entries)
 
 
-class Describe_IfdEntryFactory(object):
+class Describe_IfdEntryFactory:
     def it_constructs_the_right_class_for_a_given_ifd_entry(self, fixture):
         stream_rdr, offset, entry_cls_, ifd_entry_ = fixture
         ifd_entry = _IfdEntryFactory(stream_rdr, offset)
@@ -385,7 +385,7 @@ def offset_(self, request):
         return instance_mock(request, int)
 
 
-class Describe_IfdEntry(object):
+class Describe_IfdEntry:
     def it_can_construct_from_a_stream_and_offset(
         self, _parse_value_, _IfdEntry__init_, value_
     ):
@@ -422,7 +422,7 @@ def value_(self, request):
         return loose_mock(request)
 
 
-class Describe_AsciiIfdEntry(object):
+class Describe_AsciiIfdEntry:
     def it_can_parse_an_ascii_string_IFD_entry(self):
         bytes_ = b"foobar\x00"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
@@ -430,7 +430,7 @@ def it_can_parse_an_ascii_string_IFD_entry(self):
         assert val == "foobar"
 
 
-class Describe_ShortIfdEntry(object):
+class Describe_ShortIfdEntry:
     def it_can_parse_a_short_int_IFD_entry(self):
         bytes_ = b"foobaroo\x00\x2A"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
@@ -438,7 +438,7 @@ def it_can_parse_a_short_int_IFD_entry(self):
         assert val == 42
 
 
-class Describe_LongIfdEntry(object):
+class Describe_LongIfdEntry:
     def it_can_parse_a_long_int_IFD_entry(self):
         bytes_ = b"foobaroo\x00\x00\x00\x2A"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
@@ -446,7 +446,7 @@ def it_can_parse_a_long_int_IFD_entry(self):
         assert val == 42
 
 
-class Describe_RationalIfdEntry(object):
+class Describe_RationalIfdEntry:
     def it_can_parse_a_rational_IFD_entry(self):
         bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x54"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
index 0f528829a..1db650353 100644
--- a/tests/opc/parts/test_coreprops.py
+++ b/tests/opc/parts/test_coreprops.py
@@ -11,7 +11,7 @@
 from ...unitutil.mock import class_mock, instance_mock
 
 
-class DescribeCorePropertiesPart(object):
+class DescribeCorePropertiesPart:
     def it_provides_access_to_its_core_props_object(self, coreprops_fixture):
         core_properties_part, CoreProperties_ = coreprops_fixture
         core_properties = core_properties_part.core_properties
diff --git a/tests/opc/test_coreprops.py b/tests/opc/test_coreprops.py
index 73b9a1280..2978ad5ae 100644
--- a/tests/opc/test_coreprops.py
+++ b/tests/opc/test_coreprops.py
@@ -8,7 +8,7 @@
 from docx.oxml.parser import parse_xml
 
 
-class DescribeCoreProperties(object):
+class DescribeCoreProperties:
     def it_knows_the_string_property_values(self, text_prop_get_fixture):
         core_properties, prop_name, expected_value = text_prop_get_fixture
         actual_value = getattr(core_properties, prop_name)
diff --git a/tests/opc/test_oxml.py b/tests/opc/test_oxml.py
index 2fc2a22db..0b3e5e36f 100644
--- a/tests/opc/test_oxml.py
+++ b/tests/opc/test_oxml.py
@@ -19,7 +19,7 @@
 )
 
 
-class DescribeCT_Default(object):
+class DescribeCT_Default:
     def it_provides_read_access_to_xml_values(self):
         default = a_Default().element
         assert default.extension == "xml"
@@ -31,7 +31,7 @@ def it_can_construct_a_new_default_element(self):
         assert default.xml == expected_xml
 
 
-class DescribeCT_Override(object):
+class DescribeCT_Override:
     def it_provides_read_access_to_xml_values(self):
         override = an_Override().element
         assert override.partname == "/part/name.xml"
@@ -43,7 +43,7 @@ def it_can_construct_a_new_override_element(self):
         assert override.xml == expected_xml
 
 
-class DescribeCT_Relationship(object):
+class DescribeCT_Relationship:
     def it_provides_read_access_to_xml_values(self):
         rel = a_Relationship().element
         assert rel.rId == "rId9"
@@ -69,7 +69,7 @@ def it_can_construct_from_attribute_values(self):
             assert rel.xml == expected_rel_xml
 
 
-class DescribeCT_Relationships(object):
+class DescribeCT_Relationships:
     def it_can_construct_a_new_relationships_element(self):
         rels = CT_Relationships.new()
         expected_xml = (
@@ -98,7 +98,7 @@ def it_can_generate_rels_file_xml(self):
         assert CT_Relationships.new().xml == expected_xml
 
 
-class DescribeCT_Types(object):
+class DescribeCT_Types:
     def it_provides_access_to_default_child_elements(self):
         types = a_Types().element
         assert len(types.defaults) == 2
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index 7bb6ae62e..7fdeaa422 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -24,7 +24,7 @@
 )
 
 
-class DescribeOpcPackage(object):
+class DescribeOpcPackage:
     def it_can_open_a_pkg_file(self, PackageReader_, PartFactory_, Unmarshaller_):
         # mockery ----------------------
         pkg_file = Mock(name="pkg_file")
@@ -292,7 +292,7 @@ def Unmarshaller_(self, request):
         return class_mock(request, "docx.opc.package.Unmarshaller")
 
 
-class DescribeUnmarshaller(object):
+class DescribeUnmarshaller:
     def it_can_unmarshal_from_a_pkg_reader(
         self,
         pkg_reader_,
diff --git a/tests/opc/test_packuri.py b/tests/opc/test_packuri.py
index 272175795..987da69c4 100644
--- a/tests/opc/test_packuri.py
+++ b/tests/opc/test_packuri.py
@@ -5,7 +5,7 @@
 from docx.opc.packuri import PackURI
 
 
-class DescribePackURI(object):
+class DescribePackURI:
     def cases(self, expected_values):
         """
         Return list of tuples zipped from uri_str cases and
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index f9b5f8732..163912154 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -21,7 +21,7 @@
 )
 
 
-class DescribePart(object):
+class DescribePart:
     def it_can_be_constructed_by_PartFactory(
         self, partname_, content_type_, blob_, package_, __init_
     ):
@@ -116,7 +116,7 @@ def partname_(self, request):
         return instance_mock(request, PackURI)
 
 
-class DescribePartRelationshipManagementInterface(object):
+class DescribePartRelationshipManagementInterface:
     def it_provides_access_to_its_relationships(self, rels_fixture):
         part, Relationships_, partname_, rels_ = rels_fixture
         rels = part.rels
@@ -263,7 +263,7 @@ def url_(self, request):
         return instance_mock(request, str)
 
 
-class DescribePartFactory(object):
+class DescribePartFactory:
     def it_constructs_part_from_selector_if_defined(self, cls_selector_fixture):
         # fixture ----------------------
         (
@@ -419,7 +419,7 @@ def reltype_2_(self, request):
         return instance_mock(request, str)
 
 
-class DescribeXmlPart(object):
+class DescribeXmlPart:
     def it_can_be_constructed_by_PartFactory(
         self, partname_, content_type_, blob_, package_, element_, parse_xml_, __init_
     ):
diff --git a/tests/opc/test_phys_pkg.py b/tests/opc/test_phys_pkg.py
index e33d5cf5a..6de0d868b 100644
--- a/tests/opc/test_phys_pkg.py
+++ b/tests/opc/test_phys_pkg.py
@@ -24,7 +24,7 @@
 zip_pkg_path = test_docx_path
 
 
-class DescribeDirPkgReader(object):
+class DescribeDirPkgReader:
     def it_is_used_by_PhysPkgReader_when_pkg_is_a_dir(self):
         phys_reader = PhysPkgReader(dir_pkg_path)
         assert isinstance(phys_reader, _DirPkgReader)
@@ -63,13 +63,13 @@ def dir_reader(self):
         return _DirPkgReader(dir_pkg_path)
 
 
-class DescribePhysPkgReader(object):
+class DescribePhysPkgReader:
     def it_raises_when_pkg_path_is_not_a_package(self):
         with pytest.raises(PackageNotFoundError):
             PhysPkgReader("foobar")
 
 
-class DescribeZipPkgReader(object):
+class DescribeZipPkgReader:
     def it_is_used_by_PhysPkgReader_when_pkg_is_a_zip(self):
         phys_reader = PhysPkgReader(zip_pkg_path)
         assert isinstance(phys_reader, _ZipPkgReader)
@@ -125,7 +125,7 @@ def pkg_file_(self, request):
         return loose_mock(request)
 
 
-class DescribeZipPkgWriter(object):
+class DescribeZipPkgWriter:
     def it_is_used_by_PhysPkgWriter_unconditionally(self, tmp_docx_path):
         phys_writer = PhysPkgWriter(tmp_docx_path)
         assert isinstance(phys_writer, _ZipPkgWriter)
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index 10f3cf0b1..8e14f0e01 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -29,7 +29,7 @@
 from .unitdata.types import a_Default, a_Types, an_Override
 
 
-class DescribePackageReader(object):
+class DescribePackageReader:
     def it_can_construct_from_pkg_file(
         self, _init_, PhysPkgReader_, from_xml, _srels_for, _load_serialized_parts
     ):
@@ -276,7 +276,7 @@ def _walk_phys_parts(self, request):
         return method_mock(request, PackageReader, "_walk_phys_parts", autospec=False)
 
 
-class Describe_ContentTypeMap(object):
+class Describe_ContentTypeMap:
     def it_can_construct_from_ct_item_xml(self, from_xml_fixture):
         content_types_xml, expected_defaults, expected_overrides = from_xml_fixture
         ct_map = _ContentTypeMap.from_xml(content_types_xml)
@@ -380,7 +380,7 @@ def _xml_from(self, entries):
         return types_bldr.xml()
 
 
-class Describe_SerializedPart(object):
+class Describe_SerializedPart:
     def it_remembers_construction_values(self):
         # test data --------------------
         partname = "/part/name.xml"
@@ -398,7 +398,7 @@ def it_remembers_construction_values(self):
         assert spart.srels == srels
 
 
-class Describe_SerializedRelationship(object):
+class Describe_SerializedRelationship:
     def it_remembers_construction_values(self):
         # test data --------------------
         rel_elm = Mock(
@@ -468,7 +468,7 @@ def it_raises_on_target_partname_when_external(self):
             srel.target_partname
 
 
-class Describe_SerializedRelationships(object):
+class Describe_SerializedRelationships:
     def it_can_load_from_xml(self, parse_xml_, _SerializedRelationship_):
         # mockery ----------------------
         baseURI, rels_item_xml, rel_elm_1, rel_elm_2 = (
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
index 77d44ea63..747300f82 100644
--- a/tests/opc/test_pkgwriter.py
+++ b/tests/opc/test_pkgwriter.py
@@ -20,7 +20,7 @@
 from .unitdata.types import a_Default, a_Types, an_Override
 
 
-class DescribePackageWriter(object):
+class DescribePackageWriter:
     def it_can_write_a_package(self, PhysPkgWriter_, _write_methods):
         # mockery ----------------------
         pkg_file = Mock(name="pkg_file")
@@ -127,7 +127,7 @@ def xml_for_(self, request):
         return method_mock(request, _ContentTypesItem, "xml_for")
 
 
-class Describe_ContentTypesItem(object):
+class Describe_ContentTypesItem:
     def it_can_compose_content_types_element(self, xml_for_fixture):
         cti, expected_xml = xml_for_fixture
         types_elm = cti._element
diff --git a/tests/opc/test_rel.py b/tests/opc/test_rel.py
index 65d756ec0..7b7a98dfe 100644
--- a/tests/opc/test_rel.py
+++ b/tests/opc/test_rel.py
@@ -12,7 +12,7 @@
 from ..unitutil.mock import Mock, PropertyMock, call, class_mock, instance_mock, patch
 
 
-class Describe_Relationship(object):
+class Describe_Relationship:
     def it_remembers_construction_values(self):
         # test data --------------------
         rId = "rId9"
@@ -48,7 +48,7 @@ def it_should_have_relative_ref_for_internal_rel(self):
         assert rel.target_ref == "../media/image1.png"
 
 
-class DescribeRelationships(object):
+class DescribeRelationships:
     def it_can_add_a_relationship(self, _Relationship_):
         baseURI, rId, reltype, target, external = (
             "baseURI",
diff --git a/tests/opc/unitdata/rels.py b/tests/opc/unitdata/rels.py
index 3b4e8fa4d..268216afe 100644
--- a/tests/opc/unitdata/rels.py
+++ b/tests/opc/unitdata/rels.py
@@ -6,7 +6,7 @@
 from docx.opc.rel import Relationships
 
 
-class BaseBuilder(object):
+class BaseBuilder:
     """
     Provides common behavior for all data builders.
     """
@@ -22,7 +22,7 @@ def with_indent(self, indent):
         return self
 
 
-class RelationshipsBuilder(object):
+class RelationshipsBuilder:
     """Builder class for test Relationships"""
 
     partname_tmpls = {
diff --git a/tests/oxml/parts/test_document.py b/tests/oxml/parts/test_document.py
index ec275941c..90b587674 100644
--- a/tests/oxml/parts/test_document.py
+++ b/tests/oxml/parts/test_document.py
@@ -5,7 +5,7 @@
 from ...unitutil.cxml import element, xml
 
 
-class DescribeCT_Body(object):
+class DescribeCT_Body:
     def it_can_clear_all_its_content(self, clear_fixture):
         body, expected_xml = clear_fixture
         body.clear_content()
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
index 9331780b0..5f392df38 100644
--- a/tests/oxml/test__init__.py
+++ b/tests/oxml/test__init__.py
@@ -8,7 +8,7 @@
 from docx.oxml.shared import BaseOxmlElement
 
 
-class DescribeOxmlElement(object):
+class DescribeOxmlElement:
     def it_returns_an_lxml_element_with_matching_tag_name(self):
         element = OxmlElement("a:foo")
         assert isinstance(element, etree._Element)
@@ -32,7 +32,7 @@ def it_adds_additional_namespace_declarations_when_supplied(self):
         assert element.nsmap["x"] == ns2
 
 
-class DescribeOxmlParser(object):
+class DescribeOxmlParser:
     def it_strips_whitespace_between_elements(self, whitespace_fixture):
         pretty_xml_text, stripped_xml_text = whitespace_fixture
         element = etree.fromstring(pretty_xml_text, oxml_parser)
@@ -48,7 +48,7 @@ def whitespace_fixture(self):
         return pretty_xml_text, stripped_xml_text
 
 
-class DescribeParseXml(object):
+class DescribeParseXml:
     def it_accepts_bytes_and_assumes_utf8_encoding(self, xml_bytes):
         parse_xml(xml_bytes)
 
@@ -83,7 +83,7 @@ def xml_bytes(self):
         ).encode("utf-8")
 
 
-class DescribeRegisterElementCls(object):
+class DescribeRegisterElementCls:
     def it_determines_class_used_for_elements_with_matching_tagname(self, xml_text):
         register_element_cls("a:foo", CustElmCls)
         foo = parse_xml(xml_text)
diff --git a/tests/oxml/test_ns.py b/tests/oxml/test_ns.py
index 7e1d659f9..cd493e6ca 100644
--- a/tests/oxml/test_ns.py
+++ b/tests/oxml/test_ns.py
@@ -5,7 +5,7 @@
 from docx.oxml.ns import NamespacePrefixedTag
 
 
-class DescribeNamespacePrefixedTag(object):
+class DescribeNamespacePrefixedTag:
     def it_behaves_like_a_string_when_you_want_it_to(self, nsptag):
         s = "- %s -" % nsptag
         assert s == "- a:foobar -"
diff --git a/tests/oxml/test_styles.py b/tests/oxml/test_styles.py
index a6748b4f0..7677a8a9e 100644
--- a/tests/oxml/test_styles.py
+++ b/tests/oxml/test_styles.py
@@ -7,7 +7,7 @@
 from ..unitutil.cxml import element, xml
 
 
-class DescribeCT_Styles(object):
+class DescribeCT_Styles:
     def it_can_add_a_style_of_type(self, add_fixture):
         styles, name, style_type, builtin, expected_xml = add_fixture
         style = styles.add_style_of_type(name, style_type, builtin)
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 2cddf925b..ecd0cf9d7 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -11,7 +11,7 @@
 from ..unitutil.mock import call, instance_mock, method_mock, property_mock
 
 
-class DescribeCT_Row(object):
+class DescribeCT_Row:
     def it_can_add_a_trPr(self, add_trPr_fixture):
         tr, expected_xml = add_trPr_fixture
         tr._add_trPr()
@@ -46,7 +46,7 @@ def tc_raise_fixture(self, request):
         return tr, col_idx
 
 
-class DescribeCT_Tc(object):
+class DescribeCT_Tc:
     def it_can_merge_to_another_tc(
         self, tr_, _span_dimensions_, _tbl_, _grow_to_, top_tc_
     ):
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
index 3242223d7..fca309851 100644
--- a/tests/oxml/test_xmlchemy.py
+++ b/tests/oxml/test_xmlchemy.py
@@ -24,7 +24,7 @@
 from .unitdata.text import a_b, a_u, an_i, an_rPr
 
 
-class DescribeBaseOxmlElement(object):
+class DescribeBaseOxmlElement:
     def it_can_find_the_first_of_its_children_named_in_a_sequence(self, first_fixture):
         element, tagnames, matching_child = first_fixture
         assert element.first_child_found_in(*tagnames) is matching_child
@@ -116,7 +116,7 @@ def rPr_bldr(self, children):
         return rPr_bldr
 
 
-class DescribeSerializeForReading(object):
+class DescribeSerializeForReading:
     def it_pretty_prints_an_lxml_element(self, pretty_fixture):
         element, expected_xml_text = pretty_fixture
         xml_text = serialize_for_reading(element)
@@ -145,7 +145,7 @@ def element(self):
         return parse_xml("<foø><bår>text</bår></foø>")
 
 
-class DescribeXmlString(object):
+class DescribeXmlString:
     def it_parses_a_line_to_help_compare(self, parse_fixture):
         """
         This internal function is important to test separately because if it
@@ -236,7 +236,7 @@ def xml_line_case(self, request):
         return line, other, differs
 
 
-class DescribeChoice(object):
+class DescribeChoice:
     def it_adds_a_getter_property_for_the_choice_element(self, getter_fixture):
         parent, expected_choice = getter_fixture
         assert parent.choice is expected_choice
@@ -334,7 +334,7 @@ def parent_bldr(self, choice_tag=None):
         return parent_bldr
 
 
-class DescribeOneAndOnlyOne(object):
+class DescribeOneAndOnlyOne:
     def it_adds_a_getter_property_for_the_child_element(self, getter_fixture):
         parent, oooChild = getter_fixture
         assert parent.oooChild is oooChild
@@ -348,7 +348,7 @@ def getter_fixture(self):
         return parent, oooChild
 
 
-class DescribeOneOrMore(object):
+class DescribeOneOrMore:
     def it_adds_a_getter_property_for_the_child_element_list(self, getter_fixture):
         parent, oomChild = getter_fixture
         assert parent.oomChild_lst[0] is oomChild
@@ -433,7 +433,7 @@ def parent_bldr(self, oomChild_is_present):
         return parent_bldr
 
 
-class DescribeOptionalAttribute(object):
+class DescribeOptionalAttribute:
     def it_adds_a_getter_property_for_the_attr_value(self, getter_fixture):
         parent, optAttr_python_value = getter_fixture
         assert parent.optAttr == optAttr_python_value
@@ -466,7 +466,7 @@ def setter_fixture(self, request):
         return parent, value, expected_xml
 
 
-class DescribeRequiredAttribute(object):
+class DescribeRequiredAttribute:
     def it_adds_a_getter_property_for_the_attr_value(self, getter_fixture):
         parent, reqAttr_python_value = getter_fixture
         assert parent.reqAttr == reqAttr_python_value
@@ -518,7 +518,7 @@ def setter_fixture(self):
         return parent, value, expected_xml
 
 
-class DescribeZeroOrMore(object):
+class DescribeZeroOrMore:
     def it_adds_a_getter_property_for_the_child_element_list(self, getter_fixture):
         parent, zomChild = getter_fixture
         assert parent.zomChild_lst[0] is zomChild
@@ -604,7 +604,7 @@ def parent_bldr(self, zomChild_is_present):
         return parent_bldr
 
 
-class DescribeZeroOrOne(object):
+class DescribeZeroOrOne:
     def it_adds_a_getter_property_for_the_child_element(self, getter_fixture):
         parent, zooChild = getter_fixture
         assert parent.zooChild is zooChild
@@ -695,7 +695,7 @@ def parent_bldr(self, zooChild_is_present):
         return parent_bldr
 
 
-class DescribeZeroOrOneChoice(object):
+class DescribeZeroOrOneChoice:
     def it_adds_a_getter_for_the_current_choice(self, getter_fixture):
         parent, expected_choice = getter_fixture
         assert parent.eg_zooChoice is expected_choice
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index b9b50676a..3a86b5168 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -19,7 +19,7 @@
 from ..unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
-class DescribeDocumentPart(object):
+class DescribeDocumentPart:
     def it_can_add_a_footer_part(self, package_, FooterPart_, footer_part_, relate_to_):
         FooterPart_.new.return_value = footer_part_
         relate_to_.return_value = "rId12"
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index d153ad348..ee0cc7134 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -12,7 +12,7 @@
 from ..unitutil.mock import function_mock, initializer_mock, instance_mock, method_mock
 
 
-class DescribeFooterPart(object):
+class DescribeFooterPart:
     def it_is_used_by_loader_to_construct_footer_part(
         self, package_, FooterPart_load_, footer_part_
     ):
@@ -80,7 +80,7 @@ def parse_xml_(self, request):
         return function_mock(request, "docx.parts.hdrftr.parse_xml")
 
 
-class DescribeHeaderPart(object):
+class DescribeHeaderPart:
     def it_is_used_by_loader_to_construct_header_part(
         self, package_, HeaderPart_load_, header_part_
     ):
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
index 3b6424fe4..acf0b0727 100644
--- a/tests/parts/test_image.py
+++ b/tests/parts/test_image.py
@@ -14,7 +14,7 @@
 from ..unitutil.mock import ANY, initializer_mock, instance_mock, method_mock
 
 
-class DescribeImagePart(object):
+class DescribeImagePart:
     def it_is_used_by_PartFactory_to_construct_image_part(
         self, image_part_load_, partname_, blob_, package_, image_part_
     ):
diff --git a/tests/parts/test_numbering.py b/tests/parts/test_numbering.py
index 2783b9eea..7655206ec 100644
--- a/tests/parts/test_numbering.py
+++ b/tests/parts/test_numbering.py
@@ -9,7 +9,7 @@
 from ..unitutil.mock import class_mock, instance_mock
 
 
-class DescribeNumberingPart(object):
+class DescribeNumberingPart:
     def it_provides_access_to_the_numbering_definitions(self, num_defs_fixture):
         (
             numbering_part,
@@ -54,7 +54,7 @@ def numbering_elm_(self, request):
         return instance_mock(request, CT_Numbering)
 
 
-class Describe_NumberingDefinitions(object):
+class Describe_NumberingDefinitions:
     def it_knows_how_many_numbering_definitions_it_contains(self, len_fixture):
         numbering_definitions, numbering_definition_count = len_fixture
         assert len(numbering_definitions) == numbering_definition_count
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index 20ec8cdff..581cc6173 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -13,7 +13,7 @@
 from ..unitutil.mock import class_mock, instance_mock, method_mock
 
 
-class DescribeSettingsPart(object):
+class DescribeSettingsPart:
     def it_is_used_by_loader_to_construct_settings_part(
         self, load_, package_, settings_part_
     ):
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index 50bbf0953..b65abe8b7 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -16,7 +16,7 @@
 from ..unitutil.mock import instance_mock, method_mock, property_mock
 
 
-class DescribeStoryPart(object):
+class DescribeStoryPart:
     def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
         package_.get_or_add_image_part.return_value = image_part_
         relate_to_.return_value = "rId42"
diff --git a/tests/parts/test_styles.py b/tests/parts/test_styles.py
index faad075b5..d0f63cfbb 100644
--- a/tests/parts/test_styles.py
+++ b/tests/parts/test_styles.py
@@ -11,7 +11,7 @@
 from ..unitutil.mock import class_mock, instance_mock
 
 
-class DescribeStylesPart(object):
+class DescribeStylesPart:
     def it_provides_access_to_its_styles(self, styles_fixture):
         styles_part, Styles_, styles_ = styles_fixture
         styles = styles_part.styles
diff --git a/tests/styles/test_latent.py b/tests/styles/test_latent.py
index 5ab235445..9479d6b44 100644
--- a/tests/styles/test_latent.py
+++ b/tests/styles/test_latent.py
@@ -7,7 +7,7 @@
 from ..unitutil.cxml import element, xml
 
 
-class DescribeLatentStyle(object):
+class DescribeLatentStyle:
     def it_can_delete_itself(self, delete_fixture):
         latent_style, latent_styles, expected_xml = delete_fixture
         latent_style.delete()
@@ -129,7 +129,7 @@ def priority_set_fixture(self, request):
         return latent_style, new_value, expected_xml
 
 
-class DescribeLatentStyles(object):
+class DescribeLatentStyles:
     def it_can_add_a_latent_style(self, add_fixture):
         latent_styles, name, expected_xml = add_fixture
 
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index ffd9baf22..b24e02733 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -18,7 +18,7 @@
 from ..unitutil.mock import call, class_mock, function_mock, instance_mock
 
 
-class DescribeStyleFactory(object):
+class DescribeStyleFactory:
     def it_constructs_the_right_type_of_style(self, factory_fixture):
         style_elm, StyleCls_, style_ = factory_fixture
         style = StyleFactory(style_elm)
@@ -94,7 +94,7 @@ def numbering_style_(self, request):
         return instance_mock(request, _NumberingStyle)
 
 
-class DescribeBaseStyle(object):
+class DescribeBaseStyle:
     def it_knows_its_style_id(self, id_get_fixture):
         style, expected_value = id_get_fixture
         assert style.style_id == expected_value
@@ -396,7 +396,7 @@ def unhide_set_fixture(self, request):
         return style, value, expected_xml
 
 
-class DescribeCharacterStyle(object):
+class DescribeCharacterStyle:
     def it_knows_which_style_it_is_based_on(self, base_get_fixture):
         style, StyleFactory_, StyleFactory_calls, base_style_ = base_get_fixture
         base_style = style.base_style
@@ -476,7 +476,7 @@ def StyleFactory_(self, request):
         return function_mock(request, "docx.styles.style.StyleFactory")
 
 
-class DescribeParagraphStyle(object):
+class DescribeParagraphStyle:
     def it_knows_its_next_paragraph_style(self, next_get_fixture):
         style, expected_value = next_get_fixture
         assert style.next_paragraph_style == expected_value
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index bdee6d2b5..ea9346bdc 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -12,7 +12,7 @@
 from ..unitutil.mock import call, class_mock, function_mock, instance_mock, method_mock
 
 
-class DescribeStyles(object):
+class DescribeStyles:
     def it_supports_the_in_operator_on_style_name(self, in_fixture):
         styles, name, expected_value = in_fixture
         assert (name in styles) is expected_value
diff --git a/tests/test_api.py b/tests/test_api.py
index acd3606d5..b6e6818b5 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -9,7 +9,7 @@
 from .unitutil.mock import class_mock, function_mock, instance_mock
 
 
-class DescribeDocument(object):
+class DescribeDocument:
     def it_opens_a_docx_file(self, open_fixture):
         docx, Package_, document_ = open_fixture
         document = Document(docx)
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 9da168e1d..6f1d28a46 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -12,7 +12,7 @@
 from .unitutil.mock import call, instance_mock, method_mock
 
 
-class DescribeBlockItemContainer(object):
+class DescribeBlockItemContainer:
     def it_can_add_a_paragraph(self, add_paragraph_fixture, _add_paragraph_):
         text, style, paragraph_, add_run_calls = add_paragraph_fixture
         _add_paragraph_.return_value = paragraph_
diff --git a/tests/test_document.py b/tests/test_document.py
index b5d58aefd..12e3361db 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -20,7 +20,7 @@
 from .unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
-class DescribeDocument(object):
+class DescribeDocument:
     def it_can_add_a_heading(self, add_heading_fixture, add_paragraph_, paragraph_):
         level, style = add_heading_fixture
         add_paragraph_.return_value = paragraph_
@@ -354,7 +354,7 @@ def tables_(self, request):
         return instance_mock(request, list)
 
 
-class Describe_Body(object):
+class Describe_Body:
     def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
         body, expected_xml = clear_fixture
         _body = body.clear_content()
diff --git a/tests/test_package.py b/tests/test_package.py
index 978670b1d..eda5f0132 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -11,7 +11,7 @@
 from .unitutil.mock import class_mock, instance_mock, method_mock, property_mock
 
 
-class DescribePackage(object):
+class DescribePackage:
     def it_can_get_or_add_an_image_part_containing_a_specified_image(
         self, image_parts_prop_, image_parts_, image_part_
     ):
@@ -46,7 +46,7 @@ def image_parts_prop_(self, request):
         return property_mock(request, Package, "image_parts")
 
 
-class DescribeImageParts(object):
+class DescribeImageParts:
     def it_can_get_a_matching_image_part(
         self, Image_, image_, _get_by_sha1_, image_part_
     ):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index a4dc5d786..9f430822d 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -7,7 +7,7 @@
 from .unitutil.cxml import element, xml
 
 
-class DescribeSettings(object):
+class DescribeSettings:
     def it_knows_when_the_document_has_distinct_odd_and_even_headers(
         self, odd_and_even_get_fixture
     ):
diff --git a/tests/test_shape.py b/tests/test_shape.py
index 647ae683c..da307e48f 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -19,7 +19,7 @@
 from .unitutil.mock import loose_mock
 
 
-class DescribeInlineShapes(object):
+class DescribeInlineShapes:
     def it_knows_how_many_inline_shapes_it_contains(self, inline_shapes_fixture):
         inline_shapes, expected_count = inline_shapes_fixture
         assert len(inline_shapes) == expected_count
@@ -70,7 +70,7 @@ def inline_shapes_with_parent_(self, request):
         return inline_shapes, parent_
 
 
-class DescribeInlineShape(object):
+class DescribeInlineShape:
     def it_knows_what_type_of_shape_it_is(self, shape_type_fixture):
         inline_shape, inline_shape_type = shape_type_fixture
         assert inline_shape.type == inline_shape_type
diff --git a/tests/test_shared.py b/tests/test_shared.py
index 7a026c456..3fbe54b07 100644
--- a/tests/test_shared.py
+++ b/tests/test_shared.py
@@ -9,7 +9,7 @@
 from .unitutil.mock import instance_mock
 
 
-class DescribeElementProxy(object):
+class DescribeElementProxy:
     def it_knows_when_its_equal_to_another_proxy_object(self, eq_fixture):
         proxy, proxy_2, proxy_3, not_a_proxy = eq_fixture
 
@@ -63,7 +63,7 @@ def part_(self, request):
         return instance_mock(request, XmlPart)
 
 
-class DescribeLength(object):
+class DescribeLength:
     def it_can_construct_from_convenient_units(self, construct_fixture):
         UnitCls, units_val, emu = construct_fixture
         length = UnitCls(units_val)
@@ -109,7 +109,7 @@ def units_fixture(self, request):
         return emu, units_prop_name, expected_length_in_units, type_
 
 
-class DescribeRGBColor(object):
+class DescribeRGBColor:
     def it_is_natively_constructed_using_three_ints_0_to_255(self):
         RGBColor(0x12, 0x34, 0x56)
         with pytest.raises(ValueError, match=r"RGBColor\(\) takes three integer valu"):
diff --git a/tests/test_table.py b/tests/test_table.py
index e5f8a3c31..0ef273e3f 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -23,7 +23,7 @@
 from .unitutil.mock import instance_mock, property_mock
 
 
-class DescribeTable(object):
+class DescribeTable:
     def it_can_add_a_row(self, add_row_fixture):
         table, expected_xml = add_row_fixture
         row = table.add_row()
@@ -346,7 +346,7 @@ def table(self):
         return table
 
 
-class Describe_Cell(object):
+class Describe_Cell:
     def it_knows_what_text_it_contains(self, text_get_fixture):
         cell, expected_text = text_get_fixture
         text = cell.text
@@ -585,7 +585,7 @@ def tc_2_(self, request):
         return instance_mock(request, CT_Tc)
 
 
-class Describe_Column(object):
+class Describe_Column:
     def it_provides_access_to_its_cells(self, cells_fixture):
         column, column_idx, expected_cells = cells_fixture
         cells = column.cells
@@ -681,7 +681,7 @@ def table_prop_(self, request, table_):
         return property_mock(request, _Column, "table", return_value=table_)
 
 
-class Describe_Columns(object):
+class Describe_Columns:
     def it_knows_how_many_columns_it_contains(self, columns_fixture):
         columns, column_count = columns_fixture
         assert len(columns) == column_count
@@ -735,7 +735,7 @@ def table_(self, request):
         return instance_mock(request, Table)
 
 
-class Describe_Row(object):
+class Describe_Row:
     def it_knows_its_height(self, height_get_fixture):
         row, expected_height = height_get_fixture
         assert row.height == expected_height
@@ -900,7 +900,7 @@ def table_prop_(self, request, table_):
         return property_mock(request, _Row, "table", return_value=table_)
 
 
-class Describe_Rows(object):
+class Describe_Rows:
     def it_knows_how_many_rows_it_contains(self, rows_fixture):
         rows, row_count = rows_fixture
         assert len(rows) == row_count
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index fa927b6c8..6a9da0223 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -19,7 +19,7 @@
 from ..unitutil.mock import Mock, class_mock, instance_mock
 
 
-class DescribeFont(object):
+class DescribeFont:
     """Unit-test suite for `docx.text.font.Font`."""
 
     def it_provides_access_to_its_color_object(self, ColorFormat_: Mock, color_: Mock):
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index ff980aa0d..a5db30da8 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -18,7 +18,7 @@
 from ..unitutil.mock import call, class_mock, instance_mock, method_mock, property_mock
 
 
-class DescribeParagraph(object):
+class DescribeParagraph:
     """Unit-test suite for `docx.text.run.Paragraph`."""
 
     @pytest.mark.parametrize(
diff --git a/tests/text/test_parfmt.py b/tests/text/test_parfmt.py
index 5f9da996b..be31329e9 100644
--- a/tests/text/test_parfmt.py
+++ b/tests/text/test_parfmt.py
@@ -11,7 +11,7 @@
 from ..unitutil.mock import class_mock, instance_mock
 
 
-class DescribeParagraphFormat(object):
+class DescribeParagraphFormat:
     def it_knows_its_alignment_value(self, alignment_get_fixture):
         paragraph_format, expected_value = alignment_get_fixture
         assert paragraph_format.alignment == expected_value
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 68976e874..3d5e82cd9 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -21,7 +21,7 @@
 from ..unitutil.mock import class_mock, instance_mock, property_mock
 
 
-class DescribeRun(object):
+class DescribeRun:
     """Unit-test suite for `docx.text.run.Run`."""
 
     def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
@@ -171,7 +171,7 @@ def it_can_add_a_picture(self, add_picture_fixture):
                 'w:r/(w:rPr/(w:b, w:i), w:t"foo", w:cr, w:t"bar")',
                 "w:r/w:rPr/(w:b, w:i)",
             ),
-        ]
+        ],
     )
     def it_can_remove_its_content_but_keep_formatting(
         self, initial_r_cxml: str, expected_cxml: str
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
index ca2122206..79d920c24 100644
--- a/tests/text/test_tabstops.py
+++ b/tests/text/test_tabstops.py
@@ -10,7 +10,7 @@
 from ..unitutil.mock import call, class_mock, instance_mock
 
 
-class DescribeTabStop(object):
+class DescribeTabStop:
     def it_knows_its_position(self, position_get_fixture):
         tab_stop, expected_value = position_get_fixture
         assert tab_stop.position == expected_value
@@ -144,7 +144,7 @@ def position_set_fixture(self, request):
         return tab_stop, value, tabs, new_idx, expected_xml
 
 
-class DescribeTabStops(object):
+class DescribeTabStops:
     def it_knows_its_length(self, len_fixture):
         tab_stops, expected_value = len_fixture
         assert len(tab_stops) == expected_value
diff --git a/tests/unitdata.py b/tests/unitdata.py
index c894c4796..31f0044d8 100644
--- a/tests/unitdata.py
+++ b/tests/unitdata.py
@@ -4,7 +4,7 @@
 from docx.oxml.parser import parse_xml
 
 
-class BaseBuilder(object):
+class BaseBuilder:
     """
     Provides common behavior for all data builders.
     """
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index b88e67bd4..c7b7d172c 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -54,7 +54,7 @@ def nsdecls(*nspfxs):
     return nsdecls
 
 
-class Element(object):
+class Element:
     """
     Represents an XML element, having a namespace, tagname, attributes, and
     may contain either text or children (but not both) or may be empty.

From 9c9106f88abdf32daac2b93ccf7ef4b5622e4713 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Oct 2023 21:45:10 -0700
Subject: [PATCH 290/367] section: Section.iter_inner_content()

* clean up section (more needs doing in feature/steps and tests)
* acceptance test
* unit test
---
 features/sct-section.feature                  |   5 +
 features/steps/section.py                     |  79 +++++++----
 .../steps/test_files/sct-inner-content.docx   | Bin 0 -> 12051 bytes
 pyrightconfig.json                            |   2 +-
 src/docx/oxml/document.py                     |  21 ++-
 src/docx/oxml/section.py                      | 133 +++++++++++++++++-
 src/docx/section.py                           |  20 +++
 src/docx/table.py                             |  22 ++-
 tests/test_files/sct-inner-content.docx       | Bin 0 -> 12051 bytes
 tests/test_section.py                         |  48 +++++++
 typings/behave/__init__.pyi                   |  13 +-
 11 files changed, 295 insertions(+), 48 deletions(-)
 create mode 100644 features/steps/test_files/sct-inner-content.docx
 create mode 100644 tests/test_files/sct-inner-content.docx

diff --git a/features/sct-section.feature b/features/sct-section.feature
index d00287403..7017d77aa 100644
--- a/features/sct-section.feature
+++ b/features/sct-section.feature
@@ -57,6 +57,11 @@ Feature: Access and change section properties
      Then section.header is a _Header object
 
 
+  Scenario: Section.iter_inner_content()
+    Given a Section object of a multi-section document as section
+     Then section.iter_inner_content() produces the paragraphs and tables in section
+
+
   Scenario Outline: Get section start type
     Given a section having start type <start-type>
      Then the reported section start type is <start-type>
diff --git a/features/steps/section.py b/features/steps/section.py
index 4e0621056..6291d756e 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -1,6 +1,7 @@
 """Step implementations for section-related features."""
 
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
@@ -13,36 +14,43 @@
 
 
 @given("a Section object as section")
-def given_a_Section_object_as_section(context):
+def given_a_Section_object_as_section(context: Context):
     context.section = Document(test_docx("sct-section-props")).sections[-1]
 
 
+@given("a Section object of a multi-section document as section")
+def given_a_Section_object_of_a_multi_section_document_as_section(context: Context):
+    context.section = Document(test_docx("sct-inner-content")).sections[1]
+
+
 @given("a Section object {with_or_without} a distinct first-page header as section")
-def given_a_Section_object_with_or_without_first_page_header(context, with_or_without):
+def given_a_Section_object_with_or_without_first_page_header(
+    context: Context, with_or_without: str
+):
     section_idx = {"with": 1, "without": 0}[with_or_without]
     context.section = Document(test_docx("sct-first-page-hdrftr")).sections[section_idx]
 
 
 @given("a section collection containing 3 sections")
-def given_a_section_collection_containing_3_sections(context):
+def given_a_section_collection_containing_3_sections(context: Context):
     document = Document(test_docx("doc-access-sections"))
     context.sections = document.sections
 
 
 @given("a section having known page dimension")
-def given_a_section_having_known_page_dimension(context):
+def given_a_section_having_known_page_dimension(context: Context):
     document = Document(test_docx("sct-section-props"))
     context.section = document.sections[-1]
 
 
 @given("a section having known page margins")
-def given_a_section_having_known_page_margins(context):
+def given_a_section_having_known_page_margins(context: Context):
     document = Document(test_docx("sct-section-props"))
     context.section = document.sections[0]
 
 
 @given("a section having start type {start_type}")
-def given_a_section_having_start_type(context, start_type):
+def given_a_section_having_start_type(context: Context, start_type: str):
     section_idx = {
         "CONTINUOUS": 0,
         "NEW_PAGE": 1,
@@ -55,7 +63,7 @@ def given_a_section_having_start_type(context, start_type):
 
 
 @given("a section known to have {orientation} orientation")
-def given_a_section_having_known_orientation(context, orientation):
+def given_a_section_having_known_orientation(context: Context, orientation: str):
     section_idx = {"landscape": 0, "portrait": 1}[orientation]
     document = Document(test_docx("sct-section-props"))
     context.section = document.sections[section_idx]
@@ -65,12 +73,14 @@ def given_a_section_having_known_orientation(context, orientation):
 
 
 @when("I assign {bool_val} to section.different_first_page_header_footer")
-def when_I_assign_value_to_section_different_first_page_hdrftr(context, bool_val):
+def when_I_assign_value_to_section_different_first_page_hdrftr(
+    context: Context, bool_val: str
+):
     context.section.different_first_page_header_footer = eval(bool_val)
 
 
 @when("I set the {margin_side} margin to {inches} inches")
-def when_I_set_the_margin_side_length(context, margin_side, inches):
+def when_I_set_the_margin_side_length(context: Context, margin_side: str, inches: str):
     prop_name = {
         "left": "left_margin",
         "right": "right_margin",
@@ -85,7 +95,7 @@ def when_I_set_the_margin_side_length(context, margin_side, inches):
 
 
 @when("I set the section orientation to {orientation}")
-def when_I_set_the_section_orientation(context, orientation):
+def when_I_set_the_section_orientation(context: Context, orientation: str):
     new_orientation = {
         "WD_ORIENT.PORTRAIT": WD_ORIENT.PORTRAIT,
         "WD_ORIENT.LANDSCAPE": WD_ORIENT.LANDSCAPE,
@@ -95,17 +105,17 @@ def when_I_set_the_section_orientation(context, orientation):
 
 
 @when("I set the section page height to {y} inches")
-def when_I_set_the_section_page_height_to_y_inches(context, y):
+def when_I_set_the_section_page_height_to_y_inches(context: Context, y: str):
     context.section.page_height = Inches(float(y))
 
 
 @when("I set the section page width to {x} inches")
-def when_I_set_the_section_page_width_to_x_inches(context, x):
+def when_I_set_the_section_page_width_to_x_inches(context: Context, x: str):
     context.section.page_width = Inches(float(x))
 
 
 @when("I set the section start type to {start_type}")
-def when_I_set_the_section_start_type_to_start_type(context, start_type):
+def when_I_set_the_section_start_type_to_start_type(context: Context, start_type: str):
     new_start_type = {
         "None": None,
         "CONTINUOUS": WD_SECTION.CONTINUOUS,
@@ -121,7 +131,7 @@ def when_I_set_the_section_start_type_to_start_type(context, start_type):
 
 
 @then("I can access a section by index")
-def then_I_can_access_a_section_by_index(context):
+def then_I_can_access_a_section_by_index(context: Context):
     sections = context.sections
     for idx in range(3):
         section = sections[idx]
@@ -129,7 +139,7 @@ def then_I_can_access_a_section_by_index(context):
 
 
 @then("I can iterate over the sections")
-def then_I_can_iterate_over_the_sections(context):
+def then_I_can_iterate_over_the_sections(context: Context):
     sections = context.sections
     actual_count = 0
     for section in sections:
@@ -139,13 +149,13 @@ def then_I_can_iterate_over_the_sections(context):
 
 
 @then("len(sections) is 3")
-def then_len_sections_is_3(context):
+def then_len_sections_is_3(context: Context):
     sections = context.sections
     assert len(sections) == 3, "expected len(sections) of 3, got %s" % len(sections)
 
 
 @then("section.different_first_page_header_footer is {bool_val}")
-def then_section_different_first_page_header_footer_is(context, bool_val):
+def then_section_different_first_page_header_footer_is(context: Context, bool_val: str):
     actual = context.section.different_first_page_header_footer
     expected = eval(bool_val)
     assert actual == expected, (
@@ -154,49 +164,58 @@ def then_section_different_first_page_header_footer_is(context, bool_val):
 
 
 @then("section.even_page_footer is a _Footer object")
-def then_section_even_page_footer_is_a_Footer_object(context):
+def then_section_even_page_footer_is_a_Footer_object(context: Context):
     actual = type(context.section.even_page_footer).__name__
     expected = "_Footer"
     assert actual == expected, "section.even_page_footer is a %s object" % actual
 
 
 @then("section.even_page_header is a _Header object")
-def then_section_even_page_header_is_a_Header_object(context):
+def then_section_even_page_header_is_a_Header_object(context: Context):
     actual = type(context.section.even_page_header).__name__
     expected = "_Header"
     assert actual == expected, "section.even_page_header is a %s object" % actual
 
 
 @then("section.first_page_footer is a _Footer object")
-def then_section_first_page_footer_is_a_Footer_object(context):
+def then_section_first_page_footer_is_a_Footer_object(context: Context):
     actual = type(context.section.first_page_footer).__name__
     expected = "_Footer"
     assert actual == expected, "section.first_page_footer is a %s object" % actual
 
 
 @then("section.first_page_header is a _Header object")
-def then_section_first_page_header_is_a_Header_object(context):
+def then_section_first_page_header_is_a_Header_object(context: Context):
     actual = type(context.section.first_page_header).__name__
     expected = "_Header"
     assert actual == expected, "section.first_page_header is a %s object" % actual
 
 
 @then("section.footer is a _Footer object")
-def then_section_footer_is_a_Footer_object(context):
+def then_section_footer_is_a_Footer_object(context: Context):
     actual = type(context.section.footer).__name__
     expected = "_Footer"
     assert actual == expected, "section.footer is a %s object" % actual
 
 
 @then("section.header is a _Header object")
-def then_section_header_is_a_Header_object(context):
+def then_section_header_is_a_Header_object(context: Context):
     actual = type(context.section.header).__name__
     expected = "_Header"
     assert actual == expected, "section.header is a %s object" % actual
 
 
+@then("section.iter_inner_content() produces the paragraphs and tables in section")
+def step_impl(context: Context):
+    actual = [type(item).__name__ for item in context.section.iter_inner_content()]
+    expected = ["Table", "Paragraph", "Paragraph"]
+    assert actual == expected, f"expected: {expected}, got: {actual}"
+
+
 @then("section.{propname}.is_linked_to_previous is True")
-def then_section_hdrftr_prop_is_linked_to_previous_is_True(context, propname):
+def then_section_hdrftr_prop_is_linked_to_previous_is_True(
+    context: Context, propname: str
+):
     actual = getattr(context.section, propname).is_linked_to_previous
     expected = True
     assert actual == expected, "section.%s.is_linked_to_previous is %s" % (
@@ -206,7 +225,7 @@ def then_section_hdrftr_prop_is_linked_to_previous_is_True(context, propname):
 
 
 @then("the reported {margin_side} margin is {inches} inches")
-def then_the_reported_margin_is_inches(context, margin_side, inches):
+def then_the_reported_margin_is_inches(context: Context, margin_side: str, inches: str):
     prop_name = {
         "left": "left_margin",
         "right": "right_margin",
@@ -222,7 +241,9 @@ def then_the_reported_margin_is_inches(context, margin_side, inches):
 
 
 @then("the reported page orientation is {orientation}")
-def then_the_reported_page_orientation_is_orientation(context, orientation):
+def then_the_reported_page_orientation_is_orientation(
+    context: Context, orientation: str
+):
     expected_value = {
         "WD_ORIENT.LANDSCAPE": WD_ORIENT.LANDSCAPE,
         "WD_ORIENT.PORTRAIT": WD_ORIENT.PORTRAIT,
@@ -231,17 +252,17 @@ def then_the_reported_page_orientation_is_orientation(context, orientation):
 
 
 @then("the reported page width is {x} inches")
-def then_the_reported_page_width_is_width(context, x):
+def then_the_reported_page_width_is_width(context: Context, x: str):
     assert context.section.page_width == Inches(float(x))
 
 
 @then("the reported page height is {y} inches")
-def then_the_reported_page_height_is_11_inches(context, y):
+def then_the_reported_page_height_is_11_inches(context: Context, y: str):
     assert context.section.page_height == Inches(float(y))
 
 
 @then("the reported section start type is {start_type}")
-def then_the_reported_section_start_type_is_type(context, start_type):
+def then_the_reported_section_start_type_is_type(context: Context, start_type: str):
     expected_start_type = {
         "CONTINUOUS": WD_SECTION.CONTINUOUS,
         "EVEN_PAGE": WD_SECTION.EVEN_PAGE,
diff --git a/features/steps/test_files/sct-inner-content.docx b/features/steps/test_files/sct-inner-content.docx
new file mode 100644
index 0000000000000000000000000000000000000000..a94165f8d01889e70eee54627486286a5352cdad
GIT binary patch
literal 12051
zcmeHtg;!k3_H`3nf(D1+!Ce9b3GS}Jo!|r-w*+^02yVe8jk~+MyIXMQ>&$!eCX+Yo
z`v-pSuGOczWS?7IYoA+H`yP2INT^o;7yujq03ZRZ<cwQtKmY*5&;S4i0PcmRkc~Ca
z*czy->|$$dug&0WWl5X`^@1t`@B-Zbf7k!v8TcMMVBOAyDsmlnhZ0qzVz8T4Nb@3u
zFP>g;4;IJmh3aE;PvcWF#tQ`%h$sY0QVQ1VWmeU0pRxI5OL#Pp6U6~GZ~T`S9kaKz
zb2FRtUPicY)?%5K1^PHXTe3Aa;YxErFp+^eqKA|a<WjR!eK6H;0O2%o5vt^_VXUux
zAFx<gubY-36P77#spUYh_{cgL=!h|uGwdGL;-ol6bM_PJrg74~df#6K?Yr+yrpLM`
z$Vb{O_}CMkhU4MzC(5gZ!yW>OfNTo1z1^gFPWs<M%G{N;T<Xem=wufNRxea?DZby$
z(+e{~L=7({XO*aDE~PzF!RCcQH1ddSED)klN3G%k-tEZxVoLLuiT)U9#K_573`)eS
z<q@@5f{*$Lndx#hvOPPW8k{ry=>ozmdxO7wxy-U;*lZQRyf@*cogzMMIs$uXmGPdi
zcYER9>IM=3cz%Wi$p0-QUq|89oPc>I3ywHMa7gOf8C%*jGW@jv3&sD#@%PJLFOF_A
z?_ffDf8z7#GuEUq--eSd%V;>dfHMaRrzs(gu`p{s^Yq9wJNrU=PhV_cd?IGl)jn0!
zVKr9!6fa)oWpESx^sP>Z=6$0xAkMEbm)UvRb{#2Y`^x08pG<<f-zVe)X7C6eOw>(a
z;!rEb7LD-LRz9K`DfP&tA$e7H+9#En>qJl1j3nl%X>)N+H`qd6k!F9w`e9s81QY&>
z1XlXUi1y`5?M~(Wm|B)FbLvYvJWD1<iqt5BVg$U?#<6|Z?3VnlAU`_zO!y$idv_Bp
zbd9H-;B8!fjuVm(-*wk)@Kdz~&cO@Qf5*qPQI*04cruv5(L(@$gK)C3Gh+N#kQmt*
zI#_{Mub<1-p8*2_Uc114{%>E!(F0(@fS=udPd<qr^zS_61vf1vNfxFb0V1#Y3+Uj7
zF4kJg#3c?!_3BUUN)zozK65OLv;{kbPP*l1^xC2BhL*X_&^Uj4U3M&hYN2LvKuCiV
zrKhQ*W0^K;E-N*8`9(O3Q*o3z02FJ)O~7W%mm$R%7U8qa)~yO-rQ;A{7q{cYB8w}Z
z#?)1+it2R99%znqLsV^(yu9l3)&`QBPl<%z_BnKLk5f{eP}2xHhDk~|az{i}DtMGA
z#E>Olp02PpyX#x4ep*qBc4gWG!&5a;_epu8eeH+w%pc*jO*I%1>AO@Ua(u40;H}Jm
zvu0P|c)JzM7*`Ac01ZrrKUniCUk(!$BIY?!dsgK3o!+~wyp(_||CqV&xX>i229G)K
zRvc;=9mrX22`R<@7<QCc{&LBOZvX3KGkHbN`T5EQZj9~yT@=>WmuM`eTeFCz4LSj_
zi4-nL;Y}mw*J?s#WSBG<%H`3aO@vX)2Yp5S)-~C_YwQ%c`+%(2Z2BHUMy22gcir_+
zdGa!|aOfDzZ>7xHe3}gQ(hu|)K}3!|r7r8<`lJ+t*I04*<V^?xL~_{_FRa==K)Ue_
zN6K$jm_V5d89a9raR}%mq82kDB^T^kDzD5G;$`U2q86A(t~=(Cg&fq7`N@oD5K@~*
z`yYvi0kejnOjBd^v{(e9yz|68f;-KJ$^e5={n##1MTATZ9svR_b>^9HjaN{36s8z3
ze8%w9S)B^Avzj4x%D1{lkD!aF%QEX>q0~yx13O(pWRtCCV(3oqIF^Ci=5{kpJRDZo
zIi8xpm-LIZ^eD1)2}Fc)*Br6zr>|~R9?bOP_~nr5DGvih4|!#yPJy!dzJgfO7&Qn(
z0=7OFD5$V-_@DWP<)qDe%Ex>!Kkq<@MV~WObo3IINO=rQBp46)=vnAYoF$C$O@dmc
zTG~y^3ya?sL*244S0R1kM5lV~Aujc1Gz%aSDMTpl6Fvvw;itW~n|1!?w6I*SPj<z{
z^qsd_*yhA6q`m^9>vgxi_O(&awBL9<3C@Y(2K9xAOkP__*~uNvU>tr&R)MwBJ6nap
z$x;AB_Dh=XWvvi5)JS4a<0pJ+c@AyflKD^a;nTrKLtf0)cEd}{_^g&mh~M~_PZ5As
z?^TL8nvJ`X_h%?god`|D`<@zounRm6Lad-&6`Kkme`pkXO0OX!6@g}mI#pN4tV3+m
zBnkX$5saqTu~(qg^xaCfdsJ+ZT!_*)(dx_!zsNcM*n2f{vd+U(83OY#G0CaxR>k^w
zBB&bjP?lv7Q@CVeU-TZmIB&$)5yo)|f3a)L%}x3gcs0bp2-lHDoq&|KLBf;rVs%d}
zCn~tD%x1JoNI1=;(3&ApF?9OKn+~NIR{;Kt454qeJFXJ!5U@nLDjB&-P_S$h4&z-n
zup=OX;qB0{6w44MOq{}sx<`#|$}-2RW7H7OC85JN!P@Q&?i#pfT{QYF+HVANe2qx@
zUgd7eqJFPLOB;0K=j&mRf6t)3p1pV0K+LEX`G_du41t;7a&LmbhofKMnE>+hrh<FC
zYduEQ`A}hf*r145O%}GMJ7LXT8>v<Eu;%CTR?Ma4e7Fg4f0=F);{^`p{|@)+3)94L
z7yzJ;7y!WhGu(k6jjfCs|FFzImx#j;QX%+asLilvME-RHu0y-}#q8taXBIOY%OIbK
zCPj<9k~FiirFjsOzh1f>JXC6=5K`S1svr_`=VmmKVYx&qQPlox30C^c&IoNE_y%tk
z{^r7``oj8pHv6^p$3$+iM8x*!a7|vdPlTzVvx(&TJxv}=bRaD;@z_u_WBB7*M7qV0
zcj;b^5ML9}!Yd%pf;c0%t;x3z-RtN?nL<0cI6B}5WpE;*d>K#%48y|(Y@`Q3lDP`u
zXcAhK0?Y+X%t?`Gj>xf+PNuo;@7Hum{qS%Un#+_8g#-<ICJOJ+5z*w22}tHY>3?N@
z$JctDdmv9vE)84^ezG5Uhuv>MLW5{zZzuFv6RU|3n$J$()6oIS*tyloZkR5EP`2KH
z84@rYRX>;ju;I1IDly~@o6w)e&k|5sX#lTN9$lwecP?gXPPKJCkQ!lfWo!`n31E_5
z+Gl*<vsru8X_$F?X(2yvX}OjXXT4&9=ln95N+M5lH+ZE0wrHu81VfZjbIoc6pTk1R
z*`H=7i#ATqNTIlE_w|Ml;NuRd1iBc5iL<xpXGBzrfK<)~@=)Sa6Ds`|{<NU}a>an>
z{f)i&D=O{?1zB!Fyr2@2t{yZpS(C~Q9q1Bk<g@**kc5b|7Wa$$fu0CmzB`AytLjDL
zSYMaAxBMRGBNL2YTfFXn48_<SIY;%hJZ%-tcs<<e?&k^|G?<p9^SfO>&UigObiO#T
z111I#MdBdtaPv7@SKx4b`~V<2yN=-uMD3FT#>i(tQR5=I5|crCczmI%Ty>rOzCnn*
z*ACOj)?$jf9C4$Cj(Do^3cr=N`(wnXgS66bpflA(%1n<>d?OpyBtRq0ceAHwdVD^$
zlpJvazAuyCQr8mrakh;s*jolyh#WGI_-kMH2C}xj8LyK{eNCzwLl7xMmduhlKn~MF
zX9?A|;%{|z%*iWiwSRxpE8IT!elibTsUtLDR4Z$?AE%2gVo`*pGHOxxG)mu=q-}yE
zZxA=M0+k~P-(7#S3C67Z_=>kaP=-9g$Xw`{wEL`=F9ilI*i?0xJm_qe)&PMdI5kCD
zLxSntw}9^kg2L~(S*U#NxF-E*A=3X4BFkiZ(UF{qb!5X^7PXrC<ZM>FLR+?YY%C=}
z^y7(v^cXXq;o)MlK}S`R{(0!d6kKJ$v1QeeicxprKBfBmlAK`t5W^rQK}Vv1;?E<?
z24p|z<k87=a&GS?k&+;^94gp#_CA{DD7H^!f?{e(3=F;eG;BnB;b^C@ubj1QJG@Tp
zy5Dav!}hLT$A9U38m{JgKdDZPm<S1_;!nTi9k})+ElfyB&r#DaGbof&m)WRr(Mj%N
z0sUR!{)VXR>I=fg6p9@E?8G;x!`2vOZjnBts%GkTD^+%g4a2iNY<3SeIctMjF}l&J
z<n7|T+m#tMk)7M(Xs#loVH(_qUa<nB%5@R`7aF{~V;bx2`Ft3Hd(B$%jkLfyvem<g
z0H%U>8Xq4c&9DUQ>r%fUa*bOBu--yPjd}W-luN6Wp$6yf%X6~6$*>*oP+c<j9^T;P
zkQFPMnzENceb0g)&~CwwY@94DhCg%&v8>T_>~|+{5d1mXg9yE@OB&q)F=*TTl%D)z
zSk_Nup*<^i61#F#SE{UaYm@j=eDPXQ6xAAa+;A&j*>h`2=^7ZtJY+RPw_rhAn!jP@
zBh0WUjb6tTx_UNCz-O#m!<vA15ldZd#->TsF+&q%xe1e;$h(6xthEHoPR4dni*eHj
zHRKF)=i9Fw=r7Sj*q58hPhK@x8|guw^(rra{IN&a;8-4AsCZ}TeN3n(Xj<9rLAVb@
zo1V6Hp|;%T%+f~ofhpQSpFzdoD=&$<!z_XLiP(nWPUP?{J(T}hii&Y7Gn$>%5c68y
z>Tq#wRB61}nDa_Bp@Og}n#MBKtx;OLgPROx4ayMEUd_a-E~!JFYp=8Bc)@Q{n86H7
zi+F$f`%XlJQ{RrdvCE2HT;B1J){M?peU|3>CbnR>Ms=cq40E;ofT)alzB=k=yk>yO
z7~!Y+nl_WkLPP@<wf*Jk5GzM#6w(%ysr^*R%x~>wSmEANw0&$CyJISjb&OxRC<(6x
zx=vgLhEOEq;`ymu9Lf~UZ<k!Z9o%2;x0b2iHO&h#1&6K|rkC>i65RtU+-=HwYL=IJ
ziWKh`1G|j#4pu9%rcaKGK<iG|$PfcOA1D2fTpMPnKnF|ueFxVXxsIc|ad%-Eb3|8=
zEmN=gfM3a8Ue#Z=S|DlUin7B=>SSl_*39STsTDainbfeK)}tg;`+qHKR@<IxbbR{9
zJ+JHdNo@sq&nt=W%bwTX7zi}8Hnsn`0Df1svRU9jed5!5ZX4a9c6HLqlwC`3mOv{L
z*)m9{4yuGd7a^u@I4*x~#-PwR9>*LGc9)R7UgUM+StfkETEZ3;gQdenbKi%0+sxYD
zh)S`x@a^2C%8qha+^kbd7`jJk$2ac$_;^Nl`L&WC2!@sY1wyH!s`S^d(+>MCg|qtp
zlVJtSu;u8{BrntL4w%WWWsb1Cr^I7Y<+J2;cJB@I^U;*@qj-*}wL}r9V+()>(ZPkJ
z(8tdoP+VjdhmEO&{q;*_gyjqnxZp}1b5!HQ9(6eYPVt+k*+K+3Ajh88mi1aOl7Xro
z_B{|X=oPdo0z;re3h|oI>J9D~*VW6;<A{$1t-PmUz$BM57VlHswp!w?0nTpT0N6Ba
z9)y<AHx+FAou}ARIlJt+M;VmSQsfQYM+g1E7oP_Fgt`2H8O>x=W4%T*PgbnWKAE>P
zQ22xscmprEP4|VHPn_xHgZX`R&{dRxcY)Q;40t%)66O1PTABX)FZ)^P&Gk5md#^bT
zn?eYq3r5vV*lAXWvAr#*3qY)!h>2YA^kZ&`@B}%<DJG|@fo<^3NuwYt{l#!IvcAh)
zYeMM@;yR?;llL#GBgiS1zsC(+1g&F|r$?1JcMn{LjYHuKr9KJ6@Jj;DInH2f4~D*V
z(}n^eja_r~w%@46PFj%WMn*LHayWzZath0R0Z?X*{#PW51TtTVm}vC(S`-&W*ZA9T
zMCs?>YaZ_iTC}~Ey+k&Dw0~=Mx71*%>s&8s>?bF<TlI}Ue0|q*+IT(-5`8en7Sjvm
z)+QbPv(!ZYG8c{10_a&m<D1nI+5rz%;8t|TSiJ{M<1}f)J=Yr62s0g)dytWgwZO~~
zpbIsZmMRNc8bV#8Jx_hTzZV#`>9~4Czv%=j7h6uRo5%FsI#FbE2zX6V*bx8yjR3)Q
zn(qN+d$A6?i%An_aXTX1)pURln*(0Iy)?U41?~~0kw(|7!LjG?ooW_~#R8yALEC95
z*2d?XP@iMIPc;Oadz<89N`yQ9mHNl>@{U1Rn)#S74va|kqx%epq(vbx+LjJKGNg(b
zaDj$J_%-!}hbR*8D?)~v6;o>7ik~{SIzIC&U6uhD;1-=74Q|VuY`8<wp<`4#vStJ|
z4&VAfGdB`-k+IQ=FEtHqUyqR^zvE;^@#W}%%YF1M;!><VWIjj+mU=CTJ-HLy2E9x1
zMSPps74$A?Wx4(bOW+Ef>YAM+|7}A$<UQHxG0{J6aw+W01D3(sMhH0i(f{1!nt%m-
zWqkun<DUWE7`<S=!G!96f_RTCcpYZEGdej*y<`pPHy)CE4+th*FmPbPqp)7~bg)gP
zpQ~i2qxFe=O1j;=O-fl%qZmumL={!zOh*l^H8G(DDy<PQ9t=>3t`;mSnz5Cget~S(
z_Nc4f8<_tH+dE@Hg;`{KprvMlTOLn~fHCpu$Olvr%<Tn|$t!rQJ77psAapPw%drh8
zCN}y48~TXUH3`ytNYQ`S1q!)L+8W0Q^H&Ah=3J&{UUpl*v%rBp<)uw>4n}zN?=v+e
zrbuMhGk^PI2+8Y}LNgELkDN_-CL&m>VF2Qr>J6NbFHyJsE1a!8`rBei1h2fh#4FA!
z#=6JDF34?Oo-Jj<A-g$SvJb-SOUcBI)aNT&76*O_H;3f8uHcQsd;|R<rf#L<E!jl*
z1|4~2yv8a-G`d8zMWHVbfyyrQdjw#6#Z|${H_SB@B{<;?$ak}m2rFnU!2#^Dk~(W2
zP<y9l1gP6J&0h9jG_{jbE|rl5hzx6nd$CF(r*i!ueFb|l=ytJ0Rmg9fLyUORxp<G3
zniOu=DSC_}7CidAbhf|Qd*<;>DHiYLK&~4BG)jDVL7qJA!AYXe@HFGgBh0Tz)E9A|
zG5EwpGV|OTu?8s8{YN%5O@_5lg4qxO){S5N$p$B51EpUc__5<d<}a900jqAAC#ZHa
z#frIfrGnJ)I+B@3ke!Fc{w6FW7!C9JHjCz7r|UX`Z~EN(e3R%McROK)t2b%6@URp=
zzg5<3DcxK+u(PFwraZDZ>J_56Zna}>X-)<iBNkzcQ>Pn6VUAEFOIj-;<SJTnd`=E{
z)w(m}Pr4u5QL9?8anFH-q(9nMT3lsT)-A#uC-z1sOMXHf^4h2xj?dwi#(RL&WqG!h
zvZP7af_j=H8e&@urQQYwbjd%syNx7hLCVZ-mKeg-T##*dSFmfc>-j~3U(X#zI;`X#
zcOpB}Zks3|lZcgzxlwFZ;!B>pmRqpvR%L99=;ppKEKzrd@%bXjt7wsXc&T8gC=LGt
z<bioE^YrxBb{S8gu?NI|I!lT@z!?I;6WarxSX8j!2v&{c?QCrA8TD;#e+C&?mH(f}
z2qs*r;(#nzWNak+fue9+GI55QQ9?V3@M)ETy>+hgZIGX#X0;~BYb5UrYG+ugqiNGd
zQjmU~jZAe1DyS;NorC@isRSsw;2PBu?-WzS6C$Bb5n5H-i-L1b!O#08VU@=}huK6}
ze}mLU@$7A=$ebSSdTe+6n>fT0@k#&Wy25ev8Ch%1??FQ$>(Og`nJNWuJc$S0x>L08
z7{A$7PGGO}`%v;BQ&cYp`aXPHU{l&sM6`UL36w}wtm$QhdyVIe#xCj!Q_Q%!1dVyi
zRo?trh0HrL=xpQMLN6Q3y6LS(uyEU%7`;zOspQ<bg4J{hBt8*@UAaKrOKw7E2+PHG
zpK9PelDckWG4VdJyFHW`p=AzJE$K-k`Ww=6B7kb?Wji_{KF#`lU|BQpfWf~kZe_K1
zqd|748*xsAg{Xn>rJfKKO*B6h4xl!F1x;E^uAy4=(qsE1W8kF3E5Y57i+=YV%vD&_
z(OTQ7+&?}7)>asoO~6c@0W%ftSEd@;*!{5{{Ew>Oc>`ae(QRO=BKe<)HwwkMrF@5m
zQdyAr>}Y_FE<|ii@}s((BPiNZdnK)SiJSYVb?EB(KIVu#{cxXV*1JNm??o4y0EBp6
zZREg<rjh(LUWDT8=m|*)DtSaKnf`;K)V)w@$TCqgCfUy~c_ijT_g<8wPT+ROmt^E|
zoFVUZ`LVD&@Ucr3Q)^C8tola2)AGqq<qp1Xl}8Z<zPIBbzU)>e{LG4kIZ6Dr>(i@^
zn3*r%j=KD1Z#RnlEZDWazwT;lsxn~WkilR#Grc_Txv{@Gn=ZjasB6K5RNhWCmaRqT
zCrB40nj5-CVVX$@=<FE;IP_n%N8YfOWm?6qP19x%E^w-w_&PrQxNBBuYoIk>8f@7X
z1bA7xwYv-@AX#=j!NyAL;EX@m4tu^{{lYIaO>|V?o+CGMPECUmoue-;c*Z0*9=d4c
z>wYALcbWeAQvb6ThRsNz*!z}=8`}65@C^UAB-i3nqn`tQ!1mY!04U%de<<+wKo?8n
zKh7eJUuEnUIMMx2G(pc_awm>SDjvS(bh8@2>zfCCTF2#zVHF1J!{nLJeY0u0EdX(e
zjFgO7y)woikwT)+yPo(TJ@*n;(kj{R`cz1aJUQmP-hCD3i7+NTyRYiIZWysymdVO8
za%opgI<M+uWqi}}cz50Mcy^OXm9C^Cj2DSbRC!}rNjESR(9}e#a~6tevlYDKx+7Q^
z8h4jnzcP^MTA*rUkW`{hy-kX_b-vsNbY(GPGKUjkz#`oyGS)KYVJvw}TmSZ^zfnC{
zr6P|PIg?j1t~fT-MPb)xcsx0QIm(9VUJMW$q~0gU&|h<>m;CxeEXPXvd`l$|k+T~D
z8L&!@1t0!toayR&ZU;3dvVCLss}WqUWZ@4FYj=DJ!9z+i<3bpF*&%eZ4;Fa$DzIXt
z8xihph2QB0#T<%~BZesNS4@)<L@sW=U{;_y)w3oi!oO_c9zkRtbK|7#KNl<?{wj4Y
zwv$#%^>qlF6fK5#!r({3@@-76X^c<yWxUjc&vbR{*7boEkJq`!_EqN`+stAWypoN{
zPPc6tSNWaSj;&gX++~eUXc)2<VRw~=j4PwAd(;m|Ig{MwPaH|fc^BO$Gc}UpxtR7G
zF3-(#oEu5C=o0PrJ0Z7<<PSa3J1dB3mNm~$bD|zqB=IVx&wM<*)lZTkn-fZdYNA4}
zHp7Fv9_%pRZXGGA!!*yIOZD%E5*_9kxmbh9=e>f;m&8brLq*mItln0+emcC;EbvFx
zEy~QEG2gub;c>f^_{)NePGwV(T@U>D=q~N)<|OSV00-=zY*DrzG7h$$Yzpu<CiokQ
ztp{WGV>o5_7=c_ODQ9k|hr%w@eJ17neO<#&Ak*<NHA!fL8w}jWvFwfh;?gZ|Xv4d&
z0iT>qPrz+PVLQ`OCA%5}bc|v}mL$eW1JPm>UU+hbbtZHB!TzRicuU2RqX9~$)h48`
zWkQl38{Y{Qi+Ajtk5B4GX$d2K(xujpjX2^Q@j6pZ=s}Z0A0mUI(NXPZB_&}lx$&k=
z>q%uP-^=*c>k_LrmrBf`c9<60b?)nYGc6pQQx5-8HBO2QT>y0wHzbZ=g}tx$tOHvi
zl!z8Gh@p^eOSrg<jl|@`h6Q8@t}dSX;7xz4K{qx`_(*|&K_*(5vJe?wxxXlzwS&82
zm?pST^Rw{M>Y;Wihy_HwtnF}!!tdmiBx%p*4&*mk=QDMMVDhXt8%`3fk*;v-QXS|`
z<v;GO?+LZq5qvW;M%a~FO`=e8U=^sfpN-|h?)hGmjpmb;v+&vcX&_YfT3Ettn9iFN
z=y^;TUe=;*<NS~GW|1FF=}PvYkDNgjcJ97b(5D{?yrp55)V<-J%;T%NzrIScSs3_1
zxKP<Wuy3qNdZgn+zH3ag0h`R`e%ZJ#nP7~PEs<`V+%J|kie{P{?ND47&0o%dOMWXi
zXWoaPZ;^{-aHHJP9Q}H!d}<f6UM8v6?BQxprdt?qtc1Aq*t%KR$<DZ6nw5#I74btn
z3z;E@>5JzdJ|oW(6K(d|P&*^SVs5fP*WPvp=r(et7$ZU9@d4>5#AvR`v!|i-o#=1A
z{*Fb?9_NyML4mCCCHo?<U#fvR?vu9xdhA9nUMv)YE+jMxOHr+<6aFIX&nOW+`SoQi
zq+F~QB{WC3Vhxj^X<+S-0beZZ2lO^qB{`Hgp76-ke)wMH^aN9FI(fxZzSrpHOcDFG
zGd%kngt`yxJV}zE0>yd=EyzAm+n40{f=Q|$bmU)GY@xj_-%=oA)bCY)-A2tdaG!t<
zpTtTR+K+)Hx&?!nefGsKid*l2kQ>?Z!Rn`J;${#12*27|upSD$qpa`W0RI|n|Lb#j
zYS@X5*aVlCVn9HyGRP%fAM}RNr8+wJn<?pLe(VaXH%1Qok!qixOQFE_rOYCfxP3S`
zg_h+ECk^HEs(ocCE|zf%+;CteTU_++;=E&fMf{Q5jAPQADTAof8iz5nZa>=^_=N7M
zsm(Z|N@p!Q;WOajBkSggc0It7O#jyOUVE?)n7>u8XOnbfU2ZWbhwM6N?Mzx|xukHz
z)YZ3UYluHazj4XR$lJXTCp>WGoIzoEZd9}77`Ir-L--MX!Ts&%`2Kg}x%_|#X<i^q
zyP58Tr8$q>>DMcfvF_Tcx#sut>W+S^X1cFHIp|+|D(W-<O{~(ap7;9eKNbv?H}my2
zH}jFE<A}y6%lU8Q^i3S4$G;z09j5_YRv5BijfYogKcv^#XxrjF$<KgvIJcl9xVZv4
z7_~r^p<V>A`S|<>w#z@rU?_?C4dmaPC1)!}r?YUry+!khi6#0ntZFOTYE1hvVnB72
zk6cqgQoI_k0^yVlh7tAw?z=q63;IbkT4??k6v}$9$(6+g5HU$d1^vJ+YcG%}l|M#c
z(0oThqsj4w!&LlNJs6=J`2LS>FSQojhJ1Vxs6S>3LTMDBe!(i#W(-HA`Q8J5e;oiu
z2>#keBb?!ffcCSiWI-#BctNB$)}K|=5qSQHnDZOH2uDI-2#KKIt3QVJ=Z$`jhvdJ9
zc+}O7Cg^v?nJIXWnkgt5C{F_YpRxT5^0Nq!nFtI2pV4PA@})?{HZL4r|1jlkaymq5
z0Zsw;QLYuNu^l)GK*w?E><=G&5vhr?hG9`qteTjSNVmU5UcCbCRMroGYJ@Ww+&vo(
zz1n+nBi#2C&*^-dOb}MZgy`G2;<B3~o#+LkoF=jNN-5MGUSAsP&Y(;Ch<QlN?Av)L
z1*e67{-m4yDfF6m+hcB?IY4MJA)8Q$v)v<Uj@cJ-F(HDmW22XRCt<n=vS-i8-iw;}
z!Y^Bh^Ah8(9sSPyYj`G;KlhLv&OR@{egXa?R4jiJPNU%?)%SqM0wy(~Bz<i{24#MT
z19NdWJN8!J2D~h9?UxGrrT#%^;JVg&ZXT|Cc!5%wL|Zi><?<pDn!zbsnvQxr^zu@F
zsNy0q*<Ky#T5$F36e{Mnd2Q`qO(Z0}Qvi%(^FRbgc45CdJmtQRYC<ojry@T)u#-d8
z;pw%5Z`4-mU%;ofP(?+rmd$gRxPhe~PGT+Si1ev%jv1*Sp5UO>ypIG*RcchtB7LKf
zV#ds~UH;@2UTA5TGUH*dYnAXoER*+84D4Qw-l2|LtH2X{hg$Q#19L6V<bTYj6MLz~
zzTF?j!P)K#!&@t?DBe~3PxDaPts<rUi+RmO;>Nu8v!dyz@l@L=%w_nSp(rc*G^O|-
z6TJey>$icwncoHh%$9*_qs=hERWcU7Zmy+OrIX@#+VWko??Oy^+LZ9+n{4Wtwoy&u
zIJ9ZoJ4v{EKV&iR)igBv4pj1T)bj`T+(UINGY4;Q^2&la$3pnq8TA9K5)w-qo&D<d
zZ9k>7ykzVi>ooVuvM`Ui@|~l~YO;lb4_*zp^GD88D;8m@HZ4*Zxx60L3XAVV9Ww5@
zZ<-a3OJDCl4Nlzc%w7=9xMV>@4B5C(@yevBhmGGex+E``-!0f}J)8Gq8#g(5nXj;(
z8ay|88mG<Z%q{LiAA;T~d0Be84zVs@N?oLcJS|7E!RHv(9uZO*in+e0``%<T{P=lz
za&G9jP%PT)?rrwLk+qsodCS30g9=G#)lv1{#S+l<tfEfwM6}aS8D33w1JrYLJ(QA}
z!tk7H3V+`d+~t10V8?x#CZn#>ugU{8XKg^y>q;mg&`mmH*jd({^o(nw1AA$5(_rBK
zsP^OF`9B+ah!^x=ap|A4hrylxcKt&xvAopZ9sE7l@mF*V_`St1nUB8%|DFW)E3gXu
z*8l&P685{N-xGuW^0fy}k^ZkVq2J-ZCmQ?(pGEpN{P(nj-(CFvn&vMTOW<Use;t#4
z(eQqU|E>c61#iOsH~ep!@bCEFb;G~#1GxXj|E41T?&0qO*<W}7fE*tH_+2jh9sPIF
w;#c%A;V<YvC5+$UzaK0Aa$rIH=j{FGkSQ+(4W`G>yjny+8(1Xaq5E0-f9-;rJOBUy

literal 0
HcmV?d00001

diff --git a/pyrightconfig.json b/pyrightconfig.json
index 7808af007..161e49d2b 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -16,6 +16,6 @@
     "reportUnnecessaryTypeIgnoreComment": true,
     "stubPath": "./typings",
     "typeCheckingMode": "strict",
-    "useLibraryCodeForTypes": false,
+    "useLibraryCodeForTypes": true,
     "verboseOutput": true
 }
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index f84c0f7cc..c4894f601 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -1,5 +1,10 @@
 """Custom element classes that correspond to the document part, e.g. <w:document>."""
 
+from __future__ import annotations
+
+from typing import List
+
+from docx.oxml.section import CT_SectPr
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore, ZeroOrOne
 
 
@@ -9,10 +14,18 @@ class CT_Document(BaseOxmlElement):
     body = ZeroOrOne("w:body")
 
     @property
-    def sectPr_lst(self):
-        """Return a list containing a reference to each ``<w:sectPr>`` element in the
-        document, in the order encountered."""
-        return self.xpath(".//w:sectPr")
+    def sectPr_lst(self) -> List[CT_SectPr]:
+        """All `w:sectPr` elements directly accessible from document element.
+
+        Note this does not include a `sectPr` child in a paragraphs wrapped in
+        revision marks or other intervening layer, perhaps `w:sdt` or customXml
+        elements.
+
+        `w:sectPr` elements appear in document order. The last one is always
+        `w:body/w:sectPr`, all preceding are `w:p/w:pPr/w:sectPr`.
+        """
+        xpath = "./w:body/w:p/w:pPr/w:sectPr | ./w:body/w:sectPr"
+        return self.xpath(xpath)
 
 
 class CT_Body(BaseOxmlElement):
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index 394033e18..d1dc33ce2 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -3,11 +3,17 @@
 from __future__ import annotations
 
 from copy import deepcopy
-from typing import Callable
+from typing import Callable, Iterator, Sequence, Union, cast
+
+from lxml import etree
+from typing_extensions import TypeAlias
 
 from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION_START
+from docx.oxml.ns import nsmap
 from docx.oxml.shared import CT_OnOff
 from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure, XsdString
+from docx.oxml.table import CT_Tbl
+from docx.oxml.text.paragraph import CT_P
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OptionalAttribute,
@@ -15,7 +21,9 @@
     ZeroOrMore,
     ZeroOrOne,
 )
-from docx.shared import Length
+from docx.shared import Length, lazyproperty
+
+BlockElement: TypeAlias = Union[CT_P, CT_Tbl]
 
 
 class CT_HdrFtr(BaseOxmlElement):
@@ -251,6 +259,14 @@ def header(self, value: int | Length | None):
             value if value is None or isinstance(value, Length) else Length(value)
         )
 
+    def iter_inner_content(self) -> Iterator[CT_P | CT_Tbl]:
+        """Generate all `w:p` and `w:tbl` elements in this section.
+
+        Elements appear in document order. Elements shaded by nesting in a `w:ins` or
+        other "wrapper" element will not be included.
+        """
+        return _SectBlockElementIterator.iter_sect_block_elements(self)
+
     @property
     def left_margin(self) -> Length | None:
         """The value of the ``w:left`` attribute in the ``<w:pgMar>`` child element, as
@@ -414,3 +430,116 @@ class CT_SectType(BaseOxmlElement):
     val: WD_SECTION_START | None = (  # pyright: ignore[reportGeneralTypeIssues]
         OptionalAttribute("w:val", WD_SECTION_START)
     )
+
+
+# == HELPERS =========================================================================
+
+
+class _SectBlockElementIterator:
+    """Generates the block-item XML elements in a section.
+
+    A block-item element is a `CT_P` (paragraph) or a `CT_Tbl` (table).
+    """
+
+    _compiled_blocks_xpath: etree.XPath | None = None
+    _compiled_count_xpath: etree.XPath | None = None
+
+    def __init__(self, sectPr: CT_SectPr):
+        self._sectPr = sectPr
+
+    @classmethod
+    def iter_sect_block_elements(cls, sectPr: CT_SectPr) -> Iterator[BlockElement]:
+        """Generate each CT_P or CT_Tbl element within extents governed by `sectPr`."""
+        return cls(sectPr)._iter_sect_block_elements()
+
+    def _iter_sect_block_elements(self) -> Iterator[BlockElement]:
+        """Generate each CT_P or CT_Tbl element in section."""
+        # -- General strategy is to get all block (<w;p> and <w:tbl>) elements from
+        # -- start of doc to and including this section, then compute the count of those
+        # -- elements that came from prior sections and skip that many to leave only the
+        # -- ones in this section. It's possible to express this "between here and
+        # -- there" (end of prior section and end of this one) concept in XPath, but it
+        # -- would be harder to follow because there are special cases (e.g. no prior
+        # -- section) and the boundary expressions are fairly hairy. I also believe it
+        # -- would be computationally more expensive than doing it this straighforward
+        # -- albeit (theoretically) slightly wasteful way.
+
+        sectPr, sectPrs = self._sectPr, self._sectPrs
+        sectPr_idx = sectPrs.index(sectPr)
+
+        # -- count block items belonging to prior sections --
+        n_blks_to_skip = (
+            0
+            if sectPr_idx == 0
+            else self._count_of_blocks_in_and_above_section(sectPrs[sectPr_idx - 1])
+        )
+
+        # -- and skip those in set of all blks from doc start to end of this section --
+        for element in self._blocks_in_and_above_section(sectPr)[n_blks_to_skip:]:
+            yield element
+
+    def _blocks_in_and_above_section(self, sectPr: CT_SectPr) -> Sequence[BlockElement]:
+        """All ps and tbls in section defined by `sectPr` and all prior sections."""
+        if self._compiled_blocks_xpath is None:
+            self._compiled_blocks_xpath = etree.XPath(
+                self._blocks_in_and_above_section_xpath,
+                namespaces=nsmap,
+                regexp=False,
+            )
+        xpath = self._compiled_blocks_xpath
+        # -- XPath callable results are Any (basically), so need a cast. Also the
+        # -- callable wants an etree._Element, which CT_SectPr is, but we haven't
+        # -- figured out the typing through the metaclass yet.
+        return cast(
+            Sequence[BlockElement],
+            xpath(sectPr),  # pyright: ignore[reportGeneralTypeIssues]
+        )
+
+    @lazyproperty
+    def _blocks_in_and_above_section_xpath(self) -> str:
+        """XPath expr for ps and tbls in context of a sectPr and all prior sectPrs."""
+        # -- "p_sect" is a section with sectPr located at w:p/w:pPr/w:sectPr.
+        # -- "body_sect" is a section with sectPr located at w:body/w:sectPr. The last
+        # -- section in the document is a "body_sect". All others are of the "p_sect"
+        # -- variety. "term" means "terminal", like the last p or tbl in the section.
+        # -- "pred" means "predecessor", like a preceding p or tbl in the section.
+
+        # -- the terminal block in a p-based sect is the p the sectPr appears in --
+        p_sect_term_block = "./parent::w:pPr/parent::w:p"
+        # -- the terminus of a body-based sect is the sectPr itself (not a block) --
+        body_sect_term = "self::w:sectPr[parent::w:body]"
+        # -- all the ps and tbls preceding (but not including) the context node --
+        pred_ps_and_tbls = "preceding-sibling::*[self::w:p | self::w:tbl]"
+
+        # -- p_sect_term_block and body_sect_term(inus) are mutually exclusive. So the
+        # -- result is either the union of nodes found by the first two selectors or the
+        # -- nodes found by the last selector, never both.
+        return (
+            # -- include the p containing a sectPr --
+            f"{p_sect_term_block}"
+            # -- along with all the blocks that precede it --
+            f" | {p_sect_term_block}/{pred_ps_and_tbls}"
+            # -- or all the preceding blocks if sectPr is body-based (last sectPr) --
+            f" | {body_sect_term}/{pred_ps_and_tbls}"
+        )
+
+    def _count_of_blocks_in_and_above_section(self, sectPr: CT_SectPr) -> int:
+        """All ps and tbls in section defined by `sectPr` and all prior sections."""
+        if self._compiled_count_xpath is None:
+            self._compiled_count_xpath = etree.XPath(
+                f"count({self._blocks_in_and_above_section_xpath})",
+                namespaces=nsmap,
+                regexp=False,
+            )
+        xpath = self._compiled_count_xpath
+        # -- numeric XPath results are always float, so need an int() conversion --
+        return int(
+            cast(float, xpath(sectPr))  # pyright: ignore[reportGeneralTypeIssues]
+        )
+
+    @lazyproperty
+    def _sectPrs(self) -> Sequence[CT_SectPr]:
+        """All w:sectPr elements in document, in document-order."""
+        return self._sectPr.xpath(
+            "/w:document/w:body/w:p/w:pPr/w:sectPr | /w:document/w:body/w:sectPr",
+        )
diff --git a/src/docx/section.py b/src/docx/section.py
index 08cc36e9a..f72b60867 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -6,14 +6,18 @@
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_HEADER_FOOTER
+from docx.oxml.text.paragraph import CT_P
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.shared import lazyproperty
+from docx.table import Table
+from docx.text.paragraph import Paragraph
 
 if TYPE_CHECKING:
     from docx.enum.section import WD_ORIENTATION, WD_SECTION_START
     from docx.oxml.document import CT_Document
     from docx.oxml.section import CT_SectPr
     from docx.parts.document import DocumentPart
+    from docx.parts.story import StoryPart
     from docx.shared import Length
 
 
@@ -150,6 +154,18 @@ def header_distance(self) -> Length | None:
     def header_distance(self, value: int | Length | None):
         self._sectPr.header = value
 
+    def iter_inner_content(self) -> Iterator[Paragraph | Table]:
+        """Generate each Paragraph or Table object in this `section`.
+
+        Items appear in document order.
+        """
+        for element in self._sectPr.iter_inner_content():
+            yield (
+                Paragraph(element, self)  # pyright: ignore[reportGeneralTypeIssues]
+                if isinstance(element, CT_P)
+                else Table(element, self)
+            )
+
     @property
     def left_margin(self) -> Length | None:
         """|Length| object representing the left margin for all pages in this section in
@@ -203,6 +219,10 @@ def page_width(self) -> Length | None:
     def page_width(self, value: Length | None):
         self._sectPr.page_width = value
 
+    @property
+    def part(self) -> StoryPart:
+        return self._document_part
+
     @property
     def right_margin(self) -> Length | None:
         """|Length| object representing the right margin for all pages in this section
diff --git a/src/docx/table.py b/src/docx/table.py
index b05bffefc..13cc5b7bf 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -1,5 +1,9 @@
 """The |Table| object and related proxy classes."""
 
+from __future__ import annotations
+
+from typing import List, Tuple, overload
+
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.style import WD_STYLE_TYPE
 from docx.oxml.simpletypes import ST_Merge
@@ -85,7 +89,7 @@ def row_cells(self, row_idx):
         return self._cells[start:end]
 
     @lazyproperty
-    def rows(self):
+    def rows(self) -> _Rows:
         """|_Rows| instance containing the sequence of rows in this table."""
         return _Rows(self._tbl, self)
 
@@ -221,7 +225,7 @@ def tables(self):
         return super(_Cell, self).tables
 
     @property
-    def text(self):
+    def text(self) -> str:
         """The entire contents of this cell as a string of text.
 
         Assigning a string to this property replaces all existing content with a single
@@ -349,7 +353,7 @@ def __init__(self, tr, parent):
         self._tr = self._element = tr
 
     @property
-    def cells(self):
+    def cells(self) -> Tuple[_Cell]:
         """Sequence of |_Cell| instances corresponding to cells in this row."""
         return tuple(self.table.row_cells(self._index))
 
@@ -394,8 +398,16 @@ def __init__(self, tbl, parent):
         super(_Rows, self).__init__(parent)
         self._tbl = tbl
 
-    def __getitem__(self, idx):
-        """Provide indexed access, (e.g. 'rows[0]')"""
+    @overload
+    def __getitem__(self, idx: int) -> _Row:
+        ...
+
+    @overload
+    def __getitem__(self, idx: slice) -> List[_Row]:
+        ...
+
+    def __getitem__(self, idx: int | slice) -> _Row | List[_Row]:
+        """Provide indexed access, (e.g. `rows[0]` or `rows[1:3]`)"""
         return list(self)[idx]
 
     def __iter__(self):
diff --git a/tests/test_files/sct-inner-content.docx b/tests/test_files/sct-inner-content.docx
new file mode 100644
index 0000000000000000000000000000000000000000..a94165f8d01889e70eee54627486286a5352cdad
GIT binary patch
literal 12051
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

literal 0
HcmV?d00001

diff --git a/tests/test_section.py b/tests/test_section.py
index 4eb1f9192..333e755b7 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -8,6 +8,7 @@
 
 import pytest
 
+from docx import Document
 from docx.enum.section import WD_HEADER_FOOTER, WD_ORIENTATION, WD_SECTION
 from docx.oxml.document import CT_Document
 from docx.oxml.section import CT_SectPr
@@ -15,8 +16,11 @@
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.section import Section, Sections, _BaseHeaderFooter, _Footer, _Header
 from docx.shared import Inches, Length
+from docx.table import Table
+from docx.text.paragraph import Paragraph
 
 from .unitutil.cxml import element, xml
+from .unitutil.file import test_file
 from .unitutil.mock import (
     FixtureRequest,
     Mock,
@@ -241,6 +245,50 @@ def it_provides_access_to_its_default_header(
         )
         assert header is header_
 
+    def it_can_iterate_its_inner_content(self):
+        document = Document(test_file("sct-inner-content.docx"))
+
+        assert len(document.sections) == 3
+
+        inner_content = list(document.sections[0].iter_inner_content())
+
+        assert len(inner_content) == 3
+        p = inner_content[0]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P1"
+        t = inner_content[1]
+        assert isinstance(t, Table)
+        assert t.rows[0].cells[0].text == "T2"
+        p = inner_content[2]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P3"
+
+        inner_content = list(document.sections[1].iter_inner_content())
+
+        assert len(inner_content) == 3
+        t = inner_content[0]
+        assert isinstance(t, Table)
+        assert t.rows[0].cells[0].text == "T4"
+        p = inner_content[1]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P5"
+        p = inner_content[2]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P6"
+
+        inner_content = list(document.sections[2].iter_inner_content())
+
+        assert len(inner_content) == 3
+        p = inner_content[0]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P7"
+        p = inner_content[1]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P8"
+        p = inner_content[2]
+        assert isinstance(p, Paragraph)
+        assert p.text == "P9"
+
     @pytest.mark.parametrize(
         ("sectPr_cxml", "expected_value"),
         [
diff --git a/typings/behave/__init__.pyi b/typings/behave/__init__.pyi
index efc9b36ad..f8ffc2058 100644
--- a/typings/behave/__init__.pyi
+++ b/typings/behave/__init__.pyi
@@ -2,16 +2,15 @@ from __future__ import annotations
 
 from typing import Callable
 
-from typing_extensions import Concatenate, ParamSpec, TypeAlias
+from typing_extensions import TypeAlias
 
 from .runner import Context
 
-_P = ParamSpec("_P")
-
-_ArgsStep: TypeAlias = Callable[Concatenate[Context, _P], None]
-_NoArgsStep: TypeAlias = Callable[[Context], None]
-
-_Step: TypeAlias = _NoArgsStep | _ArgsStep[str]
+_ThreeArgStep: TypeAlias = Callable[[Context, str, str, str], None]
+_TwoArgStep: TypeAlias = Callable[[Context, str, str], None]
+_OneArgStep: TypeAlias = Callable[[Context, str], None]
+_NoArgStep: TypeAlias = Callable[[Context], None]
+_Step: TypeAlias = _NoArgStep | _OneArgStep | _TwoArgStep | _ThreeArgStep
 
 def given(phrase: str) -> Callable[[_Step], _Step]: ...
 def when(phrase: str) -> Callable[[_Step], _Step]: ...

From 7ab9d31390dca989355dca4f859a7891d0761336 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 10 Oct 2023 13:38:00 -0700
Subject: [PATCH 291/367] docs: small docs fixes

---
 docs/api/style.rst | 8 ++++----
 docs/conf.py       | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/api/style.rst b/docs/api/style.rst
index 9e05ab351..afee95c00 100644
--- a/docs/api/style.rst
+++ b/docs/api/style.rst
@@ -35,10 +35,10 @@ in the appropriate style.
        part, style_id
 
 
-|_CharacterStyle| objects
+|CharacterStyle| objects
 -------------------------
 
-.. autoclass:: _CharacterStyle()
+.. autoclass:: CharacterStyle()
    :show-inheritance:
    :members:
    :inherited-members:
@@ -46,10 +46,10 @@ in the appropriate style.
        element, part, style_id, type
 
 
-|_ParagraphStyle| objects
+|ParagraphStyle| objects
 -------------------------
 
-.. autoclass:: _ParagraphStyle()
+.. autoclass:: ParagraphStyle()
    :show-inheritance:
    :members:
    :inherited-members:
diff --git a/docs/conf.py b/docs/conf.py
index db96ecf52..06b428064 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -79,7 +79,9 @@
 
 .. |_Cell| replace:: :class:`._Cell`
 
-.. |_CharacterStyle| replace:: :class:`._CharacterStyle`
+.. |_CharacterStyle| replace:: :class:`.CharacterStyle`
+
+.. |CharacterStyle| replace:: :class:`.CharacterStyle`
 
 .. |Cm| replace:: :class:`.Cm`
 
@@ -147,7 +149,9 @@
 
 .. |ParagraphFormat| replace:: :class:`.ParagraphFormat`
 
-.. |_ParagraphStyle| replace:: :class:`._ParagraphStyle`
+.. |_ParagraphStyle| replace:: :class:`.ParagraphStyle`
+
+.. |ParagraphStyle| replace:: :class:`.ParagraphStyle`
 
 .. |Part| replace:: :class:`.Part`
 

From 6df147ebbc7d46f80273fd5819f35d0668ded98c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 10 Oct 2023 16:46:40 -0700
Subject: [PATCH 292/367] release: prepare v1.0.0 release

---
 HISTORY.rst          | 1 +
 Makefile             | 2 +-
 src/docx/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index c465665d1..e6c5bd333 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -20,6 +20,7 @@ Release History
 * Add RenderedPageBreak.preceding_paragraph_fragment
 * Add Run.contains_page_break
 * Add Run.iter_inner_content()
+* Add Section.iter_inner_content()
 
 
 0.8.11 (2021-05-15)
diff --git a/Makefile b/Makefile
index 6d5dd85b8..0478b2bce 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ test:
 test-upload: sdist wheel
 	$(TWINE) upload --repository testpypi dist/*
 
-upload: sdist wheel
+upload: clean sdist wheel
 	$(TWINE) upload dist/*
 
 wheel:
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index 19fea99eb..f6f7b5b5a 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -1,6 +1,6 @@
 from docx.api import Document  # noqa
 
-__version__ = "1.0.0rc1"
+__version__ = "1.0.0"
 
 
 # register custom Part classes with opc package reader

From 532ddd5c053d6c94f3b73b9ac5c65434e79931df Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 10 Oct 2023 17:05:45 -0700
Subject: [PATCH 293/367] docs: add .readthedocs.yaml

---
 .readthedocs.yaml     | 19 +++++++++++++++++++
 requirements-docs.txt |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 .readthedocs.yaml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 000000000..125538586
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,19 @@
+version: 2
+
+# -- set the OS, Python version and other tools you might need --
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"
+
+# -- build documentation in the "docs/" directory with Sphinx --
+sphinx:
+  configuration: docs/conf.py
+  # -- fail on all warnings to avoid broken references --
+  # fail_on_warning: true
+
+# -- package versions required to build your documentation --
+# -- see https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html --
+python:
+   install:
+   - requirements: requirements-docs.txt
diff --git a/requirements-docs.txt b/requirements-docs.txt
index 357592950..11f9d2cd2 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -1,3 +1,4 @@
 Sphinx==1.8.6
 Jinja2==2.11.3
 MarkupSafe==0.23
+-e .

From 129dd83f4aef7991a6d21da892f2b4aa2e55de34 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 11 Oct 2023 09:41:01 -0700
Subject: [PATCH 294/367] fix: #1256 republish parse_xml() at docx.oxml

Multiple downstream "extension" packages expect to find `OxmlElement`
and `parse_xml()` at `docx.oxml`. Refactoring in v1.0.0 moved those to
`docx.oxml.parser`, but republishing them at `docx.oxml` does not cause
any immediate breakage.

Republish those two callables at `docx.oxml` for v1.0.1.
---
 src/docx/oxml/__init__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index bf8d00962..621ef279a 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from docx.oxml.drawing import CT_Drawing
-from docx.oxml.parser import register_element_cls
+from docx.oxml.parser import OxmlElement, parse_xml, register_element_cls
 from docx.oxml.shape import (
     CT_Anchor,
     CT_Blip,
@@ -34,6 +34,11 @@
     CT_Text,
 )
 
+# -- `OxmlElement` and `parse_xml()` are not used in this module but several downstream
+# -- "extension" packages expect to find them here and there's no compelling reason
+# -- not to republish them here so those keep working.
+__all__ = ["OxmlElement", "parse_xml"]
+
 # ---------------------------------------------------------------------------
 # DrawingML-related elements
 

From 96f80f792a3378dbc08ef9bf696e80756cf5f976 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 12 Oct 2023 15:05:08 -0700
Subject: [PATCH 295/367] hlink: add Hyperlink.fragment and .url

---
 docs/dev/analysis/features/text/hyperlink.rst | 253 ++++++++++--------
 features/hlk-props.feature                    |  19 ++
 features/steps/hyperlink.py                   |  44 +++
 .../steps/test_files/par-hlink-frags.docx     | Bin 0 -> 12071 bytes
 src/docx/oxml/text/hyperlink.py               |  10 +-
 src/docx/text/hyperlink.py                    |  53 +++-
 tests/text/test_hyperlink.py                  |  52 +++-
 7 files changed, 310 insertions(+), 121 deletions(-)
 create mode 100644 features/steps/test_files/par-hlink-frags.docx

diff --git a/docs/dev/analysis/features/text/hyperlink.rst b/docs/dev/analysis/features/text/hyperlink.rst
index 4dff91d20..cfd451fe1 100644
--- a/docs/dev/analysis/features/text/hyperlink.rst
+++ b/docs/dev/analysis/features/text/hyperlink.rst
@@ -2,31 +2,45 @@
 Hyperlink
 =========
 
-Word allows hyperlinks to be placed in a document wherever paragraphs can appear.
+Word allows a hyperlink to be placed in a document wherever a paragraph can appear. The
+actual hyperlink element is a peer of |Run|.
 
-The target (URL) of a hyperlink may be external, such as a web site, or internal, to
-another location in the document.
+The link may be to an external resource such as a web site, or internal, to another
+location in the document. The link may also be a `mailto:` URI or a reference to a file
+on an accessible local or network filesystem.
 
 The visible text of a hyperlink is held in one or more runs. Technically a hyperlink can
 have zero runs, but this occurs only in contrived cases (otherwise there would be
 nothing to click on). As usual, each run can have its own distinct text formatting
 (font), so for example one word in the hyperlink can be bold, etc. By default, Word
-applies the built-in `Hyperlink` character style to a newly inserted hyperlink.
+applies the built-in `Hyperlink` character style to a newly inserted hyperlink. Like
+other text, the hyperlink text may often be broken into multiple runs as a result of
+edits in different "revision-save" editing sessions (between "Save" commands).
 
 Note that rendered page-breaks can occur in the middle of a hyperlink.
 
 A |Hyperlink| is a child of |Paragraph|, a peer of |Run|.
 
 
+TODO: What about URL-encoding/decoding (like %20) behaviors, if any?
+
+
 Candidate protocol
 ------------------
 
 An external hyperlink has an address and an optional anchor. An internal hyperlink has
-only an anchor. An anchor is also known as a *URI fragment* and follows a hash mark
-("#").
+only an anchor. An anchor is more precisely known as a *URI fragment* in a web URL and
+follows a hash mark ("#"). The fragment-separator hash character is not stored in the
+XML.
+
+Note that the anchor and address are stored in two distinct attributes, so you need to
+concatenate `.address` and `.anchor` like `f"{address}#{anchor}"` if you want the whole
+thing.
 
-Note that the anchor and URL are stored in two distinct attributes, so you need to
-concatenate `.address` and `.anchor` if you want the whole thing.
+Also note that Word does not rigorously separate a fragment in a web URI so it may
+appear as part of the address or separately in the anchor attribute, depending on how
+the hyperlink was authored. Hyperlinks inserted using the dialog-box seem to separate it
+and addresses typed into the document directly don't, based on my limited experience.
 
 .. highlight:: python
 
@@ -49,6 +63,16 @@ concatenate `.address` and `.anchor` if you want the whole thing.
     >>> hyperlink.address
     'https://google.com/'
 
+**Access hyperlink fragment**::
+
+    >>> hyperlink.fragment
+    'introduction'
+
+**Access hyperlink history (visited or not, True means not visited yet)**::
+
+    >>> hyperlink.history
+    True
+
 **Access hyperlinks runs**::
 
     >>> hyperlink.runs
@@ -58,6 +82,11 @@ concatenate `.address` and `.anchor` if you want the whole thing.
       <docx.text.run.Run at 0x7f...>
     ]
 
+**Access hyperlink URL**::
+
+    >>> hyperlink.url
+    'https://us.com#introduction'
+
 **Determine whether a hyperlink contains a rendered page-break**::
 
     >>> hyperlink.contains_page_break
@@ -68,29 +97,31 @@ concatenate `.address` and `.anchor` if you want the whole thing.
     >>> hyperlink.text
     'an excellent Wikipedia article on ferrets'
 
-**Add an external hyperlink**::
+**Add an external hyperlink** (not yet implemented)::
 
     >>> hyperlink = paragraph.add_hyperlink(
-          'About', address='http://us.com', anchor='about'
-        )
+    ...   'About', address='http://us.com', fragment='about'
+    ... )
     >>> hyperlink
     <docx.text.hyperlink.Hyperlink at 0x7f...>
     >>> hyperlink.text
     'About'
     >>> hyperlink.address
     'http://us.com'
-    >>> hyperlink.anchor
+    >>> hyperlink.fragment
     'about'
+    >>> hyperlink.url
+    'http://us.com#about'
 
 **Add an internal hyperlink (to a bookmark)**::
 
-    >>> hyperlink = paragraph.add_hyperlink('Section 1', anchor='Section_1')
+    >>> hyperlink = paragraph.add_hyperlink('Section 1', fragment='Section_1')
     >>> hyperlink.text
     'Section 1'
-    >>> hyperlink.anchor
+    >>> hyperlink.fragment
     'Section_1'
     >>> hyperlink.address
-    None
+    ''
 
 **Modify hyperlink properties**::
 
@@ -183,8 +214,8 @@ file, keyed by the w:hyperlink@r:id attribute::
       <Relationship Id="rId4" Mode="External" Type="http://..." Target="http://google.com/"/>
     </Relationships>
 
-A hyperlink can contain multiple runs of text (and a whole lot of other
-stuff, including nested hyperlinks, at least as far as the schema indicates)::
+A hyperlink can contain multiple runs of text (and a whole lot of other stuff, at least
+as far as the schema indicates)::
 
     <w:p>
       <w:hyperlink r:id="rId2">
@@ -256,97 +287,97 @@ Schema excerpt
 
 ::
 
-    <xsd:complexType name="CT_P">
-      <xsd:sequence>
-        <xsd:element name="pPr" type="CT_PPr" minOccurs="0"/>
-        <xsd:group   ref="EG_PContent"        minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="rsidRPr"      type="ST_LongHexNumber"/>
-      <xsd:attribute name="rsidR"        type="ST_LongHexNumber"/>
-      <xsd:attribute name="rsidDel"      type="ST_LongHexNumber"/>
-      <xsd:attribute name="rsidP"        type="ST_LongHexNumber"/>
-      <xsd:attribute name="rsidRDefault" type="ST_LongHexNumber"/>
-    </xsd:complexType>
-
-    <xsd:group name="EG_PContent">  <!-- denormalized -->
-      <xsd:choice>
-        <xsd:element name="r"         type="CT_R"/>
-        <xsd:element name="hyperlink" type="CT_Hyperlink"/>
-        <xsd:element name="fldSimple" type="CT_SimpleField"/>
-        <xsd:element name="sdt"       type="CT_SdtRun"/>
-        <xsd:element name="customXml" type="CT_CustomXmlRun"/>
-        <xsd:element name="smartTag"  type="CT_SmartTagRun"/>
-        <xsd:element name="dir"       type="CT_DirContentRun"/>
-        <xsd:element name="bdo"       type="CT_BdoContentRun"/>
-        <xsd:element name="subDoc"    type="CT_Rel"/>
-        <xsd:group ref="EG_RunLevelElts"/>
-      </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="CT_Hyperlink">
-      <xsd:group ref="EG_PContent" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:attribute name="tgtFrame"    type="s:ST_String"/>
-      <xsd:attribute name="tooltip"     type="s:ST_String"/>
-      <xsd:attribute name="docLocation" type="s:ST_String"/>
-      <xsd:attribute name="history"     type="s:ST_OnOff"/>
-      <xsd:attribute name="anchor"      type="s:ST_String"/>
-      <xsd:attribute  ref="r:id"/>
-    </xsd:complexType>
-
-    <xsd:group name="EG_RunLevelElts">
-      <xsd:choice>
-        <xsd:element name="proofErr"                    type="CT_ProofErr"/>
-        <xsd:element name="permStart"                   type="CT_PermStart"/>
-        <xsd:element name="permEnd"                     type="CT_Perm"/>
-        <xsd:element name="bookmarkStart"               type="CT_Bookmark"/>
-        <xsd:element name="bookmarkEnd"                 type="CT_MarkupRange"/>
-        <xsd:element name="moveFromRangeStart"          type="CT_MoveBookmark"/>
-        <xsd:element name="moveFromRangeEnd"            type="CT_MarkupRange"/>
-        <xsd:element name="moveToRangeStart"            type="CT_MoveBookmark"/>
-        <xsd:element name="moveToRangeEnd"              type="CT_MarkupRange"/>
-        <xsd:element name="commentRangeStart"           type="CT_MarkupRange"/>
-        <xsd:element name="commentRangeEnd"             type="CT_MarkupRange"/>
-        <xsd:element name="customXmlInsRangeStart"      type="CT_TrackChange"/>
-        <xsd:element name="customXmlInsRangeEnd"        type="CT_Markup"/>
-        <xsd:element name="customXmlDelRangeStart"      type="CT_TrackChange"/>
-        <xsd:element name="customXmlDelRangeEnd"        type="CT_Markup"/>
-        <xsd:element name="customXmlMoveFromRangeStart" type="CT_TrackChange"/>
-        <xsd:element name="customXmlMoveFromRangeEnd"   type="CT_Markup"/>
-        <xsd:element name="customXmlMoveToRangeStart"   type="CT_TrackChange"/>
-        <xsd:element name="customXmlMoveToRangeEnd"     type="CT_Markup"/>
-        <xsd:element name="ins"                         type="CT_RunTrackChange"/>
-        <xsd:element name="del"                         type="CT_RunTrackChange"/>
-        <xsd:element name="moveFrom"                    type="CT_RunTrackChange"/>
-        <xsd:element name="moveTo"                      type="CT_RunTrackChange"/>
-        <xsd:group ref="EG_MathContent" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="CT_R">
-      <xsd:sequence>
-        <xsd:group ref="EG_RPr"             minOccurs="0"/>
-        <xsd:group ref="EG_RunInnerContent" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="rsidRPr" type="ST_LongHexNumber"/>
-      <xsd:attribute name="rsidDel" type="ST_LongHexNumber"/>
-      <xsd:attribute name="rsidR"   type="ST_LongHexNumber"/>
-    </xsd:complexType>
-
-    <xsd:simpleType name="ST_OnOff">
-      <xsd:union memberTypes="xsd:boolean ST_OnOff1"/>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="ST_OnOff1">
-      <xsd:restriction base="xsd:string">
-        <xsd:enumeration value="on"/>
-        <xsd:enumeration value="off"/>
-      </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="ST_RelationshipId">
-      <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="ST_String">
-      <xsd:restriction base="xsd:string"/>
-    </xsd:simpleType>
+  <xsd:complexType name="CT_P">
+    <xsd:sequence>
+      <xsd:element name="pPr" type="CT_PPr" minOccurs="0"/>
+      <xsd:group   ref="EG_PContent"        minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="rsidRPr"      type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidR"        type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidDel"      type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidP"        type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidRDefault" type="ST_LongHexNumber"/>
+  </xsd:complexType>
+
+  <xsd:group name="EG_PContent">  <!-- denormalized -->
+    <xsd:choice>
+      <xsd:element name="r"         type="CT_R"/>
+      <xsd:element name="hyperlink" type="CT_Hyperlink"/>
+      <xsd:element name="fldSimple" type="CT_SimpleField"/>
+      <xsd:element name="sdt"       type="CT_SdtRun"/>
+      <xsd:element name="customXml" type="CT_CustomXmlRun"/>
+      <xsd:element name="smartTag"  type="CT_SmartTagRun"/>
+      <xsd:element name="dir"       type="CT_DirContentRun"/>
+      <xsd:element name="bdo"       type="CT_BdoContentRun"/>
+      <xsd:element name="subDoc"    type="CT_Rel"/>
+      <xsd:group ref="EG_RunLevelElts"/>
+    </xsd:choice>
+  </xsd:group>
+
+  <xsd:complexType name="CT_Hyperlink">
+    <xsd:group ref="EG_PContent" minOccurs="0" maxOccurs="unbounded"/>
+    <xsd:attribute name="tgtFrame"    type="s:ST_String"/>
+    <xsd:attribute name="tooltip"     type="s:ST_String"/>
+    <xsd:attribute name="docLocation" type="s:ST_String"/>
+    <xsd:attribute name="history"     type="s:ST_OnOff"/>
+    <xsd:attribute name="anchor"      type="s:ST_String"/>
+    <xsd:attribute ref="r:id"/>
+  </xsd:complexType>
+
+  <xsd:group name="EG_RunLevelElts">
+    <xsd:choice>
+      <xsd:element name="proofErr"                    type="CT_ProofErr"/>
+      <xsd:element name="permStart"                   type="CT_PermStart"/>
+      <xsd:element name="permEnd"                     type="CT_Perm"/>
+      <xsd:element name="bookmarkStart"               type="CT_Bookmark"/>
+      <xsd:element name="bookmarkEnd"                 type="CT_MarkupRange"/>
+      <xsd:element name="moveFromRangeStart"          type="CT_MoveBookmark"/>
+      <xsd:element name="moveFromRangeEnd"            type="CT_MarkupRange"/>
+      <xsd:element name="moveToRangeStart"            type="CT_MoveBookmark"/>
+      <xsd:element name="moveToRangeEnd"              type="CT_MarkupRange"/>
+      <xsd:element name="commentRangeStart"           type="CT_MarkupRange"/>
+      <xsd:element name="commentRangeEnd"             type="CT_MarkupRange"/>
+      <xsd:element name="customXmlInsRangeStart"      type="CT_TrackChange"/>
+      <xsd:element name="customXmlInsRangeEnd"        type="CT_Markup"/>
+      <xsd:element name="customXmlDelRangeStart"      type="CT_TrackChange"/>
+      <xsd:element name="customXmlDelRangeEnd"        type="CT_Markup"/>
+      <xsd:element name="customXmlMoveFromRangeStart" type="CT_TrackChange"/>
+      <xsd:element name="customXmlMoveFromRangeEnd"   type="CT_Markup"/>
+      <xsd:element name="customXmlMoveToRangeStart"   type="CT_TrackChange"/>
+      <xsd:element name="customXmlMoveToRangeEnd"     type="CT_Markup"/>
+      <xsd:element name="ins"                         type="CT_RunTrackChange"/>
+      <xsd:element name="del"                         type="CT_RunTrackChange"/>
+      <xsd:element name="moveFrom"                    type="CT_RunTrackChange"/>
+      <xsd:element name="moveTo"                      type="CT_RunTrackChange"/>
+      <xsd:group ref="EG_MathContent" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:choice>
+  </xsd:group>
+
+  <xsd:complexType name="CT_R">
+    <xsd:sequence>
+      <xsd:group ref="EG_RPr"             minOccurs="0"/>
+      <xsd:group ref="EG_RunInnerContent" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="rsidRPr" type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidDel" type="ST_LongHexNumber"/>
+    <xsd:attribute name="rsidR"   type="ST_LongHexNumber"/>
+  </xsd:complexType>
+
+  <xsd:simpleType name="ST_OnOff">
+    <xsd:union memberTypes="xsd:boolean ST_OnOff1"/>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_OnOff1">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="on"/>
+      <xsd:enumeration value="off"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_RelationshipId">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="ST_String">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
diff --git a/features/hlk-props.feature b/features/hlk-props.feature
index 5472f49a3..a315318e0 100644
--- a/features/hlk-props.feature
+++ b/features/hlk-props.feature
@@ -19,6 +19,11 @@ Feature: Access hyperlink properties
       | one          | True  |
 
 
+  Scenario: Hyperlink.fragment has the URI fragment of the hyperlink
+    Given a hyperlink having a URI fragment
+     Then hyperlink.fragment is the URI fragment of the hyperlink
+
+
   Scenario Outline: Hyperlink.runs contains Run for each run in hyperlink
     Given a hyperlink having <zero-or-more> runs
      Then hyperlink.runs has length <value>
@@ -33,3 +38,17 @@ Feature: Access hyperlink properties
   Scenario: Hyperlink.text has the visible text of the hyperlink
     Given a hyperlink
      Then hyperlink.text is the visible text of the hyperlink
+
+
+  Scenario Outline: Hyperlink.url is the full URL of an internet hyperlink
+    Given a hyperlink having address <address> and fragment <fragment>
+     Then hyperlink.url is <url>
+
+    Examples: Hyperlink.url cases
+      | address                   | fragment       | url                       |
+      | ''                        | linkedBookmark | ''                        |
+      | https://foo.com           | ''             | https://foo.com           |
+      | https://foo.com?q=bar     | ''             | https://foo.com?q=bar     |
+      | http://foo.com/           | intro          | http://foo.com/#intro     |
+      | https://foo.com?q=bar#baz | ''             | https://foo.com?q=bar#baz |
+      | court-exif.jpg            | ''             | court-exif.jpg            |
diff --git a/features/steps/hyperlink.py b/features/steps/hyperlink.py
index 0596a3cd6..2bba31ed8 100644
--- a/features/steps/hyperlink.py
+++ b/features/steps/hyperlink.py
@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Dict, Tuple
+
 from behave import given, then
 from behave.runner import Context
 
@@ -18,6 +20,30 @@ def given_a_hyperlink(context: Context):
     context.hyperlink = document.paragraphs[1].hyperlinks[0]
 
 
+@given("a hyperlink having a URI fragment")
+def given_a_hyperlink_having_a_uri_fragment(context: Context):
+    document = Document(test_docx("par-hlink-frags"))
+    context.hyperlink = document.paragraphs[1].hyperlinks[0]
+
+
+@given("a hyperlink having address {address} and fragment {fragment}")
+def given_a_hyperlink_having_address_and_fragment(
+    context: Context, address: str, fragment: str
+):
+    paragraph_idxs: Dict[Tuple[str, str], int] = {
+        ("''", "linkedBookmark"): 1,
+        ("https://foo.com", "''"): 2,
+        ("https://foo.com?q=bar", "''"): 3,
+        ("http://foo.com/", "intro"): 4,
+        ("https://foo.com?q=bar#baz", "''"): 5,
+        ("court-exif.jpg", "''"): 7,
+    }
+    paragraph_idx = paragraph_idxs[(address, fragment)]
+    document = Document(test_docx("par-hlink-frags"))
+    paragraph = document.paragraphs[paragraph_idx]
+    context.hyperlink = paragraph.hyperlinks[0]
+
+
 @given("a hyperlink having {zero_or_more} rendered page breaks")
 def given_a_hyperlink_having_rendered_page_breaks(context: Context, zero_or_more: str):
     paragraph_idx = {
@@ -61,6 +87,15 @@ def then_hyperlink_contains_page_break_is_value(context: Context, value: str):
     ), f"expected: {expected_value}, got: {actual_value}"
 
 
+@then("hyperlink.fragment is the URI fragment of the hyperlink")
+def then_hyperlink_fragment_is_the_URI_fragment_of_the_hyperlink(context: Context):
+    actual_value = context.hyperlink.fragment
+    expected_value = "linkedBookmark"
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
+
+
 @then("hyperlink.runs contains only Run instances")
 def then_hyperlink_runs_contains_only_Run_instances(context: Context):
     actual_value = [type(item).__name__ for item in context.hyperlink.runs]
@@ -86,3 +121,12 @@ def then_hyperlink_text_is_the_visible_text_of_the_hyperlink(context: Context):
     assert (
         actual_value == expected_value
     ), f"expected: {expected_value}, got: {actual_value}"
+
+
+@then("hyperlink.url is {value}")
+def then_hyperlink_url_is_value(context: Context, value: str):
+    actual_value = context.hyperlink.url
+    expected_value = "" if value == "''" else value
+    assert (
+        actual_value == expected_value
+    ), f"expected: {expected_value}, got: {actual_value}"
diff --git a/features/steps/test_files/par-hlink-frags.docx b/features/steps/test_files/par-hlink-frags.docx
new file mode 100644
index 0000000000000000000000000000000000000000..461d78ff9d743b5805de9151128fba97bc17bb12
GIT binary patch
literal 12071
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

literal 0
HcmV?d00001

diff --git a/src/docx/oxml/text/hyperlink.py b/src/docx/oxml/text/hyperlink.py
index 76733457b..77d409f6a 100644
--- a/src/docx/oxml/text/hyperlink.py
+++ b/src/docx/oxml/text/hyperlink.py
@@ -4,12 +4,11 @@
 
 from typing import TYPE_CHECKING, List
 
-from docx.oxml.simpletypes import ST_OnOff, XsdString
+from docx.oxml.simpletypes import ST_OnOff, ST_String, XsdString
 from docx.oxml.text.run import CT_R
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OptionalAttribute,
-    RequiredAttribute,
     ZeroOrMore,
 )
 
@@ -22,7 +21,12 @@ class CT_Hyperlink(BaseOxmlElement):
 
     r_lst: List[CT_R]
 
-    rId = RequiredAttribute("r:id", XsdString)
+    rId: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "r:id", XsdString
+    )
+    anchor: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:anchor", ST_String
+    )
     history = OptionalAttribute("w:history", ST_OnOff, default=True)
 
     r = ZeroOrMore("w:r")
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index 6082a53d1..a8551c39b 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -34,9 +34,12 @@ def address(self) -> str:
 
         While commonly a web link like "https://google.com" the hyperlink address can
         take a variety of forms including "internal links" to bookmarked locations
-        within the document.
+        within the document. When this hyperlink is an internal "jump" to for example a
+        heading from the table-of-contents (TOC), the address is blank. The bookmark
+        reference (like "_Toc147925734") is stored in the `.fragment` property.
         """
-        return self._parent.part.rels[self._hyperlink.rId].target_ref
+        rId = self._hyperlink.rId
+        return self._parent.part.rels[rId].target_ref if rId else ""
 
     @property
     def contains_page_break(self) -> bool:
@@ -50,6 +53,30 @@ def contains_page_break(self) -> bool:
         """
         return bool(self._hyperlink.lastRenderedPageBreaks)
 
+    @property
+    def fragment(self) -> str:
+        """Reference like `#glossary` at end of URL that refers to a sub-resource.
+
+        Note that this value does not include the fragment-separator character ("#").
+
+        This value is known as a "named anchor" in an HTML context and "anchor" in the
+        MS API, but an "anchor" element (`<a>`) represents a full hyperlink in HTML so
+        we avoid confusion by using the more precise RFC 3986 naming "URI fragment".
+
+        These are also used to refer to bookmarks within the same document, in which
+        case the `.address` value with be blank ("") and this property will hold a
+        value like "_Toc147925734".
+
+        To reliably get an entire web URL you will need to concatenate this with the
+        `.address` value, separated by "#" when both are present. Consider using the
+        `.url` property for that purpose.
+
+        Word sometimes stores a fragment in this property (an XML attribute) and
+        sometimes with the address, depending on how the URL is inserted, so don't
+        depend on this field being empty to indicate no fragment is present.
+        """
+        return self._hyperlink.anchor or ""
+
     @property
     def runs(self) -> List[Run]:
         """List of |Run| instances in this hyperlink.
@@ -59,7 +86,7 @@ def runs(self) -> List[Run]:
         example part of the hyperlink is bold or the text was changed after the document
         was saved.
         """
-        return [Run(r, self) for r in self._hyperlink.r_lst]
+        return [Run(r, self._parent) for r in self._hyperlink.r_lst]
 
     @property
     def text(self) -> str:
@@ -70,3 +97,23 @@ def text(self) -> str:
         they are not reflected in this text.
         """
         return self._hyperlink.text
+
+    @property
+    def url(self) -> str:
+        """Convenience property to get web URLs from hyperlinks that contain them.
+
+        This value is the empty string ("") when there is no address portion, so its
+        boolean value can also be used to distinguish external URIs from internal "jump"
+        hyperlinks like those found in a table-of-contents.
+
+        Note that this value may also be a link to a file, so if you only want web-urls
+        you'll need to check for a protocol prefix like `https://`.
+
+        When both an address and fragment are present, the return value joins the two
+        separated by the fragment-separator hash ("#"). Otherwise this value is the same
+        as that of the `.address` property.
+        """
+        address, fragment = self.address, self.fragment
+        if not address:
+            return ""
+        return f"{address}#{fragment}" if fragment else address
diff --git a/tests/text/test_hyperlink.py b/tests/text/test_hyperlink.py
index 484196902..b954d3ea9 100644
--- a/tests/text/test_hyperlink.py
+++ b/tests/text/test_hyperlink.py
@@ -17,12 +17,21 @@
 class DescribeHyperlink:
     """Unit-test suite for the docx.text.hyperlink.Hyperlink object."""
 
-    def it_knows_the_hyperlink_URL(self, fake_parent: t.StoryChild):
-        cxml = 'w:hyperlink{r:id=rId6}/w:r/w:t"post"'
-        hlink = cast(CT_Hyperlink, element(cxml))
+    @pytest.mark.parametrize(
+        ("hlink_cxml", "expected_value"),
+        [
+            ('w:hyperlink{r:id=rId6}/w:r/w:t"post"', "https://google.com/"),
+            ("w:hyperlink{w:anchor=_Toc147925734}", ""),
+            ("w:hyperlink", ""),
+        ],
+    )
+    def it_knows_the_hyperlink_address(
+        self, hlink_cxml: str, expected_value: str, fake_parent: t.StoryChild
+    ):
+        hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
 
-        assert hyperlink.address == "https://google.com/"
+        assert hyperlink.address == expected_value
 
     @pytest.mark.parametrize(
         ("hlink_cxml", "expected_value"),
@@ -42,6 +51,21 @@ def it_knows_whether_it_contains_a_page_break(
 
         assert hyperlink.contains_page_break is expected_value
 
+    @pytest.mark.parametrize(
+        ("hlink_cxml", "expected_value"),
+        [
+            ("w:hyperlink{r:id=rId6}", ""),
+            ("w:hyperlink{w:anchor=intro}", "intro"),
+        ],
+    )
+    def it_knows_the_link_fragment_when_there_is_one(
+        self, hlink_cxml: str, expected_value: str, fake_parent: t.StoryChild
+    ):
+        hlink = cast(CT_Hyperlink, element(hlink_cxml))
+        hyperlink = Hyperlink(hlink, fake_parent)
+
+        assert hyperlink.fragment == expected_value
+
     @pytest.mark.parametrize(
         ("hlink_cxml", "count"),
         [
@@ -85,6 +109,26 @@ def it_knows_the_visible_text_of_the_link(
 
         assert text == expected_text
 
+    @pytest.mark.parametrize(
+        ("hlink_cxml", "expected_value"),
+        [
+            ("w:hyperlink", ""),
+            ("w:hyperlink{w:anchor=_Toc147925734}", ""),
+            ('w:hyperlink{r:id=rId6}/w:r/w:t"post"', "https://google.com/"),
+            (
+                'w:hyperlink{r:id=rId6,w:anchor=foo}/w:r/w:t"post"',
+                "https://google.com/#foo",
+            ),
+        ],
+    )
+    def it_knows_the_full_url_for_web_addresses(
+        self, hlink_cxml: str, expected_value: str, fake_parent: t.StoryChild
+    ):
+        hlink = cast(CT_Hyperlink, element(hlink_cxml))
+        hyperlink = Hyperlink(hlink, fake_parent)
+
+        assert hyperlink.url == expected_value
+
     # -- fixtures --------------------------------------------------------------------
 
     @pytest.fixture

From b56f51616d61f85ff5e512006c398d77965f9715 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 12 Oct 2023 16:00:56 -0700
Subject: [PATCH 296/367] rfctr: improve typing

---
 src/docx/__init__.py | 22 +++++++++++++++++++---
 src/docx/opc/part.py | 21 ++++++++++++++-------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index f6f7b5b5a..89c66bfe4 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -1,9 +1,25 @@
-from docx.api import Document  # noqa
+"""Initialize `docx` package.
+
+Export the `Document` constructor function and establish the mapping of part-type to
+the part-classe that implements that type.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Type
+
+from docx.api import Document
+
+if TYPE_CHECKING:
+    from docx.opc.part import Part
 
 __version__ = "1.0.0"
 
 
-# register custom Part classes with opc package reader
+__all__ = ["Document"]
+
+
+# -- register custom Part classes with opc package reader --
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
@@ -17,7 +33,7 @@
 from docx.parts.styles import StylesPart
 
 
-def part_class_selector(content_type, reltype):
+def part_class_selector(content_type: str, reltype: str) -> Type[Part] | None:
     if reltype == RT.IMAGE:
         return ImagePart
     return None
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index ad9abf7c9..a4ad3e7b2 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Callable, Dict, Type
 
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
@@ -78,7 +78,7 @@ def drop_rel(self, rId: str):
             del self.rels[rId]
 
     @classmethod
-    def load(cls, partname, content_type, blob, package):
+    def load(cls, partname: str, content_type: str, blob: bytes, package: Package):
         return cls(partname, content_type, blob, package)
 
     def load_rel(self, reltype, target, rId, is_external=False):
@@ -167,12 +167,19 @@ class PartFactory:
     the part, which is by default ``opc.package.Part``.
     """
 
-    part_class_selector = None
-    part_type_for = {}
+    part_class_selector: Callable[[str, str], Type[Part] | None] | None
+    part_type_for: Dict[str, Type[Part]] = {}
     default_part_type = Part
 
-    def __new__(cls, partname, content_type, reltype, blob, package):
-        PartClass = None
+    def __new__(
+        cls,
+        partname: str,
+        content_type: str,
+        reltype: str,
+        blob: bytes,
+        package: Package,
+    ):
+        PartClass: Type[Part] | None = None
         if cls.part_class_selector is not None:
             part_class_selector = cls_method_fn(cls, "part_class_selector")
             PartClass = part_class_selector(content_type, reltype)
@@ -181,7 +188,7 @@ def __new__(cls, partname, content_type, reltype, blob, package):
         return PartClass.load(partname, content_type, blob, package)
 
     @classmethod
-    def _part_cls_for(cls, content_type):
+    def _part_cls_for(cls, content_type: str):
         """Return the custom part class registered for `content_type`, or the default
         part class if no custom class is registered for `content_type`."""
         if content_type in cls.part_type_for:

From 8e05650be5da0820a6591698e675164fe70d50a8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 12 Oct 2023 15:56:57 -0700
Subject: [PATCH 297/367] release: prepare v1.0.1 release

---
 HISTORY.rst          | 35 +++++++++++++++++++++--------------
 src/docx/__init__.py |  2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index e6c5bd333..d57bf5696 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,24 +3,31 @@
 Release History
 ---------------
 
+1.0.1 (2023-10-12)
+++++++++++++++++++
+
+- Fix #1256: parse_xml() and OxmlElement moved.
+- Add Hyperlink.fragment and .url
+
+
 1.0.0 (2023-10-01)
 +++++++++++++++++++
 
 - Remove Python 2 support. Supported versions are 3.7+
-* Fix #85:   Paragraph.text includes hyperlink text
-* Add #1113: Hyperlink.address
-* Add Hyperlink.contains_page_break
-* Add Hyperlink.runs
-* Add Hyperlink.text
-* Add Paragraph.contains_page_break
-* Add Paragraph.hyperlinks
-* Add Paragraph.iter_inner_content()
-* Add Paragraph.rendered_page_breaks
-* Add RenderedPageBreak.following_paragraph_fragment
-* Add RenderedPageBreak.preceding_paragraph_fragment
-* Add Run.contains_page_break
-* Add Run.iter_inner_content()
-* Add Section.iter_inner_content()
+- Fix #85:   Paragraph.text includes hyperlink text
+- Add #1113: Hyperlink.address
+- Add Hyperlink.contains_page_break
+- Add Hyperlink.runs
+- Add Hyperlink.text
+- Add Paragraph.contains_page_break
+- Add Paragraph.hyperlinks
+- Add Paragraph.iter_inner_content()
+- Add Paragraph.rendered_page_breaks
+- Add RenderedPageBreak.following_paragraph_fragment
+- Add RenderedPageBreak.preceding_paragraph_fragment
+- Add Run.contains_page_break
+- Add Run.iter_inner_content()
+- Add Section.iter_inner_content()
 
 
 0.8.11 (2021-05-15)
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index 89c66bfe4..a518501a5 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -13,7 +13,7 @@
 if TYPE_CHECKING:
     from docx.opc.part import Part
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 
 
 __all__ = ["Document"]

From e45fd78a04cf91a9f90ac33b8a3f4d9432483f12 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 13 Oct 2023 09:18:17 -0400
Subject: [PATCH 298/367] fix: add build-backend in pyproject.toml

This defaults to the right value on most platforms but must be explicit
on Fedora.
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index dc9884a9b..74149e24d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
 requires = ["setuptools>=61.0.0"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-docx"

From 8995a40d58013962b2662ff70b325ba24c704faa Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 13 Oct 2023 09:40:57 -0400
Subject: [PATCH 299/367] fix: include requirements files in PyPI sdist

These are needed to run tests via tox.ini.
---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index c75168672..b2d3fadcf 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include HISTORY.rst LICENSE README.rst tox.ini
+include requirements*.txt
 graft src/docx/templates
 graft features
 graft tests

From e441969102a9ddfbf04dc7b2f8e374239207a9d8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 2 Nov 2023 22:35:35 -0700
Subject: [PATCH 300/367] dev: set looponfailroots and filterwarnings

- Avoid rerunning tests when in "-f" follow mode every time Neovim
  updates the session file.
- Suppress warnings related to "-f" flag deprecation but make all other
  warnings into errors.
---
 pyproject.toml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 74149e24d..d35c790c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,6 +42,17 @@ Repository = "https://github.com/python-openxml/python-docx"
 target-version = ["py37", "py38", "py39", "py310", "py311"]
 
 [tool.pytest.ini_options]
+filterwarnings = [
+    # -- exit on any warning not explicitly ignored here --
+    "error",
+
+    # -- pytest-xdist plugin may warn about `looponfailroots` deprecation --
+    "ignore::DeprecationWarning:xdist",
+
+    # -- pytest complains when pytest-xdist is not installed --
+    "ignore:Unknown config option. looponfailroots:pytest.PytestConfigWarning",
+]
+looponfailroots = ["src", "tests"]
 norecursedirs = [
     "doc",
     "docx",

From a1c6b4f183f8801666bd0c9cbbeb12bf0d88bd6f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 2 Nov 2023 14:56:34 -0700
Subject: [PATCH 301/367] xml: BaseOxmlElement subclasses etree.ElementBase

BaseOxmlElement inherits fine from `etree.ElementBase`, it's just the
lxml stubs that says it doesn't, so ignore that error and we've got full
access to `lxml` methods and properties on all `BaseOxmlElement`
instances.
---
 src/docx/oxml/xmlchemy.py | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 2ea985abc..80c8c0e4a 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Tuple, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Dict, Tuple, Type, TypeVar
 
 from lxml import etree
 from lxml.etree import ElementBase
@@ -91,12 +91,6 @@ def _parse_line(cls, line):
 class MetaOxmlElement(type):
     """Metaclass for BaseOxmlElement."""
 
-    def __new__(
-        cls: Type[_T], clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]
-    ) -> _T:
-        bases = (*bases, etree.ElementBase)
-        return super().__new__(cls, clsname, bases, namespace)
-
     def __init__(cls, clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]):
         dispatchable = (
             OneAndOnlyOne,
@@ -647,25 +641,15 @@ def _remove_choice_group_method_name(self):
         return "_remove_%s" % self._prop_name
 
 
-class BaseOxmlElement(metaclass=MetaOxmlElement):
+# -- lxml typing isn't quite right here, just ignore this error on _Element --
+class BaseOxmlElement(  # pyright: ignore[reportGeneralTypeIssues]
+    etree.ElementBase, metaclass=MetaOxmlElement
+):
     """Effective base class for all custom element classes.
 
     Adds standardized behavior to all classes in one place.
     """
 
-    addprevious: Callable[[BaseOxmlElement], None]
-    attrib: Dict[str, str]
-    append: Callable[[BaseOxmlElement], None]
-    find: Callable[[str], ElementBase | None]
-    findall: Callable[[str], List[ElementBase]]
-    get: Callable[[str], str | None]
-    getparent: Callable[[], BaseOxmlElement]
-    insert: Callable[[int, BaseOxmlElement], None]
-    remove: Callable[[BaseOxmlElement], None]
-    set: Callable[[str, str], None]
-    tag: str
-    text: str | None
-
     def __repr__(self):
         return "<%s '<%s>' at 0x%0x>" % (
             self.__class__.__name__,

From 523328cd78e1a0c8b35d75a26747251c9bb3e45a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 2 Nov 2023 22:29:03 -0700
Subject: [PATCH 302/367] rfctr: improve xmlchemy typing

---
 src/docx/enum/base.py        |   4 +-
 src/docx/oxml/simpletypes.py |  93 ++++++++++++--------
 src/docx/oxml/xmlchemy.py    | 164 ++++++++++++++++++++++-------------
 src/docx/shared.py           |  24 +++--
 4 files changed, 180 insertions(+), 105 deletions(-)

diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index 4c20af644..e37e74299 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -67,7 +67,9 @@ def from_xml(cls, xml_value: str | None) -> Self:
     @classmethod
     def to_xml(cls: Type[_T], value: int | _T | None) -> str | None:
         """XML value of this enum member, generally an XML attribute value."""
-        return cls(value).xml_value
+        # -- presence of multi-arg `__new__()` method fools type-checker, but getting a
+        # -- member by its value using EnumCls(val) works as usual.
+        return cls(value).xml_value  # pyright: ignore[reportGeneralTypeIssues]
 
 
 class DocsPageFormatter:
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index 4e8d91cba..debb5dc3c 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -1,3 +1,5 @@
+# pyright: reportImportCycles=false
+
 """Simple-type classes, corresponding to ST_* schema items.
 
 These provide validation and format translation for values stored in XML element
@@ -7,13 +9,12 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Tuple
 
 from docx.exceptions import InvalidXmlError
 from docx.shared import Emu, Pt, RGBColor, Twips
 
 if TYPE_CHECKING:
-    from docx import types as t
     from docx.shared import Length
 
 
@@ -21,26 +22,36 @@ class BaseSimpleType:
     """Base class for simple-types."""
 
     @classmethod
-    def from_xml(cls, xml_value: str):
+    def from_xml(cls, xml_value: str) -> Any:
         return cls.convert_from_xml(xml_value)
 
     @classmethod
-    def to_xml(cls, value):
+    def to_xml(cls, value: Any) -> str:
         cls.validate(value)
         str_value = cls.convert_to_xml(value)
         return str_value
 
     @classmethod
-    def convert_from_xml(cls, str_value: str) -> t.AbstractSimpleTypeMember:
+    def convert_from_xml(cls, str_value: str) -> Any:
         return int(str_value)
 
     @classmethod
-    def validate_int(cls, value):
+    def convert_to_xml(cls, value: Any) -> str:
+        ...
+
+    @classmethod
+    def validate(cls, value: Any) -> None:
+        ...
+
+    @classmethod
+    def validate_int(cls, value: object):
         if not isinstance(value, int):
             raise TypeError("value must be <type 'int'>, got %s" % type(value))
 
     @classmethod
-    def validate_int_in_range(cls, value, min_inclusive, max_inclusive):
+    def validate_int_in_range(
+        cls, value: int, min_inclusive: int, max_inclusive: int
+    ) -> None:
         cls.validate_int(value)
         if value < min_inclusive or value > max_inclusive:
             raise ValueError(
@@ -57,15 +68,15 @@ def validate_string(cls, value: Any) -> str:
 
 class BaseIntType(BaseSimpleType):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> int:
         return int(str_value)
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(cls, value: int) -> str:
         return str(value)
 
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int(value)
 
 
@@ -84,22 +95,26 @@ def validate(cls, value: str):
 
 
 class BaseStringEnumerationType(BaseStringType):
+    _members: Tuple[str, ...]
+
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_string(value)
         if value not in cls._members:
             raise ValueError("must be one of %s, got '%s'" % (cls._members, value))
 
 
 class XsdAnyUri(BaseStringType):
-    """There's a regular expression this is supposed to meet but so far thinking
-    spending cycles on validating wouldn't be worth it for the number of programming
-    errors it would catch."""
+    """There's a regex in the spec this is supposed to meet...
+
+    but current assessment is that spending cycles on validating wouldn't be worth it
+    for the number of programming errors it would catch.
+    """
 
 
 class XsdBoolean(BaseSimpleType):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> bool:
         if str_value not in ("1", "0", "true", "false"):
             raise InvalidXmlError(
                 "value must be one of '1', '0', 'true' or 'false', got '%s'" % str_value
@@ -107,11 +122,11 @@ def convert_from_xml(cls, str_value):
         return str_value in ("1", "true")
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(cls, value: bool) -> str:
         return {True: "1", False: "0"}[value]
 
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         if value not in (True, False):
             raise TypeError(
                 "only True or False (and possibly None) may be assigned, got"
@@ -130,13 +145,13 @@ class XsdId(BaseStringType):
 
 class XsdInt(BaseIntType):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, -2147483648, 2147483647)
 
 
 class XsdLong(BaseIntType):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, -9223372036854775808, 9223372036854775807)
 
 
@@ -157,13 +172,13 @@ class XsdToken(BaseStringType):
 
 class XsdUnsignedInt(BaseIntType):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, 0, 4294967295)
 
 
 class XsdUnsignedLong(BaseIntType):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, 0, 18446744073709551615)
 
 
@@ -178,7 +193,7 @@ def validate(cls, value: str) -> None:
 
 class ST_BrType(XsdString):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_string(value)
         valid_values = ("page", "column", "textWrapping")
         if value not in valid_values:
@@ -187,19 +202,19 @@ def validate(cls, value):
 
 class ST_Coordinate(BaseIntType):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> Length:
         if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Emu(int(str_value))
 
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         ST_CoordinateUnqualified.validate(value)
 
 
 class ST_CoordinateUnqualified(XsdLong):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, -27273042329600, 27273042316900)
 
 
@@ -213,19 +228,23 @@ class ST_DrawingElementId(XsdUnsignedInt):
 
 class ST_HexColor(BaseStringType):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(  # pyright: ignore[reportIncompatibleMethodOverride]
+        cls, str_value: str
+    ) -> RGBColor | str:
         if str_value == "auto":
             return ST_HexColorAuto.AUTO
         return RGBColor.from_string(str_value)
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(  # pyright: ignore[reportIncompatibleMethodOverride]
+        cls, value: RGBColor
+    ) -> str:
         """Keep alpha hex numerals all uppercase just for consistency."""
         # expecting 3-tuple of ints in range 0-255
         return "%02X%02X%02X" % value
 
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         # must be an RGBColor object ---
         if not isinstance(value, RGBColor):
             raise ValueError(
@@ -269,7 +288,7 @@ class ST_Merge(XsdStringEnumeration):
 
 class ST_OnOff(XsdBoolean):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> bool:
         if str_value not in ("1", "0", "true", "false", "on", "off"):
             raise InvalidXmlError(
                 "value must be one of '1', '0', 'true', 'false', 'on', or 'o"
@@ -280,11 +299,11 @@ def convert_from_xml(cls, str_value):
 
 class ST_PositiveCoordinate(XsdLong):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> Length:
         return Emu(int(str_value))
 
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, 0, 27273042316900)
 
 
@@ -294,13 +313,13 @@ class ST_RelationshipId(XsdString):
 
 class ST_SignedTwipsMeasure(XsdInt):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> Length:
         if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Twips(int(str_value))
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(cls, value: int | Length) -> str:
         emu = Emu(value)
         twips = emu.twips
         return str(twips)
@@ -312,7 +331,7 @@ class ST_String(XsdString):
 
 class ST_TblLayoutType(XsdString):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_string(value)
         valid_values = ("fixed", "autofit")
         if value not in valid_values:
@@ -321,7 +340,7 @@ def validate(cls, value):
 
 class ST_TblWidth(XsdString):
     @classmethod
-    def validate(cls, value):
+    def validate(cls, value: Any) -> None:
         cls.validate_string(value)
         valid_values = ("auto", "dxa", "nil", "pct")
         if value not in valid_values:
@@ -330,13 +349,13 @@ def validate(cls, value):
 
 class ST_TwipsMeasure(XsdUnsignedLong):
     @classmethod
-    def convert_from_xml(cls, str_value):
+    def convert_from_xml(cls, str_value: str) -> Length:
         if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
         return Twips(int(str_value))
 
     @classmethod
-    def convert_to_xml(cls, value):
+    def convert_to_xml(cls, value: int | Length) -> str:
         emu = Emu(value)
         twips = emu.twips
         return str(twips)
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 80c8c0e4a..d075f88f1 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -1,24 +1,35 @@
+# pyright: reportImportCycles=false
+
 """Enabling declarative definition of lxml custom element classes."""
 
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Callable, Dict, Tuple, Type, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    List,
+    Sequence,
+    Tuple,
+    Type,
+    TypeVar,
+)
 
 from lxml import etree
-from lxml.etree import ElementBase
+from lxml.etree import ElementBase, _Element  # pyright: ignore[reportPrivateUsage]
 
 from docx.oxml.exceptions import InvalidXmlError
 from docx.oxml.ns import NamespacePrefixedTag, nsmap, qn
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
-    from docx import types as t
     from docx.enum.base import BaseXmlEnum
     from docx.oxml.simpletypes import BaseSimpleType
 
 
-def serialize_for_reading(element):
+def serialize_for_reading(element: ElementBase):
     """Serialize `element` to human-readable XML suitable for tests.
 
     No XML declaration.
@@ -39,7 +50,9 @@ class XmlString(str):
 
     _xml_elm_line_patt = re.compile(r"( *</?[\w:]+)(.*?)(/?>)([^<]*</[\w:]+>)?$")
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, str):
+            return False
         lines = self.splitlines()
         lines_other = other.splitlines()
         if len(lines) != len(lines_other):
@@ -49,10 +62,10 @@ def __eq__(self, other):
                 return False
         return True
 
-    def __ne__(self, other):
+    def __ne__(self, other: object) -> bool:
         return not self.__eq__(other)
 
-    def _attr_seq(self, attrs):
+    def _attr_seq(self, attrs: str) -> List[str]:
         """Return a sequence of attribute strings parsed from `attrs`.
 
         Each attribute string is stripped of whitespace on both ends.
@@ -61,7 +74,7 @@ def _attr_seq(self, attrs):
         attr_lst = attrs.split()
         return sorted(attr_lst)
 
-    def _eq_elm_strs(self, line, line_2):
+    def _eq_elm_strs(self, line: str, line_2: str):
         """Return True if the element in `line_2` is XML equivalent to the element in
         `line`."""
         front, attrs, close, text = self._parse_line(line)
@@ -77,10 +90,11 @@ def _eq_elm_strs(self, line, line_2):
         return True
 
     @classmethod
-    def _parse_line(cls, line):
-        """Return front, attrs, close, text 4-tuple result of parsing XML element string
-        `line`."""
+    def _parse_line(cls, line: str) -> Tuple[str, str, str, str]:
+        """(front, attrs, close, text) 4-tuple result of parsing XML element `line`."""
         match = cls._xml_elm_line_patt.match(line)
+        if match is None:
+            return "", "", "", ""
         front, attrs, close, text = [match.group(n) for n in range(1, 5)]
         return front, attrs, close, text
 
@@ -120,7 +134,7 @@ def __init__(
         self._simple_type = simple_type
 
     def populate_class_members(
-        self, element_cls: Type[BaseOxmlElement], prop_name: str
+        self, element_cls: MetaOxmlElement, prop_name: str
     ) -> None:
         """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
@@ -129,11 +143,13 @@ def populate_class_members(
         self._add_attr_property()
 
     def _add_attr_property(self):
-        """Add a read/write ``{prop_name}`` property to the element class that returns
-        the interpreted value of this attribute on access and changes the attribute
-        value to its ST_* counterpart on assignment."""
+        """Add a read/write `.{prop_name}` property to the element class.
+
+        The property returns the interpreted value of this attribute on access and
+        changes the attribute value to its ST_* counterpart on assignment.
+        """
         property_ = property(self._getter, self._setter, None)
-        # assign unconditionally to overwrite element name definition
+        # -- assign unconditionally to overwrite element name definition --
         setattr(self._element_cls, self._prop_name, property_)
 
     @property
@@ -143,13 +159,13 @@ def _clark_name(self):
         return self._attr_name
 
     @property
-    def _getter(self) -> Callable[[BaseOxmlElement], t.AbstractSimpleTypeMember]:
+    def _getter(self) -> Callable[[BaseOxmlElement], Any | None]:
         ...
 
     @property
     def _setter(
         self,
-    ) -> Callable[[BaseOxmlElement, t.AbstractSimpleTypeMember | None], None]:
+    ) -> Callable[[BaseOxmlElement, Any | None], None]:
         ...
 
 
@@ -183,12 +199,12 @@ def _docstring(self):
     @property
     def _getter(
         self,
-    ) -> Callable[[BaseOxmlElement], str | bool | t.AbstractSimpleTypeMember]:
+    ) -> Callable[[BaseOxmlElement], Any | None]:
         """Function suitable for `__get__()` method on attribute property descriptor."""
 
         def get_attr_value(
             obj: BaseOxmlElement,
-        ) -> str | bool | t.AbstractSimpleTypeMember:
+        ) -> Any | None:
             attr_str_value = obj.get(self._clark_name)
             if attr_str_value is None:
                 return self._default
@@ -198,17 +214,19 @@ def get_attr_value(
         return get_attr_value
 
     @property
-    def _setter(self) -> Callable[[BaseOxmlElement, t.AbstractSimpleTypeMember], None]:
+    def _setter(self) -> Callable[[BaseOxmlElement, Any], None]:
         """Function suitable for `__set__()` method on attribute property descriptor."""
 
-        def set_attr_value(
-            obj: BaseOxmlElement, value: t.AbstractSimpleTypeMember | None
-        ):
+        def set_attr_value(obj: BaseOxmlElement, value: Any | None):
             if value is None or value == self._default:
                 if self._clark_name in obj.attrib:
                     del obj.attrib[self._clark_name]
                 return
             str_value = self._simple_type.to_xml(value)
+            if str_value is None:
+                if self._clark_name in obj.attrib:
+                    del obj.attrib[self._clark_name]
+                return
             obj.set(self._clark_name, str_value)
 
         return set_attr_value
@@ -234,11 +252,10 @@ def _docstring(self):
         )
 
     @property
-    def _getter(self):
-        """Return a function object suitable for the "get" side of the attribute
-        property descriptor."""
+    def _getter(self) -> Callable[[BaseOxmlElement], Any]:
+        """function object suitable for "get" side of attr property descriptor."""
 
-        def get_attr_value(obj):
+        def get_attr_value(obj: BaseOxmlElement) -> Any | None:
             attr_str_value = obj.get(self._clark_name)
             if attr_str_value is None:
                 raise InvalidXmlError(
@@ -251,27 +268,33 @@ def get_attr_value(obj):
         return get_attr_value
 
     @property
-    def _setter(self):
-        """Return a function object suitable for the "set" side of the attribute
-        property descriptor."""
+    def _setter(self) -> Callable[[BaseOxmlElement, Any], None]:
+        """function object suitable for "set" side of attribute property descriptor."""
 
-        def set_attr_value(obj, value):
+        def set_attr_value(obj: BaseOxmlElement, value: Any):
             str_value = self._simple_type.to_xml(value)
+            if str_value is None:
+                raise ValueError(f"cannot assign {value} to this required attribute")
             obj.set(self._clark_name, str_value)
 
         return set_attr_value
 
 
 class _BaseChildElement:
-    """Base class for the child element classes corresponding to varying cardinalities,
-    such as ZeroOrOne and ZeroOrMore."""
+    """Base class for the child-element classes.
 
-    def __init__(self, nsptagname, successors=()):
+    The child-element sub-classes correspond to varying cardinalities, such as ZeroOrOne
+    and ZeroOrMore.
+    """
+
+    def __init__(self, nsptagname: str, successors: Tuple[str, ...] = ()):
         super(_BaseChildElement, self).__init__()
         self._nsptagname = nsptagname
         self._successors = successors
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: MetaOxmlElement, prop_name: str
+    ) -> None:
         """Baseline behavior for adding the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._prop_name = prop_name
@@ -279,7 +302,7 @@ def populate_class_members(self, element_cls, prop_name):
     def _add_adder(self):
         """Add an ``_add_x()`` method to the element class for this child element."""
 
-        def _add_child(obj, **attrs):
+        def _add_child(obj: BaseOxmlElement, **attrs: Any):
             new_method = getattr(obj, self._new_method_name)
             child = new_method()
             for key, value in attrs.items():
@@ -308,13 +331,13 @@ def _add_getter(self):
         """Add a read-only ``{prop_name}`` property to the element class for this child
         element."""
         property_ = property(self._getter, None, None)
-        # assign unconditionally to overwrite element name definition
+        # -- assign unconditionally to overwrite element name definition --
         setattr(self._element_cls, self._prop_name, property_)
 
     def _add_inserter(self):
         """Add an ``_insert_x()`` method to the element class for this child element."""
 
-        def _insert_child(obj, child):
+        def _insert_child(obj: BaseOxmlElement, child: BaseOxmlElement):
             obj.insert_element_before(child, *self._successors)
             return child
 
@@ -338,7 +361,7 @@ def _add_method_name(self):
     def _add_public_adder(self):
         """Add a public ``add_x()`` method to the parent element class."""
 
-        def add_child(obj):
+        def add_child(obj: BaseOxmlElement):
             private_add_method = getattr(obj, self._add_method_name)
             child = private_add_method()
             return child
@@ -349,7 +372,7 @@ def add_child(obj):
         )
         self._add_to_class(self._public_add_method_name, add_child)
 
-    def _add_to_class(self, name, method):
+    def _add_to_class(self, name: str, method: Callable[..., Any]):
         """Add `method` to the target class as `name`, unless `name` is already defined
         on the class."""
         if hasattr(self._element_cls, name):
@@ -357,11 +380,11 @@ def _add_to_class(self, name, method):
         setattr(self._element_cls, name, method)
 
     @property
-    def _creator(self):
+    def _creator(self) -> Callable[[BaseOxmlElement], BaseOxmlElement]:
         """Callable that creates an empty element of the right type, with no attrs."""
         from docx.oxml.parser import OxmlElement
 
-        def new_child_element(obj):
+        def new_child_element(obj: BaseOxmlElement):
             return OxmlElement(self._nsptagname)
 
         return new_child_element
@@ -375,7 +398,7 @@ def _getter(self):
         if not present.
         """
 
-        def get_child_element(obj):
+        def get_child_element(obj: BaseOxmlElement):
             return obj.find(qn(self._nsptagname))
 
         get_child_element.__doc__ = (
@@ -392,7 +415,7 @@ def _list_getter(self):
         """Return a function object suitable for the "get" side of a list property
         descriptor."""
 
-        def get_child_element_list(obj):
+        def get_child_element_list(obj: BaseOxmlElement):
             return obj.findall(qn(self._nsptagname))
 
         get_child_element_list.__doc__ = (
@@ -428,7 +451,12 @@ class Choice(_BaseChildElement):
     def nsptagname(self):
         return self._nsptagname
 
-    def populate_class_members(self, element_cls, group_prop_name, successors):
+    def populate_class_members(  # pyright: ignore[reportIncompatibleMethodOverride]
+        self,
+        element_cls: MetaOxmlElement,
+        group_prop_name: str,
+        successors: Tuple[str, ...],
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._group_prop_name = group_prop_name
@@ -444,7 +472,7 @@ def _add_get_or_change_to_method(self):
         """Add a ``get_or_change_to_x()`` method to the element class for this child
         element."""
 
-        def get_or_change_to_child(obj):
+        def get_or_change_to_child(obj: BaseOxmlElement):
             child = getattr(obj, self._prop_name)
             if child is not None:
                 return child
@@ -477,10 +505,12 @@ def _remove_group_method_name(self):
 class OneAndOnlyOne(_BaseChildElement):
     """Defines a required child element for MetaOxmlElement."""
 
-    def __init__(self, nsptagname):
-        super(OneAndOnlyOne, self).__init__(nsptagname, None)
+    def __init__(self, nsptagname: str):
+        super(OneAndOnlyOne, self).__init__(nsptagname, ())
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: MetaOxmlElement, prop_name: str
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(OneAndOnlyOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
@@ -490,7 +520,7 @@ def _getter(self):
         """Return a function object suitable for the "get" side of the property
         descriptor."""
 
-        def get_child_element(obj):
+        def get_child_element(obj: BaseOxmlElement):
             child = obj.find(qn(self._nsptagname))
             if child is None:
                 raise InvalidXmlError(
@@ -508,7 +538,9 @@ class OneOrMore(_BaseChildElement):
     """Defines a repeating child element for MetaOxmlElement that must appear at least
     once."""
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: MetaOxmlElement, prop_name: str
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(OneOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
@@ -522,7 +554,9 @@ def populate_class_members(self, element_cls, prop_name):
 class ZeroOrMore(_BaseChildElement):
     """Defines an optional repeating child element for MetaOxmlElement."""
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: MetaOxmlElement, prop_name: str
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(ZeroOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
@@ -536,7 +570,9 @@ def populate_class_members(self, element_cls, prop_name):
 class ZeroOrOne(_BaseChildElement):
     """Defines an optional child element for MetaOxmlElement."""
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: MetaOxmlElement, prop_name: str
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(ZeroOrOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
@@ -550,7 +586,7 @@ def _add_get_or_adder(self):
         """Add a ``get_or_add_x()`` method to the element class for this child
         element."""
 
-        def get_or_add_child(obj):
+        def get_or_add_child(obj: BaseOxmlElement):
             child = getattr(obj, self._prop_name)
             if child is None:
                 add_method = getattr(obj, self._add_method_name)
@@ -565,7 +601,7 @@ def get_or_add_child(obj):
     def _add_remover(self):
         """Add a ``_remove_x()`` method to the element class for this child element."""
 
-        def _remove_child(obj):
+        def _remove_child(obj: BaseOxmlElement):
             obj.remove_all(self._nsptagname)
 
         _remove_child.__doc__ = (
@@ -582,11 +618,13 @@ class ZeroOrOneChoice(_BaseChildElement):
     """Correspondes to an ``EG_*`` element group where at most one of its members may
     appear as a child."""
 
-    def __init__(self, choices, successors=()):
+    def __init__(self, choices: Sequence[Choice], successors: Tuple[str, ...] = ()):
         self._choices = choices
         self._successors = successors
 
-    def populate_class_members(self, element_cls, prop_name):
+    def populate_class_members(
+        self, element_cls: MetaOxmlElement, prop_name: str
+    ) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(ZeroOrOneChoice, self).populate_class_members(element_cls, prop_name)
         self._add_choice_getter()
@@ -607,7 +645,7 @@ def _add_group_remover(self):
         """Add a ``_remove_eg_x()`` method to the element class for this choice
         group."""
 
-        def _remove_choice_group(obj):
+        def _remove_choice_group(obj: BaseOxmlElement):
             for tagname in self._member_nsptagnames:
                 obj.remove_all(tagname)
 
@@ -621,7 +659,7 @@ def _choice_getter(self):
         """Return a function object suitable for the "get" side of the property
         descriptor."""
 
-        def get_group_member_element(obj):
+        def get_group_member_element(obj: BaseOxmlElement):
             return obj.first_child_found_in(*self._member_nsptagnames)
 
         get_group_member_element.__doc__ = (
@@ -657,7 +695,7 @@ def __repr__(self):
             id(self),
         )
 
-    def first_child_found_in(self, *tagnames: str) -> ElementBase | None:
+    def first_child_found_in(self, *tagnames: str) -> _Element | None:
         """First child with tag in `tagnames`, or None if not found."""
         for tagname in tagnames:
             child = self.find(qn(tagname))
@@ -688,7 +726,9 @@ def xml(self) -> str:
         """
         return serialize_for_reading(self)
 
-    def xpath(self, xpath_str: str) -> Any:
+    def xpath(  # pyright: ignore[reportIncompatibleMethodOverride]
+        self, xpath_str: str
+    ) -> Any:
         """Override of `lxml` _Element.xpath() method.
 
         Provides standard Open XML namespace mapping (`nsmap`) in centralized location.
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 304fce4a4..0f91b9cdd 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -3,7 +3,17 @@
 from __future__ import annotations
 
 import functools
-from typing import TYPE_CHECKING, Any, Callable, Generic, Iterator, List, TypeVar, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Generic,
+    Iterator,
+    List,
+    Tuple,
+    TypeVar,
+    cast,
+)
 
 if TYPE_CHECKING:
     from docx.oxml.xmlchemy import BaseOxmlElement
@@ -109,13 +119,17 @@ def __new__(cls, twips):
         return Length.__new__(cls, emu)
 
 
-class RGBColor(tuple):
+class RGBColor(Tuple[int, int, int]):
     """Immutable value object defining a particular RGB color."""
 
-    def __new__(cls, r, g, b):
+    def __new__(cls, r: int, g: int, b: int):
         msg = "RGBColor() takes three integer values 0-255"
         for val in (r, g, b):
-            if not isinstance(val, int) or val < 0 or val > 255:
+            if (
+                not isinstance(val, int)  # pyright: ignore[reportUnnecessaryIsInstance]
+                or val < 0
+                or val > 255
+            ):
                 raise ValueError(msg)
         return super(RGBColor, cls).__new__(cls, (r, g, b))
 
@@ -127,7 +141,7 @@ def __str__(self):
         return "%02X%02X%02X" % self
 
     @classmethod
-    def from_string(cls, rgb_hex_str):
+    def from_string(cls, rgb_hex_str: str) -> RGBColor:
         """Return a new instance from an RGB color hex string like ``'3C2F80'``."""
         r = int(rgb_hex_str[:2], 16)
         g = int(rgb_hex_str[2:4], 16)

From b7f590391b8dda42c69bb0aa1dead7a476ffad08 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 2 Nov 2023 22:45:03 -0700
Subject: [PATCH 303/367] rfctr: resolve StoryChild conflation

We need one type for the base-class role and a different one for the
parameter-type role. The base-class is concrete, the parameter-type is
abstract.

Introduce `docx.types.ProvidesStoryPart` for the parameter-type role.
Add `ProvidesXmlPart` while we're at it for use by `ElementProxy`, which
probably needs a little more thought too.
---
 src/docx/drawing/__init__.py |  2 +-
 src/docx/text/hyperlink.py   |  2 +-
 src/docx/text/pagebreak.py   |  4 +++-
 src/docx/text/paragraph.py   |  3 ++-
 src/docx/text/run.py         |  3 ++-
 src/docx/types.py            | 23 ++++++++++++++++++++---
 tests/conftest.py            | 15 ++++++++++-----
 tests/text/test_hyperlink.py | 14 +++++++-------
 tests/text/test_pagebreak.py | 16 ++++++++--------
 tests/text/test_paragraph.py |  8 ++++----
 tests/text/test_run.py       |  2 +-
 11 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/src/docx/drawing/__init__.py b/src/docx/drawing/__init__.py
index 71bda0413..03c9c5ab8 100644
--- a/src/docx/drawing/__init__.py
+++ b/src/docx/drawing/__init__.py
@@ -10,7 +10,7 @@
 class Drawing(Parented):
     """Container for a DrawingML object."""
 
-    def __init__(self, drawing: CT_Drawing, parent: t.StoryChild):
+    def __init__(self, drawing: CT_Drawing, parent: t.ProvidesStoryPart):
         super().__init__(parent)
         self._parent = parent
         self._drawing = self._element = drawing
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index a8551c39b..705a97ee4 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -23,7 +23,7 @@ class Hyperlink(Parented):
     stored.
     """
 
-    def __init__(self, hyperlink: CT_Hyperlink, parent: t.StoryChild):
+    def __init__(self, hyperlink: CT_Hyperlink, parent: t.ProvidesStoryPart):
         super().__init__(parent)
         self._parent = parent
         self._hyperlink = self._element = hyperlink
diff --git a/src/docx/text/pagebreak.py b/src/docx/text/pagebreak.py
index f3c16bc5c..a5e68b5aa 100644
--- a/src/docx/text/pagebreak.py
+++ b/src/docx/text/pagebreak.py
@@ -36,7 +36,9 @@ class RenderedPageBreak(Parented):
     """
 
     def __init__(
-        self, lastRenderedPageBreak: CT_LastRenderedPageBreak, parent: t.StoryChild
+        self,
+        lastRenderedPageBreak: CT_LastRenderedPageBreak,
+        parent: t.ProvidesStoryPart,
     ):
         super().__init__(parent)
         self._element = lastRenderedPageBreak
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 2425f1d6e..fb1067c16 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -6,6 +6,7 @@
 
 from typing_extensions import Self
 
+from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
 from docx.oxml.text.paragraph import CT_P
@@ -21,7 +22,7 @@
 class Paragraph(StoryChild):
     """Proxy object wrapping a `<w:p>` element."""
 
-    def __init__(self, p: CT_P, parent: StoryChild):
+    def __init__(self, p: CT_P, parent: t.ProvidesStoryPart):
         super(Paragraph, self).__init__(parent)
         self._p = self._element = p
 
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index ec0e6c757..44c41c0fe 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -4,6 +4,7 @@
 
 from typing import IO, TYPE_CHECKING, Iterator, cast
 
+from docx import types as t
 from docx.drawing import Drawing
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK
@@ -30,7 +31,7 @@ class Run(StoryChild):
     the style hierarchy.
     """
 
-    def __init__(self, r: CT_R, parent: StoryChild):
+    def __init__(self, r: CT_R, parent: t.ProvidesStoryPart):
         super().__init__(parent)
         self._r = self._element = self.element = r
 
diff --git a/src/docx/types.py b/src/docx/types.py
index 6097f740c..00bc100a1 100644
--- a/src/docx/types.py
+++ b/src/docx/types.py
@@ -2,13 +2,17 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from typing_extensions import Protocol
 
-from docx.parts.story import StoryPart
+if TYPE_CHECKING:
+    from docx.opc.part import XmlPart
+    from docx.parts.story import StoryPart
 
 
-class StoryChild(Protocol):
-    """An object that can fulfill the `parent` role in a `Parented` class.
+class ProvidesStoryPart(Protocol):
+    """An object that provides access to the StoryPart.
 
     This type is for objects that have a story part like document or header as their
     root part.
@@ -17,3 +21,16 @@ class StoryChild(Protocol):
     @property
     def part(self) -> StoryPart:
         ...
+
+
+class ProvidesXmlPart(Protocol):
+    """An object that provides access to its XmlPart.
+
+    This type is for objects that need access to their part but it either isn't a
+    StoryPart or they don't care, possibly because they just need access to the package
+    or related parts.
+    """
+
+    @property
+    def part(self) -> XmlPart:
+        ...
diff --git a/tests/conftest.py b/tests/conftest.py
index 6503efb3b..2abfcc969 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,16 +1,21 @@
 """pytest fixtures that are shared across test modules."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 import pytest
 
-from docx import types as t
-from docx.parts.story import StoryPart
+if TYPE_CHECKING:
+    from docx import types as t
+    from docx.parts.story import StoryPart
 
 
 @pytest.fixture
-def fake_parent() -> t.StoryChild:
-    class StoryChild:
+def fake_parent() -> t.ProvidesStoryPart:
+    class ProvidesStoryPart:
         @property
         def part(self) -> StoryPart:
             raise NotImplementedError
 
-    return StoryChild()
+    return ProvidesStoryPart()
diff --git a/tests/text/test_hyperlink.py b/tests/text/test_hyperlink.py
index b954d3ea9..0cb977156 100644
--- a/tests/text/test_hyperlink.py
+++ b/tests/text/test_hyperlink.py
@@ -26,7 +26,7 @@ class DescribeHyperlink:
         ],
     )
     def it_knows_the_hyperlink_address(
-        self, hlink_cxml: str, expected_value: str, fake_parent: t.StoryChild
+        self, hlink_cxml: str, expected_value: str, fake_parent: t.ProvidesStoryPart
     ):
         hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
@@ -44,7 +44,7 @@ def it_knows_the_hyperlink_address(
         ],
     )
     def it_knows_whether_it_contains_a_page_break(
-        self, hlink_cxml: str, expected_value: bool, fake_parent: t.StoryChild
+        self, hlink_cxml: str, expected_value: bool, fake_parent: t.ProvidesStoryPart
     ):
         hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
@@ -59,7 +59,7 @@ def it_knows_whether_it_contains_a_page_break(
         ],
     )
     def it_knows_the_link_fragment_when_there_is_one(
-        self, hlink_cxml: str, expected_value: str, fake_parent: t.StoryChild
+        self, hlink_cxml: str, expected_value: str, fake_parent: t.ProvidesStoryPart
     ):
         hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
@@ -78,7 +78,7 @@ def it_knows_the_link_fragment_when_there_is_one(
         ],
     )
     def it_provides_access_to_the_runs_it_contains(
-        self, hlink_cxml: str, count: int, fake_parent: t.StoryChild
+        self, hlink_cxml: str, count: int, fake_parent: t.ProvidesStoryPart
     ):
         hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
@@ -100,7 +100,7 @@ def it_provides_access_to_the_runs_it_contains(
         ],
     )
     def it_knows_the_visible_text_of_the_link(
-        self, hlink_cxml: str, expected_text: str, fake_parent: t.StoryChild
+        self, hlink_cxml: str, expected_text: str, fake_parent: t.ProvidesStoryPart
     ):
         hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
@@ -122,7 +122,7 @@ def it_knows_the_visible_text_of_the_link(
         ],
     )
     def it_knows_the_full_url_for_web_addresses(
-        self, hlink_cxml: str, expected_value: str, fake_parent: t.StoryChild
+        self, hlink_cxml: str, expected_value: str, fake_parent: t.ProvidesStoryPart
     ):
         hlink = cast(CT_Hyperlink, element(hlink_cxml))
         hyperlink = Hyperlink(hlink, fake_parent)
@@ -132,7 +132,7 @@ def it_knows_the_full_url_for_web_addresses(
     # -- fixtures --------------------------------------------------------------------
 
     @pytest.fixture
-    def fake_parent(self, story_part: Mock, rel: Mock) -> t.StoryChild:
+    def fake_parent(self, story_part: Mock, rel: Mock) -> t.ProvidesStoryPart:
         class StoryChild:
             @property
             def part(self) -> StoryPart:
diff --git a/tests/text/test_pagebreak.py b/tests/text/test_pagebreak.py
index 6bb770619..c7494dca2 100644
--- a/tests/text/test_pagebreak.py
+++ b/tests/text/test_pagebreak.py
@@ -17,7 +17,7 @@ class DescribeRenderedPageBreak:
     """Unit-test suite for the docx.text.pagebreak.RenderedPageBreak object."""
 
     def it_raises_on_preceding_fragment_when_page_break_is_not_first_in_paragrah(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         p_cxml = 'w:p/(w:r/(w:t"abc",w:lastRenderedPageBreak,w:lastRenderedPageBreak))'
         p = cast(CT_P, element(p_cxml))
@@ -28,7 +28,7 @@ def it_raises_on_preceding_fragment_when_page_break_is_not_first_in_paragrah(
             page_break.preceding_paragraph_fragment
 
     def it_produces_None_for_preceding_fragment_when_page_break_is_leading(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         """A page-break with no preceding content is "leading"."""
         p_cxml = 'w:p/(w:pPr/w:ind,w:r/(w:lastRenderedPageBreak,w:t"foo",w:t"bar"))'
@@ -41,7 +41,7 @@ def it_produces_None_for_preceding_fragment_when_page_break_is_leading(
         assert preceding_fragment is None
 
     def it_can_split_off_the_preceding_paragraph_content_when_in_a_run(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         p_cxml = (
             "w:p/("
@@ -61,7 +61,7 @@ def it_can_split_off_the_preceding_paragraph_content_when_in_a_run(
         assert preceding_fragment._p.xml == xml(expected_cxml)
 
     def and_it_can_split_off_the_preceding_paragraph_content_when_in_a_hyperlink(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         p_cxml = (
             "w:p/("
@@ -81,7 +81,7 @@ def and_it_can_split_off_the_preceding_paragraph_content_when_in_a_hyperlink(
         assert preceding_fragment._p.xml == xml(expected_cxml)
 
     def it_raises_on_following_fragment_when_page_break_is_not_first_in_paragrah(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         p_cxml = 'w:p/(w:r/(w:lastRenderedPageBreak,w:lastRenderedPageBreak,w:t"abc"))'
         p = cast(CT_P, element(p_cxml))
@@ -92,7 +92,7 @@ def it_raises_on_following_fragment_when_page_break_is_not_first_in_paragrah(
             page_break.following_paragraph_fragment
 
     def it_produces_None_for_following_fragment_when_page_break_is_trailing(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         """A page-break with no following content is "trailing"."""
         p_cxml = 'w:p/(w:pPr/w:ind,w:r/(w:t"foo",w:t"bar",w:lastRenderedPageBreak))'
@@ -105,7 +105,7 @@ def it_produces_None_for_following_fragment_when_page_break_is_trailing(
         assert following_fragment is None
 
     def it_can_split_off_the_following_paragraph_content_when_in_a_run(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         p_cxml = (
             "w:p/("
@@ -125,7 +125,7 @@ def it_can_split_off_the_following_paragraph_content_when_in_a_run(
         assert following_fragment._p.xml == xml(expected_cxml)
 
     def and_it_can_split_off_the_following_paragraph_content_when_in_a_hyperlink(
-        self, fake_parent: t.StoryChild
+        self, fake_parent: t.ProvidesStoryPart
     ):
         p_cxml = (
             "w:p/("
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index a5db30da8..c1451c3c1 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -31,7 +31,7 @@ class DescribeParagraph:
         ],
     )
     def it_knows_whether_it_contains_a_page_break(
-        self, p_cxml: str, expected_value: bool, fake_parent: t.StoryChild
+        self, p_cxml: str, expected_value: bool, fake_parent: t.ProvidesStoryPart
     ):
         p = cast(CT_P, element(p_cxml))
         paragraph = Paragraph(p, fake_parent)
@@ -50,7 +50,7 @@ def it_knows_whether_it_contains_a_page_break(
         ],
     )
     def it_provides_access_to_the_hyperlinks_it_contains(
-        self, p_cxml: str, count: int, fake_parent: t.StoryChild
+        self, p_cxml: str, count: int, fake_parent: t.ProvidesStoryPart
     ):
         p = cast(CT_P, element(p_cxml))
         paragraph = Paragraph(p, fake_parent)
@@ -72,7 +72,7 @@ def it_provides_access_to_the_hyperlinks_it_contains(
         ],
     )
     def it_can_iterate_its_inner_content_items(
-        self, p_cxml: str, expected: List[str], fake_parent: t.StoryChild
+        self, p_cxml: str, expected: List[str], fake_parent: t.ProvidesStoryPart
     ):
         p = cast(CT_P, element(p_cxml))
         paragraph = Paragraph(p, fake_parent)
@@ -120,7 +120,7 @@ def it_can_change_its_paragraph_style(self, style_set_fixture):
         ],
     )
     def it_provides_access_to_the_rendered_page_breaks_it_contains(
-        self, p_cxml: str, count: int, fake_parent: t.StoryChild
+        self, p_cxml: str, count: int, fake_parent: t.ProvidesStoryPart
     ):
         p = cast(CT_P, element(p_cxml))
         paragraph = Paragraph(p, fake_parent)
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 3d5e82cd9..772c5ad82 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -70,7 +70,7 @@ def it_knows_whether_it_contains_a_page_break(
         ],
     )
     def it_can_iterate_its_inner_content_items(
-        self, r_cxml: str, expected: List[str], fake_parent: t.StoryChild
+        self, r_cxml: str, expected: List[str], fake_parent: t.ProvidesStoryPart
     ):
         r = cast(CT_R, element(r_cxml))
         run = Run(r, fake_parent)

From cf178112cc3ed86db9154356552ee5ac1590c555 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 2 Nov 2023 22:13:07 -0700
Subject: [PATCH 304/367] rfctr: docx.shared type-checks strict

---
 src/docx/shared.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/docx/shared.py b/src/docx/shared.py
index 0f91b9cdd..7b696202f 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -16,6 +16,8 @@
 )
 
 if TYPE_CHECKING:
+    from docx import types as t
+    from docx.opc.part import XmlPart
     from docx.oxml.xmlchemy import BaseOxmlElement
     from docx.parts.story import StoryPart
 
@@ -34,7 +36,7 @@ class Length(int):
     _EMUS_PER_PT = 12700
     _EMUS_PER_TWIP = 635
 
-    def __new__(cls, emu):
+    def __new__(cls, emu: int):
         return int.__new__(cls, emu)
 
     @property
@@ -71,7 +73,7 @@ def twips(self):
 class Inches(Length):
     """Convenience constructor for length in inches, e.g. ``width = Inches(0.5)``."""
 
-    def __new__(cls, inches):
+    def __new__(cls, inches: float):
         emu = int(inches * Length._EMUS_PER_INCH)
         return Length.__new__(cls, emu)
 
@@ -79,7 +81,7 @@ def __new__(cls, inches):
 class Cm(Length):
     """Convenience constructor for length in centimeters, e.g. ``height = Cm(12)``."""
 
-    def __new__(cls, cm):
+    def __new__(cls, cm: float):
         emu = int(cm * Length._EMUS_PER_CM)
         return Length.__new__(cls, emu)
 
@@ -88,14 +90,14 @@ class Emu(Length):
     """Convenience constructor for length in English Metric Units, e.g. ``width =
     Emu(457200)``."""
 
-    def __new__(cls, emu):
+    def __new__(cls, emu: int):
         return Length.__new__(cls, int(emu))
 
 
 class Mm(Length):
     """Convenience constructor for length in millimeters, e.g. ``width = Mm(240.5)``."""
 
-    def __new__(cls, mm):
+    def __new__(cls, mm: float):
         emu = int(mm * Length._EMUS_PER_MM)
         return Length.__new__(cls, emu)
 
@@ -103,7 +105,7 @@ def __new__(cls, mm):
 class Pt(Length):
     """Convenience value class for specifying a length in points."""
 
-    def __new__(cls, points):
+    def __new__(cls, points: float):
         emu = int(points * Length._EMUS_PER_PT)
         return Length.__new__(cls, emu)
 
@@ -114,7 +116,7 @@ class Twips(Length):
     A twip is a twentieth of a point, 635 EMU.
     """
 
-    def __new__(cls, twips):
+    def __new__(cls, twips: float):
         emu = int(twips * Length._EMUS_PER_TWIP)
         return Length.__new__(cls, emu)
 
@@ -263,7 +265,7 @@ def __set__(self, obj: Any, value: Any) -> None:
         raise AttributeError("can't set attribute")
 
 
-def write_only_property(f):
+def write_only_property(f: Callable[[Any, Any], None]):
     """@write_only_property decorator.
 
     Creates a property (descriptor attribute) that accepts assignment, but not getattr
@@ -282,11 +284,13 @@ class ElementProxy:
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    def __init__(self, element: BaseOxmlElement, parent: Any | None = None):
+    def __init__(
+        self, element: BaseOxmlElement, parent: t.ProvidesXmlPart | None = None
+    ):
         self._element = element
         self._parent = parent
 
-    def __eq__(self, other):
+    def __eq__(self, other: object):
         """Return |True| if this proxy object refers to the same oxml element as does
         `other`.
 
@@ -298,7 +302,7 @@ def __eq__(self, other):
             return False
         return self._element is other._element
 
-    def __ne__(self, other):
+    def __ne__(self, other: object):
         if not isinstance(other, ElementProxy):
             return True
         return self._element is not other._element
@@ -309,8 +313,10 @@ def element(self):
         return self._element
 
     @property
-    def part(self):
+    def part(self) -> XmlPart:
         """The package part containing this object."""
+        if self._parent is None:
+            raise ValueError("part is not accessible from this element")
         return self._parent.part
 
 
@@ -322,7 +328,7 @@ class Parented:
     Provides ``self._parent`` attribute to subclasses.
     """
 
-    def __init__(self, parent):
+    def __init__(self, parent: t.ProvidesXmlPart):
         self._parent = parent
 
     @property
@@ -342,7 +348,7 @@ class StoryChild:
     Provides `self._parent` attribute to subclasses.
     """
 
-    def __init__(self, parent: StoryChild):
+    def __init__(self, parent: t.ProvidesStoryPart):
         self._parent = parent
 
     @property

From e31513946633a62e9006c6438c3da85d06ac4568 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 2 Nov 2023 16:20:31 -0700
Subject: [PATCH 305/367] rfctr: improve typing local to BlockItemContainer

---
 features/steps/block.py    | 13 ++++----
 src/docx/blkcntnr.py       | 35 ++++++++++++++++-----
 src/docx/document.py       | 58 ++++++++++++++++++++++++----------
 src/docx/oxml/document.py  | 25 ++++++++++-----
 src/docx/oxml/section.py   | 23 +++++++-------
 src/docx/oxml/table.py     | 28 +++++++++++++----
 src/docx/table.py          | 64 ++++++++++++++++++++++----------------
 src/docx/text/paragraph.py | 11 ++++---
 tests/oxml/test_table.py   |  2 ++
 tests/test_blkcntnr.py     |  2 ++
 tests/test_document.py     |  7 +++++
 11 files changed, 182 insertions(+), 86 deletions(-)

diff --git a/features/steps/block.py b/features/steps/block.py
index a091694ad..fea1bfb4a 100644
--- a/features/steps/block.py
+++ b/features/steps/block.py
@@ -1,6 +1,7 @@
 """Step implementations for block content containers."""
 
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
 from docx.table import Table
@@ -11,12 +12,12 @@
 
 
 @given("a document containing a table")
-def given_a_document_containing_a_table(context):
+def given_a_document_containing_a_table(context: Context):
     context.document = Document(test_docx("blk-containing-table"))
 
 
 @given("a paragraph")
-def given_a_paragraph(context):
+def given_a_paragraph(context: Context):
     context.document = Document()
     context.paragraph = context.document.add_paragraph()
 
@@ -25,13 +26,13 @@ def given_a_paragraph(context):
 
 
 @when("I add a paragraph")
-def when_add_paragraph(context):
+def when_add_paragraph(context: Context):
     document = context.document
     context.p = document.add_paragraph()
 
 
 @when("I add a table")
-def when_add_table(context):
+def when_add_table(context: Context):
     rows, cols = 2, 2
     context.document.add_table(rows, cols)
 
@@ -40,12 +41,12 @@ def when_add_table(context):
 
 
 @then("I can access the table")
-def then_can_access_table(context):
+def then_can_access_table(context: Context):
     table = context.document.tables[-1]
     assert isinstance(table, Table)
 
 
 @then("the new table appears in the document")
-def then_new_table_appears_in_document(context):
+def then_new_table_appears_in_document(context: Context):
     table = context.document.tables[-1]
     assert isinstance(table, Table)
diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index 81166556a..d1df8e70a 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -1,15 +1,34 @@
+# pyright: reportImportCycles=false
+
 """Block item container, used by body, cell, header, etc.
 
 Block level items are things like paragraph and table, although there are a few other
 specialized ones like structured document tags.
 """
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from typing_extensions import TypeAlias
+
 from docx.oxml.table import CT_Tbl
-from docx.shared import Parented
+from docx.shared import StoryChild
 from docx.text.paragraph import Paragraph
 
+if TYPE_CHECKING:
+    from docx import types as t
+    from docx.oxml.document import CT_Body
+    from docx.oxml.section import CT_HdrFtr
+    from docx.oxml.table import CT_Tc
+    from docx.shared import Length
+    from docx.styles.style import ParagraphStyle
+    from docx.table import Table
 
-class BlockItemContainer(Parented):
+BlockItemElement: TypeAlias = "CT_Body | CT_HdrFtr | CT_Tc"
+
+
+class BlockItemContainer(StoryChild):
     """Base class for proxy objects that can contain block items.
 
     These containers include _Body, _Cell, header, footer, footnote, endnote, comment,
@@ -17,11 +36,13 @@ class BlockItemContainer(Parented):
     paragraph or table.
     """
 
-    def __init__(self, element, parent):
+    def __init__(self, element: BlockItemElement, parent: t.ProvidesStoryPart):
         super(BlockItemContainer, self).__init__(parent)
         self._element = element
 
-    def add_paragraph(self, text="", style=None):
+    def add_paragraph(
+        self, text: str = "", style: str | ParagraphStyle | None = None
+    ) -> Paragraph:
         """Return paragraph newly added to the end of the content in this container.
 
         The paragraph has `text` in a single run if present, and is given paragraph
@@ -37,7 +58,7 @@ def add_paragraph(self, text="", style=None):
             paragraph.style = style
         return paragraph
 
-    def add_table(self, rows, cols, width):
+    def add_table(self, rows: int, cols: int, width: Length) -> Table:
         """Return table of `width` having `rows` rows and `cols` columns.
 
         The table is appended appended at the end of the content in this container.
@@ -47,7 +68,7 @@ def add_table(self, rows, cols, width):
         from docx.table import Table
 
         tbl = CT_Tbl.new_tbl(rows, cols, width)
-        self._element._insert_tbl(tbl)
+        self._element._insert_tbl(tbl)  #  # pyright: ignore[reportPrivateUsage]
         return Table(tbl, self)
 
     @property
@@ -64,7 +85,7 @@ def tables(self):
 
         Read-only.
         """
-        from .table import Table
+        from docx.table import Table
 
         return [Table(tbl, self) for tbl in self._element.tbl_lst]
 
diff --git a/src/docx/document.py b/src/docx/document.py
index 07751f155..8a72cd7f9 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -1,11 +1,27 @@
+# pyright: reportImportCycles=false
+# pyright: reportPrivateUsage=false
+
 """|Document| and closely related objects."""
 
+from __future__ import annotations
+
+from typing import IO, TYPE_CHECKING, List
+
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.section import Section, Sections
 from docx.shared import ElementProxy, Emu
-from docx.text.paragraph import Paragraph
+
+if TYPE_CHECKING:
+    from docx import types as t
+    from docx.oxml.document import CT_Body, CT_Document
+    from docx.parts.document import DocumentPart
+    from docx.settings import Settings
+    from docx.shared import Length
+    from docx.styles.style import ParagraphStyle, _TableStyle
+    from docx.table import Table
+    from docx.text.paragraph import Paragraph
 
 
 class Document(ElementProxy):
@@ -15,12 +31,13 @@ class Document(ElementProxy):
     a document.
     """
 
-    def __init__(self, element, part):
+    def __init__(self, element: CT_Document, part: DocumentPart):
         super(Document, self).__init__(element)
+        self._element = element
         self._part = part
         self.__body = None
 
-    def add_heading(self, text="", level=1):
+    def add_heading(self, text: str = "", level: int = 1):
         """Return a heading paragraph newly added to the end of the document.
 
         The heading paragraph will contain `text` and have its paragraph style
@@ -39,7 +56,9 @@ def add_page_break(self):
         paragraph.add_run().add_break(WD_BREAK.PAGE)
         return paragraph
 
-    def add_paragraph(self, text: str = "", style=None) -> Paragraph:
+    def add_paragraph(
+        self, text: str = "", style: str | ParagraphStyle | None = None
+    ) -> Paragraph:
         """Return paragraph newly added to the end of the document.
 
         The paragraph is populated with `text` and having paragraph style `style`.
@@ -51,7 +70,12 @@ def add_paragraph(self, text: str = "", style=None) -> Paragraph:
         """
         return self._body.add_paragraph(text, style)
 
-    def add_picture(self, image_path_or_stream, width=None, height=None):
+    def add_picture(
+        self,
+        image_path_or_stream: str | IO[bytes],
+        width: int | Length | None = None,
+        height: int | Length | None = None,
+    ):
         """Return new picture shape added in its own paragraph at end of the document.
 
         The picture contains the image at `image_path_or_stream`, scaled based on
@@ -65,7 +89,7 @@ def add_picture(self, image_path_or_stream, width=None, height=None):
         run = self.add_paragraph().add_run()
         return run.add_picture(image_path_or_stream, width, height)
 
-    def add_section(self, start_type=WD_SECTION.NEW_PAGE):
+    def add_section(self, start_type: WD_SECTION = WD_SECTION.NEW_PAGE):
         """Return a |Section| object newly added at the end of the document.
 
         The optional `start_type` argument must be a member of the :ref:`WdSectionStart`
@@ -75,7 +99,7 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         new_sectPr.start_type = start_type
         return Section(new_sectPr, self._part)
 
-    def add_table(self, rows, cols, style=None):
+    def add_table(self, rows: int, cols: int, style: str | _TableStyle | None = None):
         """Add a table having row and column counts of `rows` and `cols` respectively.
 
         `style` may be a table style object or a table style name. If `style` is |None|,
@@ -92,7 +116,7 @@ def core_properties(self):
 
     @property
     def inline_shapes(self):
-        """The |InlineShapes| collectoin for this document.
+        """The |InlineShapes| collection for this document.
 
         An inline shape is a graphical object, such as a picture, contained in a run of
         text and behaving like a character glyph, being flowed like other text in a
@@ -101,7 +125,7 @@ def inline_shapes(self):
         return self._part.inline_shapes
 
     @property
-    def paragraphs(self):
+    def paragraphs(self) -> List[Paragraph]:
         """The |Paragraph| instances in the document, in document order.
 
         Note that paragraphs within revision marks such as ``<w:ins>`` or ``<w:del>`` do
@@ -110,11 +134,11 @@ def paragraphs(self):
         return self._body.paragraphs
 
     @property
-    def part(self):
+    def part(self) -> DocumentPart:
         """The |DocumentPart| object of this document."""
         return self._part
 
-    def save(self, path_or_stream):
+    def save(self, path_or_stream: str | IO[bytes]):
         """Save this document to `path_or_stream`.
 
         `path_or_stream` can be either a path to a filesystem location (a string) or a
@@ -123,12 +147,12 @@ def save(self, path_or_stream):
         self._part.save(path_or_stream)
 
     @property
-    def sections(self):
+    def sections(self) -> Sections:
         """|Sections| object providing access to each section in this document."""
         return Sections(self._element, self._part)
 
     @property
-    def settings(self):
+    def settings(self) -> Settings:
         """A |Settings| object providing access to the document-level settings."""
         return self._part.settings
 
@@ -138,7 +162,7 @@ def styles(self):
         return self._part.styles
 
     @property
-    def tables(self):
+    def tables(self) -> List[Table]:
         """All |Table| instances in the document, in document order.
 
         Note that only tables appearing at the top level of the document appear in this
@@ -149,13 +173,13 @@ def tables(self):
         return self._body.tables
 
     @property
-    def _block_width(self):
+    def _block_width(self) -> Length:
         """A |Length| object specifying the space between margins in last section."""
         section = self.sections[-1]
         return Emu(section.page_width - section.left_margin - section.right_margin)
 
     @property
-    def _body(self):
+    def _body(self) -> _Body:
         """The |_Body| instance containing the content for this document."""
         if self.__body is None:
             self.__body = _Body(self._element.body, self)
@@ -168,7 +192,7 @@ class _Body(BlockItemContainer):
     It's primary role is a container for document content.
     """
 
-    def __init__(self, body_elm, parent):
+    def __init__(self, body_elm: CT_Body, parent: t.ProvidesStoryPart):
         super(_Body, self).__init__(body_elm, parent)
         self._body = body_elm
 
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index c4894f601..ebbfa1888 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -2,11 +2,15 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import TYPE_CHECKING, Callable, List
 
 from docx.oxml.section import CT_SectPr
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore, ZeroOrOne
 
+if TYPE_CHECKING:
+    from docx.oxml.table import CT_Tbl
+    from docx.oxml.text.paragraph import CT_P
+
 
 class CT_Document(BaseOxmlElement):
     """``<w:document>`` element, the root element of a document.xml file."""
@@ -29,14 +33,22 @@ def sectPr_lst(self) -> List[CT_SectPr]:
 
 
 class CT_Body(BaseOxmlElement):
-    """``<w:body>``, the container element for the main document story in
-    ``document.xml``."""
+    """`w:body`, the container element for the main document story in `document.xml`."""
+
+    add_p: Callable[[], CT_P]
+    get_or_add_sectPr: Callable[[], CT_SectPr]
+    p_lst: List[CT_P]
+    tbl_lst: List[CT_Tbl]
+
+    _insert_tbl: Callable[[CT_Tbl], CT_Tbl]
 
     p = ZeroOrMore("w:p", successors=("w:sectPr",))
     tbl = ZeroOrMore("w:tbl", successors=("w:sectPr",))
-    sectPr = ZeroOrOne("w:sectPr", successors=())
+    sectPr: CT_SectPr | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:sectPr", successors=()
+    )
 
-    def add_section_break(self):
+    def add_section_break(self) -> CT_SectPr:
         """Return `w:sectPr` element for new section added at end of document.
 
         The last `w:sectPr` becomes the second-to-last, with the new `w:sectPr` being an
@@ -63,6 +75,5 @@ def clear_content(self):
 
         Leave the <w:sectPr> element if it is present.
         """
-        content_elms = self[:-1] if self.sectPr is not None else self[:]
-        for content_elm in content_elms:
+        for content_elm in self.xpath("./*[not(self::w:sectPr)]"):
             self.remove(content_elm)
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index d1dc33ce2..4de4caa41 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from copy import deepcopy
-from typing import Callable, Iterator, Sequence, Union, cast
+from typing import Callable, Iterator, List, Sequence, cast
 
 from lxml import etree
 from typing_extensions import TypeAlias
@@ -23,12 +23,18 @@
 )
 from docx.shared import Length, lazyproperty
 
-BlockElement: TypeAlias = Union[CT_P, CT_Tbl]
+BlockElement: TypeAlias = "CT_P | CT_Tbl"
 
 
 class CT_HdrFtr(BaseOxmlElement):
     """`w:hdr` and `w:ftr`, the root element for header and footer part respectively."""
 
+    add_p: Callable[[], CT_P]
+    p_lst: List[CT_P]
+    tbl_lst: List[CT_Tbl]
+
+    _insert_tbl: Callable[[CT_Tbl], CT_Tbl]
+
     p = ZeroOrMore("w:p", successors=())
     tbl = ZeroOrMore("w:tbl", successors=())
 
@@ -487,13 +493,8 @@ def _blocks_in_and_above_section(self, sectPr: CT_SectPr) -> Sequence[BlockEleme
                 regexp=False,
             )
         xpath = self._compiled_blocks_xpath
-        # -- XPath callable results are Any (basically), so need a cast. Also the
-        # -- callable wants an etree._Element, which CT_SectPr is, but we haven't
-        # -- figured out the typing through the metaclass yet.
-        return cast(
-            Sequence[BlockElement],
-            xpath(sectPr),  # pyright: ignore[reportGeneralTypeIssues]
-        )
+        # -- XPath callable results are Any (basically), so need a cast. --
+        return cast(Sequence[BlockElement], xpath(sectPr))
 
     @lazyproperty
     def _blocks_in_and_above_section_xpath(self) -> str:
@@ -533,9 +534,7 @@ def _count_of_blocks_in_and_above_section(self, sectPr: CT_SectPr) -> int:
             )
         xpath = self._compiled_count_xpath
         # -- numeric XPath results are always float, so need an int() conversion --
-        return int(
-            cast(float, xpath(sectPr))  # pyright: ignore[reportGeneralTypeIssues]
-        )
+        return int(cast(float, xpath(sectPr)))
 
     @lazyproperty
     def _sectPrs(self) -> Sequence[CT_SectPr]:
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index cefc545bf..c15c92907 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -1,5 +1,9 @@
 """Custom element classes for tables."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Callable, List
+
 from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
 from docx.exceptions import InvalidSpanError
 from docx.oxml.ns import nsdecls, qn
@@ -22,6 +26,10 @@
 )
 from docx.shared import Emu, Twips
 
+if TYPE_CHECKING:
+    from docx.oxml.text.paragraph import CT_P
+    from docx.shared import Length
+
 
 class CT_Height(BaseOxmlElement):
     """Used for ``<w:trHeight>`` to specify a row height and row height rule."""
@@ -140,9 +148,11 @@ def iter_tcs(self):
                 yield tc
 
     @classmethod
-    def new_tbl(cls, rows, cols, width):
-        """Return a new `w:tbl` element having `rows` rows and `cols` columns with
-        `width` distributed evenly between the columns."""
+    def new_tbl(cls, rows: int, cols: int, width: Length) -> CT_Tbl:
+        """Return a new `w:tbl` element having `rows` rows and `cols` columns.
+
+        `width` is distributed evenly between the columns.
+        """
         return parse_xml(cls._tbl_xml(rows, cols, width))
 
     @property
@@ -167,7 +177,7 @@ def tblStyle_val(self, styleId):
         tblPr._add_tblStyle().val = styleId
 
     @classmethod
-    def _tbl_xml(cls, rows, cols, width):
+    def _tbl_xml(cls, rows: int, cols: int, width: Length) -> str:
         col_width = Emu(width / cols) if cols > 0 else Emu(0)
         return (
             "<w:tbl %s>\n"
@@ -295,7 +305,7 @@ def alignment(self, value):
         jc.val = value
 
     @property
-    def autofit(self):
+    def autofit(self) -> bool:
         """|False| when there is a `w:tblLayout` child with `@w:type="fixed"`.
 
         Otherwise |True|.
@@ -304,7 +314,7 @@ def autofit(self):
         return True if tblLayout is None else tblLayout.type != "fixed"
 
     @autofit.setter
-    def autofit(self, value):
+    def autofit(self, value: bool):
         tblLayout = self.get_or_add_tblLayout()
         tblLayout.type = "autofit" if value else "fixed"
 
@@ -352,6 +362,12 @@ def width(self, value):
 class CT_Tc(BaseOxmlElement):
     """`w:tc` table cell element."""
 
+    add_p: Callable[[], CT_P]
+    p_lst: List[CT_P]
+    tbl_lst: List[CT_Tbl]
+
+    _insert_tbl: Callable[[CT_Tbl], CT_Tbl]
+
     tcPr = ZeroOrOne("w:tcPr")  # bunches of successors, overriding insert
     p = OneOrMore("w:p")
     tbl = OneOrMore("w:tbl")
diff --git a/src/docx/table.py b/src/docx/table.py
index 13cc5b7bf..31372284c 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -2,22 +2,29 @@
 
 from __future__ import annotations
 
-from typing import List, Tuple, overload
+from typing import TYPE_CHECKING, List, Tuple, overload
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.style import WD_STYLE_TYPE
 from docx.oxml.simpletypes import ST_Merge
 from docx.shared import Inches, Parented, lazyproperty
 
+if TYPE_CHECKING:
+    from docx import types as t
+    from docx.enum.table import WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+    from docx.oxml.table import CT_Tbl, CT_TblPr
+    from docx.shared import Length
+    from docx.styles.style import _TableStyle  # pyright: ignore[reportPrivateUsage]
+
 
 class Table(Parented):
     """Proxy class for a WordprocessingML ``<w:tbl>`` element."""
 
-    def __init__(self, tbl, parent):
+    def __init__(self, tbl: CT_Tbl, parent: t.StoryChild):
         super(Table, self).__init__(parent)
         self._element = self._tbl = tbl
 
-    def add_column(self, width):
+    def add_column(self, width: Length):
         """Return a |_Column| object of `width`, newly added rightmost to the table."""
         tblGrid = self._tbl.tblGrid
         gridCol = tblGrid.add_gridCol()
@@ -37,7 +44,7 @@ def add_row(self):
         return _Row(tr, self)
 
     @property
-    def alignment(self):
+    def alignment(self) -> WD_TABLE_ALIGNMENT | None:
         """Read/write.
 
         A member of :ref:`WdRowAlignment` or None, specifying the positioning of this
@@ -47,11 +54,11 @@ def alignment(self):
         return self._tblPr.alignment
 
     @alignment.setter
-    def alignment(self, value):
+    def alignment(self, value: WD_TABLE_ALIGNMENT | None):
         self._tblPr.alignment = value
 
     @property
-    def autofit(self):
+    def autofit(self) -> bool:
         """|True| if column widths can be automatically adjusted to improve the fit of
         cell contents.
 
@@ -61,16 +68,18 @@ def autofit(self):
         return self._tblPr.autofit
 
     @autofit.setter
-    def autofit(self, value):
+    def autofit(self, value: bool):
         self._tblPr.autofit = value
 
-    def cell(self, row_idx, col_idx):
-        """Return |_Cell| instance correponding to table cell at `row_idx`, `col_idx`
-        intersection, where (0, 0) is the top, left-most cell."""
+    def cell(self, row_idx: int, col_idx: int) -> _Cell:
+        """|_Cell| at `row_idx`, `col_idx` intersection.
+
+        (0, 0) is the top, left-most cell.
+        """
         cell_idx = col_idx + (row_idx * self._column_count)
         return self._cells[cell_idx]
 
-    def column_cells(self, column_idx):
+    def column_cells(self, column_idx: int) -> List[_Cell]:
         """Sequence of cells in the column at `column_idx` in this table."""
         cells = self._cells
         idxs = range(column_idx, len(cells), self._column_count)
@@ -81,7 +90,7 @@ def columns(self):
         """|_Columns| instance representing the sequence of columns in this table."""
         return _Columns(self._tbl, self)
 
-    def row_cells(self, row_idx):
+    def row_cells(self, row_idx: int) -> List[_Cell]:
         """Sequence of cells in the row at `row_idx` in this table."""
         column_count = self._column_count
         start = row_idx * column_count
@@ -94,22 +103,23 @@ def rows(self) -> _Rows:
         return _Rows(self._tbl, self)
 
     @property
-    def style(self):
-        """Read/write. A |_TableStyle| object representing the style applied to this
-        table. The default table style for the document (often `Normal Table`) is
+    def style(self) -> _TableStyle | None:
+        """|_TableStyle| object representing the style applied to this table.
+
+        Read/write. The default table style for the document (often `Normal Table`) is
         returned if the table has no directly-applied style. Assigning |None| to this
         property removes any directly-applied table style causing it to inherit the
-        default table style of the document. Note that the style name of a table style
-        differs slightly from that.
+        default table style of the document.
 
-        displayed in the user interface; a hyphen, if it appears, must be removed. For
-        example, `Light Shading - Accent 1` becomes `Light Shading Accent 1`.
+        Note that the style name of a table style differs slightly from that displayed
+        in the user interface; a hyphen, if it appears, must be removed. For example,
+        `Light Shading - Accent 1` becomes `Light Shading Accent 1`.
         """
         style_id = self._tbl.tblStyle_val
         return self.part.get_style(style_id, WD_STYLE_TYPE.TABLE)
 
     @style.setter
-    def style(self, style_or_name):
+    def style(self, style_or_name: _TableStyle | None):
         style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.TABLE)
         self._tbl.tblStyle_val = style_id
 
@@ -124,20 +134,20 @@ def table(self):
         return self
 
     @property
-    def table_direction(self):
-        """A member of :ref:`WdTableDirection` indicating the direction in which the
-        table cells are ordered, e.g. `WD_TABLE_DIRECTION.LTR`.
+    def table_direction(self) -> WD_TABLE_DIRECTION | None:
+        """Member of :ref:`WdTableDirection` indicating cell-ordering direction.
 
-        |None| indicates the value is inherited from the style hierarchy.
+        For example: `WD_TABLE_DIRECTION.LTR`. |None| indicates the value is inherited
+        from the style hierarchy.
         """
         return self._element.bidiVisual_val
 
     @table_direction.setter
-    def table_direction(self, value):
+    def table_direction(self, value: WD_TABLE_DIRECTION | None):
         self._element.bidiVisual_val = value
 
     @property
-    def _cells(self):
+    def _cells(self) -> List[_Cell]:
         """A sequence of |_Cell| objects, one for each cell of the layout grid.
 
         If the table contains a span, one or more |_Cell| object references are
@@ -161,7 +171,7 @@ def _column_count(self):
         return self._tbl.col_count
 
     @property
-    def _tblPr(self):
+    def _tblPr(self) -> CT_TblPr:
         return self._tbl.tblPr
 
 
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index fb1067c16..0a5d67674 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -2,22 +2,25 @@
 
 from __future__ import annotations
 
-from typing import Iterator, List, cast
+from typing import TYPE_CHECKING, Iterator, List, cast
 
 from typing_extensions import Self
 
 from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
-from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
-from docx.oxml.text.paragraph import CT_P
 from docx.oxml.text.run import CT_R
 from docx.shared import StoryChild
-from docx.styles.style import CharacterStyle, ParagraphStyle
+from docx.styles.style import ParagraphStyle
 from docx.text.hyperlink import Hyperlink
 from docx.text.pagebreak import RenderedPageBreak
 from docx.text.parfmt import ParagraphFormat
 from docx.text.run import Run
 
+if TYPE_CHECKING:
+    from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
+    from docx.oxml.text.paragraph import CT_P
+    from docx.styles.style import CharacterStyle
+
 
 class Paragraph(StoryChild):
     """Proxy object wrapping a `<w:p>` element."""
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index ecd0cf9d7..07a42876b 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -1,5 +1,7 @@
 """Test suite for the docx.oxml.text module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.exceptions import InvalidSpanError
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 6f1d28a46..dfd4aa933 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -13,6 +13,8 @@
 
 
 class DescribeBlockItemContainer:
+    """Unit-test suite for `docx.blkcntnr.BlockItemContainer`."""
+
     def it_can_add_a_paragraph(self, add_paragraph_fixture, _add_paragraph_):
         text, style, paragraph_, add_run_calls = add_paragraph_fixture
         _add_paragraph_.return_value = paragraph_
diff --git a/tests/test_document.py b/tests/test_document.py
index 12e3361db..adb667893 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -1,5 +1,10 @@
+# pyright: reportPrivateUsage=false
+# pyright: reportUnknownMemberType=false
+
 """Unit test suite for the docx.document module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.document import Document, _Body
@@ -21,6 +26,8 @@
 
 
 class DescribeDocument:
+    """Unit-test suite for `docx.Document`."""
+
     def it_can_add_a_heading(self, add_heading_fixture, add_paragraph_, paragraph_):
         level, style = add_heading_fixture
         add_paragraph_.return_value = paragraph_

From 3c1669156c70a0516c67adeee1d3c17198d3c2f9 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 3 Nov 2023 13:09:52 -0700
Subject: [PATCH 306/367] xfail: for BlockItemContainer.iter_inner_content()

---
 features/blk-iter-inner-content.feature       |  28 ++++++++++
 features/steps/block.py                       |  50 ++++++++++++++++++
 .../test_files/blk-paras-and-tables.docx      | Bin 0 -> 15649 bytes
 3 files changed, 78 insertions(+)
 create mode 100644 features/blk-iter-inner-content.feature
 create mode 100644 features/steps/test_files/blk-paras-and-tables.docx

diff --git a/features/blk-iter-inner-content.feature b/features/blk-iter-inner-content.feature
new file mode 100644
index 000000000..0ad2f44a8
--- /dev/null
+++ b/features/blk-iter-inner-content.feature
@@ -0,0 +1,28 @@
+Feature: Iterate paragraphs and tables in document-order
+  In order to access paragraphs and tables in the same order they appear in the document
+  As a developer using python-docx
+  I need the ability to iterate the inner-content of a block-item-container
+
+
+  @wip
+  Scenario: Document.iter_inner_content()
+    Given a Document object with paragraphs and tables
+     Then document.iter_inner_content() produces the block-items in document order
+
+
+  @wip
+  Scenario: Header.iter_inner_content()
+    Given a Header object with paragraphs and tables
+     Then header.iter_inner_content() produces the block-items in document order
+
+
+  @wip
+  Scenario: Footer.iter_inner_content()
+    Given a Footer object with paragraphs and tables
+     Then footer.iter_inner_content() produces the block-items in document order
+
+
+  @wip
+  Scenario: _Cell.iter_inner_content()
+    Given a _Cell object with paragraphs and tables
+     Then cell.iter_inner_content() produces the block-items in document order
diff --git a/features/steps/block.py b/features/steps/block.py
index fea1bfb4a..c365c9510 100644
--- a/features/steps/block.py
+++ b/features/steps/block.py
@@ -11,11 +11,33 @@
 # given ===================================================
 
 
+@given("a _Cell object with paragraphs and tables")
+def given_a_cell_with_paragraphs_and_tables(context: Context):
+    context.cell = (
+        Document(test_docx("blk-paras-and-tables")).tables[1].rows[0].cells[0]
+    )
+
+
+@given("a Document object with paragraphs and tables")
+def given_a_document_with_paragraphs_and_tables(context: Context):
+    context.document = Document(test_docx("blk-paras-and-tables"))
+
+
 @given("a document containing a table")
 def given_a_document_containing_a_table(context: Context):
     context.document = Document(test_docx("blk-containing-table"))
 
 
+@given("a Footer object with paragraphs and tables")
+def given_a_footer_with_paragraphs_and_tables(context: Context):
+    context.footer = Document(test_docx("blk-paras-and-tables")).sections[0].footer
+
+
+@given("a Header object with paragraphs and tables")
+def given_a_header_with_paragraphs_and_tables(context: Context):
+    context.header = Document(test_docx("blk-paras-and-tables")).sections[0].header
+
+
 @given("a paragraph")
 def given_a_paragraph(context: Context):
     context.document = Document()
@@ -40,6 +62,34 @@ def when_add_table(context: Context):
 # then =====================================================
 
 
+@then("cell.iter_inner_content() produces the block-items in document order")
+def then_cell_iter_inner_content_produces_the_block_items(context: Context):
+    actual = [type(item).__name__ for item in context.cell.iter_inner_content()]
+    expected = ["Paragraph", "Table", "Paragraph"]
+    assert actual == expected, f"expected: {expected}, got: {actual}"
+
+
+@then("document.iter_inner_content() produces the block-items in document order")
+def then_document_iter_inner_content_produces_the_block_items(context: Context):
+    actual = [type(item).__name__ for item in context.document.iter_inner_content()]
+    expected = ["Table", "Paragraph", "Table", "Paragraph", "Table", "Paragraph"]
+    assert actual == expected, f"expected: {expected}, got: {actual}"
+
+
+@then("footer.iter_inner_content() produces the block-items in document order")
+def then_footer_iter_inner_content_produces_the_block_items(context: Context):
+    actual = [type(item).__name__ for item in context.footer.iter_inner_content()]
+    expected = ["Paragraph", "Table", "Paragraph"]
+    assert actual == expected, f"expected: {expected}, got: {actual}"
+
+
+@then("header.iter_inner_content() produces the block-items in document order")
+def then_header_iter_inner_content_produces_the_block_items(context: Context):
+    actual = [type(item).__name__ for item in context.header.iter_inner_content()]
+    expected = ["Table", "Paragraph"]
+    assert actual == expected, f"expected: {expected}, got: {actual}"
+
+
 @then("I can access the table")
 def then_can_access_table(context: Context):
     table = context.document.tables[-1]
diff --git a/features/steps/test_files/blk-paras-and-tables.docx b/features/steps/test_files/blk-paras-and-tables.docx
new file mode 100644
index 0000000000000000000000000000000000000000..85553c08ab5a13fe35ab2bf6c9b4adb3999e2b54
GIT binary patch
literal 15649
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
T%lK_C1qsj&G%lHszy14vez(MZ

literal 0
HcmV?d00001


From f46751fd9df36e500ef2193c245bd4dec75f9649 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 3 Nov 2023 13:22:57 -0700
Subject: [PATCH 307/367] blk: add Document.iter_inner_content()

---
 src/docx/blkcntnr.py   |  6 +++++-
 src/docx/document.py   |  6 +++++-
 tests/test_document.py | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index d1df8e70a..367121be8 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -8,7 +8,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Iterator
 
 from typing_extensions import TypeAlias
 
@@ -71,6 +71,10 @@ def add_table(self, rows: int, cols: int, width: Length) -> Table:
         self._element._insert_tbl(tbl)  #  # pyright: ignore[reportPrivateUsage]
         return Table(tbl, self)
 
+    def iter_inner_content(self) -> Iterator[Paragraph | Table]:
+        """Generate each `Paragraph` or `Table` in this container in document order."""
+        raise NotImplementedError
+
     @property
     def paragraphs(self):
         """A list containing the paragraphs in this container, in document order.
diff --git a/src/docx/document.py b/src/docx/document.py
index 8a72cd7f9..4deb8aa8e 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import IO, TYPE_CHECKING, List
+from typing import IO, TYPE_CHECKING, Iterator, List
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_SECTION
@@ -124,6 +124,10 @@ def inline_shapes(self):
         """
         return self._part.inline_shapes
 
+    def iter_inner_content(self) -> Iterator[Paragraph | Table]:
+        """Generate each `Paragraph` or `Table` in this document in document order."""
+        return self._body.iter_inner_content()
+
     @property
     def paragraphs(self) -> List[Paragraph]:
         """The |Paragraph| instances in the document, in document order.
diff --git a/tests/test_document.py b/tests/test_document.py
index adb667893..6a2c5af88 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -5,12 +5,15 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 import pytest
 
 from docx.document import Document, _Body
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
+from docx.oxml.document import CT_Document
 from docx.parts.document import DocumentPart
 from docx.section import Section, Sections
 from docx.settings import Settings
@@ -22,7 +25,7 @@
 from docx.text.run import Run
 
 from .unitutil.cxml import element, xml
-from .unitutil.mock import class_mock, instance_mock, method_mock, property_mock
+from .unitutil.mock import Mock, class_mock, instance_mock, method_mock, property_mock
 
 
 class DescribeDocument:
@@ -104,6 +107,16 @@ def it_provides_access_to_its_inline_shapes(self, inline_shapes_fixture):
         document, inline_shapes_ = inline_shapes_fixture
         assert document.inline_shapes is inline_shapes_
 
+    def it_can_iterate_the_inner_content_of_the_document(
+        self, body_prop_: Mock, body_: Mock, document_part_: Mock
+    ):
+        document_elm = cast(CT_Document, element("w:document"))
+        body_prop_.return_value = body_
+        body_.iter_inner_content.return_value = iter((1, 2, 3))
+        document = Document(document_elm, document_part_)
+
+        assert list(document.iter_inner_content()) == [1, 2, 3]
+
     def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
         document, paragraphs_ = paragraphs_fixture
         paragraphs = document.paragraphs

From 24e4c1b44c0793fa6162cd910a1808487f1d398e Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 3 Nov 2023 14:39:44 -0700
Subject: [PATCH 308/367] oxml: add .inner_content_elements props

---
 src/docx/oxml/document.py   |  9 +++++++++
 src/docx/oxml/section.py    |  9 +++++++++
 src/docx/oxml/table.py      |  9 +++++++++
 tests/oxml/test_document.py | 19 +++++++++++++++++++
 tests/oxml/test_section.py  | 19 +++++++++++++++++++
 tests/oxml/test_table.py    |  9 ++++++++-
 6 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 tests/oxml/test_document.py
 create mode 100644 tests/oxml/test_section.py

diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index ebbfa1888..cc27f5aa9 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -77,3 +77,12 @@ def clear_content(self):
         """
         for content_elm in self.xpath("./*[not(self::w:sectPr)]"):
             self.remove(content_elm)
+
+    @property
+    def inner_content_elements(self) -> List[CT_P | CT_Tbl]:
+        """Generate all `w:p` and `w:tbl` elements in this document-body.
+
+        Elements appear in document order. Elements shaded by nesting in a `w:ins` or
+        other "wrapper" element will not be included.
+        """
+        return self.xpath("./w:p | ./w:tbl")
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index 4de4caa41..a4090898a 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -38,6 +38,15 @@ class CT_HdrFtr(BaseOxmlElement):
     p = ZeroOrMore("w:p", successors=())
     tbl = ZeroOrMore("w:tbl", successors=())
 
+    @property
+    def inner_content_elements(self) -> List[CT_P | CT_Tbl]:
+        """Generate all `w:p` and `w:tbl` elements in this header or footer.
+
+        Elements appear in document order. Elements shaded by nesting in a `w:ins` or
+        other "wrapper" element will not be included.
+        """
+        return self.xpath("./w:p | ./w:tbl")
+
 
 class CT_HdrFtrRef(BaseOxmlElement):
     """`w:headerReference` and `w:footerReference` elements."""
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index c15c92907..48a6d8c2f 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -415,6 +415,15 @@ def grid_span(self, value):
         tcPr = self.get_or_add_tcPr()
         tcPr.grid_span = value
 
+    @property
+    def inner_content_elements(self) -> List[CT_P | CT_Tbl]:
+        """Generate all `w:p` and `w:tbl` elements in this document-body.
+
+        Elements appear in document order. Elements shaded by nesting in a `w:ins` or
+        other "wrapper" element will not be included.
+        """
+        return self.xpath("./w:p | ./w:tbl")
+
     def iter_block_items(self):
         """Generate a reference to each of the block-level content elements in this
         cell, in the order they appear."""
diff --git a/tests/oxml/test_document.py b/tests/oxml/test_document.py
new file mode 100644
index 000000000..f7f99a524
--- /dev/null
+++ b/tests/oxml/test_document.py
@@ -0,0 +1,19 @@
+"""Unit-test suite for `docx.oxml.document` module."""
+
+from __future__ import annotations
+
+from typing import cast
+
+from docx.oxml.document import CT_Body
+from docx.oxml.table import CT_Tbl
+from docx.oxml.text.paragraph import CT_P
+
+from ..unitutil.cxml import element
+
+
+class DescribeCT_Body:
+    """Unit-test suite for selected units of `docx.oxml.document.CT_Body`."""
+
+    def it_knows_its_inner_content_block_item_elements(self):
+        body = cast(CT_Body, element("w:body/(w:tbl, w:p,w:p)"))
+        assert [type(e) for e in body.inner_content_elements] == [CT_Tbl, CT_P, CT_P]
diff --git a/tests/oxml/test_section.py b/tests/oxml/test_section.py
new file mode 100644
index 000000000..8cf0bd9b7
--- /dev/null
+++ b/tests/oxml/test_section.py
@@ -0,0 +1,19 @@
+"""Unit-test suite for `docx.oxml.section` module."""
+
+from __future__ import annotations
+
+from typing import cast
+
+from docx.oxml.section import CT_HdrFtr
+from docx.oxml.table import CT_Tbl
+from docx.oxml.text.paragraph import CT_P
+
+from ..unitutil.cxml import element
+
+
+class DescribeCT_HdrFtr:
+    """Unit-test suite for selected units of `docx.oxml.section.CT_HdrFtr`."""
+
+    def it_knows_its_inner_content_block_item_elements(self):
+        hdr = cast(CT_HdrFtr, element("w:hdr/(w:tbl,w:tbl,w:p)"))
+        assert [type(e) for e in hdr.inner_content_elements] == [CT_Tbl, CT_Tbl, CT_P]
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 07a42876b..395c812a6 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -2,11 +2,14 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 import pytest
 
 from docx.exceptions import InvalidSpanError
 from docx.oxml.parser import parse_xml
-from docx.oxml.table import CT_Row, CT_Tc
+from docx.oxml.table import CT_Row, CT_Tbl, CT_Tc
+from docx.oxml.text.paragraph import CT_P
 
 from ..unitutil.cxml import element, xml
 from ..unitutil.file import snippet_seq
@@ -102,6 +105,10 @@ def it_can_extend_its_horz_span_to_help_merge(
         ]
         assert tc.vMerge == vMerge
 
+    def it_knows_its_inner_content_block_item_elements(self):
+        tc = cast(CT_Tc, element("w:tc/(w:p,w:tbl,w:p)"))
+        assert [type(e) for e in tc.inner_content_elements] == [CT_P, CT_Tbl, CT_P]
+
     def it_can_swallow_the_next_tc_help_merge(self, swallow_fixture):
         tc, grid_width, top_tc, tr, expected_xml = swallow_fixture
         tc._swallow_next_tc(grid_width, top_tc)

From ee130dc275b53fbb21f519e32d9e763dc7c372a9 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 3 Nov 2023 14:43:50 -0700
Subject: [PATCH 309/367] blk: add BlockItemContainer.iter_inner_content()

---
 features/blk-iter-inner-content.feature |   4 ----
 src/docx/blkcntnr.py                    |  10 +++++++++-
 tests/test_blkcntnr.py                  |  23 ++++++++++++++++++++++-
 tests/test_files/blk-inner-content.docx | Bin 0 -> 11949 bytes
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_files/blk-inner-content.docx

diff --git a/features/blk-iter-inner-content.feature b/features/blk-iter-inner-content.feature
index 0ad2f44a8..047efb9ee 100644
--- a/features/blk-iter-inner-content.feature
+++ b/features/blk-iter-inner-content.feature
@@ -4,25 +4,21 @@ Feature: Iterate paragraphs and tables in document-order
   I need the ability to iterate the inner-content of a block-item-container
 
 
-  @wip
   Scenario: Document.iter_inner_content()
     Given a Document object with paragraphs and tables
      Then document.iter_inner_content() produces the block-items in document order
 
 
-  @wip
   Scenario: Header.iter_inner_content()
     Given a Header object with paragraphs and tables
      Then header.iter_inner_content() produces the block-items in document order
 
 
-  @wip
   Scenario: Footer.iter_inner_content()
     Given a Footer object with paragraphs and tables
      Then footer.iter_inner_content() produces the block-items in document order
 
 
-  @wip
   Scenario: _Cell.iter_inner_content()
     Given a _Cell object with paragraphs and tables
      Then cell.iter_inner_content() produces the block-items in document order
diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index 367121be8..1327e6d08 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -13,6 +13,7 @@
 from typing_extensions import TypeAlias
 
 from docx.oxml.table import CT_Tbl
+from docx.oxml.text.paragraph import CT_P
 from docx.shared import StoryChild
 from docx.text.paragraph import Paragraph
 
@@ -73,7 +74,14 @@ def add_table(self, rows: int, cols: int, width: Length) -> Table:
 
     def iter_inner_content(self) -> Iterator[Paragraph | Table]:
         """Generate each `Paragraph` or `Table` in this container in document order."""
-        raise NotImplementedError
+        from docx.table import Table
+
+        for element in self._element.inner_content_elements:
+            yield (
+                Paragraph(element, self)
+                if isinstance(element, CT_P)
+                else Table(element, self)
+            )
 
     @property
     def paragraphs(self):
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index dfd4aa933..1549bd8ea 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -2,13 +2,14 @@
 
 import pytest
 
+from docx import Document
 from docx.blkcntnr import BlockItemContainer
 from docx.shared import Inches
 from docx.table import Table
 from docx.text.paragraph import Paragraph
 
 from .unitutil.cxml import element, xml
-from .unitutil.file import snippet_seq
+from .unitutil.file import snippet_seq, test_file
 from .unitutil.mock import call, instance_mock, method_mock
 
 
@@ -34,6 +35,26 @@ def it_can_add_a_table(self, add_table_fixture):
         assert table._element.xml == expected_xml
         assert table._parent is blkcntnr
 
+    def it_can_iterate_its_inner_content(self):
+        document = Document(test_file("blk-inner-content.docx"))
+
+        inner_content = document.iter_inner_content()
+
+        para = next(inner_content)
+        assert isinstance(para, Paragraph)
+        assert para.text == "P1"
+        # --
+        t = next(inner_content)
+        assert isinstance(t, Table)
+        assert t.rows[0].cells[0].text == "T2"
+        # --
+        para = next(inner_content)
+        assert isinstance(para, Paragraph)
+        assert para.text == "P3"
+        # --
+        with pytest.raises(StopIteration):
+            next(inner_content)
+
     def it_provides_access_to_the_paragraphs_it_contains(self, paragraphs_fixture):
         # test len(), iterable, and indexed access
         blkcntnr, expected_count = paragraphs_fixture
diff --git a/tests/test_files/blk-inner-content.docx b/tests/test_files/blk-inner-content.docx
new file mode 100644
index 0000000000000000000000000000000000000000..1edfb41977970ba897ade620b1361df205742a12
GIT binary patch
literal 11949
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

literal 0
HcmV?d00001


From 16c7f3421d31a3834d73741066ffde73cc6a7dc5 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 3 Nov 2023 16:57:05 -0700
Subject: [PATCH 310/367] docs: update docs for .iter_inner_content()

---
 docs/api/table.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/api/table.rst b/docs/api/table.rst
index 215bf807c..6f27670fa 100644
--- a/docs/api/table.rst
+++ b/docs/api/table.rst
@@ -22,7 +22,9 @@ Table objects are constructed using the ``add_table()`` method on |Document|.
 ------------------------
 
 .. autoclass:: _Cell
+   :inherited-members: 
    :members:
+   :exclude-members: part
 
 
 |_Row| objects

From 57d3b9ee9cb778e76258653c6dc464d5598ca80b Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 3 Nov 2023 17:15:44 -0700
Subject: [PATCH 311/367] release: prepare v1.1.0 release

---
 HISTORY.rst          | 6 ++++++
 src/docx/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index d57bf5696..8e0b1a588 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ---------------
 
+1.1.0 (2023-11-03)
+++++++++++++++++++
+
+- Add BlockItemContainer.iter_inner_content()
+
+
 1.0.1 (2023-10-12)
 ++++++++++++++++++
 
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index a518501a5..b214045d1 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -13,7 +13,7 @@
 if TYPE_CHECKING:
     from docx.opc.part import Part
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 
 
 __all__ = ["Document"]

From 630ecbf0d8da2f413571243e22bc0be1fb1e5a57 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 29 Apr 2024 15:30:47 -0700
Subject: [PATCH 312/367] rfctr(lint): tune in ruff settings

---
 pyproject.toml         | 8 ++++++--
 src/docx/image/tiff.py | 6 +-----
 tests/unitutil/cxml.py | 6 ++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index d35c790c7..8c0518a96 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,7 @@ Homepage = "https://github.com/python-openxml/python-docx"
 Repository = "https://github.com/python-openxml/python-docx"
 
 [tool.black]
+line-length = 100
 target-version = ["py37", "py38", "py39", "py310", "py311"]
 
 [tool.pytest.ini_options]
@@ -69,6 +70,10 @@ python_functions = ["it_", "its_", "they_", "and_", "but_"]
 
 [tool.ruff]
 exclude = []
+line-length = 100
+target-version = "py38"
+
+[tool.ruff.lint]
 ignore = [
     "COM812",   # -- over-aggressively insists on trailing commas where not desired --
     "PT001",    # -- wants @pytest.fixture() instead of @pytest.fixture --
@@ -88,9 +93,8 @@ select = [
     "UP032",    # -- Use f-string instead of `.format()` call --
     "UP034",    # -- Avoid extraneous parentheses --
 ]
-target-version = "py37"
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["docx"]
 known-local-folder = ["helpers"]
 
diff --git a/src/docx/image/tiff.py b/src/docx/image/tiff.py
index b84d9f10f..1194929af 100644
--- a/src/docx/image/tiff.py
+++ b/src/docx/image/tiff.py
@@ -98,11 +98,7 @@ def _dpi(self, resolution_tag):
             return 72
 
         # resolution unit defaults to inches (2)
-        resolution_unit = (
-            ifd_entries[TIFF_TAG.RESOLUTION_UNIT]
-            if TIFF_TAG.RESOLUTION_UNIT in ifd_entries
-            else 2
-        )
+        resolution_unit = ifd_entries.get(TIFF_TAG.RESOLUTION_UNIT, 2)
 
         if resolution_unit == 1:  # aspect ratio only
             return 72
diff --git a/tests/unitutil/cxml.py b/tests/unitutil/cxml.py
index c7b7d172c..e76cabd74 100644
--- a/tests/unitutil/cxml.py
+++ b/tests/unitutil/cxml.py
@@ -89,7 +89,7 @@ def from_token(cls, token):
         Return an ``Element`` object constructed from a parser element token.
         """
         tagname = token.tagname
-        attrs = [(name, value) for name, value in token.attr_list]
+        attrs = [tuple(a) for a in token.attr_list]
         text = token.text
         return cls(tagname, attrs, text)
 
@@ -263,9 +263,7 @@ def grammar():
     child_node_list << (open_paren + delimitedList(node) + close_paren | node)
 
     root_node = (
-        element("element")
-        + Group(Optional(slash + child_node_list))("child_node_list")
-        + stringEnd
+        element("element") + Group(Optional(slash + child_node_list))("child_node_list") + stringEnd
     ).setParseAction(connect_root_node_children)
 
     return root_node

From 5a22c521c5f749847c7b038cef0074b469a7994a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 5 Nov 2023 22:11:55 -0800
Subject: [PATCH 313/367] rfctr: improve typing for tables

---
 pyrightconfig.json              |   2 +-
 requirements-dev.txt            |   2 +
 requirements-test.txt           |   1 +
 src/docx/opc/oxml.py            |   6 +-
 src/docx/oxml/__init__.py       |   2 +
 src/docx/oxml/document.py       |   2 +-
 src/docx/oxml/parser.py         |   4 +-
 src/docx/oxml/section.py        |  66 ++---
 src/docx/oxml/shared.py         |   6 +-
 src/docx/oxml/table.py          | 491 ++++++++++++++++++--------------
 src/docx/oxml/text/hyperlink.py |  14 +-
 src/docx/oxml/text/paragraph.py |   6 +-
 src/docx/oxml/text/parfmt.py    |   6 +-
 src/docx/oxml/text/run.py       |  15 +-
 src/docx/oxml/xmlchemy.py       |  67 ++---
 src/docx/table.py               | 121 ++++----
 tests/test_table.py             |  94 +++---
 17 files changed, 480 insertions(+), 425 deletions(-)

diff --git a/pyrightconfig.json b/pyrightconfig.json
index 161e49d2b..21afeb97b 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -6,7 +6,7 @@
     "ignore":  [
     ],
     "include": [
-        "src/docx/",
+        "src/docx",
         "tests"
     ],
     "pythonPlatform": "All",
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 45e5f78c3..14d8740e3 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,7 @@
 -r requirements-test.txt
 build
+ruff
 setuptools>=61.0.0
 tox
 twine
+types-lxml
diff --git a/requirements-test.txt b/requirements-test.txt
index 85d9f6ba3..9ee78b43f 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,4 +2,5 @@
 behave>=1.2.3
 pyparsing>=2.0.1
 pytest>=2.5
+pytest-xdist
 ruff
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index 570dcf413..0249de918 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -1,3 +1,5 @@
+# pyright: reportPrivateUsage=false
+
 """Temporary stand-in for main oxml module.
 
 This module came across with the PackageReader transplant. Probably much will get
@@ -27,7 +29,7 @@
 # ===========================================================================
 
 
-def parse_xml(text: str) -> etree._Element:  # pyright: ignore[reportPrivateUsage]
+def parse_xml(text: str) -> etree._Element:
     """`etree.fromstring()` replacement that uses oxml parser."""
     return etree.fromstring(text, oxml_parser)
 
@@ -44,7 +46,7 @@ def qn(tag):
     return "{%s}%s" % (uri, tagroot)
 
 
-def serialize_part_xml(part_elm):
+def serialize_part_xml(part_elm: etree._Element):
     """Serialize `part_elm` etree element to XML suitable for storage as an XML part.
 
     That is to say, no insignificant whitespace added for readability, and an
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 621ef279a..a37ee9b8e 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -149,6 +149,7 @@
     CT_TblGridCol,
     CT_TblLayoutType,
     CT_TblPr,
+    CT_TblPrEx,
     CT_TblWidth,
     CT_Tc,
     CT_TcPr,
@@ -164,6 +165,7 @@
 register_element_cls("w:tblGrid", CT_TblGrid)
 register_element_cls("w:tblLayout", CT_TblLayoutType)
 register_element_cls("w:tblPr", CT_TblPr)
+register_element_cls("w:tblPrEx", CT_TblPrEx)
 register_element_cls("w:tblStyle", CT_String)
 register_element_cls("w:tc", CT_Tc)
 register_element_cls("w:tcPr", CT_TcPr)
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index cc27f5aa9..ff3736f65 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -44,7 +44,7 @@ class CT_Body(BaseOxmlElement):
 
     p = ZeroOrMore("w:p", successors=("w:sectPr",))
     tbl = ZeroOrMore("w:tbl", successors=("w:sectPr",))
-    sectPr: CT_SectPr | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+    sectPr: CT_SectPr | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:sectPr", successors=()
     )
 
diff --git a/src/docx/oxml/parser.py b/src/docx/oxml/parser.py
index 7e6a0fb49..a38362676 100644
--- a/src/docx/oxml/parser.py
+++ b/src/docx/oxml/parser.py
@@ -1,3 +1,5 @@
+# pyright: reportImportCycles=false
+
 """XML parser for python-docx."""
 
 from __future__ import annotations
@@ -43,7 +45,7 @@ def OxmlElement(
     nsptag_str: str,
     attrs: Dict[str, str] | None = None,
     nsdecls: Dict[str, str] | None = None,
-) -> BaseOxmlElement:
+) -> BaseOxmlElement | etree._Element:  # pyright: ignore[reportPrivateUsage]
     """Return a 'loose' lxml element having the tag specified by `nsptag_str`.
 
     The tag in `nsptag_str` must contain the standard namespace prefix, e.g. `a:tbl`.
diff --git a/src/docx/oxml/section.py b/src/docx/oxml/section.py
index a4090898a..71072e2df 100644
--- a/src/docx/oxml/section.py
+++ b/src/docx/oxml/section.py
@@ -51,38 +51,34 @@ def inner_content_elements(self) -> List[CT_P | CT_Tbl]:
 class CT_HdrFtrRef(BaseOxmlElement):
     """`w:headerReference` and `w:footerReference` elements."""
 
-    type_: WD_HEADER_FOOTER = (
-        RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-            "w:type", WD_HEADER_FOOTER
-        )
-    )
-    rId: str = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "r:id", XsdString
+    type_: WD_HEADER_FOOTER = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:type", WD_HEADER_FOOTER
     )
+    rId: str = RequiredAttribute("r:id", XsdString)  # pyright: ignore[reportAssignmentType]
 
 
 class CT_PageMar(BaseOxmlElement):
     """``<w:pgMar>`` element, defining page margins."""
 
-    top: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    top: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:top", ST_SignedTwipsMeasure
     )
-    right: Length | None = OptionalAttribute(  # pyright: ignore
+    right: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:right", ST_TwipsMeasure
     )
-    bottom: Length | None = OptionalAttribute(  # pyright: ignore
+    bottom: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:bottom", ST_SignedTwipsMeasure
     )
-    left: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    left: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:left", ST_TwipsMeasure
     )
-    header: Length | None = OptionalAttribute(  # pyright: ignore
+    header: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:header", ST_TwipsMeasure
     )
-    footer: Length | None = OptionalAttribute(  # pyright: ignore
+    footer: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:footer", ST_TwipsMeasure
     )
-    gutter: Length | None = OptionalAttribute(  # pyright: ignore
+    gutter: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:gutter", ST_TwipsMeasure
     )
 
@@ -90,16 +86,14 @@ class CT_PageMar(BaseOxmlElement):
 class CT_PageSz(BaseOxmlElement):
     """``<w:pgSz>`` element, defining page dimensions and orientation."""
 
-    w: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    w: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:w", ST_TwipsMeasure
     )
-    h: Length | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    h: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:h", ST_TwipsMeasure
     )
-    orient: WD_ORIENTATION = (
-        OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-            "w:orient", WD_ORIENTATION, default=WD_ORIENTATION.PORTRAIT
-        )
+    orient: WD_ORIENTATION = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:orient", WD_ORIENTATION, default=WD_ORIENTATION.PORTRAIT
     )
 
 
@@ -139,16 +133,16 @@ class CT_SectPr(BaseOxmlElement):
     )
     headerReference = ZeroOrMore("w:headerReference", successors=_tag_seq)
     footerReference = ZeroOrMore("w:footerReference", successors=_tag_seq)
-    type: CT_SectType | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+    type: CT_SectType | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:type", successors=_tag_seq[3:]
     )
-    pgSz: CT_PageSz | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+    pgSz: CT_PageSz | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:pgSz", successors=_tag_seq[4:]
     )
-    pgMar: CT_PageMar | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+    pgMar: CT_PageMar | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:pgMar", successors=_tag_seq[5:]
     )
-    titlePg: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+    titlePg: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:titlePg", successors=_tag_seq[14:]
     )
     del _tag_seq
@@ -187,9 +181,7 @@ def bottom_margin(self) -> Length | None:
     @bottom_margin.setter
     def bottom_margin(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.bottom = (
-            value if value is None or isinstance(value, Length) else Length(value)
-        )
+        pgMar.bottom = value if value is None or isinstance(value, Length) else Length(value)
 
     def clone(self) -> CT_SectPr:
         """Return an exact duplicate of this ``<w:sectPr>`` element tree suitable for
@@ -217,9 +209,7 @@ def footer(self) -> Length | None:
     @footer.setter
     def footer(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.footer = (
-            value if value is None or isinstance(value, Length) else Length(value)
-        )
+        pgMar.footer = value if value is None or isinstance(value, Length) else Length(value)
 
     def get_footerReference(self, type_: WD_HEADER_FOOTER) -> CT_HdrFtrRef | None:
         """Return footerReference element of `type_` or None if not present."""
@@ -251,9 +241,7 @@ def gutter(self) -> Length | None:
     @gutter.setter
     def gutter(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.gutter = (
-            value if value is None or isinstance(value, Length) else Length(value)
-        )
+        pgMar.gutter = value if value is None or isinstance(value, Length) else Length(value)
 
     @property
     def header(self) -> Length | None:
@@ -270,9 +258,7 @@ def header(self) -> Length | None:
     @header.setter
     def header(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.header = (
-            value if value is None or isinstance(value, Length) else Length(value)
-        )
+        pgMar.header = value if value is None or isinstance(value, Length) else Length(value)
 
     def iter_inner_content(self) -> Iterator[CT_P | CT_Tbl]:
         """Generate all `w:p` and `w:tbl` elements in this section.
@@ -295,9 +281,7 @@ def left_margin(self) -> Length | None:
     @left_margin.setter
     def left_margin(self, value: int | Length | None):
         pgMar = self.get_or_add_pgMar()
-        pgMar.left = (
-            value if value is None or isinstance(value, Length) else Length(value)
-        )
+        pgMar.left = value if value is None or isinstance(value, Length) else Length(value)
 
     @property
     def orientation(self) -> WD_ORIENTATION:
@@ -442,8 +426,8 @@ def top_margin(self, value: Length | None):
 class CT_SectType(BaseOxmlElement):
     """``<w:sectType>`` element, defining the section start type."""
 
-    val: WD_SECTION_START | None = (  # pyright: ignore[reportGeneralTypeIssues]
-        OptionalAttribute("w:val", WD_SECTION_START)
+    val: WD_SECTION_START | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", WD_SECTION_START
     )
 
 
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index 1774560ac..a74abc4ac 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -15,7 +15,7 @@ class CT_DecimalNumber(BaseOxmlElement):
     containing a text representation of a decimal number (e.g. 42) in its ``val``
     attribute."""
 
-    val = RequiredAttribute("w:val", ST_DecimalNumber)
+    val: int = RequiredAttribute("w:val", ST_DecimalNumber)  # pyright: ignore[reportAssignmentType]
 
     @classmethod
     def new(cls, nsptagname, val):
@@ -42,9 +42,7 @@ class CT_String(BaseOxmlElement):
     In those cases, it containing a style name in its `val` attribute.
     """
 
-    val: str = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:val", ST_String
-    )
+    val: str = RequiredAttribute("w:val", ST_String)  # pyright: ignore[reportGeneralTypeIssues]
 
     @classmethod
     def new(cls, nsptagname: str, val: str):
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 48a6d8c2f..da3c6b51d 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, List
+from typing import TYPE_CHECKING, Callable, cast
 
-from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE
+from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT, WD_ROW_HEIGHT_RULE, WD_TABLE_DIRECTION
 from docx.exceptions import InvalidSpanError
 from docx.oxml.ns import nsdecls, qn
 from docx.oxml.parser import parse_xml
+from docx.oxml.shared import CT_DecimalNumber
 from docx.oxml.simpletypes import (
     ST_Merge,
     ST_TblLayoutType,
@@ -15,6 +16,7 @@
     ST_TwipsMeasure,
     XsdInt,
 )
+from docx.oxml.text.paragraph import CT_P
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
     OneAndOnlyOne,
@@ -24,31 +26,43 @@
     ZeroOrMore,
     ZeroOrOne,
 )
-from docx.shared import Emu, Twips
+from docx.shared import Emu, Length, Twips
 
 if TYPE_CHECKING:
-    from docx.oxml.text.paragraph import CT_P
-    from docx.shared import Length
+    from docx.enum.table import WD_TABLE_ALIGNMENT
+    from docx.enum.text import WD_ALIGN_PARAGRAPH
+    from docx.oxml.shared import CT_OnOff, CT_String
+    from docx.oxml.text.parfmt import CT_Jc
 
 
 class CT_Height(BaseOxmlElement):
-    """Used for ``<w:trHeight>`` to specify a row height and row height rule."""
+    """Used for `w:trHeight` to specify a row height and row height rule."""
 
-    val = OptionalAttribute("w:val", ST_TwipsMeasure)
-    hRule = OptionalAttribute("w:hRule", WD_ROW_HEIGHT_RULE)
+    val: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", ST_TwipsMeasure
+    )
+    hRule: WD_ROW_HEIGHT_RULE | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:hRule", WD_ROW_HEIGHT_RULE
+    )
 
 
 class CT_Row(BaseOxmlElement):
     """``<w:tr>`` element."""
 
-    tblPrEx = ZeroOrOne("w:tblPrEx")  # custom inserter below
-    trPr = ZeroOrOne("w:trPr")  # custom inserter below
+    add_tc: Callable[[], CT_Tc]
+    get_or_add_trPr: Callable[[], CT_TrPr]
+
+    tc_lst: list[CT_Tc]
+    # -- custom inserter below --
+    tblPrEx: CT_TblPrEx | None = ZeroOrOne("w:tblPrEx")  # pyright: ignore[reportAssignmentType]
+    # -- custom inserter below --
+    trPr: CT_TrPr | None = ZeroOrOne("w:trPr")  # pyright: ignore[reportAssignmentType]
     tc = ZeroOrMore("w:tc")
 
-    def tc_at_grid_col(self, idx):
-        """The ``<w:tc>`` element appearing at grid column `idx`.
+    def tc_at_grid_col(self, idx: int) -> CT_Tc:
+        """`<w:tc>` element appearing at grid column `idx`.
 
-        Raises |ValueError| if no ``w:tc`` element begins at that grid column.
+        Raises |ValueError| if no `w:tc` element begins at that grid column.
         """
         grid_col = 0
         for tc in self.tc_lst:
@@ -60,21 +74,21 @@ def tc_at_grid_col(self, idx):
         raise ValueError("index out of bounds")
 
     @property
-    def tr_idx(self):
-        """The index of this ``<w:tr>`` element within its parent ``<w:tbl>``
-        element."""
-        return self.getparent().tr_lst.index(self)
+    def tr_idx(self) -> int:
+        """Index of this `w:tr` element within its parent `w:tbl` element."""
+        tbl = cast(CT_Tbl, self.getparent())
+        return tbl.tr_lst.index(self)
 
     @property
-    def trHeight_hRule(self):
-        """Return the value of `w:trPr/w:trHeight@w:hRule`, or |None| if not present."""
+    def trHeight_hRule(self) -> WD_ROW_HEIGHT_RULE | None:
+        """The value of `./w:trPr/w:trHeight/@w:hRule`, or |None| if not present."""
         trPr = self.trPr
         if trPr is None:
             return None
         return trPr.trHeight_hRule
 
     @trHeight_hRule.setter
-    def trHeight_hRule(self, value):
+    def trHeight_hRule(self, value: WD_ROW_HEIGHT_RULE | None):
         trPr = self.get_or_add_trPr()
         trPr.trHeight_hRule = value
 
@@ -87,14 +101,14 @@ def trHeight_val(self):
         return trPr.trHeight_val
 
     @trHeight_val.setter
-    def trHeight_val(self, value):
+    def trHeight_val(self, value: Length | None):
         trPr = self.get_or_add_trPr()
         trPr.trHeight_val = value
 
-    def _insert_tblPrEx(self, tblPrEx):
+    def _insert_tblPrEx(self, tblPrEx: CT_TblPrEx):
         self.insert(0, tblPrEx)
 
-    def _insert_trPr(self, trPr):
+    def _insert_trPr(self, trPr: CT_TrPr):
         tblPrEx = self.tblPrEx
         if tblPrEx is not None:
             tblPrEx.addnext(trPr)
@@ -108,13 +122,16 @@ def _new_tc(self):
 class CT_Tbl(BaseOxmlElement):
     """``<w:tbl>`` element."""
 
-    tblPr = OneAndOnlyOne("w:tblPr")
-    tblGrid = OneAndOnlyOne("w:tblGrid")
+    add_tr: Callable[[], CT_Row]
+    tr_lst: list[CT_Row]
+
+    tblPr: CT_TblPr = OneAndOnlyOne("w:tblPr")  # pyright: ignore[reportAssignmentType]
+    tblGrid: CT_TblGrid = OneAndOnlyOne("w:tblGrid")  # pyright: ignore[reportAssignmentType]
     tr = ZeroOrMore("w:tr")
 
     @property
-    def bidiVisual_val(self):
-        """Value of `w:tblPr/w:bidiVisual/@w:val` or |None| if not present.
+    def bidiVisual_val(self) -> bool | None:
+        """Value of `./w:tblPr/w:bidiVisual/@w:val` or |None| if not present.
 
         Controls whether table cells are displayed right-to-left or left-to-right.
         """
@@ -124,12 +141,12 @@ def bidiVisual_val(self):
         return bidiVisual.val
 
     @bidiVisual_val.setter
-    def bidiVisual_val(self, value):
+    def bidiVisual_val(self, value: WD_TABLE_DIRECTION | None):
         tblPr = self.tblPr
         if value is None:
-            tblPr._remove_bidiVisual()
+            tblPr._remove_bidiVisual()  # pyright: ignore[reportPrivateUsage]
         else:
-            tblPr.get_or_add_bidiVisual().val = value
+            tblPr.get_or_add_bidiVisual().val = bool(value)
 
     @property
     def col_count(self):
@@ -153,111 +170,118 @@ def new_tbl(cls, rows: int, cols: int, width: Length) -> CT_Tbl:
 
         `width` is distributed evenly between the columns.
         """
-        return parse_xml(cls._tbl_xml(rows, cols, width))
+        return cast(CT_Tbl, parse_xml(cls._tbl_xml(rows, cols, width)))
 
     @property
-    def tblStyle_val(self):
-        """Value of `w:tblPr/w:tblStyle/@w:val` (a table style id) or |None| if not
-        present."""
+    def tblStyle_val(self) -> str | None:
+        """`w:tblPr/w:tblStyle/@w:val` (a table style id) or |None| if not present."""
         tblStyle = self.tblPr.tblStyle
         if tblStyle is None:
             return None
         return tblStyle.val
 
     @tblStyle_val.setter
-    def tblStyle_val(self, styleId):
+    def tblStyle_val(self, styleId: str | None) -> None:
         """Set the value of `w:tblPr/w:tblStyle/@w:val` (a table style id) to `styleId`.
 
         If `styleId` is None, remove the `w:tblStyle` element.
         """
         tblPr = self.tblPr
-        tblPr._remove_tblStyle()
+        tblPr._remove_tblStyle()  # pyright: ignore[reportPrivateUsage]
         if styleId is None:
             return
-        tblPr._add_tblStyle().val = styleId
+        tblPr._add_tblStyle().val = styleId  # pyright: ignore[reportPrivateUsage]
 
     @classmethod
     def _tbl_xml(cls, rows: int, cols: int, width: Length) -> str:
-        col_width = Emu(width / cols) if cols > 0 else Emu(0)
+        col_width = Emu(width // cols) if cols > 0 else Emu(0)
         return (
-            "<w:tbl %s>\n"
-            "  <w:tblPr>\n"
-            '    <w:tblW w:type="auto" w:w="0"/>\n'
-            '    <w:tblLook w:firstColumn="1" w:firstRow="1"\n'
-            '               w:lastColumn="0" w:lastRow="0" w:noHBand="0"\n'
-            '               w:noVBand="1" w:val="04A0"/>\n'
-            "  </w:tblPr>\n"
-            "%s"  # tblGrid
-            "%s"  # trs
-            "</w:tbl>\n"
-        ) % (
-            nsdecls("w"),
-            cls._tblGrid_xml(cols, col_width),
-            cls._trs_xml(rows, cols, col_width),
+            f"<w:tbl {nsdecls('w')}>\n"
+            f"  <w:tblPr>\n"
+            f'    <w:tblW w:type="auto" w:w="0"/>\n'
+            f'    <w:tblLook w:firstColumn="1" w:firstRow="1"\n'
+            f'               w:lastColumn="0" w:lastRow="0" w:noHBand="0"\n'
+            f'               w:noVBand="1" w:val="04A0"/>\n'
+            f"  </w:tblPr>\n"
+            f"{cls._tblGrid_xml(cols, col_width)}"
+            f"{cls._trs_xml(rows, cols, col_width)}"
+            f"</w:tbl>\n"
         )
 
     @classmethod
-    def _tblGrid_xml(cls, col_count, col_width):
+    def _tblGrid_xml(cls, col_count: int, col_width: Length) -> str:
         xml = "  <w:tblGrid>\n"
-        for i in range(col_count):
+        for _ in range(col_count):
             xml += '    <w:gridCol w:w="%d"/>\n' % col_width.twips
         xml += "  </w:tblGrid>\n"
         return xml
 
     @classmethod
-    def _trs_xml(cls, row_count, col_count, col_width):
-        xml = ""
-        for i in range(row_count):
-            xml += ("  <w:tr>\n" "%s" "  </w:tr>\n") % cls._tcs_xml(
-                col_count, col_width
-            )
-        return xml
+    def _trs_xml(cls, row_count: int, col_count: int, col_width: Length) -> str:
+        return f"  <w:tr>\n{cls._tcs_xml(col_count, col_width)}  </w:tr>\n" * row_count
 
     @classmethod
-    def _tcs_xml(cls, col_count, col_width):
-        xml = ""
-        for i in range(col_count):
-            xml += (
-                "    <w:tc>\n"
-                "      <w:tcPr>\n"
-                '        <w:tcW w:type="dxa" w:w="%d"/>\n'
-                "      </w:tcPr>\n"
-                "      <w:p/>\n"
-                "    </w:tc>\n"
-            ) % col_width.twips
-        return xml
+    def _tcs_xml(cls, col_count: int, col_width: Length) -> str:
+        return (
+            f"    <w:tc>\n"
+            f"      <w:tcPr>\n"
+            f'        <w:tcW w:type="dxa" w:w="{col_width.twips}"/>\n'
+            f"      </w:tcPr>\n"
+            f"      <w:p/>\n"
+            f"    </w:tc>\n"
+        ) * col_count
 
 
 class CT_TblGrid(BaseOxmlElement):
-    """``<w:tblGrid>`` element, child of ``<w:tbl>``, holds ``<w:gridCol>`` elements
-    that define column count, width, etc."""
+    """`w:tblGrid` element.
+
+    Child of `w:tbl`, holds `w:gridCol> elements that define column count, width, etc.
+    """
+
+    add_gridCol: Callable[[], CT_TblGridCol]
+    gridCol_lst: list[CT_TblGridCol]
 
     gridCol = ZeroOrMore("w:gridCol", successors=("w:tblGridChange",))
 
 
 class CT_TblGridCol(BaseOxmlElement):
-    """``<w:gridCol>`` element, child of ``<w:tblGrid>``, defines a table column."""
+    """`w:gridCol` element, child of `w:tblGrid`, defines a table column."""
 
-    w = OptionalAttribute("w:w", ST_TwipsMeasure)
+    w: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:w", ST_TwipsMeasure
+    )
 
     @property
-    def gridCol_idx(self):
-        """The index of this ``<w:gridCol>`` element within its parent ``<w:tblGrid>``
-        element."""
-        return self.getparent().gridCol_lst.index(self)
+    def gridCol_idx(self) -> int:
+        """Index of this `w:gridCol` element within its parent `w:tblGrid` element."""
+        tblGrid = cast(CT_TblGrid, self.getparent())
+        return tblGrid.gridCol_lst.index(self)
 
 
 class CT_TblLayoutType(BaseOxmlElement):
-    """``<w:tblLayout>`` element, specifying whether column widths are fixed or can be
-    automatically adjusted based on content."""
+    """`w:tblLayout` element.
 
-    type = OptionalAttribute("w:type", ST_TblLayoutType)
+    Specifies whether column widths are fixed or can be automatically adjusted based on
+    content.
+    """
+
+    type: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:type", ST_TblLayoutType
+    )
 
 
 class CT_TblPr(BaseOxmlElement):
     """``<w:tblPr>`` element, child of ``<w:tbl>``, holds child elements that define
     table properties such as style and borders."""
 
+    get_or_add_bidiVisual: Callable[[], CT_OnOff]
+    get_or_add_jc: Callable[[], CT_Jc]
+    get_or_add_tblLayout: Callable[[], CT_TblLayoutType]
+    _add_tblStyle: Callable[[], CT_String]
+    _remove_bidiVisual: Callable[[], None]
+    _remove_jc: Callable[[], None]
+    _remove_tblStyle: Callable[[], None]
+
     _tag_seq = (
         "w:tblStyle",
         "w:tblpPr",
@@ -278,31 +302,35 @@ class CT_TblPr(BaseOxmlElement):
         "w:tblDescription",
         "w:tblPrChange",
     )
-    tblStyle = ZeroOrOne("w:tblStyle", successors=_tag_seq[1:])
-    bidiVisual = ZeroOrOne("w:bidiVisual", successors=_tag_seq[4:])
-    jc = ZeroOrOne("w:jc", successors=_tag_seq[8:])
-    tblLayout = ZeroOrOne("w:tblLayout", successors=_tag_seq[13:])
+    tblStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:tblStyle", successors=_tag_seq[1:]
+    )
+    bidiVisual: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:bidiVisual", successors=_tag_seq[4:]
+    )
+    jc: CT_Jc | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:jc", successors=_tag_seq[8:]
+    )
+    tblLayout: CT_TblLayoutType | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:tblLayout", successors=_tag_seq[13:]
+    )
     del _tag_seq
 
     @property
-    def alignment(self):
-        """Member of :ref:`WdRowAlignment` enumeration or |None|, based on the contents
-        of the `w:val` attribute of `./w:jc`.
-
-        |None| if no `w:jc` element is present.
-        """
+    def alignment(self) -> WD_TABLE_ALIGNMENT | None:
+        """Horizontal alignment of table, |None| if `./w:jc` is not present."""
         jc = self.jc
         if jc is None:
             return None
-        return jc.val
+        return cast("WD_TABLE_ALIGNMENT | None", jc.val)
 
     @alignment.setter
-    def alignment(self, value):
+    def alignment(self, value: WD_TABLE_ALIGNMENT | None):
         self._remove_jc()
         if value is None:
             return
         jc = self.get_or_add_jc()
-        jc.val = value
+        jc.val = cast("WD_ALIGN_PARAGRAPH", value)
 
     @property
     def autofit(self) -> bool:
@@ -328,33 +356,40 @@ def style(self):
         return tblStyle.val
 
     @style.setter
-    def style(self, value):
+    def style(self, value: str | None):
         self._remove_tblStyle()
         if value is None:
             return
-        self._add_tblStyle(val=value)
+        self._add_tblStyle().val = value
+
+
+class CT_TblPrEx(BaseOxmlElement):
+    """`w:tblPrEx` element, exceptions to table-properties.
+
+    Applied at a lower level, like a `w:tr` to modify the appearance. Possibly used when
+    two tables are merged. For more see:
+    http://officeopenxml.com/WPtablePropertyExceptions.php
+    """
 
 
 class CT_TblWidth(BaseOxmlElement):
-    """Used for ``<w:tblW>`` and ``<w:tcW>`` elements and many others, to specify a
-    table-related width."""
+    """Used for `w:tblW` and `w:tcW` and others, specifies a table-related width."""
 
     # the type for `w` attr is actually ST_MeasurementOrPercent, but using
     # XsdInt for now because only dxa (twips) values are being used. It's not
     # entirely clear what the semantics are for other values like -01.4mm
-    w = RequiredAttribute("w:w", XsdInt)
+    w: int = RequiredAttribute("w:w", XsdInt)  # pyright: ignore[reportAssignmentType]
     type = RequiredAttribute("w:type", ST_TblWidth)
 
     @property
-    def width(self):
-        """Return the EMU length value represented by the combined ``w:w`` and
-        ``w:type`` attributes."""
+    def width(self) -> Length | None:
+        """EMU length indicated by the combined `w:w` and `w:type` attrs."""
         if self.type != "dxa":
             return None
         return Twips(self.w)
 
     @width.setter
-    def width(self, value):
+    def width(self, value: Length):
         self.type = "dxa"
         self.w = Emu(value).twips
 
@@ -363,17 +398,19 @@ class CT_Tc(BaseOxmlElement):
     """`w:tc` table cell element."""
 
     add_p: Callable[[], CT_P]
-    p_lst: List[CT_P]
-    tbl_lst: List[CT_Tbl]
-
+    get_or_add_tcPr: Callable[[], CT_TcPr]
+    p_lst: list[CT_P]
+    tbl_lst: list[CT_Tbl]
     _insert_tbl: Callable[[CT_Tbl], CT_Tbl]
+    _new_p: Callable[[], CT_P]
 
-    tcPr = ZeroOrOne("w:tcPr")  # bunches of successors, overriding insert
+    # -- tcPr has many successors, `._insert_tcPr()` is overridden below --
+    tcPr: CT_TcPr | None = ZeroOrOne("w:tcPr")  # pyright: ignore[reportAssignmentType]
     p = OneOrMore("w:p")
     tbl = OneOrMore("w:tbl")
 
     @property
-    def bottom(self):
+    def bottom(self) -> int:
         """The row index that marks the bottom extent of the vertical span of this cell.
 
         This is one greater than the index of the bottom-most row of the span, similar
@@ -386,21 +423,18 @@ def bottom(self):
         return self._tr_idx + 1
 
     def clear_content(self):
-        """Remove all content child elements, preserving the ``<w:tcPr>`` element if
-        present.
+        """Remove all content elements, preserving `w:tcPr` element if present.
 
-        Note that this leaves the ``<w:tc>`` element in an invalid state because it
-        doesn't contain at least one block-level element. It's up to the caller to add a
-        ``<w:p>``child element as the last content element.
+        Note that this leaves the `w:tc` element in an invalid state because it doesn't
+        contain at least one block-level element. It's up to the caller to add a
+        `w:p`child element as the last content element.
         """
-        new_children = []
-        tcPr = self.tcPr
-        if tcPr is not None:
-            new_children.append(tcPr)
-        self[:] = new_children
+        # -- remove all cell inner-content except a `w:tcPr` when present. --
+        for e in self.xpath("./*[not(self::w:tcPr)]"):
+            self.remove(e)
 
     @property
-    def grid_span(self):
+    def grid_span(self) -> int:
         """The integer number of columns this cell spans.
 
         Determined by ./w:tcPr/w:gridSpan/@val, it defaults to 1.
@@ -411,12 +445,12 @@ def grid_span(self):
         return tcPr.grid_span
 
     @grid_span.setter
-    def grid_span(self, value):
+    def grid_span(self, value: int):
         tcPr = self.get_or_add_tcPr()
         tcPr.grid_span = value
 
     @property
-    def inner_content_elements(self) -> List[CT_P | CT_Tbl]:
+    def inner_content_elements(self) -> list[CT_P | CT_Tbl]:
         """Generate all `w:p` and `w:tbl` elements in this document-body.
 
         Elements appear in document order. Elements shaded by nesting in a `w:ins` or
@@ -433,27 +467,28 @@ def iter_block_items(self):
                 yield child
 
     @property
-    def left(self):
+    def left(self) -> int:
         """The grid column index at which this ``<w:tc>`` element appears."""
         return self._grid_col
 
-    def merge(self, other_tc):
-        """Return the top-left ``<w:tc>`` element of a new span formed by merging the
-        rectangular region defined by using this tc element and `other_tc` as diagonal
-        corners."""
+    def merge(self, other_tc: CT_Tc) -> CT_Tc:
+        """Return top-left `w:tc` element of a new span.
+
+        Span is formed by merging the rectangular region defined by using this tc
+        element and `other_tc` as diagonal corners.
+        """
         top, left, height, width = self._span_dimensions(other_tc)
         top_tc = self._tbl.tr_lst[top].tc_at_grid_col(left)
         top_tc._grow_to(width, height)
         return top_tc
 
     @classmethod
-    def new(cls):
-        """Return a new ``<w:tc>`` element, containing an empty paragraph as the
-        required EG_BlockLevelElt."""
-        return parse_xml("<w:tc %s>\n" "  <w:p/>\n" "</w:tc>" % nsdecls("w"))
+    def new(cls) -> CT_Tc:
+        """A new `w:tc` element, containing an empty paragraph as the required EG_BlockLevelElt."""
+        return cast(CT_Tc, parse_xml("<w:tc %s>\n" "  <w:p/>\n" "</w:tc>" % nsdecls("w")))
 
     @property
-    def right(self):
+    def right(self) -> int:
         """The grid column index that marks the right-side extent of the horizontal span
         of this cell.
 
@@ -463,108 +498,118 @@ def right(self):
         return self._grid_col + self.grid_span
 
     @property
-    def top(self):
+    def top(self) -> int:
         """The top-most row index in the vertical span of this cell."""
         if self.vMerge is None or self.vMerge == ST_Merge.RESTART:
             return self._tr_idx
         return self._tc_above.top
 
     @property
-    def vMerge(self):
-        """The value of the ./w:tcPr/w:vMerge/@val attribute, or |None| if the w:vMerge
-        element is not present."""
+    def vMerge(self) -> str | None:
+        """Value of ./w:tcPr/w:vMerge/@val, |None| if w:vMerge is not present."""
         tcPr = self.tcPr
         if tcPr is None:
             return None
         return tcPr.vMerge_val
 
     @vMerge.setter
-    def vMerge(self, value):
+    def vMerge(self, value: str | None):
         tcPr = self.get_or_add_tcPr()
         tcPr.vMerge_val = value
 
     @property
-    def width(self):
-        """Return the EMU length value represented in the ``./w:tcPr/w:tcW`` child
-        element or |None| if not present."""
+    def width(self) -> Length | None:
+        """EMU length represented in `./w:tcPr/w:tcW` or |None| if not present."""
         tcPr = self.tcPr
         if tcPr is None:
             return None
         return tcPr.width
 
     @width.setter
-    def width(self, value):
+    def width(self, value: Length):
         tcPr = self.get_or_add_tcPr()
         tcPr.width = value
 
-    def _add_width_of(self, other_tc):
+    def _add_width_of(self, other_tc: CT_Tc):
         """Add the width of `other_tc` to this cell.
 
         Does nothing if either this tc or `other_tc` does not have a specified width.
         """
         if self.width and other_tc.width:
-            self.width += other_tc.width
+            self.width = Length(self.width + other_tc.width)
 
     @property
-    def _grid_col(self):
+    def _grid_col(self) -> int:
         """The grid column at which this cell begins."""
         tr = self._tr
         idx = tr.tc_lst.index(self)
         preceding_tcs = tr.tc_lst[:idx]
         return sum(tc.grid_span for tc in preceding_tcs)
 
-    def _grow_to(self, width, height, top_tc=None):
-        """Grow this cell to `width` grid columns and `height` rows by expanding
-        horizontal spans and creating continuation cells to form vertical spans."""
+    def _grow_to(self, width: int, height: int, top_tc: CT_Tc | None = None):
+        """Grow this cell to `width` grid columns and `height` rows.
 
-        def vMerge_val(top_tc):
-            if top_tc is not self:
-                return ST_Merge.CONTINUE
-            if height == 1:
-                return None
-            return ST_Merge.RESTART
+        This is accomplished by expanding horizontal spans and creating continuation
+        cells to form vertical spans.
+        """
+
+        def vMerge_val(top_tc: CT_Tc):
+            return (
+                ST_Merge.CONTINUE
+                if top_tc is not self
+                else None if height == 1 else ST_Merge.RESTART
+            )
 
         top_tc = self if top_tc is None else top_tc
         self._span_to_width(width, top_tc, vMerge_val(top_tc))
         if height > 1:
-            self._tc_below._grow_to(width, height - 1, top_tc)
+            tc_below = self._tc_below
+            assert tc_below is not None
+            tc_below._grow_to(width, height - 1, top_tc)
 
-    def _insert_tcPr(self, tcPr):
-        """``tcPr`` has a bunch of successors, but it comes first if it appears, so just
-        overriding and using insert(0, ...) rather than spelling out successors."""
+    def _insert_tcPr(self, tcPr: CT_TcPr) -> CT_TcPr:
+        """Override default `._insert_tcPr()`."""
+        # -- `tcPr`` has a large number of successors, but always comes first if it appears,
+        # -- so just using insert(0, ...) rather than spelling out successors.
         self.insert(0, tcPr)
         return tcPr
 
     @property
-    def _is_empty(self):
-        """True if this cell contains only a single empty ``<w:p>`` element."""
+    def _is_empty(self) -> bool:
+        """True if this cell contains only a single empty `w:p` element."""
         block_items = list(self.iter_block_items())
         if len(block_items) > 1:
             return False
-        p = block_items[0]  # cell must include at least one <w:p> element
-        if len(p.r_lst) == 0:
+        # -- cell must include at least one block item but can be a `w:tbl`, `w:sdt`,
+        # -- `w:customXml` or a `w:p`
+        only_item = block_items[0]
+        if isinstance(only_item, CT_P) and len(only_item.r_lst) == 0:
             return True
         return False
 
-    def _move_content_to(self, other_tc):
-        """Append the content of this cell to `other_tc`, leaving this cell with a
-        single empty ``<w:p>`` element."""
+    def _move_content_to(self, other_tc: CT_Tc):
+        """Append the content of this cell to `other_tc`.
+
+        Leaves this cell with a single empty ``<w:p>`` element.
+        """
         if other_tc is self:
             return
         if self._is_empty:
             return
         other_tc._remove_trailing_empty_p()
-        # appending moves each element from self to other_tc
+        # -- appending moves each element from self to other_tc --
         for block_element in self.iter_block_items():
             other_tc.append(block_element)
-        # add back the required minimum single empty <w:p> element
+        # -- add back the required minimum single empty <w:p> element --
         self.append(self._new_p())
 
-    def _new_tbl(self):
-        return CT_Tbl.new()
+    def _new_tbl(self) -> None:
+        raise NotImplementedError(
+            "use CT_Tbl.new_tbl() to add a new table, specifying rows and columns"
+        )
 
     @property
-    def _next_tc(self):
+    def _next_tc(self) -> CT_Tc | None:
         """The `w:tc` element immediately following this one in this row, or |None| if
         this is the last `w:tc` element in the row."""
         following_tcs = self.xpath("./following-sibling::w:tc")
@@ -572,32 +617,33 @@ def _next_tc(self):
 
     def _remove(self):
         """Remove this `w:tc` element from the XML tree."""
-        self.getparent().remove(self)
+        parent_element = self.getparent()
+        assert parent_element is not None
+        parent_element.remove(self)
 
     def _remove_trailing_empty_p(self):
-        """Remove the last content element from this cell if it is an empty ``<w:p>``
-        element."""
+        """Remove last content element from this cell if it's an empty `w:p` element."""
         block_items = list(self.iter_block_items())
         last_content_elm = block_items[-1]
-        if last_content_elm.tag != qn("w:p"):
+        if not isinstance(last_content_elm, CT_P):
             return
         p = last_content_elm
         if len(p.r_lst) > 0:
             return
         self.remove(p)
 
-    def _span_dimensions(self, other_tc):
+    def _span_dimensions(self, other_tc: CT_Tc) -> tuple[int, int, int, int]:
         """Return a (top, left, height, width) 4-tuple specifying the extents of the
         merged cell formed by using this tc and `other_tc` as opposite corner
         extents."""
 
-        def raise_on_inverted_L(a, b):
+        def raise_on_inverted_L(a: CT_Tc, b: CT_Tc):
             if a.top == b.top and a.bottom != b.bottom:
                 raise InvalidSpanError("requested span not rectangular")
             if a.left == b.left and a.right != b.right:
                 raise InvalidSpanError("requested span not rectangular")
 
-        def raise_on_tee_shaped(a, b):
+        def raise_on_tee_shaped(a: CT_Tc, b: CT_Tc):
             top_most, other = (a, b) if a.top < b.top else (b, a)
             if top_most.top < other.top and top_most.bottom > other.bottom:
                 raise InvalidSpanError("requested span not rectangular")
@@ -616,9 +662,10 @@ def raise_on_tee_shaped(a, b):
 
         return top, left, bottom - top, right - left
 
-    def _span_to_width(self, grid_width, top_tc, vMerge):
-        """Incorporate and then remove `w:tc` elements to the right of this one until
-        this cell spans `grid_width`.
+    def _span_to_width(self, grid_width: int, top_tc: CT_Tc, vMerge: str | None):
+        """Incorporate `w:tc` elements to the right until this cell spans `grid_width`.
+
+        Incorporated `w:tc` elements are removed (replaced by gridSpan value).
 
         Raises |ValueError| if `grid_width` cannot be exactly achieved, such as when a
         merged cell would drive the span width greater than `grid_width` or if not
@@ -632,7 +679,7 @@ def _span_to_width(self, grid_width, top_tc, vMerge):
             self._swallow_next_tc(grid_width, top_tc)
         self.vMerge = vMerge
 
-    def _swallow_next_tc(self, grid_width, top_tc):
+    def _swallow_next_tc(self, grid_width: int, top_tc: CT_Tc):
         """Extend the horizontal span of this `w:tc` element to incorporate the
         following `w:tc` element in the row and then delete that following `w:tc`
         element.
@@ -643,7 +690,7 @@ def _swallow_next_tc(self, grid_width, top_tc):
         than `grid_width` or if there is no next `<w:tc>` element in the row.
         """
 
-        def raise_on_invalid_swallow(next_tc):
+        def raise_on_invalid_swallow(next_tc: CT_Tc | None):
             if next_tc is None:
                 raise InvalidSpanError("not enough grid columns")
             if self.grid_span + next_tc.grid_span > grid_width:
@@ -651,23 +698,24 @@ def raise_on_invalid_swallow(next_tc):
 
         next_tc = self._next_tc
         raise_on_invalid_swallow(next_tc)
+        assert next_tc is not None
         next_tc._move_content_to(top_tc)
         self._add_width_of(next_tc)
         self.grid_span += next_tc.grid_span
         next_tc._remove()
 
     @property
-    def _tbl(self):
+    def _tbl(self) -> CT_Tbl:
         """The tbl element this tc element appears in."""
-        return self.xpath("./ancestor::w:tbl[position()=1]")[0]
+        return cast(CT_Tbl, self.xpath("./ancestor::w:tbl[position()=1]")[0])
 
     @property
-    def _tc_above(self):
+    def _tc_above(self) -> CT_Tc:
         """The `w:tc` element immediately above this one in its grid column."""
         return self._tr_above.tc_at_grid_col(self._grid_col)
 
     @property
-    def _tc_below(self):
+    def _tc_below(self) -> CT_Tc | None:
         """The tc element immediately below this one in its grid column."""
         tr_below = self._tr_below
         if tr_below is None:
@@ -675,12 +723,12 @@ def _tc_below(self):
         return tr_below.tc_at_grid_col(self._grid_col)
 
     @property
-    def _tr(self):
+    def _tr(self) -> CT_Row:
         """The tr element this tc element appears in."""
-        return self.xpath("./ancestor::w:tr[position()=1]")[0]
+        return cast(CT_Row, self.xpath("./ancestor::w:tr[position()=1]")[0])
 
     @property
-    def _tr_above(self):
+    def _tr_above(self) -> CT_Row:
         """The tr element prior in sequence to the tr this cell appears in.
 
         Raises |ValueError| if called on a cell in the top-most row.
@@ -692,7 +740,7 @@ def _tr_above(self):
         return tr_lst[tr_idx - 1]
 
     @property
-    def _tr_below(self):
+    def _tr_below(self) -> CT_Row | None:
         """The tr element next in sequence after the tr this cell appears in, or |None|
         if this cell appears in the last row."""
         tr_lst = self._tbl.tr_lst
@@ -703,7 +751,7 @@ def _tr_below(self):
             return None
 
     @property
-    def _tr_idx(self):
+    def _tr_idx(self) -> int:
         """The row index of the tr element this tc element appears in."""
         return self._tbl.tr_lst.index(self._tr)
 
@@ -711,6 +759,14 @@ def _tr_idx(self):
 class CT_TcPr(BaseOxmlElement):
     """``<w:tcPr>`` element, defining table cell properties."""
 
+    get_or_add_gridSpan: Callable[[], CT_DecimalNumber]
+    get_or_add_tcW: Callable[[], CT_TblWidth]
+    get_or_add_vAlign: Callable[[], CT_VerticalJc]
+    _add_vMerge: Callable[[], CT_VMerge]
+    _remove_gridSpan: Callable[[], None]
+    _remove_vAlign: Callable[[], None]
+    _remove_vMerge: Callable[[], None]
+
     _tag_seq = (
         "w:cnfStyle",
         "w:tcW",
@@ -731,14 +787,22 @@ class CT_TcPr(BaseOxmlElement):
         "w:cellMerge",
         "w:tcPrChange",
     )
-    tcW = ZeroOrOne("w:tcW", successors=_tag_seq[2:])
-    gridSpan = ZeroOrOne("w:gridSpan", successors=_tag_seq[3:])
-    vMerge = ZeroOrOne("w:vMerge", successors=_tag_seq[5:])
-    vAlign = ZeroOrOne("w:vAlign", successors=_tag_seq[12:])
+    tcW: CT_TblWidth | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:tcW", successors=_tag_seq[2:]
+    )
+    gridSpan: CT_DecimalNumber | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:gridSpan", successors=_tag_seq[3:]
+    )
+    vMerge: CT_VMerge | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:vMerge", successors=_tag_seq[5:]
+    )
+    vAlign: CT_VerticalJc | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:vAlign", successors=_tag_seq[12:]
+    )
     del _tag_seq
 
     @property
-    def grid_span(self):
+    def grid_span(self) -> int:
         """The integer number of columns this cell spans.
 
         Determined by ./w:gridSpan/@val, it defaults to 1.
@@ -749,7 +813,7 @@ def grid_span(self):
         return gridSpan.val
 
     @grid_span.setter
-    def grid_span(self, value):
+    def grid_span(self, value: int):
         self._remove_gridSpan()
         if value > 1:
             self.get_or_add_gridSpan().val = value
@@ -767,7 +831,7 @@ def vAlign_val(self):
         return vAlign.val
 
     @vAlign_val.setter
-    def vAlign_val(self, value):
+    def vAlign_val(self, value: WD_CELL_VERTICAL_ALIGNMENT | None):
         if value is None:
             self._remove_vAlign()
             return
@@ -783,22 +847,21 @@ def vMerge_val(self):
         return vMerge.val
 
     @vMerge_val.setter
-    def vMerge_val(self, value):
+    def vMerge_val(self, value: str | None):
         self._remove_vMerge()
         if value is not None:
             self._add_vMerge().val = value
 
     @property
-    def width(self):
-        """Return the EMU length value represented in the ``<w:tcW>`` child element or
-        |None| if not present or its type is not 'dxa'."""
+    def width(self) -> Length | None:
+        """EMU length in `./w:tcW` or |None| if not present or its type is not 'dxa'."""
         tcW = self.tcW
         if tcW is None:
             return None
         return tcW.width
 
     @width.setter
-    def width(self, value):
+    def width(self, value: Length):
         tcW = self.get_or_add_tcW()
         tcW.width = value
 
@@ -806,6 +869,8 @@ def width(self, value):
 class CT_TrPr(BaseOxmlElement):
     """``<w:trPr>`` element, defining table row properties."""
 
+    get_or_add_trHeight: Callable[[], CT_Height]
+
     _tag_seq = (
         "w:cnfStyle",
         "w:divId",
@@ -823,11 +888,13 @@ class CT_TrPr(BaseOxmlElement):
         "w:del",
         "w:trPrChange",
     )
-    trHeight = ZeroOrOne("w:trHeight", successors=_tag_seq[8:])
+    trHeight: CT_Height | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:trHeight", successors=_tag_seq[8:]
+    )
     del _tag_seq
 
     @property
-    def trHeight_hRule(self):
+    def trHeight_hRule(self) -> WD_ROW_HEIGHT_RULE | None:
         """Return the value of `w:trHeight@w:hRule`, or |None| if not present."""
         trHeight = self.trHeight
         if trHeight is None:
@@ -835,7 +902,7 @@ def trHeight_hRule(self):
         return trHeight.hRule
 
     @trHeight_hRule.setter
-    def trHeight_hRule(self, value):
+    def trHeight_hRule(self, value: WD_ROW_HEIGHT_RULE | None):
         if value is None and self.trHeight is None:
             return
         trHeight = self.get_or_add_trHeight()
@@ -850,7 +917,7 @@ def trHeight_val(self):
         return trHeight.val
 
     @trHeight_val.setter
-    def trHeight_val(self, value):
+    def trHeight_val(self, value: Length | None):
         if value is None and self.trHeight is None:
             return
         trHeight = self.get_or_add_trHeight()
@@ -860,10 +927,14 @@ def trHeight_val(self, value):
 class CT_VerticalJc(BaseOxmlElement):
     """`w:vAlign` element, specifying vertical alignment of cell."""
 
-    val = RequiredAttribute("w:val", WD_CELL_VERTICAL_ALIGNMENT)
+    val: WD_CELL_VERTICAL_ALIGNMENT = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", WD_CELL_VERTICAL_ALIGNMENT
+    )
 
 
 class CT_VMerge(BaseOxmlElement):
     """``<w:vMerge>`` element, specifying vertical merging behavior of a cell."""
 
-    val = OptionalAttribute("w:val", ST_Merge, default=ST_Merge.CONTINUE)
+    val: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", ST_Merge, default=ST_Merge.CONTINUE  # pyright: ignore[reportArgumentType]
+    )
diff --git a/src/docx/oxml/text/hyperlink.py b/src/docx/oxml/text/hyperlink.py
index 77d409f6a..38a33ff15 100644
--- a/src/docx/oxml/text/hyperlink.py
+++ b/src/docx/oxml/text/hyperlink.py
@@ -21,13 +21,13 @@ class CT_Hyperlink(BaseOxmlElement):
 
     r_lst: List[CT_R]
 
-    rId: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "r:id", XsdString
-    )
-    anchor: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    rId: str | None = OptionalAttribute("r:id", XsdString)  # pyright: ignore[reportAssignmentType]
+    anchor: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:anchor", ST_String
     )
-    history = OptionalAttribute("w:history", ST_OnOff, default=True)
+    history: bool = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:history", ST_OnOff, default=True
+    )
 
     r = ZeroOrMore("w:r")
 
@@ -36,8 +36,8 @@ def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
         """All `w:lastRenderedPageBreak` descendants of this hyperlink."""
         return self.xpath("./w:r/w:lastRenderedPageBreak")
 
-    @property  # pyright: ignore[reportIncompatibleVariableOverride]
-    def text(self) -> str:
+    @property
+    def text(self) -> str:  # pyright: ignore[reportIncompatibleMethodOverride]
         """The textual content of this hyperlink.
 
         `CT_Hyperlink` stores the hyperlink-text as one or more `w:r` children.
diff --git a/src/docx/oxml/text/paragraph.py b/src/docx/oxml/text/paragraph.py
index f771dd74f..63e96f312 100644
--- a/src/docx/oxml/text/paragraph.py
+++ b/src/docx/oxml/text/paragraph.py
@@ -26,7 +26,7 @@ class CT_P(BaseOxmlElement):
     hyperlink_lst: List[CT_Hyperlink]
     r_lst: List[CT_R]
 
-    pPr: CT_PPr | None = ZeroOrOne("w:pPr")  # pyright: ignore[reportGeneralTypeIssues]
+    pPr: CT_PPr | None = ZeroOrOne("w:pPr")  # pyright: ignore[reportAssignmentType]
     hyperlink = ZeroOrMore("w:hyperlink")
     r = ZeroOrMore("w:r")
 
@@ -92,8 +92,8 @@ def style(self, style: str | None):
         pPr = self.get_or_add_pPr()
         pPr.style = style
 
-    @property  # pyright: ignore[reportIncompatibleVariableOverride]
-    def text(self):
+    @property
+    def text(self):  # pyright: ignore[reportIncompatibleMethodOverride]
         """The textual content of this paragraph.
 
         Inner-content child elements like `w:r` and `w:hyperlink` are translated to
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index 49ea01003..94e802938 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -37,7 +37,9 @@ class CT_Ind(BaseOxmlElement):
 class CT_Jc(BaseOxmlElement):
     """``<w:jc>`` element, specifying paragraph justification."""
 
-    val = RequiredAttribute("w:val", WD_ALIGN_PARAGRAPH)
+    val: WD_ALIGN_PARAGRAPH = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", WD_ALIGN_PARAGRAPH
+    )
 
 
 class CT_PPr(BaseOxmlElement):
@@ -86,7 +88,7 @@ class CT_PPr(BaseOxmlElement):
         "w:sectPr",
         "w:pPrChange",
     )
-    pStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+    pStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:pStyle", successors=_tag_seq[1:]
     )
     keepNext = ZeroOrOne("w:keepNext", successors=_tag_seq[2:])
diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index f17d33845..88efae83c 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -29,7 +29,7 @@ class CT_R(BaseOxmlElement):
     _add_drawing: Callable[[], CT_Drawing]
     _add_t: Callable[..., CT_Text]
 
-    rPr: CT_RPr | None = ZeroOrOne("w:rPr")  # pyright: ignore[reportGeneralTypeIssues]
+    rPr: CT_RPr | None = ZeroOrOne("w:rPr")  # pyright: ignore[reportAssignmentType]
     br = ZeroOrMore("w:br")
     cr = ZeroOrMore("w:cr")
     drawing = ZeroOrMore("w:drawing")
@@ -120,12 +120,11 @@ def text(self) -> str:
         equivalent.
         """
         return "".join(
-            str(e)
-            for e in self.xpath("w:br | w:cr | w:noBreakHyphen | w:ptab | w:t | w:tab")
+            str(e) for e in self.xpath("w:br | w:cr | w:noBreakHyphen | w:ptab | w:t | w:tab")
         )
 
-    @text.setter  # pyright: ignore[reportIncompatibleVariableOverride]
-    def text(self, text: str):
+    @text.setter
+    def text(self, text: str):  # pyright: ignore[reportIncompatibleMethodOverride]
         self.clear_content()
         _RunContentAppender.append_to_run_from_text(self, text)
 
@@ -141,12 +140,10 @@ def _insert_rPr(self, rPr: CT_RPr) -> CT_RPr:
 class CT_Br(BaseOxmlElement):
     """`<w:br>` element, indicating a line, page, or column break in a run."""
 
-    type: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    type: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:type", ST_BrType, default="textWrapping"
     )
-    clear: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:clear", ST_BrClear
-    )
+    clear: str | None = OptionalAttribute("w:clear", ST_BrClear)  # pyright: ignore
 
     def __str__(self) -> str:
         """Text equivalent of this element. Actual value depends on break type.
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index d075f88f1..077bcd583 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -126,16 +126,12 @@ class BaseAttribute:
     Provides common methods.
     """
 
-    def __init__(
-        self, attr_name: str, simple_type: Type[BaseXmlEnum] | Type[BaseSimpleType]
-    ):
+    def __init__(self, attr_name: str, simple_type: Type[BaseXmlEnum] | Type[BaseSimpleType]):
         super(BaseAttribute, self).__init__()
         self._attr_name = attr_name
         self._simple_type = simple_type
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._prop_name = prop_name
@@ -159,14 +155,12 @@ def _clark_name(self):
         return self._attr_name
 
     @property
-    def _getter(self) -> Callable[[BaseOxmlElement], Any | None]:
-        ...
+    def _getter(self) -> Callable[[BaseOxmlElement], Any | None]: ...
 
     @property
     def _setter(
         self,
-    ) -> Callable[[BaseOxmlElement, Any | None], None]:
-        ...
+    ) -> Callable[[BaseOxmlElement, Any | None], None]: ...
 
 
 class OptionalAttribute(BaseAttribute):
@@ -181,7 +175,7 @@ def __init__(
         self,
         attr_name: str,
         simple_type: Type[BaseXmlEnum] | Type[BaseSimpleType],
-        default: BaseXmlEnum | BaseSimpleType | None = None,
+        default: BaseXmlEnum | BaseSimpleType | str | bool | None = None,
     ):
         super(OptionalAttribute, self).__init__(attr_name, simple_type)
         self._default = default
@@ -259,8 +253,7 @@ def get_attr_value(obj: BaseOxmlElement) -> Any | None:
             attr_str_value = obj.get(self._clark_name)
             if attr_str_value is None:
                 raise InvalidXmlError(
-                    "required '%s' attribute not present on element %s"
-                    % (self._attr_name, obj.tag)
+                    "required '%s' attribute not present on element %s" % (self._attr_name, obj.tag)
                 )
             return self._simple_type.from_xml(attr_str_value)
 
@@ -292,9 +285,7 @@ def __init__(self, nsptagname: str, successors: Tuple[str, ...] = ()):
         self._nsptagname = nsptagname
         self._successors = successors
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Baseline behavior for adding the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
         self._prop_name = prop_name
@@ -508,9 +499,7 @@ class OneAndOnlyOne(_BaseChildElement):
     def __init__(self, nsptagname: str):
         super(OneAndOnlyOne, self).__init__(nsptagname, ())
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(OneAndOnlyOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
@@ -528,9 +517,7 @@ def get_child_element(obj: BaseOxmlElement):
                 )
             return child
 
-        get_child_element.__doc__ = (
-            "Required ``<%s>`` child element." % self._nsptagname
-        )
+        get_child_element.__doc__ = "Required ``<%s>`` child element." % self._nsptagname
         return get_child_element
 
 
@@ -538,9 +525,7 @@ class OneOrMore(_BaseChildElement):
     """Defines a repeating child element for MetaOxmlElement that must appear at least
     once."""
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(OneOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
@@ -554,9 +539,7 @@ def populate_class_members(
 class ZeroOrMore(_BaseChildElement):
     """Defines an optional repeating child element for MetaOxmlElement."""
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(ZeroOrMore, self).populate_class_members(element_cls, prop_name)
         self._add_list_getter()
@@ -570,9 +553,7 @@ def populate_class_members(
 class ZeroOrOne(_BaseChildElement):
     """Defines an optional child element for MetaOxmlElement."""
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(ZeroOrOne, self).populate_class_members(element_cls, prop_name)
         self._add_getter()
@@ -604,9 +585,7 @@ def _add_remover(self):
         def _remove_child(obj: BaseOxmlElement):
             obj.remove_all(self._nsptagname)
 
-        _remove_child.__doc__ = (
-            "Remove all ``<%s>`` child elements."
-        ) % self._nsptagname
+        _remove_child.__doc__ = ("Remove all ``<%s>`` child elements.") % self._nsptagname
         self._add_to_class(self._remove_method_name, _remove_child)
 
     @lazyproperty
@@ -622,16 +601,12 @@ def __init__(self, choices: Sequence[Choice], successors: Tuple[str, ...] = ()):
         self._choices = choices
         self._successors = successors
 
-    def populate_class_members(
-        self, element_cls: MetaOxmlElement, prop_name: str
-    ) -> None:
+    def populate_class_members(self, element_cls: MetaOxmlElement, prop_name: str) -> None:
         """Add the appropriate methods to `element_cls`."""
         super(ZeroOrOneChoice, self).populate_class_members(element_cls, prop_name)
         self._add_choice_getter()
         for choice in self._choices:
-            choice.populate_class_members(
-                element_cls, self._prop_name, self._successors
-            )
+            choice.populate_class_members(element_cls, self._prop_name, self._successors)
         self._add_group_remover()
 
     def _add_choice_getter(self):
@@ -649,9 +624,7 @@ def _remove_choice_group(obj: BaseOxmlElement):
             for tagname in self._member_nsptagnames:
                 obj.remove_all(tagname)
 
-        _remove_choice_group.__doc__ = (
-            "Remove the current choice group child element if present."
-        )
+        _remove_choice_group.__doc__ = "Remove the current choice group child element if present."
         self._add_to_class(self._remove_choice_group_method_name, _remove_choice_group)
 
     @property
@@ -680,9 +653,7 @@ def _remove_choice_group_method_name(self):
 
 
 # -- lxml typing isn't quite right here, just ignore this error on _Element --
-class BaseOxmlElement(  # pyright: ignore[reportGeneralTypeIssues]
-    etree.ElementBase, metaclass=MetaOxmlElement
-):
+class BaseOxmlElement(etree.ElementBase, metaclass=MetaOxmlElement):
     """Effective base class for all custom element classes.
 
     Adds standardized behavior to all classes in one place.
@@ -726,9 +697,7 @@ def xml(self) -> str:
         """
         return serialize_for_reading(self)
 
-    def xpath(  # pyright: ignore[reportIncompatibleMethodOverride]
-        self, xpath_str: str
-    ) -> Any:
+    def xpath(self, xpath_str: str) -> Any:  # pyright: ignore[reportIncompatibleMethodOverride]
         """Override of `lxml` _Element.xpath() method.
 
         Provides standard Open XML namespace mapping (`nsmap`) in centralized location.
diff --git a/src/docx/table.py b/src/docx/table.py
index 31372284c..55cf77f41 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -2,27 +2,37 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Tuple, overload
+from typing import TYPE_CHECKING, cast, overload
 
+from typing_extensions import TypeAlias
+
+from docx import types as t
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.style import WD_STYLE_TYPE
+from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT
 from docx.oxml.simpletypes import ST_Merge
-from docx.shared import Inches, Parented, lazyproperty
+from docx.oxml.table import CT_TblGridCol
+from docx.shared import Inches, Parented, StoryChild, lazyproperty
 
 if TYPE_CHECKING:
-    from docx import types as t
-    from docx.enum.table import WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
-    from docx.oxml.table import CT_Tbl, CT_TblPr
+    from docx.enum.table import WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
+    from docx.oxml.table import CT_Row, CT_Tbl, CT_TblPr, CT_Tc
     from docx.shared import Length
-    from docx.styles.style import _TableStyle  # pyright: ignore[reportPrivateUsage]
+    from docx.styles.style import (
+        ParagraphStyle,
+        _TableStyle,  # pyright: ignore[reportPrivateUsage]
+    )
+
+TableParent: TypeAlias = "Table | _Columns | _Rows"
 
 
-class Table(Parented):
+class Table(StoryChild):
     """Proxy class for a WordprocessingML ``<w:tbl>`` element."""
 
-    def __init__(self, tbl: CT_Tbl, parent: t.StoryChild):
+    def __init__(self, tbl: CT_Tbl, parent: t.ProvidesStoryPart):
         super(Table, self).__init__(parent)
-        self._element = self._tbl = tbl
+        self._element = tbl
+        self._tbl = tbl
 
     def add_column(self, width: Length):
         """Return a |_Column| object of `width`, newly added rightmost to the table."""
@@ -40,7 +50,8 @@ def add_row(self):
         tr = tbl.add_tr()
         for gridCol in tbl.tblGrid.gridCol_lst:
             tc = tr.add_tc()
-            tc.width = gridCol.w
+            if gridCol.w is not None:
+                tc.width = gridCol.w
         return _Row(tr, self)
 
     @property
@@ -79,7 +90,7 @@ def cell(self, row_idx: int, col_idx: int) -> _Cell:
         cell_idx = col_idx + (row_idx * self._column_count)
         return self._cells[cell_idx]
 
-    def column_cells(self, column_idx: int) -> List[_Cell]:
+    def column_cells(self, column_idx: int) -> list[_Cell]:
         """Sequence of cells in the column at `column_idx` in this table."""
         cells = self._cells
         idxs = range(column_idx, len(cells), self._column_count)
@@ -90,7 +101,7 @@ def columns(self):
         """|_Columns| instance representing the sequence of columns in this table."""
         return _Columns(self._tbl, self)
 
-    def row_cells(self, row_idx: int) -> List[_Cell]:
+    def row_cells(self, row_idx: int) -> list[_Cell]:
         """Sequence of cells in the row at `row_idx` in this table."""
         column_count = self._column_count
         start = row_idx * column_count
@@ -116,7 +127,7 @@ def style(self) -> _TableStyle | None:
         `Light Shading - Accent 1` becomes `Light Shading Accent 1`.
         """
         style_id = self._tbl.tblStyle_val
-        return self.part.get_style(style_id, WD_STYLE_TYPE.TABLE)
+        return cast("_TableStyle | None", self.part.get_style(style_id, WD_STYLE_TYPE.TABLE))
 
     @style.setter
     def style(self, style_or_name: _TableStyle | None):
@@ -140,21 +151,21 @@ def table_direction(self) -> WD_TABLE_DIRECTION | None:
         For example: `WD_TABLE_DIRECTION.LTR`. |None| indicates the value is inherited
         from the style hierarchy.
         """
-        return self._element.bidiVisual_val
+        return cast("WD_TABLE_DIRECTION | None", self._tbl.bidiVisual_val)
 
     @table_direction.setter
     def table_direction(self, value: WD_TABLE_DIRECTION | None):
         self._element.bidiVisual_val = value
 
     @property
-    def _cells(self) -> List[_Cell]:
+    def _cells(self) -> list[_Cell]:
         """A sequence of |_Cell| objects, one for each cell of the layout grid.
 
         If the table contains a span, one or more |_Cell| object references are
         repeated.
         """
         col_count = self._column_count
-        cells = []
+        cells: list[_Cell] = []
         for tc in self._tbl.iter_tcs():
             for grid_span_idx in range(tc.grid_span):
                 if tc.vMerge == ST_Merge.CONTINUE:
@@ -178,11 +189,12 @@ def _tblPr(self) -> CT_TblPr:
 class _Cell(BlockItemContainer):
     """Table cell."""
 
-    def __init__(self, tc, parent):
-        super(_Cell, self).__init__(tc, parent)
+    def __init__(self, tc: CT_Tc, parent: TableParent):
+        super(_Cell, self).__init__(tc, cast(t.ProvidesStoryPart, parent))
+        self._parent = parent
         self._tc = self._element = tc
 
-    def add_paragraph(self, text="", style=None):
+    def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = None):
         """Return a paragraph newly added to the end of the content in this cell.
 
         If present, `text` is added to the paragraph in a single run. If specified, the
@@ -195,9 +207,12 @@ def add_paragraph(self, text="", style=None):
         """
         return super(_Cell, self).add_paragraph(text, style)
 
-    def add_table(self, rows, cols):
-        """Return a table newly added to this cell after any existing cell content,
-        having `rows` rows and `cols` columns.
+    def add_table(  # pyright: ignore[reportIncompatibleMethodOverride]
+        self, rows: int, cols: int
+    ) -> Table:
+        """Return a table newly added to this cell after any existing cell content.
+
+        The new table will have `rows` rows and `cols` columns.
 
         An empty paragraph is added after the table because Word requires a paragraph
         element as the last element in every cell.
@@ -207,7 +222,7 @@ def add_table(self, rows, cols):
         self.add_paragraph()
         return table
 
-    def merge(self, other_cell):
+    def merge(self, other_cell: _Cell):
         """Return a merged cell created by spanning the rectangular region having this
         cell and `other_cell` as diagonal corners.
 
@@ -244,7 +259,7 @@ def text(self) -> str:
         return "\n".join(p.text for p in self.paragraphs)
 
     @text.setter
-    def text(self, text):
+    def text(self, text: str):
         """Write-only.
 
         Set entire contents of cell to the string `text`. Any existing content or
@@ -270,7 +285,7 @@ def vertical_alignment(self):
         return tcPr.vAlign_val
 
     @vertical_alignment.setter
-    def vertical_alignment(self, value):
+    def vertical_alignment(self, value: WD_CELL_VERTICAL_ALIGNMENT | None):
         tcPr = self._element.get_or_add_tcPr()
         tcPr.vAlign_val = value
 
@@ -280,34 +295,35 @@ def width(self):
         return self._tc.width
 
     @width.setter
-    def width(self, value):
+    def width(self, value: Length):
         self._tc.width = value
 
 
 class _Column(Parented):
     """Table column."""
 
-    def __init__(self, gridCol, parent):
+    def __init__(self, gridCol: CT_TblGridCol, parent: TableParent):
         super(_Column, self).__init__(parent)
+        self._parent = parent
         self._gridCol = gridCol
 
     @property
-    def cells(self):
+    def cells(self) -> tuple[_Cell, ...]:
         """Sequence of |_Cell| instances corresponding to cells in this column."""
         return tuple(self.table.column_cells(self._index))
 
     @property
-    def table(self):
+    def table(self) -> Table:
         """Reference to the |Table| object this column belongs to."""
         return self._parent.table
 
     @property
-    def width(self):
+    def width(self) -> Length | None:
         """The width of this column in EMU, or |None| if no explicit width is set."""
         return self._gridCol.w
 
     @width.setter
-    def width(self, value):
+    def width(self, value: Length | None):
         self._gridCol.w = value
 
     @property
@@ -322,11 +338,12 @@ class _Columns(Parented):
     Supports ``len()``, iteration and indexed access.
     """
 
-    def __init__(self, tbl, parent):
+    def __init__(self, tbl: CT_Tbl, parent: TableParent):
         super(_Columns, self).__init__(parent)
+        self._parent = parent
         self._tbl = tbl
 
-    def __getitem__(self, idx):
+    def __getitem__(self, idx: int):
         """Provide indexed access, e.g. 'columns[0]'."""
         try:
             gridCol = self._gridCol_lst[idx]
@@ -343,7 +360,7 @@ def __len__(self):
         return len(self._gridCol_lst)
 
     @property
-    def table(self):
+    def table(self) -> Table:
         """Reference to the |Table| object this column collection belongs to."""
         return self._parent.table
 
@@ -358,42 +375,45 @@ def _gridCol_lst(self):
 class _Row(Parented):
     """Table row."""
 
-    def __init__(self, tr, parent):
+    def __init__(self, tr: CT_Row, parent: TableParent):
         super(_Row, self).__init__(parent)
+        self._parent = parent
         self._tr = self._element = tr
 
     @property
-    def cells(self) -> Tuple[_Cell]:
+    def cells(self) -> tuple[_Cell, ...]:
         """Sequence of |_Cell| instances corresponding to cells in this row."""
         return tuple(self.table.row_cells(self._index))
 
     @property
-    def height(self):
+    def height(self) -> Length | None:
         """Return a |Length| object representing the height of this cell, or |None| if
         no explicit height is set."""
         return self._tr.trHeight_val
 
     @height.setter
-    def height(self, value):
+    def height(self, value: Length | None):
         self._tr.trHeight_val = value
 
     @property
-    def height_rule(self):
-        """Return the height rule of this cell as a member of the :ref:`WdRowHeightRule`
-        enumeration, or |None| if no explicit height_rule is set."""
+    def height_rule(self) -> WD_ROW_HEIGHT_RULE | None:
+        """Return the height rule of this cell as a member of the :ref:`WdRowHeightRule`.
+
+        This value is |None| if no explicit height_rule is set.
+        """
         return self._tr.trHeight_hRule
 
     @height_rule.setter
-    def height_rule(self, value):
+    def height_rule(self, value: WD_ROW_HEIGHT_RULE | None):
         self._tr.trHeight_hRule = value
 
     @property
-    def table(self):
+    def table(self) -> Table:
         """Reference to the |Table| object this row belongs to."""
         return self._parent.table
 
     @property
-    def _index(self):
+    def _index(self) -> int:
         """Index of this row in its table, starting from zero."""
         return self._tr.tr_idx
 
@@ -404,19 +424,18 @@ class _Rows(Parented):
     Supports ``len()``, iteration, indexed access, and slicing.
     """
 
-    def __init__(self, tbl, parent):
+    def __init__(self, tbl: CT_Tbl, parent: TableParent):
         super(_Rows, self).__init__(parent)
+        self._parent = parent
         self._tbl = tbl
 
     @overload
-    def __getitem__(self, idx: int) -> _Row:
-        ...
+    def __getitem__(self, idx: int) -> _Row: ...
 
     @overload
-    def __getitem__(self, idx: slice) -> List[_Row]:
-        ...
+    def __getitem__(self, idx: slice) -> list[_Row]: ...
 
-    def __getitem__(self, idx: int | slice) -> _Row | List[_Row]:
+    def __getitem__(self, idx: int | slice) -> _Row | list[_Row]:
         """Provide indexed access, (e.g. `rows[0]` or `rows[1:3]`)"""
         return list(self)[idx]
 
@@ -427,6 +446,6 @@ def __len__(self):
         return len(self._tbl.tr_lst)
 
     @property
-    def table(self):
+    def table(self) -> Table:
         """Reference to the |Table| object this row collection belongs to."""
         return self._parent.table
diff --git a/tests/test_table.py b/tests/test_table.py
index 0ef273e3f..eef4b1df1 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -1,7 +1,14 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for the docx.table module."""
 
+from __future__ import annotations
+
+from typing import cast
+
 import pytest
 
+from docx.document import Document
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.table import (
     WD_ALIGN_VERTICAL,
@@ -10,7 +17,7 @@
     WD_TABLE_DIRECTION,
 )
 from docx.oxml.parser import parse_xml
-from docx.oxml.table import CT_Tc
+from docx.oxml.table import CT_Tbl, CT_Tc
 from docx.parts.document import DocumentPart
 from docx.shared import Inches
 from docx.table import Table, _Cell, _Column, _Columns, _Row, _Rows
@@ -20,7 +27,7 @@
 from .oxml.unitdata.text import a_p
 from .unitutil.cxml import element, xml
 from .unitutil.file import snippet_seq
-from .unitutil.mock import instance_mock, property_mock
+from .unitutil.mock import FixtureRequest, Mock, instance_mock, property_mock
 
 
 class DescribeTable:
@@ -89,14 +96,44 @@ def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
         table = table_fixture
         assert table.table is table
 
-    def it_knows_its_direction(self, direction_get_fixture):
-        table, expected_value = direction_get_fixture
-        assert table.table_direction == expected_value
-
-    def it_can_change_its_direction(self, direction_set_fixture):
-        table, new_value, expected_xml = direction_set_fixture
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "expected_value"),
+        [
+            # ("w:tbl/w:tblPr", None),
+            ("w:tbl/w:tblPr/w:bidiVisual", WD_TABLE_DIRECTION.RTL),
+            ("w:tbl/w:tblPr/w:bidiVisual{w:val=0}", WD_TABLE_DIRECTION.LTR),
+            ("w:tbl/w:tblPr/w:bidiVisual{w:val=on}", WD_TABLE_DIRECTION.RTL),
+        ],
+    )
+    def it_knows_its_direction(
+        self, tbl_cxml: str, expected_value: WD_TABLE_DIRECTION | None, document_: Mock
+    ):
+        tbl = cast(CT_Tbl, element(tbl_cxml))
+        assert Table(tbl, document_).table_direction == expected_value
+
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "new_value", "expected_cxml"),
+        [
+            ("w:tbl/w:tblPr", WD_TABLE_DIRECTION.RTL, "w:tbl/w:tblPr/w:bidiVisual"),
+            (
+                "w:tbl/w:tblPr/w:bidiVisual",
+                WD_TABLE_DIRECTION.LTR,
+                "w:tbl/w:tblPr/w:bidiVisual{w:val=0}",
+            ),
+            (
+                "w:tbl/w:tblPr/w:bidiVisual{w:val=0}",
+                WD_TABLE_DIRECTION.RTL,
+                "w:tbl/w:tblPr/w:bidiVisual",
+            ),
+            ("w:tbl/w:tblPr/w:bidiVisual{w:val=1}", None, "w:tbl/w:tblPr"),
+        ],
+    )
+    def it_can_change_its_direction(
+        self, tbl_cxml: str, new_value: WD_TABLE_DIRECTION, expected_cxml: str, document_: Mock
+    ):
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
         table.table_direction = new_value
-        assert table._element.xml == expected_xml
+        assert table._element.xml == xml(expected_cxml)
 
     def it_knows_its_table_style(self, style_get_fixture):
         table, style_id_, style_ = style_get_fixture
@@ -245,41 +282,6 @@ def column_count_fixture(self):
         table = Table(element(tbl_cxml), None)
         return table, expected_value
 
-    @pytest.fixture(
-        params=[
-            ("w:tbl/w:tblPr", None),
-            ("w:tbl/w:tblPr/w:bidiVisual", WD_TABLE_DIRECTION.RTL),
-            ("w:tbl/w:tblPr/w:bidiVisual{w:val=0}", WD_TABLE_DIRECTION.LTR),
-            ("w:tbl/w:tblPr/w:bidiVisual{w:val=on}", WD_TABLE_DIRECTION.RTL),
-        ]
-    )
-    def direction_get_fixture(self, request):
-        tbl_cxml, expected_value = request.param
-        table = Table(element(tbl_cxml), None)
-        return table, expected_value
-
-    @pytest.fixture(
-        params=[
-            ("w:tbl/w:tblPr", WD_TABLE_DIRECTION.RTL, "w:tbl/w:tblPr/w:bidiVisual"),
-            (
-                "w:tbl/w:tblPr/w:bidiVisual",
-                WD_TABLE_DIRECTION.LTR,
-                "w:tbl/w:tblPr/w:bidiVisual{w:val=0}",
-            ),
-            (
-                "w:tbl/w:tblPr/w:bidiVisual{w:val=0}",
-                WD_TABLE_DIRECTION.RTL,
-                "w:tbl/w:tblPr/w:bidiVisual",
-            ),
-            ("w:tbl/w:tblPr/w:bidiVisual{w:val=1}", None, "w:tbl/w:tblPr"),
-        ]
-    )
-    def direction_set_fixture(self, request):
-        tbl_cxml, new_value, expected_cxml = request.param
-        table = Table(element(tbl_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return table, new_value, expected_xml
-
     @pytest.fixture
     def row_cells_fixture(self, _cells_, _column_count_):
         table = Table(None, None)
@@ -331,6 +333,10 @@ def _cells_(self, request):
     def _column_count_(self, request):
         return property_mock(request, Table, "_column_count")
 
+    @pytest.fixture
+    def document_(self, request: FixtureRequest):
+        return instance_mock(request, Document)
+
     @pytest.fixture
     def document_part_(self, request):
         return instance_mock(request, DocumentPart)

From cf5286cf8bbd0902a05b6d73d2b9c8ecf2eb697b Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 15:24:32 -0700
Subject: [PATCH 314/367] rfctr: modernize table tests

---
 features/steps/cell.py                        |   50 -
 features/steps/table.py                       |  165 ++-
 ...ble.feature => tbl-cell-add-table.feature} |    0
 ...cel-text.feature => tbl-cell-text.feature} |    0
 src/docx/oxml/table.py                        |    1 +
 src/docx/table.py                             |    2 +-
 tests/oxml/test_table.py                      |  479 ++++---
 tests/oxml/unitdata/table.py                  |   88 --
 tests/test_table.py                           | 1198 +++++++----------
 9 files changed, 857 insertions(+), 1126 deletions(-)
 delete mode 100644 features/steps/cell.py
 rename features/{cel-add-table.feature => tbl-cell-add-table.feature} (100%)
 rename features/{cel-text.feature => tbl-cell-text.feature} (100%)
 delete mode 100644 tests/oxml/unitdata/table.py

diff --git a/features/steps/cell.py b/features/steps/cell.py
deleted file mode 100644
index 10896872b..000000000
--- a/features/steps/cell.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""Step implementations for table cell-related features."""
-
-from behave import given, then, when
-
-from docx import Document
-
-from helpers import test_docx
-
-# given ===================================================
-
-
-@given("a table cell")
-def given_a_table_cell(context):
-    table = Document(test_docx("tbl-2x2-table")).tables[0]
-    context.cell = table.cell(0, 0)
-
-
-# when =====================================================
-
-
-@when("I add a 2 x 2 table into the first cell")
-def when_I_add_a_2x2_table_into_the_first_cell(context):
-    context.table_ = context.cell.add_table(2, 2)
-
-
-@when("I assign a string to the cell text attribute")
-def when_assign_string_to_cell_text_attribute(context):
-    cell = context.cell
-    text = "foobar"
-    cell.text = text
-    context.expected_text = text
-
-
-# then =====================================================
-
-
-@then("cell.tables[0] is a 2 x 2 table")
-def then_cell_tables_0_is_a_2x2_table(context):
-    cell = context.cell
-    table = cell.tables[0]
-    assert len(table.rows) == 2
-    assert len(table.columns) == 2
-
-
-@then("the cell contains the string I assigned")
-def then_cell_contains_string_assigned(context):
-    cell, expected_text = context.cell, context.expected_text
-    text = cell.paragraphs[0].runs[0].text
-    msg = "expected '%s', got '%s'" % (expected_text, text)
-    assert text == expected_text, msg
diff --git a/features/steps/table.py b/features/steps/table.py
index 95f2fab75..0b08f567c 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -1,6 +1,9 @@
+# pyright: reportPrivateUsage=false
+
 """Step implementations for table-related features."""
 
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
 from docx.enum.table import (
@@ -10,7 +13,7 @@
     WD_TABLE_DIRECTION,
 )
 from docx.shared import Inches
-from docx.table import _Column, _Columns, _Row, _Rows
+from docx.table import Table, _Column, _Columns, _Row, _Rows
 
 from helpers import test_docx
 
@@ -18,12 +21,12 @@
 
 
 @given("a 2 x 2 table")
-def given_a_2x2_table(context):
+def given_a_2x2_table(context: Context):
     context.table_ = Document().add_table(rows=2, cols=2)
 
 
 @given("a 3x3 table having {span_state}")
-def given_a_3x3_table_having_span_state(context, span_state):
+def given_a_3x3_table_having_span_state(context: Context, span_state: str):
     table_idx = {
         "only uniform cells": 0,
         "a horizontal span": 1,
@@ -35,7 +38,7 @@ def given_a_3x3_table_having_span_state(context, span_state):
 
 
 @given("a _Cell object with {state} vertical alignment as cell")
-def given_a_Cell_object_with_vertical_alignment_as_cell(context, state):
+def given_a_Cell_object_with_vertical_alignment_as_cell(context: Context, state: str):
     table_idx = {
         "inherited": 0,
         "bottom": 1,
@@ -48,26 +51,32 @@ def given_a_Cell_object_with_vertical_alignment_as_cell(context, state):
 
 
 @given("a column collection having two columns")
-def given_a_column_collection_having_two_columns(context):
+def given_a_column_collection_having_two_columns(context: Context):
     docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     context.columns = document.tables[0].columns
 
 
 @given("a row collection having two rows")
-def given_a_row_collection_having_two_rows(context):
+def given_a_row_collection_having_two_rows(context: Context):
     docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     context.rows = document.tables[0].rows
 
 
 @given("a table")
-def given_a_table(context):
+def given_a_table(context: Context):
     context.table_ = Document().add_table(rows=2, cols=2)
 
 
+@given("a table cell")
+def given_a_table_cell(context: Context):
+    table = Document(test_docx("tbl-2x2-table")).tables[0]
+    context.cell = table.cell(0, 0)
+
+
 @given("a table cell having a width of {width}")
-def given_a_table_cell_having_a_width_of_width(context, width):
+def given_a_table_cell_having_a_width_of_width(context: Context, width: str):
     table_idx = {"no explicit setting": 0, "1 inch": 1, "2 inches": 2}[width]
     document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
@@ -76,7 +85,7 @@ def given_a_table_cell_having_a_width_of_width(context, width):
 
 
 @given("a table column having a width of {width_desc}")
-def given_a_table_having_a_width_of_width_desc(context, width_desc):
+def given_a_table_having_a_width_of_width_desc(context: Context, width_desc: str):
     col_idx = {
         "no explicit setting": 0,
         "1440": 1,
@@ -87,7 +96,7 @@ def given_a_table_having_a_width_of_width_desc(context, width_desc):
 
 
 @given("a table having {alignment} alignment")
-def given_a_table_having_alignment_alignment(context, alignment):
+def given_a_table_having_alignment_alignment(context: Context, alignment: str):
     table_idx = {
         "inherited": 3,
         "left": 4,
@@ -100,7 +109,7 @@ def given_a_table_having_alignment_alignment(context, alignment):
 
 
 @given("a table having an autofit layout of {autofit}")
-def given_a_table_having_an_autofit_layout_of_autofit(context, autofit):
+def given_a_table_having_an_autofit_layout_of_autofit(context: Context, autofit: str):
     tbl_idx = {
         "no explicit setting": 0,
         "autofit": 1,
@@ -111,7 +120,7 @@ def given_a_table_having_an_autofit_layout_of_autofit(context, autofit):
 
 
 @given("a table having {style} style")
-def given_a_table_having_style(context, style):
+def given_a_table_having_style(context: Context, style: str):
     table_idx = {
         "no explicit": 0,
         "Table Grid": 1,
@@ -123,14 +132,14 @@ def given_a_table_having_style(context, style):
 
 
 @given("a table having table direction set {setting}")
-def given_a_table_having_table_direction_setting(context, setting):
+def given_a_table_having_table_direction_setting(context: Context, setting: str):
     table_idx = ["to inherit", "right-to-left", "left-to-right"].index(setting)
     document = Document(test_docx("tbl-on-off-props"))
     context.table_ = document.tables[table_idx]
 
 
 @given("a table having two columns")
-def given_a_table_having_two_columns(context):
+def given_a_table_having_two_columns(context: Context):
     docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     # context.table is used internally by behave, underscore added
@@ -139,14 +148,14 @@ def given_a_table_having_two_columns(context):
 
 
 @given("a table having two rows")
-def given_a_table_having_two_rows(context):
+def given_a_table_having_two_rows(context: Context):
     docx_path = test_docx("blk-containing-table")
     document = Document(docx_path)
     context.table_ = document.tables[0]
 
 
 @given("a table row having height of {state}")
-def given_a_table_row_having_height_of_state(context, state):
+def given_a_table_row_having_height_of_state(context: Context, state: str):
     table_idx = {"no explicit setting": 0, "2 inches": 2, "3 inches": 3}[state]
     document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
@@ -154,10 +163,8 @@ def given_a_table_row_having_height_of_state(context, state):
 
 
 @given("a table row having height rule {state}")
-def given_a_table_row_having_height_rule_state(context, state):
-    table_idx = {"no explicit setting": 0, "automatic": 1, "at least": 2, "exactly": 3}[
-        state
-    ]
+def given_a_table_row_having_height_rule_state(context: Context, state: str):
+    table_idx = {"no explicit setting": 0, "automatic": 1, "at least": 2, "exactly": 3}[state]
     document = Document(test_docx("tbl-props"))
     table = document.tables[table_idx]
     context.row = table.rows[0]
@@ -167,35 +174,48 @@ def given_a_table_row_having_height_rule_state(context, state):
 
 
 @when("I add a 1.0 inch column to the table")
-def when_I_add_a_1_inch_column_to_table(context):
+def when_I_add_a_1_inch_column_to_table(context: Context):
     context.column = context.table_.add_column(Inches(1.0))
 
 
+@when("I add a 2 x 2 table into the first cell")
+def when_I_add_a_2x2_table_into_the_first_cell(context: Context):
+    context.table_ = context.cell.add_table(2, 2)
+
+
 @when("I add a row to the table")
-def when_add_row_to_table(context):
+def when_add_row_to_table(context: Context):
     table = context.table_
     context.row = table.add_row()
 
 
+@when("I assign a string to the cell text attribute")
+def when_assign_string_to_cell_text_attribute(context: Context):
+    cell = context.cell
+    text = "foobar"
+    cell.text = text
+    context.expected_text = text
+
+
 @when("I assign {value} to cell.vertical_alignment")
-def when_I_assign_value_to_cell_vertical_alignment(context, value):
+def when_I_assign_value_to_cell_vertical_alignment(context: Context, value: str):
     context.cell.vertical_alignment = eval(value)
 
 
 @when("I assign {value} to row.height")
-def when_I_assign_value_to_row_height(context, value):
+def when_I_assign_value_to_row_height(context: Context, value: str):
     new_value = None if value == "None" else int(value)
     context.row.height = new_value
 
 
 @when("I assign {value} to row.height_rule")
-def when_I_assign_value_to_row_height_rule(context, value):
+def when_I_assign_value_to_row_height_rule(context: Context, value: str):
     new_value = None if value == "None" else getattr(WD_ROW_HEIGHT_RULE, value)
     context.row.height_rule = new_value
 
 
 @when("I assign {value_str} to table.alignment")
-def when_I_assign_value_to_table_alignment(context, value_str):
+def when_I_assign_value_to_table_alignment(context: Context, value_str: str):
     value = {
         "None": None,
         "WD_TABLE_ALIGNMENT.LEFT": WD_TABLE_ALIGNMENT.LEFT,
@@ -207,7 +227,7 @@ def when_I_assign_value_to_table_alignment(context, value_str):
 
 
 @when("I assign {value} to table.style")
-def when_apply_value_to_table_style(context, value):
+def when_apply_value_to_table_style(context: Context, value: str):
     table, styles = context.table_, context.document.styles
     if value == "None":
         new_value = None
@@ -219,14 +239,14 @@ def when_apply_value_to_table_style(context, value):
 
 
 @when("I assign {value} to table.table_direction")
-def when_assign_value_to_table_table_direction(context, value):
+def when_assign_value_to_table_table_direction(context: Context, value: str):
     new_value = None if value == "None" else getattr(WD_TABLE_DIRECTION, value)
     context.table_.table_direction = new_value
 
 
 @when("I merge from cell {origin} to cell {other}")
-def when_I_merge_from_cell_origin_to_cell_other(context, origin, other):
-    def cell(table, idx):
+def when_I_merge_from_cell_origin_to_cell_other(context: Context, origin: str, other: str):
+    def cell(table: Table, idx: int):
         row, col = idx // 3, idx % 3
         return table.cell(row, col)
 
@@ -237,19 +257,19 @@ def cell(table, idx):
 
 
 @when("I set the cell width to {width}")
-def when_I_set_the_cell_width_to_width(context, width):
+def when_I_set_the_cell_width_to_width(context: Context, width: str):
     new_value = {"1 inch": Inches(1)}[width]
     context.cell.width = new_value
 
 
 @when("I set the column width to {width_emu}")
-def when_I_set_the_column_width_to_width_emu(context, width_emu):
+def when_I_set_the_column_width_to_width_emu(context: Context, width_emu: str):
     new_value = None if width_emu == "None" else int(width_emu)
     context.column.width = new_value
 
 
 @when("I set the table autofit to {setting}")
-def when_I_set_the_table_autofit_to_setting(context, setting):
+def when_I_set_the_table_autofit_to_setting(context: Context, setting: str):
     new_value = {"autofit": True, "fixed": False}[setting]
     table = context.table_
     table.autofit = new_value
@@ -258,21 +278,27 @@ def when_I_set_the_table_autofit_to_setting(context, setting):
 # then =====================================================
 
 
+@then("cell.tables[0] is a 2 x 2 table")
+def then_cell_tables_0_is_a_2x2_table(context: Context):
+    cell = context.cell
+    table = cell.tables[0]
+    assert len(table.rows) == 2
+    assert len(table.columns) == 2
+
+
 @then("cell.vertical_alignment is {value}")
-def then_cell_vertical_alignment_is_value(context, value):
+def then_cell_vertical_alignment_is_value(context: Context, value: str):
     expected_value = {
         "None": None,
         "WD_ALIGN_VERTICAL.BOTTOM": WD_ALIGN_VERTICAL.BOTTOM,
         "WD_ALIGN_VERTICAL.CENTER": WD_ALIGN_VERTICAL.CENTER,
     }[value]
     actual_value = context.cell.vertical_alignment
-    assert actual_value is expected_value, (
-        "cell.vertical_alignment is %s" % actual_value
-    )
+    assert actual_value is expected_value, "cell.vertical_alignment is %s" % actual_value
 
 
 @then("I can access a collection column by index")
-def then_can_access_collection_column_by_index(context):
+def then_can_access_collection_column_by_index(context: Context):
     columns = context.columns
     for idx in range(2):
         column = columns[idx]
@@ -280,7 +306,7 @@ def then_can_access_collection_column_by_index(context):
 
 
 @then("I can access a collection row by index")
-def then_can_access_collection_row_by_index(context):
+def then_can_access_collection_row_by_index(context: Context):
     rows = context.rows
     for idx in range(2):
         row = rows[idx]
@@ -288,21 +314,21 @@ def then_can_access_collection_row_by_index(context):
 
 
 @then("I can access the column collection of the table")
-def then_can_access_column_collection_of_table(context):
+def then_can_access_column_collection_of_table(context: Context):
     table = context.table_
     columns = table.columns
     assert isinstance(columns, _Columns)
 
 
 @then("I can access the row collection of the table")
-def then_can_access_row_collection_of_table(context):
+def then_can_access_row_collection_of_table(context: Context):
     table = context.table_
     rows = table.rows
     assert isinstance(rows, _Rows)
 
 
 @then("I can iterate over the column collection")
-def then_can_iterate_over_column_collection(context):
+def then_can_iterate_over_column_collection(context: Context):
     columns = context.columns
     actual_count = 0
     for column in columns:
@@ -312,7 +338,7 @@ def then_can_iterate_over_column_collection(context):
 
 
 @then("I can iterate over the row collection")
-def then_can_iterate_over_row_collection(context):
+def then_can_iterate_over_row_collection(context: Context):
     rows = context.rows
     actual_count = 0
     for row in rows:
@@ -322,7 +348,7 @@ def then_can_iterate_over_row_collection(context):
 
 
 @then("row.height is {value}")
-def then_row_height_is_value(context, value):
+def then_row_height_is_value(context: Context, value: str):
     expected_height = None if value == "None" else int(value)
     actual_height = context.row.height
     assert actual_height == expected_height, "expected %s, got %s" % (
@@ -332,7 +358,7 @@ def then_row_height_is_value(context, value):
 
 
 @then("row.height_rule is {value}")
-def then_row_height_rule_is_value(context, value):
+def then_row_height_rule_is_value(context: Context, value: str):
     expected_rule = None if value == "None" else getattr(WD_ROW_HEIGHT_RULE, value)
     actual_rule = context.row.height_rule
     assert actual_rule == expected_rule, "expected %s, got %s" % (
@@ -342,7 +368,7 @@ def then_row_height_rule_is_value(context, value):
 
 
 @then("table.alignment is {value_str}")
-def then_table_alignment_is_value(context, value_str):
+def then_table_alignment_is_value(context: Context, value_str: str):
     value = {
         "None": None,
         "WD_TABLE_ALIGNMENT.LEFT": WD_TABLE_ALIGNMENT.LEFT,
@@ -354,7 +380,7 @@ def then_table_alignment_is_value(context, value_str):
 
 
 @then("table.cell({row}, {col}).text is {expected_text}")
-def then_table_cell_row_col_text_is_text(context, row, col, expected_text):
+def then_table_cell_row_col_text_is_text(context: Context, row: str, col: str, expected_text: str):
     table = context.table_
     row_idx, col_idx = int(row), int(col)
     cell_text = table.cell(row_idx, col_idx).text
@@ -362,68 +388,76 @@ def then_table_cell_row_col_text_is_text(context, row, col, expected_text):
 
 
 @then("table.style is styles['{style_name}']")
-def then_table_style_is_styles_style_name(context, style_name):
+def then_table_style_is_styles_style_name(context: Context, style_name: str):
     table, styles = context.table_, context.document.styles
     expected_style = styles[style_name]
     assert table.style == expected_style, "got '%s'" % table.style
 
 
 @then("table.table_direction is {value}")
-def then_table_table_direction_is_value(context, value):
+def then_table_table_direction_is_value(context: Context, value: str):
     expected_value = None if value == "None" else getattr(WD_TABLE_DIRECTION, value)
     actual_value = context.table_.table_direction
     assert actual_value == expected_value, "got '%s'" % actual_value
 
 
+@then("the cell contains the string I assigned")
+def then_cell_contains_string_assigned(context: Context):
+    cell, expected_text = context.cell, context.expected_text
+    text = cell.paragraphs[0].runs[0].text
+    msg = "expected '%s', got '%s'" % (expected_text, text)
+    assert text == expected_text, msg
+
+
 @then("the column cells text is {expected_text}")
-def then_the_column_cells_text_is_expected_text(context, expected_text):
+def then_the_column_cells_text_is_expected_text(context: Context, expected_text: str):
     table = context.table_
     cells_text = " ".join(c.text for col in table.columns for c in col.cells)
     assert cells_text == expected_text, "got %s" % cells_text
 
 
 @then("the length of the column collection is 2")
-def then_len_of_column_collection_is_2(context):
+def then_len_of_column_collection_is_2(context: Context):
     columns = context.table_.columns
     assert len(columns) == 2
 
 
 @then("the length of the row collection is 2")
-def then_len_of_row_collection_is_2(context):
+def then_len_of_row_collection_is_2(context: Context):
     rows = context.table_.rows
     assert len(rows) == 2
 
 
 @then("the new column has 2 cells")
-def then_new_column_has_2_cells(context):
+def then_new_column_has_2_cells(context: Context):
     assert len(context.column.cells) == 2
 
 
 @then("the new column is 1.0 inches wide")
-def then_new_column_is_1_inches_wide(context):
+def then_new_column_is_1_inches_wide(context: Context):
     assert context.column.width == Inches(1)
 
 
 @then("the new row has 2 cells")
-def then_new_row_has_2_cells(context):
+def then_new_row_has_2_cells(context: Context):
     assert len(context.row.cells) == 2
 
 
 @then("the reported autofit setting is {autofit}")
-def then_the_reported_autofit_setting_is_autofit(context, autofit):
+def then_the_reported_autofit_setting_is_autofit(context: Context, autofit: str):
     expected_value = {"autofit": True, "fixed": False}[autofit]
     table = context.table_
     assert table.autofit is expected_value
 
 
 @then("the reported column width is {width_emu}")
-def then_the_reported_column_width_is_width_emu(context, width_emu):
+def then_the_reported_column_width_is_width_emu(context: Context, width_emu: str):
     expected_value = None if width_emu == "None" else int(width_emu)
     assert context.column.width == expected_value, "got %s" % context.column.width
 
 
 @then("the reported width of the cell is {width}")
-def then_the_reported_width_of_the_cell_is_width(context, width):
+def then_the_reported_width_of_the_cell_is_width(context: Context, width: str):
     expected_width = {"None": None, "1 inch": Inches(1)}[width]
     actual_width = context.cell.width
     assert actual_width == expected_width, "expected %s, got %s" % (
@@ -433,7 +467,7 @@ def then_the_reported_width_of_the_cell_is_width(context, width):
 
 
 @then("the row cells text is {encoded_text}")
-def then_the_row_cells_text_is_expected_text(context, encoded_text):
+def then_the_row_cells_text_is_expected_text(context: Context, encoded_text: str):
     expected_text = encoded_text.replace("\\", "\n")
     table = context.table_
     cells_text = " ".join(c.text for row in table.rows for c in row.cells)
@@ -441,32 +475,33 @@ def then_the_row_cells_text_is_expected_text(context, encoded_text):
 
 
 @then("the table has {count} columns")
-def then_table_has_count_columns(context, count):
+def then_table_has_count_columns(context: Context, count: str):
     column_count = int(count)
     columns = context.table_.columns
     assert len(columns) == column_count
 
 
 @then("the table has {count} rows")
-def then_table_has_count_rows(context, count):
+def then_table_has_count_rows(context: Context, count: str):
     row_count = int(count)
     rows = context.table_.rows
     assert len(rows) == row_count
 
 
 @then("the width of cell {n_str} is {inches_str} inches")
-def then_the_width_of_cell_n_is_x_inches(context, n_str, inches_str):
-    def _cell(table, idx):
+def then_the_width_of_cell_n_is_x_inches(context: Context, n_str: str, inches_str: str):
+    def _cell(table: Table, idx: int):
         row, col = idx // 3, idx % 3
         return table.cell(row, col)
 
     idx, inches = int(n_str) - 1, float(inches_str)
     cell = _cell(context.table_, idx)
+    assert cell.width is not None
     assert cell.width == Inches(inches), "got %s" % cell.width.inches
 
 
 @then("the width of each cell is {inches} inches")
-def then_the_width_of_each_cell_is_inches(context, inches):
+def then_the_width_of_each_cell_is_inches(context: Context, inches: str):
     table = context.table_
     expected_width = Inches(float(inches))
     for cell in table._cells:
@@ -474,7 +509,7 @@ def then_the_width_of_each_cell_is_inches(context, inches):
 
 
 @then("the width of each column is {inches} inches")
-def then_the_width_of_each_column_is_inches(context, inches):
+def then_the_width_of_each_column_is_inches(context: Context, inches: str):
     table = context.table_
     expected_width = Inches(float(inches))
     for column in table.columns:
diff --git a/features/cel-add-table.feature b/features/tbl-cell-add-table.feature
similarity index 100%
rename from features/cel-add-table.feature
rename to features/tbl-cell-add-table.feature
diff --git a/features/cel-text.feature b/features/tbl-cell-text.feature
similarity index 100%
rename from features/cel-text.feature
rename to features/tbl-cell-text.feature
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index da3c6b51d..e0aed09a3 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -51,6 +51,7 @@ class CT_Row(BaseOxmlElement):
 
     add_tc: Callable[[], CT_Tc]
     get_or_add_trPr: Callable[[], CT_TrPr]
+    _add_trPr: Callable[[], CT_TrPr]
 
     tc_lst: list[CT_Tc]
     # -- custom inserter below --
diff --git a/src/docx/table.py b/src/docx/table.py
index 55cf77f41..709bc8dbb 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -130,7 +130,7 @@ def style(self) -> _TableStyle | None:
         return cast("_TableStyle | None", self.part.get_style(style_id, WD_STYLE_TYPE.TABLE))
 
     @style.setter
-    def style(self, style_or_name: _TableStyle | None):
+    def style(self, style_or_name: _TableStyle | str | None):
         style_id = self.part.get_style_id(style_or_name, WD_STYLE_TYPE.TABLE)
         self._tbl.tblStyle_val = style_id
 
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 395c812a6..6a177ab77 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -1,3 +1,5 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for the docx.oxml.text module."""
 
 from __future__ import annotations
@@ -13,50 +15,48 @@
 
 from ..unitutil.cxml import element, xml
 from ..unitutil.file import snippet_seq
-from ..unitutil.mock import call, instance_mock, method_mock, property_mock
+from ..unitutil.mock import FixtureRequest, Mock, call, instance_mock, method_mock, property_mock
 
 
 class DescribeCT_Row:
-    def it_can_add_a_trPr(self, add_trPr_fixture):
-        tr, expected_xml = add_trPr_fixture
-        tr._add_trPr()
-        assert tr.xml == expected_xml
 
-    def it_raises_on_tc_at_grid_col(self, tc_raise_fixture):
-        tr, idx = tc_raise_fixture
-        with pytest.raises(ValueError):  # noqa: PT011
-            tr.tc_at_grid_col(idx)
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tr_cxml", "expected_cxml"),
+        [
             ("w:tr", "w:tr/w:trPr"),
             ("w:tr/w:tblPrEx", "w:tr/(w:tblPrEx,w:trPr)"),
             ("w:tr/w:tc", "w:tr/(w:trPr,w:tc)"),
             ("w:tr/(w:sdt,w:del,w:tc)", "w:tr/(w:trPr,w:sdt,w:del,w:tc)"),
-        ]
+        ],
     )
-    def add_trPr_fixture(self, request):
-        tr_cxml, expected_cxml = request.param
-        tr = element(tr_cxml)
-        expected_xml = xml(expected_cxml)
-        return tr, expected_xml
-
-    @pytest.fixture(params=[(0, 0, 3), (1, 0, 1)])
-    def tc_raise_fixture(self, request):
-        snippet_idx, row_idx, col_idx = request.param
-        tbl = parse_xml(snippet_seq("tbl-cells")[snippet_idx])
-        tr = tbl.tr_lst[row_idx]
-        return tr, col_idx
+    def it_can_add_a_trPr(self, tr_cxml: str, expected_cxml: str):
+        tr = cast(CT_Row, element(tr_cxml))
+        tr._add_trPr()
+        assert tr.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("snippet_idx", "row_idx", "col_idx", "err_msg"),
+        [
+            (0, 0, 3, "index out of bounds"),
+            (1, 0, 1, "no cell on grid column 1"),
+        ],
+    )
+    def it_raises_on_tc_at_grid_col(
+        self, snippet_idx: int, row_idx: int, col_idx: int, err_msg: str
+    ):
+        tr = cast(CT_Tbl, parse_xml(snippet_seq("tbl-cells")[snippet_idx])).tr_lst[row_idx]
+        with pytest.raises(ValueError, match=err_msg):
+            tr.tc_at_grid_col(col_idx)
 
 
 class DescribeCT_Tc:
+    """Unit-test suite for `docx.oxml.table.CT_Tc` objects."""
+
     def it_can_merge_to_another_tc(
-        self, tr_, _span_dimensions_, _tbl_, _grow_to_, top_tc_
+        self, tr_: Mock, _span_dimensions_: Mock, _tbl_: Mock, _grow_to_: Mock, top_tc_: Mock
     ):
         top_tr_ = tr_
-        tc, other_tc = element("w:tc"), element("w:tc")
+        tc, other_tc = cast(CT_Tc, element("w:tc")), cast(CT_Tc, element("w:tc"))
         top, left, height, width = 0, 1, 2, 3
         _span_dimensions_.return_value = top, left, height, width
         _tbl_.return_value.tr_lst = [tr_]
@@ -69,118 +69,9 @@ def it_can_merge_to_another_tc(
         top_tc_._grow_to.assert_called_once_with(width, height)
         assert merged_tc is top_tc_
 
-    def it_knows_its_extents_to_help(self, extents_fixture):
-        tc, attr_name, expected_value = extents_fixture
-        extent = getattr(tc, attr_name)
-        assert extent == expected_value
-
-    def it_calculates_the_dimensions_of_a_span_to_help(self, span_fixture):
-        tc, other_tc, expected_dimensions = span_fixture
-        dimensions = tc._span_dimensions(other_tc)
-        assert dimensions == expected_dimensions
-
-    def it_raises_on_invalid_span(self, span_raise_fixture):
-        tc, other_tc = span_raise_fixture
-        with pytest.raises(InvalidSpanError):
-            tc._span_dimensions(other_tc)
-
-    def it_can_grow_itself_to_help_merge(self, grow_to_fixture):
-        tc, width, height, top_tc, expected_calls = grow_to_fixture
-        tc._grow_to(width, height, top_tc)
-        assert tc._span_to_width.call_args_list == expected_calls
-
-    def it_can_extend_its_horz_span_to_help_merge(
-        self, top_tc_, grid_span_, _move_content_to_, _swallow_next_tc_
-    ):
-        grid_span_.side_effect = [1, 3, 4]
-        grid_width, vMerge = 4, "continue"
-        tc = element("w:tc")
-
-        tc._span_to_width(grid_width, top_tc_, vMerge)
-
-        _move_content_to_.assert_called_once_with(tc, top_tc_)
-        assert _swallow_next_tc_.call_args_list == [
-            call(tc, grid_width, top_tc_),
-            call(tc, grid_width, top_tc_),
-        ]
-        assert tc.vMerge == vMerge
-
-    def it_knows_its_inner_content_block_item_elements(self):
-        tc = cast(CT_Tc, element("w:tc/(w:p,w:tbl,w:p)"))
-        assert [type(e) for e in tc.inner_content_elements] == [CT_P, CT_Tbl, CT_P]
-
-    def it_can_swallow_the_next_tc_help_merge(self, swallow_fixture):
-        tc, grid_width, top_tc, tr, expected_xml = swallow_fixture
-        tc._swallow_next_tc(grid_width, top_tc)
-        assert tr.xml == expected_xml
-
-    def it_adds_cell_widths_on_swallow(self, add_width_fixture):
-        tc, grid_width, top_tc, tr, expected_xml = add_width_fixture
-        tc._swallow_next_tc(grid_width, top_tc)
-        assert tr.xml == expected_xml
-
-    def it_raises_on_invalid_swallow(self, swallow_raise_fixture):
-        tc, grid_width, top_tc, tr = swallow_raise_fixture
-        with pytest.raises(InvalidSpanError):
-            tc._swallow_next_tc(grid_width, top_tc)
-
-    def it_can_move_its_content_to_help_merge(self, move_fixture):
-        tc, tc_2, expected_tc_xml, expected_tc_2_xml = move_fixture
-        tc._move_content_to(tc_2)
-        assert tc.xml == expected_tc_xml
-        assert tc_2.xml == expected_tc_2_xml
-
-    def it_raises_on_tr_above(self, tr_above_raise_fixture):
-        tc = tr_above_raise_fixture
-        with pytest.raises(ValueError, match="no tr above topmost tr"):
-            tc._tr_above
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
-            # both cells have a width
-            (
-                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p),"
-                "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
-                0,
-                2,
-                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=2880,w:type=dxa},"
-                "w:gridSpan{w:val=2}),w:p))",
-            ),
-            # neither have a width
-            (
-                "w:tr/(w:tc/w:p,w:tc/w:p)",
-                0,
-                2,
-                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
-            ),
-            # only second one has a width
-            (
-                "w:tr/(w:tc/w:p," "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
-                0,
-                2,
-                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
-            ),
-            # only first one has a width
-            (
-                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p)," "w:tc/w:p)",
-                0,
-                2,
-                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=1440,w:type=dxa},"
-                "w:gridSpan{w:val=2}),w:p))",
-            ),
-        ]
-    )
-    def add_width_fixture(self, request):
-        tr_cxml, tc_idx, grid_width, expected_tr_cxml = request.param
-        tr = element(tr_cxml)
-        tc = top_tc = tr[tc_idx]
-        expected_tr_xml = xml(expected_tr_cxml)
-        return tc, grid_width, top_tc, tr, expected_tr_xml
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("snippet_idx", "row", "col", "attr_name", "expected_value"),
+        [
             (0, 0, 0, "top", 0),
             (2, 0, 1, "top", 0),
             (2, 1, 1, "top", 0),
@@ -195,63 +86,22 @@ def add_width_fixture(self, request):
             (4, 1, 1, "bottom", 3),
             (0, 0, 0, "right", 1),
             (1, 0, 0, "right", 2),
-            (0, 0, 0, "right", 1),
             (4, 2, 1, "right", 3),
-        ]
+        ],
     )
-    def extents_fixture(self, request):
-        snippet_idx, row, col, attr_name, expected_value = request.param
+    def it_knows_its_extents_to_help(
+        self, snippet_idx: int, row: int, col: int, attr_name: str, expected_value: int
+    ):
         tbl = self._snippet_tbl(snippet_idx)
         tc = tbl.tr_lst[row].tc_lst[col]
-        return tc, attr_name, expected_value
 
-    @pytest.fixture(
-        params=[
-            (0, 0, 0, 2, 1),
-            (0, 0, 1, 1, 2),
-            (0, 1, 1, 2, 2),
-            (1, 0, 0, 2, 2),
-            (2, 0, 0, 2, 2),
-            (2, 1, 2, 1, 2),
-        ]
-    )
-    def grow_to_fixture(self, request, _span_to_width_):
-        snippet_idx, row, col, width, height = request.param
-        tbl = self._snippet_tbl(snippet_idx)
-        tc = tbl.tr_lst[row].tc_lst[col]
-        start = 0 if height == 1 else 1
-        end = start + height
-        expected_calls = [
-            call(width, tc, None),
-            call(width, tc, "restart"),
-            call(width, tc, "continue"),
-            call(width, tc, "continue"),
-        ][start:end]
-        return tc, width, height, None, expected_calls
-
-    @pytest.fixture(
-        params=[
-            ("w:tc/w:p", "w:tc/w:p", "w:tc/w:p", "w:tc/w:p"),
-            ("w:tc/w:p", "w:tc/w:p/w:r", "w:tc/w:p", "w:tc/w:p/w:r"),
-            ("w:tc/w:p/w:r", "w:tc/w:p", "w:tc/w:p", "w:tc/w:p/w:r"),
-            ("w:tc/(w:p/w:r,w:sdt)", "w:tc/w:p", "w:tc/w:p", "w:tc/(w:p/w:r,w:sdt)"),
-            (
-                "w:tc/(w:p/w:r,w:sdt)",
-                "w:tc/(w:tbl,w:p)",
-                "w:tc/w:p",
-                "w:tc/(w:tbl,w:p/w:r,w:sdt)",
-            ),
-        ]
-    )
-    def move_fixture(self, request):
-        tc_cxml, tc_2_cxml, expected_tc_cxml, expected_tc_2_cxml = request.param
-        tc, tc_2 = element(tc_cxml), element(tc_2_cxml)
-        expected_tc_xml = xml(expected_tc_cxml)
-        expected_tc_2_xml = xml(expected_tc_2_cxml)
-        return tc, tc_2, expected_tc_xml, expected_tc_2_xml
-
-    @pytest.fixture(
-        params=[
+        extent = getattr(tc, attr_name)
+
+        assert extent == expected_value
+
+    @pytest.mark.parametrize(
+        ("snippet_idx", "row", "col", "row_2", "col_2", "expected_value"),
+        [
             (0, 0, 0, 0, 1, (0, 0, 1, 2)),
             (0, 0, 1, 2, 1, (0, 1, 3, 1)),
             (0, 2, 2, 1, 1, (1, 1, 2, 2)),
@@ -262,17 +112,28 @@ def move_fixture(self, request):
             (2, 0, 1, 1, 0, (0, 0, 2, 2)),
             (2, 1, 2, 0, 1, (0, 1, 2, 2)),
             (4, 0, 1, 0, 0, (0, 0, 1, 3)),
-        ]
+        ],
     )
-    def span_fixture(self, request):
-        snippet_idx, row, col, row_2, col_2, expected_value = request.param
+    def it_calculates_the_dimensions_of_a_span_to_help(
+        self,
+        snippet_idx: int,
+        row: int,
+        col: int,
+        row_2: int,
+        col_2: int,
+        expected_value: tuple[int, int, int, int],
+    ):
         tbl = self._snippet_tbl(snippet_idx)
         tc = tbl.tr_lst[row].tc_lst[col]
-        tc_2 = tbl.tr_lst[row_2].tc_lst[col_2]
-        return tc, tc_2, expected_value
+        other_tc = tbl.tr_lst[row_2].tc_lst[col_2]
+
+        dimensions = tc._span_dimensions(other_tc)
 
-    @pytest.fixture(
-        params=[
+        assert dimensions == expected_value
+
+    @pytest.mark.parametrize(
+        ("snippet_idx", "row", "col", "row_2", "col_2"),
+        [
             (1, 0, 0, 1, 0),  # inverted-L horz
             (1, 1, 0, 0, 0),  # same in opposite order
             (2, 0, 2, 0, 1),  # inverted-L vert
@@ -280,17 +141,72 @@ def span_fixture(self, request):
             (5, 1, 0, 2, 1),  # same, opposite side
             (6, 1, 0, 0, 1),  # tee-shape vert bar
             (6, 0, 1, 1, 2),  # same, opposite side
-        ]
+        ],
     )
-    def span_raise_fixture(self, request):
-        snippet_idx, row, col, row_2, col_2 = request.param
+    def it_raises_on_invalid_span(
+        self, snippet_idx: int, row: int, col: int, row_2: int, col_2: int
+    ):
         tbl = self._snippet_tbl(snippet_idx)
         tc = tbl.tr_lst[row].tc_lst[col]
-        tc_2 = tbl.tr_lst[row_2].tc_lst[col_2]
-        return tc, tc_2
+        other_tc = tbl.tr_lst[row_2].tc_lst[col_2]
+
+        with pytest.raises(InvalidSpanError):
+            tc._span_dimensions(other_tc)
+
+    @pytest.mark.parametrize(
+        ("snippet_idx", "row", "col", "width", "height"),
+        [
+            (0, 0, 0, 2, 1),
+            (0, 0, 1, 1, 2),
+            (0, 1, 1, 2, 2),
+            (1, 0, 0, 2, 2),
+            (2, 0, 0, 2, 2),
+            (2, 1, 2, 1, 2),
+        ],
+    )
+    def it_can_grow_itself_to_help_merge(
+        self, snippet_idx: int, row: int, col: int, width: int, height: int, _span_to_width_: Mock
+    ):
+        tbl = self._snippet_tbl(snippet_idx)
+        tc = tbl.tr_lst[row].tc_lst[col]
+        start = 0 if height == 1 else 1
+        end = start + height
+
+        tc._grow_to(width, height, None)
 
-    @pytest.fixture(
-        params=[
+        assert (
+            _span_to_width_.call_args_list
+            == [
+                call(width, tc, None),
+                call(width, tc, "restart"),
+                call(width, tc, "continue"),
+                call(width, tc, "continue"),
+            ][start:end]
+        )
+
+    def it_can_extend_its_horz_span_to_help_merge(
+        self, top_tc_: Mock, grid_span_: Mock, _move_content_to_: Mock, _swallow_next_tc_: Mock
+    ):
+        grid_span_.side_effect = [1, 3, 4]
+        grid_width, vMerge = 4, "continue"
+        tc = cast(CT_Tc, element("w:tc"))
+
+        tc._span_to_width(grid_width, top_tc_, vMerge)
+
+        _move_content_to_.assert_called_once_with(tc, top_tc_)
+        assert _swallow_next_tc_.call_args_list == [
+            call(tc, grid_width, top_tc_),
+            call(tc, grid_width, top_tc_),
+        ]
+        assert tc.vMerge == vMerge
+
+    def it_knows_its_inner_content_block_item_elements(self):
+        tc = cast(CT_Tc, element("w:tc/(w:p,w:tbl,w:p)"))
+        assert [type(e) for e in tc.inner_content_elements] == [CT_P, CT_Tbl, CT_P]
+
+    @pytest.mark.parametrize(
+        ("tr_cxml", "tc_idx", "grid_width", "expected_cxml"),
+        [
             (
                 "w:tr/(w:tc/w:p,w:tc/w:p)",
                 0,
@@ -307,8 +223,7 @@ def span_raise_fixture(self, request):
                 'w:tr/(w:tc/w:p/w:r/w:t"a",w:tc/w:p/w:r/w:t"b")',
                 0,
                 2,
-                'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p/w:r/w:t"a",'
-                'w:p/w:r/w:t"b"))',
+                'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p/w:r/w:t"a",' 'w:p/w:r/w:t"b"))',
             ),
             (
                 "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p),w:tc/w:p)",
@@ -322,75 +237,145 @@ def span_raise_fixture(self, request):
                 3,
                 "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=3},w:p))",
             ),
-        ]
+        ],
+    )
+    def it_can_swallow_the_next_tc_help_merge(
+        self, tr_cxml: str, tc_idx: int, grid_width: int, expected_cxml: str
+    ):
+        tr = cast(CT_Row, element(tr_cxml))
+        tc = top_tc = tr.tc_lst[tc_idx]
+
+        tc._swallow_next_tc(grid_width, top_tc)
+
+        assert tr.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("tr_cxml", "tc_idx", "grid_width", "expected_cxml"),
+        [
+            # both cells have a width
+            (
+                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p),"
+                "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=2880,w:type=dxa}," "w:gridSpan{w:val=2}),w:p))",
+            ),
+            # neither have a width
+            (
+                "w:tr/(w:tc/w:p,w:tc/w:p)",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+            ),
+            # only second one has a width
+            (
+                "w:tr/(w:tc/w:p," "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
+            ),
+            # only first one has a width
+            (
+                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p)," "w:tc/w:p)",
+                0,
+                2,
+                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=1440,w:type=dxa}," "w:gridSpan{w:val=2}),w:p))",
+            ),
+        ],
     )
-    def swallow_fixture(self, request):
-        tr_cxml, tc_idx, grid_width, expected_tr_cxml = request.param
-        tr = element(tr_cxml)
-        tc = top_tc = tr[tc_idx]
-        expected_tr_xml = xml(expected_tr_cxml)
-        return tc, grid_width, top_tc, tr, expected_tr_xml
-
-    @pytest.fixture(
-        params=[
+    def it_adds_cell_widths_on_swallow(
+        self, tr_cxml: str, tc_idx: int, grid_width: int, expected_cxml: str
+    ):
+        tr = cast(CT_Row, element(tr_cxml))
+        tc = top_tc = tr.tc_lst[tc_idx]
+        tc._swallow_next_tc(grid_width, top_tc)
+        assert tr.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("tr_cxml", "tc_idx", "grid_width"),
+        [
             ("w:tr/w:tc/w:p", 0, 2),
             ("w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))", 0, 2),
-        ]
+        ],
     )
-    def swallow_raise_fixture(self, request):
-        tr_cxml, tc_idx, grid_width = request.param
-        tr = element(tr_cxml)
-        tc = top_tc = tr[tc_idx]
-        return tc, grid_width, top_tc, tr
-
-    @pytest.fixture(params=[(0, 0, 0), (4, 0, 0)])
-    def tr_above_raise_fixture(self, request):
-        snippet_idx, row_idx, col_idx = request.param
-        tbl = parse_xml(snippet_seq("tbl-cells")[snippet_idx])
+    def it_raises_on_invalid_swallow(self, tr_cxml: str, tc_idx: int, grid_width: int):
+        tr = cast(CT_Row, element(tr_cxml))
+        tc = top_tc = tr.tc_lst[tc_idx]
+
+        with pytest.raises(InvalidSpanError):
+            tc._swallow_next_tc(grid_width, top_tc)
+
+    @pytest.mark.parametrize(
+        ("tc_cxml", "tc_2_cxml", "expected_tc_cxml", "expected_tc_2_cxml"),
+        [
+            ("w:tc/w:p", "w:tc/w:p", "w:tc/w:p", "w:tc/w:p"),
+            ("w:tc/w:p", "w:tc/w:p/w:r", "w:tc/w:p", "w:tc/w:p/w:r"),
+            ("w:tc/w:p/w:r", "w:tc/w:p", "w:tc/w:p", "w:tc/w:p/w:r"),
+            ("w:tc/(w:p/w:r,w:sdt)", "w:tc/w:p", "w:tc/w:p", "w:tc/(w:p/w:r,w:sdt)"),
+            (
+                "w:tc/(w:p/w:r,w:sdt)",
+                "w:tc/(w:tbl,w:p)",
+                "w:tc/w:p",
+                "w:tc/(w:tbl,w:p/w:r,w:sdt)",
+            ),
+        ],
+    )
+    def it_can_move_its_content_to_help_merge(
+        self, tc_cxml: str, tc_2_cxml: str, expected_tc_cxml: str, expected_tc_2_cxml: str
+    ):
+        tc, tc_2 = cast(CT_Tc, element(tc_cxml)), cast(CT_Tc, element(tc_2_cxml))
+
+        tc._move_content_to(tc_2)
+
+        assert tc.xml == xml(expected_tc_cxml)
+        assert tc_2.xml == xml(expected_tc_2_cxml)
+
+    @pytest.mark.parametrize(("snippet_idx", "row_idx", "col_idx"), [(0, 0, 0), (4, 0, 0)])
+    def it_raises_on_tr_above(self, snippet_idx: int, row_idx: int, col_idx: int):
+        tbl = cast(CT_Tbl, parse_xml(snippet_seq("tbl-cells")[snippet_idx]))
         tc = tbl.tr_lst[row_idx].tc_lst[col_idx]
-        return tc
 
-    # fixture components ---------------------------------------------
+        with pytest.raises(ValueError, match="no tr above topmost tr"):
+            tc._tr_above
+
+    # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def grid_span_(self, request):
+    def grid_span_(self, request: FixtureRequest):
         return property_mock(request, CT_Tc, "grid_span")
 
     @pytest.fixture
-    def _grow_to_(self, request):
+    def _grow_to_(self, request: FixtureRequest):
         return method_mock(request, CT_Tc, "_grow_to")
 
     @pytest.fixture
-    def _move_content_to_(self, request):
+    def _move_content_to_(self, request: FixtureRequest):
         return method_mock(request, CT_Tc, "_move_content_to")
 
     @pytest.fixture
-    def _span_dimensions_(self, request):
+    def _span_dimensions_(self, request: FixtureRequest):
         return method_mock(request, CT_Tc, "_span_dimensions")
 
     @pytest.fixture
-    def _span_to_width_(self, request):
+    def _span_to_width_(self, request: FixtureRequest):
         return method_mock(request, CT_Tc, "_span_to_width", autospec=False)
 
-    def _snippet_tbl(self, idx):
-        """
-        Return a <w:tbl> element for snippet at `idx` in 'tbl-cells' snippet
-        file.
-        """
-        return parse_xml(snippet_seq("tbl-cells")[idx])
+    def _snippet_tbl(self, idx: int) -> CT_Tbl:
+        """A <w:tbl> element for snippet at `idx` in 'tbl-cells' snippet file."""
+        return cast(CT_Tbl, parse_xml(snippet_seq("tbl-cells")[idx]))
 
     @pytest.fixture
-    def _swallow_next_tc_(self, request):
+    def _swallow_next_tc_(self, request: FixtureRequest):
         return method_mock(request, CT_Tc, "_swallow_next_tc")
 
     @pytest.fixture
-    def _tbl_(self, request):
+    def _tbl_(self, request: FixtureRequest):
         return property_mock(request, CT_Tc, "_tbl")
 
     @pytest.fixture
-    def top_tc_(self, request):
+    def top_tc_(self, request: FixtureRequest):
         return instance_mock(request, CT_Tc)
 
     @pytest.fixture
-    def tr_(self, request):
+    def tr_(self, request: FixtureRequest):
         return instance_mock(request, CT_Row)
diff --git a/tests/oxml/unitdata/table.py b/tests/oxml/unitdata/table.py
deleted file mode 100644
index 4f760c1a8..000000000
--- a/tests/oxml/unitdata/table.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""Test data builders for text XML elements."""
-
-from ...unitdata import BaseBuilder
-from .shared import CT_StringBuilder
-
-
-class CT_RowBuilder(BaseBuilder):
-    __tag__ = "w:tr"
-    __nspfxs__ = ("w",)
-    __attrs__ = ("w:w",)
-
-
-class CT_TblBuilder(BaseBuilder):
-    __tag__ = "w:tbl"
-    __nspfxs__ = ("w",)
-    __attrs__ = ()
-
-
-class CT_TblGridBuilder(BaseBuilder):
-    __tag__ = "w:tblGrid"
-    __nspfxs__ = ("w",)
-    __attrs__ = ("w:w",)
-
-
-class CT_TblGridColBuilder(BaseBuilder):
-    __tag__ = "w:gridCol"
-    __nspfxs__ = ("w",)
-    __attrs__ = ("w:w",)
-
-
-class CT_TblPrBuilder(BaseBuilder):
-    __tag__ = "w:tblPr"
-    __nspfxs__ = ("w",)
-    __attrs__ = ()
-
-
-class CT_TblWidthBuilder(BaseBuilder):
-    __tag__ = "w:tblW"
-    __nspfxs__ = ("w",)
-    __attrs__ = ("w:w", "w:type")
-
-
-class CT_TcBuilder(BaseBuilder):
-    __tag__ = "w:tc"
-    __nspfxs__ = ("w",)
-    __attrs__ = ("w:id",)
-
-
-class CT_TcPrBuilder(BaseBuilder):
-    __tag__ = "w:tcPr"
-    __nspfxs__ = ("w",)
-    __attrs__ = ()
-
-
-def a_gridCol():
-    return CT_TblGridColBuilder()
-
-
-def a_tbl():
-    return CT_TblBuilder()
-
-
-def a_tblGrid():
-    return CT_TblGridBuilder()
-
-
-def a_tblPr():
-    return CT_TblPrBuilder()
-
-
-def a_tblStyle():
-    return CT_StringBuilder("w:tblStyle")
-
-
-def a_tblW():
-    return CT_TblWidthBuilder()
-
-
-def a_tc():
-    return CT_TcBuilder()
-
-
-def a_tcPr():
-    return CT_TcPrBuilder()
-
-
-def a_tr():
-    return CT_RowBuilder()
diff --git a/tests/test_table.py b/tests/test_table.py
index eef4b1df1..65f7cb423 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -17,37 +17,45 @@
     WD_TABLE_DIRECTION,
 )
 from docx.oxml.parser import parse_xml
-from docx.oxml.table import CT_Tbl, CT_Tc
+from docx.oxml.table import CT_Row, CT_Tbl, CT_TblGridCol, CT_Tc
 from docx.parts.document import DocumentPart
-from docx.shared import Inches
+from docx.shared import Emu, Inches, Length
 from docx.table import Table, _Cell, _Column, _Columns, _Row, _Rows
 from docx.text.paragraph import Paragraph
 
-from .oxml.unitdata.table import a_gridCol, a_tbl, a_tblGrid, a_tc, a_tr
-from .oxml.unitdata.text import a_p
 from .unitutil.cxml import element, xml
 from .unitutil.file import snippet_seq
 from .unitutil.mock import FixtureRequest, Mock, instance_mock, property_mock
 
 
 class DescribeTable:
-    def it_can_add_a_row(self, add_row_fixture):
-        table, expected_xml = add_row_fixture
+    """Unit-test suite for `docx.table._Rows` objects."""
+
+    def it_can_add_a_row(self, document_: Mock):
+        snippets = snippet_seq("add-row-col")
+        tbl = cast(CT_Tbl, parse_xml(snippets[0]))
+        table = Table(tbl, document_)
+
         row = table.add_row()
-        assert table._tbl.xml == expected_xml
+
+        assert table._tbl.xml == snippets[1]
         assert isinstance(row, _Row)
         assert row._tr is table._tbl.tr_lst[-1]
         assert row._parent is table
 
-    def it_can_add_a_column(self, add_column_fixture):
-        table, width, expected_xml = add_column_fixture
-        column = table.add_column(width)
-        assert table._tbl.xml == expected_xml
+    def it_can_add_a_column(self, document_: Mock):
+        snippets = snippet_seq("add-row-col")
+        tbl = cast(CT_Tbl, parse_xml(snippets[0]))
+        table = Table(tbl, document_)
+
+        column = table.add_column(Inches(1.5))
+
+        assert table._tbl.xml == snippets[2]
         assert isinstance(column, _Column)
         assert column._gridCol is table._tbl.tblGrid.gridCol_lst[-1]
         assert column._parent is table
 
-    def it_provides_access_to_a_cell_by_row_and_col_indices(self, table):
+    def it_provides_access_to_a_cell_by_row_and_col_indices(self, table: Table):
         for row_idx in range(2):
             for col_idx in range(2):
                 cell = table.cell(row_idx, col_idx)
@@ -56,50 +64,121 @@ def it_provides_access_to_a_cell_by_row_and_col_indices(self, table):
                 tc = tr.tc_lst[col_idx]
                 assert tc is cell._tc
 
-    def it_provides_access_to_the_table_rows(self, table):
+    def it_provides_access_to_the_table_rows(self, table: Table):
         rows = table.rows
         assert isinstance(rows, _Rows)
 
-    def it_provides_access_to_the_table_columns(self, table):
+    def it_provides_access_to_the_table_columns(self, table: Table):
         columns = table.columns
         assert isinstance(columns, _Columns)
 
-    def it_provides_access_to_the_cells_in_a_column(self, col_cells_fixture):
-        table, column_idx, expected_cells = col_cells_fixture
+    def it_provides_access_to_the_cells_in_a_column(
+        self, _cells_: Mock, _column_count_: Mock, document_: Mock
+    ):
+        table = Table(cast(CT_Tbl, element("w:tbl")), document_)
+        _cells_.return_value = [0, 1, 2, 3, 4, 5, 6, 7, 8]
+        _column_count_.return_value = 3
+        column_idx = 1
+
         column_cells = table.column_cells(column_idx)
-        assert column_cells == expected_cells
 
-    def it_provides_access_to_the_cells_in_a_row(self, row_cells_fixture):
-        table, row_idx, expected_cells = row_cells_fixture
-        row_cells = table.row_cells(row_idx)
-        assert row_cells == expected_cells
+        assert column_cells == [1, 4, 7]
+
+    def it_provides_access_to_the_cells_in_a_row(
+        self, _cells_: Mock, _column_count_: Mock, document_: Mock
+    ):
+        table = Table(cast(CT_Tbl, element("w:tbl")), document_)
+        _cells_.return_value = [0, 1, 2, 3, 4, 5, 6, 7, 8]
+        _column_count_.return_value = 3
+
+        row_cells = table.row_cells(1)
+
+        assert row_cells == [3, 4, 5]
 
-    def it_knows_its_alignment_setting(self, alignment_get_fixture):
-        table, expected_value = alignment_get_fixture
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "expected_value"),
+        [
+            ("w:tbl/w:tblPr", None),
+            ("w:tbl/w:tblPr/w:jc{w:val=center}", WD_TABLE_ALIGNMENT.CENTER),
+            ("w:tbl/w:tblPr/w:jc{w:val=right}", WD_TABLE_ALIGNMENT.RIGHT),
+            ("w:tbl/w:tblPr/w:jc{w:val=left}", WD_TABLE_ALIGNMENT.LEFT),
+        ],
+    )
+    def it_knows_its_alignment_setting(
+        self, tbl_cxml: str, expected_value: WD_TABLE_ALIGNMENT | None, document_: Mock
+    ):
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
         assert table.alignment == expected_value
 
-    def it_can_change_its_alignment_setting(self, alignment_set_fixture):
-        table, new_value, expected_xml = alignment_set_fixture
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "new_value", "expected_cxml"),
+        [
+            ("w:tbl/w:tblPr", WD_TABLE_ALIGNMENT.LEFT, "w:tbl/w:tblPr/w:jc{w:val=left}"),
+            (
+                "w:tbl/w:tblPr/w:jc{w:val=left}",
+                WD_TABLE_ALIGNMENT.RIGHT,
+                "w:tbl/w:tblPr/w:jc{w:val=right}",
+            ),
+            ("w:tbl/w:tblPr/w:jc{w:val=right}", None, "w:tbl/w:tblPr"),
+        ],
+    )
+    def it_can_change_its_alignment_setting(
+        self,
+        tbl_cxml: str,
+        new_value: WD_TABLE_ALIGNMENT | None,
+        expected_cxml: str,
+        document_: Mock,
+    ):
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
         table.alignment = new_value
-        assert table._tbl.xml == expected_xml
+        assert table._tbl.xml == xml(expected_cxml)
 
-    def it_knows_whether_it_should_autofit(self, autofit_get_fixture):
-        table, expected_value = autofit_get_fixture
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "expected_value"),
+        [
+            ("w:tbl/w:tblPr", True),
+            ("w:tbl/w:tblPr/w:tblLayout", True),
+            ("w:tbl/w:tblPr/w:tblLayout{w:type=autofit}", True),
+            ("w:tbl/w:tblPr/w:tblLayout{w:type=fixed}", False),
+        ],
+    )
+    def it_knows_whether_it_should_autofit(
+        self, tbl_cxml: str, expected_value: bool, document_: Mock
+    ):
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
         assert table.autofit is expected_value
 
-    def it_can_change_its_autofit_setting(self, autofit_set_fixture):
-        table, new_value, expected_xml = autofit_set_fixture
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "new_value", "expected_cxml"),
+        [
+            ("w:tbl/w:tblPr", True, "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}"),
+            ("w:tbl/w:tblPr", False, "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}"),
+            (
+                "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}",
+                True,
+                "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}",
+            ),
+            (
+                "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}",
+                False,
+                "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}",
+            ),
+        ],
+    )
+    def it_can_change_its_autofit_setting(
+        self, tbl_cxml: str, new_value: bool, expected_cxml: str, document_: Mock
+    ):
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
         table.autofit = new_value
-        assert table._tbl.xml == expected_xml
+        assert table._tbl.xml == xml(expected_cxml)
 
-    def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
-        table = table_fixture
+    def it_knows_it_is_the_table_its_children_belong_to(self, table: Table):
         assert table.table is table
 
     @pytest.mark.parametrize(
         ("tbl_cxml", "expected_value"),
         [
-            # ("w:tbl/w:tblPr", None),
+            ("w:tbl/w:tblPr", None),
             ("w:tbl/w:tblPr/w:bidiVisual", WD_TABLE_DIRECTION.RTL),
             ("w:tbl/w:tblPr/w:bidiVisual{w:val=0}", WD_TABLE_DIRECTION.LTR),
             ("w:tbl/w:tblPr/w:bidiVisual{w:val=on}", WD_TABLE_DIRECTION.RTL),
@@ -135,202 +214,95 @@ def it_can_change_its_direction(
         table.table_direction = new_value
         assert table._element.xml == xml(expected_cxml)
 
-    def it_knows_its_table_style(self, style_get_fixture):
-        table, style_id_, style_ = style_get_fixture
-        style = table.style
-        table.part.get_style.assert_called_once_with(style_id_, WD_STYLE_TYPE.TABLE)
-        assert style is style_
-
-    def it_can_change_its_table_style(self, style_set_fixture):
-        table, value, expected_xml = style_set_fixture
-        table.style = value
-        table.part.get_style_id.assert_called_once_with(value, WD_STYLE_TYPE.TABLE)
-        assert table._tbl.xml == expected_xml
-
-    def it_provides_access_to_its_cells_to_help(self, cells_fixture):
-        table, cell_count, unique_count, matches = cells_fixture
-        cells = table._cells
-        assert len(cells) == cell_count
-        assert len(set(cells)) == unique_count
-        for matching_idxs in matches:
-            comparator_idx = matching_idxs[0]
-            for idx in matching_idxs[1:]:
-                assert cells[idx] is cells[comparator_idx]
+    def it_knows_its_table_style(self, part_prop_: Mock, document_part_: Mock, document_: Mock):
+        part_prop_.return_value = document_part_
+        style_ = document_part_.get_style.return_value
+        table = Table(cast(CT_Tbl, element("w:tbl/w:tblPr/w:tblStyle{w:val=BarBaz}")), document_)
 
-    def it_knows_its_column_count_to_help(self, column_count_fixture):
-        table, expected_value = column_count_fixture
-        column_count = table._column_count
-        assert column_count == expected_value
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def add_column_fixture(self):
-        snippets = snippet_seq("add-row-col")
-        tbl = parse_xml(snippets[0])
-        table = Table(tbl, None)
-        width = Inches(1.5)
-        expected_xml = snippets[2]
-        return table, width, expected_xml
-
-    @pytest.fixture
-    def add_row_fixture(self):
-        snippets = snippet_seq("add-row-col")
-        tbl = parse_xml(snippets[0])
-        table = Table(tbl, None)
-        expected_xml = snippets[1]
-        return table, expected_xml
+        style = table.style
 
-    @pytest.fixture(
-        params=[
-            ("w:tbl/w:tblPr", None),
-            ("w:tbl/w:tblPr/w:jc{w:val=center}", WD_TABLE_ALIGNMENT.CENTER),
-            ("w:tbl/w:tblPr/w:jc{w:val=right}", WD_TABLE_ALIGNMENT.RIGHT),
-            ("w:tbl/w:tblPr/w:jc{w:val=left}", WD_TABLE_ALIGNMENT.LEFT),
-        ]
-    )
-    def alignment_get_fixture(self, request):
-        tbl_cxml, expected_value = request.param
-        table = Table(element(tbl_cxml), None)
-        return table, expected_value
+        document_part_.get_style.assert_called_once_with("BarBaz", WD_STYLE_TYPE.TABLE)
+        assert style is style_
 
-    @pytest.fixture(
-        params=[
-            (
-                "w:tbl/w:tblPr",
-                WD_TABLE_ALIGNMENT.LEFT,
-                "w:tbl/w:tblPr/w:jc{w:val=left}",
-            ),
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "new_value", "style_id", "expected_cxml"),
+        [
+            ("w:tbl/w:tblPr", "Tbl A", "TblA", "w:tbl/w:tblPr/w:tblStyle{w:val=TblA}"),
             (
-                "w:tbl/w:tblPr/w:jc{w:val=left}",
-                WD_TABLE_ALIGNMENT.RIGHT,
-                "w:tbl/w:tblPr/w:jc{w:val=right}",
+                "w:tbl/w:tblPr/w:tblStyle{w:val=TblA}",
+                "Tbl B",
+                "TblB",
+                "w:tbl/w:tblPr/w:tblStyle{w:val=TblB}",
             ),
-            ("w:tbl/w:tblPr/w:jc{w:val=right}", None, "w:tbl/w:tblPr"),
-        ]
-    )
-    def alignment_set_fixture(self, request):
-        tbl_cxml, new_value, expected_tbl_cxml = request.param
-        table = Table(element(tbl_cxml), None)
-        expected_xml = xml(expected_tbl_cxml)
-        return table, new_value, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:tbl/w:tblPr", True),
-            ("w:tbl/w:tblPr/w:tblLayout", True),
-            ("w:tbl/w:tblPr/w:tblLayout{w:type=autofit}", True),
-            ("w:tbl/w:tblPr/w:tblLayout{w:type=fixed}", False),
-        ]
+            ("w:tbl/w:tblPr/w:tblStyle{w:val=TblB}", None, None, "w:tbl/w:tblPr"),
+        ],
     )
-    def autofit_get_fixture(self, request):
-        tbl_cxml, expected_autofit = request.param
-        table = Table(element(tbl_cxml), None)
-        return table, expected_autofit
+    def it_can_change_its_table_style(
+        self,
+        tbl_cxml: str,
+        new_value: str | None,
+        style_id: str | None,
+        expected_cxml: str,
+        document_: Mock,
+        part_prop_: Mock,
+        document_part_: Mock,
+    ):
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
+        part_prop_.return_value = document_part_
+        document_part_.get_style_id.return_value = style_id
 
-    @pytest.fixture(
-        params=[
-            ("w:tbl/w:tblPr", True, "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}"),
-            ("w:tbl/w:tblPr", False, "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}"),
-            ("w:tbl/w:tblPr", None, "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}"),
-            (
-                "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}",
-                True,
-                "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}",
-            ),
-            (
-                "w:tbl/w:tblPr/w:tblLayout{w:type=autofit}",
-                False,
-                "w:tbl/w:tblPr/w:tblLayout{w:type=fixed}",
-            ),
-        ]
-    )
-    def autofit_set_fixture(self, request):
-        tbl_cxml, new_value, expected_tbl_cxml = request.param
-        table = Table(element(tbl_cxml), None)
-        expected_xml = xml(expected_tbl_cxml)
-        return table, new_value, expected_xml
-
-    @pytest.fixture(
-        params=[
+        table.style = new_value
+
+        document_part_.get_style_id.assert_called_once_with(new_value, WD_STYLE_TYPE.TABLE)
+        assert table._tbl.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("snippet_idx", "cell_count", "unique_count", "matches"),
+        [
             (0, 9, 9, ()),
             (1, 9, 8, ((0, 1),)),
             (2, 9, 8, ((1, 4),)),
             (3, 9, 6, ((0, 1, 3, 4),)),
             (4, 9, 4, ((0, 1), (3, 6), (4, 5, 7, 8))),
-        ]
+        ],
     )
-    def cells_fixture(self, request):
-        snippet_idx, cell_count, unique_count, matches = request.param
+    def it_provides_access_to_its_cells_to_help(
+        self,
+        snippet_idx: int,
+        cell_count: int,
+        unique_count: int,
+        matches: tuple[tuple[int, ...]],
+        document_: Mock,
+    ):
         tbl_xml = snippet_seq("tbl-cells")[snippet_idx]
-        table = Table(parse_xml(tbl_xml), None)
-        return table, cell_count, unique_count, matches
+        table = Table(cast(CT_Tbl, parse_xml(tbl_xml)), document_)
 
-    @pytest.fixture
-    def col_cells_fixture(self, _cells_, _column_count_):
-        table = Table(None, None)
-        _cells_.return_value = [0, 1, 2, 3, 4, 5, 6, 7, 8]
-        _column_count_.return_value = 3
-        column_idx = 1
-        expected_cells = [1, 4, 7]
-        return table, column_idx, expected_cells
+        cells = table._cells
 
-    @pytest.fixture
-    def column_count_fixture(self):
+        assert len(cells) == cell_count
+        assert len(set(cells)) == unique_count
+        for matching_idxs in matches:
+            comparator_idx = matching_idxs[0]
+            for idx in matching_idxs[1:]:
+                assert cells[idx] is cells[comparator_idx]
+
+    def it_knows_its_column_count_to_help(self, document_: Mock):
         tbl_cxml = "w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)"
         expected_value = 3
-        table = Table(element(tbl_cxml), None)
-        return table, expected_value
-
-    @pytest.fixture
-    def row_cells_fixture(self, _cells_, _column_count_):
-        table = Table(None, None)
-        _cells_.return_value = [0, 1, 2, 3, 4, 5, 6, 7, 8]
-        _column_count_.return_value = 3
-        row_idx = 1
-        expected_cells = [3, 4, 5]
-        return table, row_idx, expected_cells
+        table = Table(cast(CT_Tbl, element(tbl_cxml)), document_)
 
-    @pytest.fixture
-    def style_get_fixture(self, part_prop_):
-        style_id = "Barbaz"
-        tbl_cxml = "w:tbl/w:tblPr/w:tblStyle{w:val=%s}" % style_id
-        table = Table(element(tbl_cxml), None)
-        style_ = part_prop_.return_value.get_style.return_value
-        return table, style_id, style_
-
-    @pytest.fixture(
-        params=[
-            ("w:tbl/w:tblPr", "Tbl A", "TblA", "w:tbl/w:tblPr/w:tblStyle{w:val=TblA}"),
-            (
-                "w:tbl/w:tblPr/w:tblStyle{w:val=TblA}",
-                "Tbl B",
-                "TblB",
-                "w:tbl/w:tblPr/w:tblStyle{w:val=TblB}",
-            ),
-            ("w:tbl/w:tblPr/w:tblStyle{w:val=TblB}", None, None, "w:tbl/w:tblPr"),
-        ]
-    )
-    def style_set_fixture(self, request, part_prop_):
-        tbl_cxml, value, style_id, expected_cxml = request.param
-        table = Table(element(tbl_cxml), None)
-        part_prop_.return_value.get_style_id.return_value = style_id
-        expected_xml = xml(expected_cxml)
-        return table, value, expected_xml
+        column_count = table._column_count
 
-    @pytest.fixture
-    def table_fixture(self):
-        table = Table(None, None)
-        return table
+        assert column_count == expected_value
 
-    # fixture components ---------------------------------------------
+    # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def _cells_(self, request):
+    def _cells_(self, request: FixtureRequest):
         return property_mock(request, Table, "_cells")
 
     @pytest.fixture
-    def _column_count_(self, request):
+    def _column_count_(self, request: FixtureRequest):
         return property_mock(request, Table, "_column_count")
 
     @pytest.fixture
@@ -338,130 +310,78 @@ def document_(self, request: FixtureRequest):
         return instance_mock(request, Document)
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def part_prop_(self, request, document_part_):
-        return property_mock(request, Table, "part", return_value=document_part_)
+    def part_prop_(self, request: FixtureRequest):
+        return property_mock(request, Table, "part")
 
     @pytest.fixture
-    def table(self):
-        tbl = _tbl_bldr(rows=2, cols=2).element
-        table = Table(tbl, None)
-        return table
+    def table(self, document_: Mock):
+        tbl_cxml = "w:tbl/(w:tblGrid/(w:gridCol,w:gridCol),w:tr/(w:tc,w:tc),w:tr/(w:tc,w:tc))"
+        return Table(cast(CT_Tbl, element(tbl_cxml)), document_)
 
 
 class Describe_Cell:
-    def it_knows_what_text_it_contains(self, text_get_fixture):
-        cell, expected_text = text_get_fixture
+    """Unit-test suite for `docx.table._Cell` objects."""
+
+    @pytest.mark.parametrize(
+        ("tc_cxml", "expected_text"),
+        [
+            ("w:tc", ""),
+            ('w:tc/w:p/w:r/w:t"foobar"', "foobar"),
+            ('w:tc/(w:p/w:r/w:t"foo",w:p/w:r/w:t"bar")', "foo\nbar"),
+            ('w:tc/(w:tcPr,w:p/w:r/w:t"foobar")', "foobar"),
+            ('w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)', "fo\tob\nar\n"),
+        ],
+    )
+    def it_knows_what_text_it_contains(self, tc_cxml: str, expected_text: str, parent_: Mock):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
         text = cell.text
         assert text == expected_text
 
-    def it_can_replace_its_content_with_a_string_of_text(self, text_set_fixture):
-        cell, text, expected_xml = text_set_fixture
-        cell.text = text
-        assert cell._tc.xml == expected_xml
-
-    def it_knows_its_vertical_alignment(self, alignment_get_fixture):
-        cell, expected_value = alignment_get_fixture
-        vertical_alignment = cell.vertical_alignment
-        assert vertical_alignment == expected_value
-
-    def it_can_change_its_vertical_alignment(self, alignment_set_fixture):
-        cell, new_value, expected_xml = alignment_set_fixture
-        cell.vertical_alignment = new_value
-        assert cell._element.xml == expected_xml
-
-    def it_knows_its_width_in_EMU(self, width_get_fixture):
-        cell, expected_width = width_get_fixture
-        assert cell.width == expected_width
-
-    def it_can_change_its_width(self, width_set_fixture):
-        cell, value, expected_xml = width_set_fixture
-        cell.width = value
-        assert cell.width == value
-        assert cell._tc.xml == expected_xml
-
-    def it_provides_access_to_the_paragraphs_it_contains(self, paragraphs_fixture):
-        cell = paragraphs_fixture
-        paragraphs = cell.paragraphs
-        assert len(paragraphs) == 2
-        count = 0
-        for idx, paragraph in enumerate(paragraphs):
-            assert isinstance(paragraph, Paragraph)
-            assert paragraph is paragraphs[idx]
-            count += 1
-        assert count == 2
-
-    def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
-        # test len(), iterable, and indexed access
-        cell, expected_count = tables_fixture
-        tables = cell.tables
-        assert len(tables) == expected_count
-        count = 0
-        for idx, table in enumerate(tables):
-            assert isinstance(table, Table)
-            assert tables[idx] is table
-            count += 1
-        assert count == expected_count
-
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        cell, expected_xml = add_paragraph_fixture
-        p = cell.add_paragraph()
-        assert cell._tc.xml == expected_xml
-        assert isinstance(p, Paragraph)
-
-    def it_can_add_a_table(self, add_table_fixture):
-        cell, expected_xml = add_table_fixture
-        table = cell.add_table(rows=2, cols=2)
-        assert cell._element.xml == expected_xml
-        assert isinstance(table, Table)
-
-    def it_can_merge_itself_with_other_cells(self, merge_fixture):
-        cell, other_cell, merged_tc_ = merge_fixture
-        merged_cell = cell.merge(other_cell)
-        cell._tc.merge.assert_called_once_with(other_cell._tc)
-        assert isinstance(merged_cell, _Cell)
-        assert merged_cell._tc is merged_tc_
-        assert merged_cell._parent is cell._parent
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
-            ("w:tc", "w:tc/w:p"),
-            ("w:tc/w:p", "w:tc/(w:p, w:p)"),
-            ("w:tc/w:tbl", "w:tc/(w:tbl, w:p)"),
-        ]
+    @pytest.mark.parametrize(
+        ("tc_cxml", "new_text", "expected_cxml"),
+        [
+            ("w:tc/w:p", "foobar", 'w:tc/w:p/w:r/w:t"foobar"'),
+            (
+                "w:tc/w:p",
+                "fo\tob\rar\n",
+                'w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)',
+            ),
+            (
+                "w:tc/(w:tcPr, w:p, w:tbl, w:p)",
+                "foobar",
+                'w:tc/(w:tcPr, w:p/w:r/w:t"foobar")',
+            ),
+        ],
     )
-    def add_paragraph_fixture(self, request):
-        tc_cxml, after_tc_cxml = request.param
-        cell = _Cell(element(tc_cxml), None)
-        expected_xml = xml(after_tc_cxml)
-        return cell, expected_xml
-
-    @pytest.fixture
-    def add_table_fixture(self, request):
-        cell = _Cell(element("w:tc/w:p"), None)
-        expected_xml = snippet_seq("new-tbl")[1]
-        return cell, expected_xml
+    def it_can_replace_its_content_with_a_string_of_text(
+        self, tc_cxml: str, new_text: str, expected_cxml: str, parent_: Mock
+    ):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+        cell.text = new_text
+        assert cell._tc.xml == xml(expected_cxml)
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tc_cxml", "expected_value"),
+        [
             ("w:tc", None),
             ("w:tc/w:tcPr", None),
             ("w:tc/w:tcPr/w:vAlign{w:val=bottom}", WD_ALIGN_VERTICAL.BOTTOM),
             ("w:tc/w:tcPr/w:vAlign{w:val=top}", WD_ALIGN_VERTICAL.TOP),
-        ]
+        ],
     )
-    def alignment_get_fixture(self, request):
-        tc_cxml, expected_value = request.param
-        cell = _Cell(element(tc_cxml), None)
-        return cell, expected_value
+    def it_knows_its_vertical_alignment(
+        self, tc_cxml: str, expected_value: WD_ALIGN_VERTICAL | None, parent_: Mock
+    ):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+        assert cell.vertical_alignment == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tc_cxml", "new_value", "expected_cxml"),
+        [
             ("w:tc", WD_ALIGN_VERTICAL.TOP, "w:tc/w:tcPr/w:vAlign{w:val=top}"),
             (
                 "w:tc/w:tcPr",
@@ -476,330 +396,272 @@ def alignment_get_fixture(self, request):
             ("w:tc/w:tcPr/w:vAlign{w:val=center}", None, "w:tc/w:tcPr"),
             ("w:tc", None, "w:tc/w:tcPr"),
             ("w:tc/w:tcPr", None, "w:tc/w:tcPr"),
-        ]
-    )
-    def alignment_set_fixture(self, request):
-        cxml, new_value, expected_cxml = request.param
-        cell = _Cell(element(cxml), None)
-        expected_xml = xml(expected_cxml)
-        return cell, new_value, expected_xml
-
-    @pytest.fixture
-    def merge_fixture(self, tc_, tc_2_, parent_, merged_tc_):
-        cell, other_cell = _Cell(tc_, parent_), _Cell(tc_2_, parent_)
-        tc_.merge.return_value = merged_tc_
-        return cell, other_cell, merged_tc_
-
-    @pytest.fixture
-    def paragraphs_fixture(self):
-        return _Cell(element("w:tc/(w:p, w:p)"), None)
-
-    @pytest.fixture(
-        params=[
-            ("w:tc", 0),
-            ("w:tc/w:tbl", 1),
-            ("w:tc/(w:tbl,w:tbl)", 2),
-            ("w:tc/(w:p,w:tbl)", 1),
-            ("w:tc/(w:tbl,w:tbl,w:p)", 2),
-        ]
-    )
-    def tables_fixture(self, request):
-        cell_cxml, expected_count = request.param
-        cell = _Cell(element(cell_cxml), None)
-        return cell, expected_count
-
-    @pytest.fixture(
-        params=[
-            ("w:tc", ""),
-            ('w:tc/w:p/w:r/w:t"foobar"', "foobar"),
-            ('w:tc/(w:p/w:r/w:t"foo",w:p/w:r/w:t"bar")', "foo\nbar"),
-            ('w:tc/(w:tcPr,w:p/w:r/w:t"foobar")', "foobar"),
-            ('w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)', "fo\tob\nar\n"),
-        ]
+        ],
     )
-    def text_get_fixture(self, request):
-        tc_cxml, expected_text = request.param
-        cell = _Cell(element(tc_cxml), None)
-        return cell, expected_text
+    def it_can_change_its_vertical_alignment(
+        self, tc_cxml: str, new_value: WD_ALIGN_VERTICAL | None, expected_cxml: str, parent_: Mock
+    ):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+        cell.vertical_alignment = new_value
+        assert cell._element.xml == xml(expected_cxml)
 
-    @pytest.fixture(
-        params=[
-            ("w:tc/w:p", "foobar", 'w:tc/w:p/w:r/w:t"foobar"'),
-            (
-                "w:tc/w:p",
-                "fo\tob\rar\n",
-                'w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)',
-            ),
-            (
-                "w:tc/(w:tcPr, w:p, w:tbl, w:p)",
-                "foobar",
-                'w:tc/(w:tcPr, w:p/w:r/w:t"foobar")',
-            ),
-        ]
-    )
-    def text_set_fixture(self, request):
-        tc_cxml, new_text, expected_cxml = request.param
-        cell = _Cell(element(tc_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return cell, new_text, expected_xml
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tc_cxml", "expected_value"),
+        [
             ("w:tc", None),
             ("w:tc/w:tcPr", None),
             ("w:tc/w:tcPr/w:tcW{w:w=25%,w:type=pct}", None),
             ("w:tc/w:tcPr/w:tcW{w:w=1440,w:type=dxa}", 914400),
-        ]
+        ],
     )
-    def width_get_fixture(self, request):
-        tc_cxml, expected_width = request.param
-        cell = _Cell(element(tc_cxml), None)
-        return cell, expected_width
+    def it_knows_its_width_in_EMU(self, tc_cxml: str, expected_value: int | None, parent_: Mock):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+        assert cell.width == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tc_cxml", "new_value", "expected_cxml"),
+        [
             ("w:tc", Inches(1), "w:tc/w:tcPr/w:tcW{w:w=1440,w:type=dxa}"),
             (
                 "w:tc/w:tcPr/w:tcW{w:w=25%,w:type=pct}",
                 Inches(2),
                 "w:tc/w:tcPr/w:tcW{w:w=2880,w:type=dxa}",
             ),
-        ]
+        ],
+    )
+    def it_can_change_its_width(
+        self, tc_cxml: str, new_value: Length, expected_cxml: str, parent_: Mock
+    ):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+        cell.width = new_value
+        assert cell.width == new_value
+        assert cell._tc.xml == xml(expected_cxml)
+
+    def it_provides_access_to_the_paragraphs_it_contains(self, parent_: Mock):
+        cell = _Cell(cast(CT_Tc, element("w:tc/(w:p, w:p)")), parent_)
+
+        paragraphs = cell.paragraphs
+
+        # -- every w:p produces a Paragraph instance --
+        assert len(paragraphs) == 2
+        assert all(isinstance(p, Paragraph) for p in paragraphs)
+        # -- the return value is iterable and indexable --
+        assert all(p is paragraphs[idx] for idx, p in enumerate(paragraphs))
+
+    @pytest.mark.parametrize(
+        ("tc_cxml", "expected_table_count"),
+        [
+            ("w:tc", 0),
+            ("w:tc/w:tbl", 1),
+            ("w:tc/(w:tbl,w:tbl)", 2),
+            ("w:tc/(w:p,w:tbl)", 1),
+            ("w:tc/(w:tbl,w:tbl,w:p)", 2),
+        ],
     )
-    def width_set_fixture(self, request):
-        tc_cxml, new_value, expected_cxml = request.param
-        cell = _Cell(element(tc_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return cell, new_value, expected_xml
+    def it_provides_access_to_the_tables_it_contains(
+        self, tc_cxml: str, expected_table_count: int, parent_: Mock
+    ):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+
+        tables = cell.tables
+
+        # --- test len(), iterable, and indexed access
+        assert len(tables) == expected_table_count
+        assert all(isinstance(t, Table) for t in tables)
+        assert all(t is tables[idx] for idx, t in enumerate(tables))
+
+    @pytest.mark.parametrize(
+        ("tc_cxml", "expected_cxml"),
+        [
+            ("w:tc", "w:tc/w:p"),
+            ("w:tc/w:p", "w:tc/(w:p, w:p)"),
+            ("w:tc/w:tbl", "w:tc/(w:tbl, w:p)"),
+        ],
+    )
+    def it_can_add_a_paragraph(self, tc_cxml: str, expected_cxml: str, parent_: Mock):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
 
-    # fixture components ---------------------------------------------
+        p = cell.add_paragraph()
+
+        assert isinstance(p, Paragraph)
+        assert cell._tc.xml == xml(expected_cxml)
+
+    def it_can_add_a_table(self, parent_: Mock):
+        cell = _Cell(cast(CT_Tc, element("w:tc/w:p")), parent_)
+
+        table = cell.add_table(rows=2, cols=2)
+
+        assert isinstance(table, Table)
+        assert cell._element.xml == snippet_seq("new-tbl")[1]
+
+    def it_can_merge_itself_with_other_cells(
+        self, tc_: Mock, tc_2_: Mock, parent_: Mock, merged_tc_: Mock
+    ):
+        cell, other_cell = _Cell(tc_, parent_), _Cell(tc_2_, parent_)
+        tc_.merge.return_value = merged_tc_
+
+        merged_cell = cell.merge(other_cell)
+
+        assert isinstance(merged_cell, _Cell)
+        tc_.merge.assert_called_once_with(other_cell._tc)
+        assert merged_cell._tc is merged_tc_
+        assert merged_cell._parent is cell._parent
+
+    # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def merged_tc_(self, request):
+    def merged_tc_(self, request: FixtureRequest):
         return instance_mock(request, CT_Tc)
 
     @pytest.fixture
-    def parent_(self, request):
+    def parent_(self, request: FixtureRequest):
         return instance_mock(request, Table)
 
     @pytest.fixture
-    def tc_(self, request):
+    def tc_(self, request: FixtureRequest):
         return instance_mock(request, CT_Tc)
 
     @pytest.fixture
-    def tc_2_(self, request):
+    def tc_2_(self, request: FixtureRequest):
         return instance_mock(request, CT_Tc)
 
 
 class Describe_Column:
-    def it_provides_access_to_its_cells(self, cells_fixture):
-        column, column_idx, expected_cells = cells_fixture
-        cells = column.cells
-        column.table.column_cells.assert_called_once_with(column_idx)
-        assert cells == expected_cells
+    """Unit-test suite for `docx.table._Cell` objects."""
 
-    def it_provides_access_to_the_table_it_belongs_to(self, table_fixture):
-        column, table_ = table_fixture
-        assert column.table is table_
+    def it_provides_access_to_its_cells(self, _index_prop_: Mock, table_prop_: Mock, table_: Mock):
+        table_prop_.return_value = table_
+        _index_prop_.return_value = 4
+        column = _Column(cast(CT_TblGridCol, element("w:gridCol{w:w=500}")), table_)
+        table_.column_cells.return_value = [3, 2, 1]
 
-    def it_knows_its_width_in_EMU(self, width_get_fixture):
-        column, expected_width = width_get_fixture
-        assert column.width == expected_width
-
-    def it_can_change_its_width(self, width_set_fixture):
-        column, value, expected_xml = width_set_fixture
-        column.width = value
-        assert column.width == value
-        assert column._gridCol.xml == expected_xml
-
-    def it_knows_its_index_in_table_to_help(self, index_fixture):
-        column, expected_idx = index_fixture
-        assert column._index == expected_idx
-
-    # fixtures -------------------------------------------------------
+        cells = column.cells
 
-    @pytest.fixture
-    def cells_fixture(self, _index_, table_prop_, table_):
-        column = _Column(None, None)
-        _index_.return_value = column_idx = 4
-        expected_cells = (3, 2, 1)
-        table_.column_cells.return_value = list(expected_cells)
-        return column, column_idx, expected_cells
+        table_.column_cells.assert_called_once_with(4)
+        assert cells == (3, 2, 1)
 
-    @pytest.fixture
-    def index_fixture(self):
-        tbl = element("w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)")
-        gridCol, expected_idx = tbl.tblGrid[1], 1
-        column = _Column(gridCol, None)
-        return column, expected_idx
+    def it_provides_access_to_the_table_it_belongs_to(self, table_: Mock):
+        table_.table = table_
+        column = _Column(cast(CT_TblGridCol, element("w:gridCol{w:w=500}")), table_)
 
-    @pytest.fixture
-    def table_fixture(self, parent_, table_):
-        column = _Column(None, parent_)
-        parent_.table = table_
-        return column, table_
+        assert column.table is table_
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("gridCol_cxml", "expected_width"),
+        [
             ("w:gridCol{w:w=4242}", 2693670),
             ("w:gridCol{w:w=1440}", 914400),
             ("w:gridCol{w:w=2.54cm}", 914400),
             ("w:gridCol{w:w=54mm}", 1944000),
             ("w:gridCol{w:w=12.5pt}", 158750),
             ("w:gridCol", None),
-        ]
+        ],
     )
-    def width_get_fixture(self, request):
-        gridCol_cxml, expected_width = request.param
-        column = _Column(element(gridCol_cxml), None)
-        return column, expected_width
-
-    @pytest.fixture(
-        params=[
-            ("w:gridCol", 914400, "w:gridCol{w:w=1440}"),
-            ("w:gridCol{w:w=4242}", 457200, "w:gridCol{w:w=720}"),
+    def it_knows_its_width_in_EMU(
+        self, gridCol_cxml: str, expected_width: int | None, table_: Mock
+    ):
+        column = _Column(cast(CT_TblGridCol, element(gridCol_cxml)), table_)
+        assert column.width == expected_width
+
+    @pytest.mark.parametrize(
+        ("gridCol_cxml", "new_value", "expected_cxml"),
+        [
+            ("w:gridCol", Emu(914400), "w:gridCol{w:w=1440}"),
+            ("w:gridCol{w:w=4242}", Inches(0.5), "w:gridCol{w:w=720}"),
             ("w:gridCol{w:w=4242}", None, "w:gridCol"),
             ("w:gridCol", None, "w:gridCol"),
-        ]
+        ],
     )
-    def width_set_fixture(self, request):
-        gridCol_cxml, new_value, expected_cxml = request.param
-        column = _Column(element(gridCol_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return column, new_value, expected_xml
+    def it_can_change_its_width(
+        self, gridCol_cxml: str, new_value: Length | None, expected_cxml: str, table_: Mock
+    ):
+        column = _Column(cast(CT_TblGridCol, element(gridCol_cxml)), table_)
+
+        column.width = new_value
+
+        assert column.width == new_value
+        assert column._gridCol.xml == xml(expected_cxml)
 
-    # fixture components ---------------------------------------------
+    def it_knows_its_index_in_table_to_help(self, table_: Mock):
+        tbl = cast(CT_Tbl, element("w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)"))
+        gridCol = tbl.tblGrid.gridCol_lst[1]
+        column = _Column(gridCol, table_)
+        assert column._index == 1
+
+    # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def _index_(self, request):
+    def _index_prop_(self, request: FixtureRequest):
         return property_mock(request, _Column, "_index")
 
     @pytest.fixture
-    def parent_(self, request):
+    def parent_(self, request: FixtureRequest):
         return instance_mock(request, Table)
 
     @pytest.fixture
-    def table_(self, request):
+    def table_(self, request: FixtureRequest):
         return instance_mock(request, Table)
 
     @pytest.fixture
-    def table_prop_(self, request, table_):
-        return property_mock(request, _Column, "table", return_value=table_)
+    def table_prop_(self, request: FixtureRequest):
+        return property_mock(request, _Column, "table")
 
 
 class Describe_Columns:
-    def it_knows_how_many_columns_it_contains(self, columns_fixture):
-        columns, column_count = columns_fixture
-        assert len(columns) == column_count
-
-    def it_can_interate_over_its__Column_instances(self, columns_fixture):
-        columns, column_count = columns_fixture
-        actual_count = 0
-        for column in columns:
-            assert isinstance(column, _Column)
-            actual_count += 1
-        assert actual_count == column_count
-
-    def it_provides_indexed_access_to_columns(self, columns_fixture):
-        columns, column_count = columns_fixture
-        for idx in range(-column_count, column_count):
-            column = columns[idx]
-            assert isinstance(column, _Column)
-
-    def it_raises_on_indexed_access_out_of_range(self, columns_fixture):
-        columns, column_count = columns_fixture
-        too_low = -1 - column_count
-        too_high = column_count
-        with pytest.raises(IndexError):
-            columns[too_low]
-        with pytest.raises(IndexError):
-            columns[too_high]
+    """Unit-test suite for `docx.table._Columns` objects."""
 
-    def it_provides_access_to_the_table_it_belongs_to(self, table_fixture):
-        columns, table_ = table_fixture
-        assert columns.table is table_
+    def it_has_sequence_behaviors(self, table_: Mock):
+        columns = _Columns(cast(CT_Tbl, element("w:tbl/w:tblGrid/(w:gridCol,w:gridCol)")), table_)
 
-    # fixtures -------------------------------------------------------
+        # -- it supports len() --
+        assert len(columns) == 2
+        # -- it is iterable --
+        assert len(tuple(c for c in columns)) == 2
+        assert all(type(c) is _Column for c in columns)
+        # -- it is indexable --
+        assert all(type(columns[i]) is _Column for i in range(2))
 
-    @pytest.fixture
-    def columns_fixture(self):
-        column_count = 2
-        tbl = _tbl_bldr(rows=2, cols=column_count).element
-        columns = _Columns(tbl, None)
-        return columns, column_count
+    def it_raises_on_indexed_access_out_of_range(self, table_: Mock):
+        columns = _Columns(cast(CT_Tbl, element("w:tbl/w:tblGrid/(w:gridCol,w:gridCol)")), table_)
 
-    @pytest.fixture
-    def table_fixture(self, table_):
-        columns = _Columns(None, table_)
+        with pytest.raises(IndexError):
+            columns[2]
+        with pytest.raises(IndexError):
+            columns[-3]
+
+    def it_provides_access_to_the_table_it_belongs_to(self, table_: Mock):
+        columns = _Columns(cast(CT_Tbl, element("w:tbl")), table_)
         table_.table = table_
-        return columns, table_
 
-    # fixture components ---------------------------------------------
+        assert columns.table is table_
+
+    # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def table_(self, request):
+    def table_(self, request: FixtureRequest):
         return instance_mock(request, Table)
 
 
 class Describe_Row:
-    def it_knows_its_height(self, height_get_fixture):
-        row, expected_height = height_get_fixture
-        assert row.height == expected_height
-
-    def it_can_change_its_height(self, height_set_fixture):
-        row, value, expected_xml = height_set_fixture
-        row.height = value
-        assert row._tr.xml == expected_xml
-
-    def it_knows_its_height_rule(self, height_rule_get_fixture):
-        row, expected_rule = height_rule_get_fixture
-        assert row.height_rule == expected_rule
-
-    def it_can_change_its_height_rule(self, height_rule_set_fixture):
-        row, rule, expected_xml = height_rule_set_fixture
-        row.height_rule = rule
-        assert row._tr.xml == expected_xml
-
-    def it_provides_access_to_its_cells(self, cells_fixture):
-        row, row_idx, expected_cells = cells_fixture
-        cells = row.cells
-        row.table.row_cells.assert_called_once_with(row_idx)
-        assert cells == expected_cells
-
-    def it_provides_access_to_the_table_it_belongs_to(self, table_fixture):
-        row, table_ = table_fixture
-        assert row.table is table_
-
-    def it_knows_its_index_in_table_to_help(self, idx_fixture):
-        row, expected_idx = idx_fixture
-        assert row._index == expected_idx
-
-    # fixtures -------------------------------------------------------
+    """Unit-test suite for `docx.table._Row` objects."""
 
-    @pytest.fixture
-    def cells_fixture(self, _index_, table_prop_, table_):
-        row = _Row(None, None)
-        _index_.return_value = row_idx = 6
-        expected_cells = (1, 2, 3)
-        table_.row_cells.return_value = list(expected_cells)
-        return row, row_idx, expected_cells
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tr_cxml", "expected_value"),
+        [
             ("w:tr", None),
             ("w:tr/w:trPr", None),
             ("w:tr/w:trPr/w:trHeight", None),
             ("w:tr/w:trPr/w:trHeight{w:val=0}", 0),
             ("w:tr/w:trPr/w:trHeight{w:val=1440}", 914400),
-        ]
+        ],
     )
-    def height_get_fixture(self, request):
-        tr_cxml, expected_height = request.param
-        row = _Row(element(tr_cxml), None)
-        return row, expected_height
+    def it_knows_its_height(self, tr_cxml: str, expected_value: int | None, parent_: Mock):
+        row = _Row(cast(CT_Row, element(tr_cxml)), parent_)
+        assert row.height == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tr_cxml", "new_value", "expected_cxml"),
+        [
             ("w:tr", Inches(1), "w:tr/w:trPr/w:trHeight{w:val=1440}"),
             ("w:tr/w:trPr", Inches(1), "w:tr/w:trPr/w:trHeight{w:val=1440}"),
             ("w:tr/w:trPr/w:trHeight", Inches(1), "w:tr/w:trPr/w:trHeight{w:val=1440}"),
@@ -812,16 +674,18 @@ def height_get_fixture(self, request):
             ("w:tr", None, "w:tr/w:trPr"),
             ("w:tr/w:trPr", None, "w:tr/w:trPr"),
             ("w:tr/w:trPr/w:trHeight", None, "w:tr/w:trPr/w:trHeight"),
-        ]
+        ],
     )
-    def height_set_fixture(self, request):
-        tr_cxml, new_value, expected_cxml = request.param
-        row = _Row(element(tr_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return row, new_value, expected_xml
-
-    @pytest.fixture(
-        params=[
+    def it_can_change_its_height(
+        self, tr_cxml: str, new_value: Length | None, expected_cxml: str, parent_: Mock
+    ):
+        row = _Row(cast(CT_Row, element(tr_cxml)), parent_)
+        row.height = new_value
+        assert row._tr.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("tr_cxml", "expected_value"),
+        [
             ("w:tr", None),
             ("w:tr/w:trPr", None),
             ("w:tr/w:trPr/w:trHeight{w:val=0, w:hRule=auto}", WD_ROW_HEIGHT.AUTO),
@@ -833,15 +697,17 @@ def height_set_fixture(self, request):
                 "w:tr/w:trPr/w:trHeight{w:val=2880, w:hRule=exact}",
                 WD_ROW_HEIGHT.EXACTLY,
             ),
-        ]
+        ],
     )
-    def height_rule_get_fixture(self, request):
-        tr_cxml, expected_rule = request.param
-        row = _Row(element(tr_cxml), None)
-        return row, expected_rule
+    def it_knows_its_height_rule(
+        self, tr_cxml: str, expected_value: WD_ROW_HEIGHT | None, parent_: Mock
+    ):
+        row = _Row(cast(CT_Row, element(tr_cxml)), parent_)
+        assert row.height_rule == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("tr_cxml", "new_value", "expected_cxml"),
+        [
             ("w:tr", WD_ROW_HEIGHT.AUTO, "w:tr/w:trPr/w:trHeight{w:hRule=auto}"),
             (
                 "w:tr/w:trPr",
@@ -866,143 +732,125 @@ def height_rule_get_fixture(self, request):
             ("w:tr", None, "w:tr/w:trPr"),
             ("w:tr/w:trPr", None, "w:tr/w:trPr"),
             ("w:tr/w:trPr/w:trHeight", None, "w:tr/w:trPr/w:trHeight"),
-        ]
+        ],
     )
-    def height_rule_set_fixture(self, request):
-        tr_cxml, new_rule, expected_cxml = request.param
-        row = _Row(element(tr_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return row, new_rule, expected_xml
+    def it_can_change_its_height_rule(
+        self, tr_cxml: str, new_value: WD_ROW_HEIGHT | None, expected_cxml: str, parent_: Mock
+    ):
+        row = _Row(cast(CT_Row, element(tr_cxml)), parent_)
+        row.height_rule = new_value
+        assert row._tr.xml == xml(expected_cxml)
 
-    @pytest.fixture
-    def idx_fixture(self):
-        tbl = element("w:tbl/(w:tr,w:tr,w:tr)")
-        tr, expected_idx = tbl[1], 1
-        row = _Row(tr, None)
-        return row, expected_idx
+    def it_provides_access_to_its_cells(
+        self, _index_prop_: Mock, table_prop_: Mock, table_: Mock, parent_: Mock
+    ):
+        row = _Row(cast(CT_Row, element("w:tr")), parent_)
+        _index_prop_.return_value = row_idx = 6
+        expected_cells = (1, 2, 3)
+        table_.row_cells.return_value = list(expected_cells)
 
-    @pytest.fixture
-    def table_fixture(self, parent_, table_):
-        row = _Row(None, parent_)
+        cells = row.cells
+
+        table_.row_cells.assert_called_once_with(row_idx)
+        assert cells == expected_cells
+
+    def it_provides_access_to_the_table_it_belongs_to(self, parent_: Mock, table_: Mock):
         parent_.table = table_
-        return row, table_
+        row = _Row(cast(CT_Row, element("w:tr")), parent_)
+        assert row.table is table_
+
+    def it_knows_its_index_in_table_to_help(self, parent_: Mock):
+        tbl = element("w:tbl/(w:tr,w:tr,w:tr)")
+        row = _Row(cast(CT_Row, tbl[1]), parent_)
+        assert row._index == 1
 
-    # fixture components ---------------------------------------------
+    # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def _index_(self, request):
+    def _index_prop_(self, request: FixtureRequest):
         return property_mock(request, _Row, "_index")
 
     @pytest.fixture
-    def parent_(self, request):
+    def parent_(self, request: FixtureRequest):
         return instance_mock(request, Table)
 
     @pytest.fixture
-    def table_(self, request):
+    def table_(self, request: FixtureRequest):
         return instance_mock(request, Table)
 
     @pytest.fixture
-    def table_prop_(self, request, table_):
+    def table_prop_(self, request: FixtureRequest, table_: Mock):
         return property_mock(request, _Row, "table", return_value=table_)
 
 
 class Describe_Rows:
-    def it_knows_how_many_rows_it_contains(self, rows_fixture):
-        rows, row_count = rows_fixture
-        assert len(rows) == row_count
-
-    def it_can_iterate_over_its__Row_instances(self, rows_fixture):
-        rows, row_count = rows_fixture
-        actual_count = 0
-        for row in rows:
-            assert isinstance(row, _Row)
-            actual_count += 1
-        assert actual_count == row_count
-
-    def it_provides_indexed_access_to_rows(self, rows_fixture):
-        rows, row_count = rows_fixture
-        for idx in range(-row_count, row_count):
-            row = rows[idx]
-            assert isinstance(row, _Row)
+    """Unit-test suite for `docx.table._Rows` objects."""
 
-    def it_provides_sliced_access_to_rows(self, slice_fixture):
-        rows, start, end, expected_count = slice_fixture
-        slice_of_rows = rows[start:end]
-        assert len(slice_of_rows) == expected_count
-        tr_lst = rows._tbl.tr_lst
-        for idx, row in enumerate(slice_of_rows):
-            assert tr_lst.index(row._tr) == start + idx
-            assert isinstance(row, _Row)
-
-    def it_raises_on_indexed_access_out_of_range(self, rows_fixture):
-        rows, row_count = rows_fixture
-        too_low = -1 - row_count
-        too_high = row_count
-
-        with pytest.raises(IndexError, match="list index out of range"):
-            rows[too_low]
-        with pytest.raises(IndexError, match="list index out of range"):
-            rows[too_high]
-
-    def it_provides_access_to_the_table_it_belongs_to(self, table_fixture):
-        rows, table_ = table_fixture
-        assert rows.table is table_
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def rows_fixture(self):
-        row_count = 2
-        tbl = _tbl_bldr(rows=row_count, cols=2).element
-        rows = _Rows(tbl, None)
-        return rows, row_count
-
-    @pytest.fixture(
-        params=[
-            (3, 1, 3, 2),
-            (3, 0, -1, 2),
-        ]
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "expected_len"),
+        [
+            ("w:tbl", 0),
+            ("w:tbl/w:tr", 1),
+            ("w:tbl/(w:tr,w:tr)", 2),
+            ("w:tbl/(w:tr,w:tr,w:tr)", 3),
+        ],
     )
-    def slice_fixture(self, request):
-        row_count, start, end, expected_count = request.param
-        tbl = _tbl_bldr(rows=row_count, cols=2).element
-        rows = _Rows(tbl, None)
-        return rows, start, end, expected_count
-
-    @pytest.fixture
-    def table_fixture(self, table_):
-        rows = _Rows(None, table_)
-        table_.table = table_
-        return rows, table_
+    def it_has_sequence_behaviors(self, tbl_cxml: str, expected_len: int, parent_: Mock):
+        tbl = cast(CT_Tbl, element(tbl_cxml))
+        table = Table(tbl, parent_)
+        rows = _Rows(tbl, table)
 
-    # fixture components ---------------------------------------------
+        # -- it supports len() --
+        assert len(rows) == expected_len
+        # -- it is iterable --
+        assert len(tuple(r for r in rows)) == expected_len
+        assert all(type(r) is _Row for r in rows)
+        # -- it is indexable --
+        assert all(type(rows[i]) is _Row for i in range(expected_len))
 
-    @pytest.fixture
-    def table_(self, request):
-        return instance_mock(request, Table)
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "out_of_range_idx"),
+        [
+            ("w:tbl", 0),
+            ("w:tbl", 1),
+            ("w:tbl", -1),
+            ("w:tbl/w:tr", 1),
+            ("w:tbl/w:tr", -2),
+            ("w:tbl/(w:tr,w:tr,w:tr)", 3),
+            ("w:tbl/(w:tr,w:tr,w:tr)", -4),
+        ],
+    )
+    def it_raises_on_indexed_access_out_of_range(
+        self, tbl_cxml: str, out_of_range_idx: int, parent_: Mock
+    ):
+        rows = _Rows(cast(CT_Tbl, element(tbl_cxml)), parent_)
 
+        with pytest.raises(IndexError, match="list index out of range"):
+            rows[out_of_range_idx]
 
-# fixtures -----------------------------------------------------------
+    @pytest.mark.parametrize(("start", "end", "expected_len"), [(1, 3, 2), (0, -1, 2)])
+    def it_provides_sliced_access_to_rows(
+        self, start: int, end: int, expected_len: int, parent_: Mock
+    ):
+        tbl = cast(CT_Tbl, element("w:tbl/(w:tr,w:tr,w:tr)"))
+        rows = _Rows(tbl, parent_)
 
+        slice_of_rows = rows[start:end]
 
-def _tbl_bldr(rows, cols):
-    tblGrid_bldr = a_tblGrid()
-    for i in range(cols):
-        tblGrid_bldr.with_child(a_gridCol())
-    tbl_bldr = a_tbl().with_nsdecls().with_child(tblGrid_bldr)
-    for i in range(rows):
-        tr_bldr = _tr_bldr(cols)
-        tbl_bldr.with_child(tr_bldr)
-    return tbl_bldr
+        assert len(slice_of_rows) == expected_len
+        for idx, row in enumerate(slice_of_rows):
+            assert tbl.tr_lst.index(row._tr) == start + idx
+            assert isinstance(row, _Row)
 
+    def it_provides_access_to_the_table_it_belongs_to(self, parent_: Mock):
+        tbl = cast(CT_Tbl, element("w:tbl"))
+        table = Table(tbl, parent_)
+        rows = _Rows(tbl, table)
 
-def _tc_bldr():
-    return a_tc().with_child(a_p())
+        assert rows.table is table
 
+    # fixtures -------------------------------------------------------
 
-def _tr_bldr(cols):
-    tr_bldr = a_tr()
-    for i in range(cols):
-        tc_bldr = _tc_bldr()
-        tr_bldr.with_child(tc_bldr)
-    return tr_bldr
+    @pytest.fixture
+    def parent_(self, request: FixtureRequest):
+        return instance_mock(request, Document)

From d8a328985810a14308f3c90bd5bd3f6795b3956d Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 16:07:13 -0700
Subject: [PATCH 315/367] rfctr: improve expression

---
 src/docx/oxml/table.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index e0aed09a3..687c6e2e6 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -441,9 +441,7 @@ def grid_span(self) -> int:
         Determined by ./w:tcPr/w:gridSpan/@val, it defaults to 1.
         """
         tcPr = self.tcPr
-        if tcPr is None:
-            return 1
-        return tcPr.grid_span
+        return 1 if tcPr is None else tcPr.grid_span
 
     @grid_span.setter
     def grid_span(self, value: int):
@@ -809,9 +807,7 @@ def grid_span(self) -> int:
         Determined by ./w:gridSpan/@val, it defaults to 1.
         """
         gridSpan = self.gridSpan
-        if gridSpan is None:
-            return 1
-        return gridSpan.val
+        return 1 if gridSpan is None else gridSpan.val
 
     @grid_span.setter
     def grid_span(self, value: int):
@@ -898,9 +894,7 @@ class CT_TrPr(BaseOxmlElement):
     def trHeight_hRule(self) -> WD_ROW_HEIGHT_RULE | None:
         """Return the value of `w:trHeight@w:hRule`, or |None| if not present."""
         trHeight = self.trHeight
-        if trHeight is None:
-            return None
-        return trHeight.hRule
+        return None if trHeight is None else trHeight.hRule
 
     @trHeight_hRule.setter
     def trHeight_hRule(self, value: WD_ROW_HEIGHT_RULE | None):
@@ -913,9 +907,7 @@ def trHeight_hRule(self, value: WD_ROW_HEIGHT_RULE | None):
     def trHeight_val(self):
         """Return the value of `w:trHeight@w:val`, or |None| if not present."""
         trHeight = self.trHeight
-        if trHeight is None:
-            return None
-        return trHeight.val
+        return None if trHeight is None else trHeight.val
 
     @trHeight_val.setter
     def trHeight_val(self, value: Length | None):

From 6c34f128a5b5e331f1bbf88935f7c13396d33fb3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 29 Apr 2024 14:43:04 -0700
Subject: [PATCH 316/367] rfctr: modernize opc.shared.lazyproperty

No need for two, use the already modernized `docx.shared.lazyproperty`.
---
 src/docx/opc/package.py     |  44 ++++---
 src/docx/opc/part.py        |  14 ++-
 src/docx/opc/pkgwriter.py   |  13 +-
 src/docx/opc/rel.py         |  18 +--
 src/docx/opc/shared.py      |  28 ++---
 tests/opc/test_package.py   | 170 ++++++++++++---------------
 tests/opc/test_part.py      | 228 ++++++++++++++++--------------------
 tests/opc/test_pkgwriter.py |  70 ++++++-----
 8 files changed, 277 insertions(+), 308 deletions(-)

diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index b5bdc0e7c..148cd39b1 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -1,5 +1,9 @@
 """Objects that implement reading and writing OPC packages."""
 
+from __future__ import annotations
+
+from typing import IO, TYPE_CHECKING, Iterator
+
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.packuri import PACKAGE_URI, PackURI
 from docx.opc.part import PartFactory
@@ -7,7 +11,10 @@
 from docx.opc.pkgreader import PackageReader
 from docx.opc.pkgwriter import PackageWriter
 from docx.opc.rel import Relationships
-from docx.opc.shared import lazyproperty
+from docx.shared import lazyproperty
+
+if TYPE_CHECKING:
+    from docx.opc.part import Part
 
 
 class OpcPackage:
@@ -56,7 +63,7 @@ def walk_rels(source, visited=None):
         for rel in walk_rels(self):
             yield rel
 
-    def iter_parts(self):
+    def iter_parts(self) -> Iterator[Part]:
         """Generate exactly one reference to each of the parts in the package by
         performing a depth-first traversal of the rels graph."""
 
@@ -76,7 +83,7 @@ def walk_parts(source, visited=[]):
         for part in walk_parts(self):
             yield part
 
-    def load_rel(self, reltype, target, rId, is_external=False):
+    def load_rel(self, reltype: str, target: Part | str, rId: str, is_external: bool = False):
         """Return newly added |_Relationship| instance of `reltype` between this part
         and `target` with key `rId`.
 
@@ -111,14 +118,14 @@ def next_partname(self, template):
                 return PackURI(candidate_partname)
 
     @classmethod
-    def open(cls, pkg_file):
+    def open(cls, pkg_file: str | IO[bytes]) -> OpcPackage:
         """Return an |OpcPackage| instance loaded with the contents of `pkg_file`."""
         pkg_reader = PackageReader.from_file(pkg_file)
         package = cls()
         Unmarshaller.unmarshal(pkg_reader, package, PartFactory)
         return package
 
-    def part_related_by(self, reltype):
+    def part_related_by(self, reltype: str) -> Part:
         """Return part to which this package has a relationship of `reltype`.
 
         Raises |KeyError| if no such relationship is found and |ValueError| if more than
@@ -127,13 +134,16 @@ def part_related_by(self, reltype):
         return self.rels.part_with_reltype(reltype)
 
     @property
-    def parts(self):
+    def parts(self) -> list[Part]:
         """Return a list containing a reference to each of the parts in this package."""
         return list(self.iter_parts())
 
-    def relate_to(self, part, reltype):
-        """Return rId key of relationship to `part`, from the existing relationship if
-        there is one, otherwise a newly created one."""
+    def relate_to(self, part: Part, reltype: str):
+        """Return rId key of new or existing relationship to `part`.
+
+        If a relationship of `reltype` to `part` already exists, its rId is returned. Otherwise a
+        new relationship is created and that rId is returned.
+        """
         rel = self.rels.get_or_add(reltype, part)
         return rel.rId
 
@@ -143,9 +153,11 @@ def rels(self):
         relationships for this package."""
         return Relationships(PACKAGE_URI.baseURI)
 
-    def save(self, pkg_file):
-        """Save this package to `pkg_file`, where `file` can be either a path to a file
-        (a string) or a file-like object."""
+    def save(self, pkg_file: str | IO[bytes]):
+        """Save this package to `pkg_file`.
+
+        `pkg_file` can be either a file-path or a file-like object.
+        """
         for part in self.parts:
             part.before_marshal()
         PackageWriter.write(pkg_file, self.rels, self.parts)
@@ -190,9 +202,7 @@ def _unmarshal_parts(pkg_reader, package, part_factory):
         """
         parts = {}
         for partname, content_type, reltype, blob in pkg_reader.iter_sparts():
-            parts[partname] = part_factory(
-                partname, content_type, reltype, blob, package
-            )
+            parts[partname] = part_factory(partname, content_type, reltype, blob, package)
         return parts
 
     @staticmethod
@@ -202,7 +212,5 @@ def _unmarshal_relationships(pkg_reader, package, parts):
         in `parts`."""
         for source_uri, srel in pkg_reader.iter_srels():
             source = package if source_uri == "/" else parts[source_uri]
-            target = (
-                srel.target_ref if srel.is_external else parts[srel.target_partname]
-            )
+            target = srel.target_ref if srel.is_external else parts[srel.target_partname]
             source.load_rel(srel.reltype, target, srel.rId, srel.is_external)
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index a4ad3e7b2..142f49dd1 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -7,8 +7,9 @@
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
 from docx.opc.rel import Relationships
-from docx.opc.shared import cls_method_fn, lazyproperty
+from docx.opc.shared import cls_method_fn
 from docx.oxml.parser import parse_xml
+from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
     from docx.package import Package
@@ -81,9 +82,10 @@ def drop_rel(self, rId: str):
     def load(cls, partname: str, content_type: str, blob: bytes, package: Package):
         return cls(partname, content_type, blob, package)
 
-    def load_rel(self, reltype, target, rId, is_external=False):
-        """Return newly added |_Relationship| instance of `reltype` between this part
-        and `target` with key `rId`.
+    def load_rel(self, reltype: str, target: Part | str, rId: str, is_external: bool = False):
+        """Return newly added |_Relationship| instance of `reltype`.
+
+        The new relationship relates the `target` part to this part with key `rId`.
 
         Target mode is set to ``RTM.EXTERNAL`` if `is_external` is |True|. Intended for
         use during load from a serialized package, where the rId is well-known. Other
@@ -118,7 +120,7 @@ def part_related_by(self, reltype: str) -> Part:
         """
         return self.rels.part_with_reltype(reltype)
 
-    def relate_to(self, target: Part, reltype: str, is_external: bool = False) -> str:
+    def relate_to(self, target: Part | str, reltype: str, is_external: bool = False) -> str:
         """Return rId key of relationship of `reltype` to `target`.
 
         The returned `rId` is from an existing relationship if there is one, otherwise a
@@ -142,7 +144,7 @@ def rels(self):
         """|Relationships| instance holding the relationships for this part."""
         return Relationships(self._partname.baseURI)
 
-    def target_ref(self, rId):
+    def target_ref(self, rId: str) -> str:
         """Return URL contained in target ref of relationship identified by `rId`."""
         rel = self.rels[rId]
         return rel.target_ref
diff --git a/src/docx/opc/pkgwriter.py b/src/docx/opc/pkgwriter.py
index 75af6ac75..e63516979 100644
--- a/src/docx/opc/pkgwriter.py
+++ b/src/docx/opc/pkgwriter.py
@@ -4,6 +4,10 @@
 OpcPackage.save().
 """
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Iterable
+
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.oxml import CT_Types, serialize_part_xml
 from docx.opc.packuri import CONTENT_TYPES_URI, PACKAGE_URI
@@ -11,6 +15,9 @@
 from docx.opc.shared import CaseInsensitiveDict
 from docx.opc.spec import default_content_types
 
+if TYPE_CHECKING:
+    from docx.opc.part import Part
+
 
 class PackageWriter:
     """Writes a zip-format OPC package to `pkg_file`, where `pkg_file` can be either a
@@ -38,13 +45,13 @@ def _write_content_types_stream(phys_writer, parts):
         phys_writer.write(CONTENT_TYPES_URI, cti.blob)
 
     @staticmethod
-    def _write_parts(phys_writer, parts):
+    def _write_parts(phys_writer: PhysPkgWriter, parts: Iterable[Part]):
         """Write the blob of each part in `parts` to the package, along with a rels item
         for its relationships if and only if it has any."""
         for part in parts:
             phys_writer.write(part.partname, part.blob)
-            if len(part._rels):
-                phys_writer.write(part.partname.rels_uri, part._rels.xml)
+            if len(part.rels):
+                phys_writer.write(part.partname.rels_uri, part.rels.xml)
 
     @staticmethod
     def _write_pkg_rels(phys_writer, pkg_rels):
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index efac5e06b..5fae7ad9c 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -2,10 +2,13 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import TYPE_CHECKING, Any, Dict
 
 from docx.opc.oxml import CT_Relationships
 
+if TYPE_CHECKING:
+    from docx.opc.part import Part
+
 
 class Relationships(Dict[str, "_Relationship"]):
     """Collection object for |_Relationship| instances, having list semantics."""
@@ -16,7 +19,7 @@ def __init__(self, baseURI: str):
         self._target_parts_by_rId: Dict[str, Any] = {}
 
     def add_relationship(
-        self, reltype: str, target: str | Any, rId: str, is_external: bool = False
+        self, reltype: str, target: Part | str, rId: str, is_external: bool = False
     ) -> "_Relationship":
         """Return a newly added |_Relationship| instance."""
         rel = _Relationship(rId, reltype, target, self._baseURI, is_external)
@@ -25,7 +28,7 @@ def add_relationship(
             self._target_parts_by_rId[rId] = target
         return rel
 
-    def get_or_add(self, reltype, target_part):
+    def get_or_add(self, reltype: str, target_part: Part) -> _Relationship:
         """Return relationship of `reltype` to `target_part`, newly added if not already
         present in collection."""
         rel = self._get_matching(reltype, target_part)
@@ -64,7 +67,9 @@ def xml(self):
             rels_elm.add_rel(rel.rId, rel.reltype, rel.target_ref, rel.is_external)
         return rels_elm.xml
 
-    def _get_matching(self, reltype, target, is_external=False):
+    def _get_matching(
+        self, reltype: str, target: Part | str, is_external: bool = False
+    ) -> _Relationship | None:
         """Return relationship of matching `reltype`, `target`, and `is_external` from
         collection, or None if not found."""
 
@@ -99,7 +104,7 @@ def _get_rel_of_type(self, reltype):
         return matching[0]
 
     @property
-    def _next_rId(self):
+    def _next_rId(self) -> str:
         """Next available rId in collection, starting from 'rId1' and making use of any
         gaps in numbering, e.g. 'rId2' for rIds ['rId1', 'rId3']."""
         for n in range(1, len(self) + 2):
@@ -135,8 +140,7 @@ def rId(self):
     def target_part(self):
         if self._is_external:
             raise ValueError(
-                "target_part property on _Relationship is undef"
-                "ined when target mode is External"
+                "target_part property on _Relationship is undef" "ined when target mode is External"
             )
         return self._target
 
diff --git a/src/docx/opc/shared.py b/src/docx/opc/shared.py
index 1862f66db..9d4c0a6d3 100644
--- a/src/docx/opc/shared.py
+++ b/src/docx/opc/shared.py
@@ -1,7 +1,13 @@
 """Objects shared by opc modules."""
 
+from __future__ import annotations
 
-class CaseInsensitiveDict(dict):
+from typing import Any, Dict, TypeVar
+
+_T = TypeVar("_T")
+
+
+class CaseInsensitiveDict(Dict[str, Any]):
     """Mapping type that behaves like dict except that it matches without respect to the
     case of the key.
 
@@ -23,23 +29,3 @@ def __setitem__(self, key, value):
 def cls_method_fn(cls: type, method_name: str):
     """Return method of `cls` having `method_name`."""
     return getattr(cls, method_name)
-
-
-def lazyproperty(f):
-    """@lazyprop decorator.
-
-    Decorated method will be called only on first access to calculate a cached property
-    value. After that, the cached value is returned.
-    """
-    cache_attr_name = "_%s" % f.__name__  # like '_foobar' for prop 'foobar'
-    docstring = f.__doc__
-
-    def get_prop_value(obj):
-        try:
-            return getattr(obj, cache_attr_name)
-        except AttributeError:
-            value = f(obj)
-            setattr(obj, cache_attr_name, value)
-            return value
-
-    return property(get_prop_value, doc=docstring)
diff --git a/tests/opc/test_package.py b/tests/opc/test_package.py
index 7fdeaa422..d8fcef453 100644
--- a/tests/opc/test_package.py
+++ b/tests/opc/test_package.py
@@ -1,5 +1,9 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for docx.opc.package module"""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
@@ -12,8 +16,8 @@
 from docx.opc.rel import Relationships, _Relationship
 
 from ..unitutil.mock import (
+    FixtureRequest,
     Mock,
-    PropertyMock,
     call,
     class_mock,
     instance_mock,
@@ -25,6 +29,8 @@
 
 
 class DescribeOpcPackage:
+    """Unit-test suite for `docx.opc.package.OpcPackage` objects."""
+
     def it_can_open_a_pkg_file(self, PackageReader_, PartFactory_, Unmarshaller_):
         # mockery ----------------------
         pkg_file = Mock(name="pkg_file")
@@ -42,19 +48,26 @@ def it_initializes_its_rels_collection_on_first_reference(self, Relationships_):
         Relationships_.assert_called_once_with(PACKAGE_URI.baseURI)
         assert rels == Relationships_.return_value
 
-    def it_can_add_a_relationship_to_a_part(self, pkg_with_rels_, rel_attrs_):
-        reltype, target, rId = rel_attrs_
-        pkg = pkg_with_rels_
-        # exercise ---------------------
-        pkg.load_rel(reltype, target, rId)
-        # verify -----------------------
-        pkg._rels.add_relationship.assert_called_once_with(reltype, target, rId, False)
+    def it_can_add_a_relationship_to_a_part(self, rels_prop_: Mock, rels_: Mock, part_: Mock):
+        rels_prop_.return_value = rels_
+        pkg = OpcPackage()
+
+        pkg.load_rel("http://rel/type", part_, "rId99")
 
-    def it_can_establish_a_relationship_to_another_part(self, relate_to_part_fixture_):
-        pkg, part_, reltype, rId = relate_to_part_fixture_
-        _rId = pkg.relate_to(part_, reltype)
-        pkg.rels.get_or_add.assert_called_once_with(reltype, part_)
-        assert _rId == rId
+        rels_.add_relationship.assert_called_once_with("http://rel/type", part_, "rId99", False)
+
+    def it_can_establish_a_relationship_to_another_part(
+        self, rels_prop_: Mock, rels_: Mock, rel_: Mock, part_: Mock
+    ):
+        rel_.rId = "rId99"
+        rels_.get_or_add.return_value = rel_
+        rels_prop_.return_value = rels_
+        pkg = OpcPackage()
+
+        rId = pkg.relate_to(part_, "http://rel/type")
+
+        rels_.get_or_add.assert_called_once_with("http://rel/type", part_)
+        assert rId == "rId99"
 
     def it_can_provide_a_list_of_the_parts_it_contains(self):
         # mockery ----------------------
@@ -64,7 +77,7 @@ def it_can_provide_a_list_of_the_parts_it_contains(self):
         with patch.object(OpcPackage, "iter_parts", return_value=parts):
             assert pkg.parts == [parts[0], parts[1]]
 
-    def it_can_iterate_over_parts_by_walking_rels_graph(self):
+    def it_can_iterate_over_parts_by_walking_rels_graph(self, rels_prop_: Mock):
         # +----------+       +--------+
         # | pkg_rels |-----> | part_1 |
         # +----------+       +--------+
@@ -77,7 +90,7 @@ def it_can_iterate_over_parts_by_walking_rels_graph(self):
         part1.rels = {1: Mock(name="rel1", is_external=False, target_part=part2)}
         part2.rels = {1: Mock(name="rel2", is_external=False, target_part=part1)}
         pkg = OpcPackage()
-        pkg._rels = {
+        rels_prop_.return_value = {
             1: Mock(name="rel3", is_external=False, target_part=part1),
             2: Mock(name="rel4", is_external=True),
         }
@@ -106,21 +119,22 @@ def it_can_find_a_part_related_by_reltype(self, related_part_fixture_):
         pkg.rels.part_with_reltype.assert_called_once_with(reltype)
         assert related_part is related_part_
 
-    def it_can_save_to_a_pkg_file(self, pkg_file_, PackageWriter_, parts, parts_):
+    def it_can_save_to_a_pkg_file(
+        self, pkg_file_: Mock, PackageWriter_: Mock, parts_prop_: Mock, parts_: list[Mock]
+    ):
+        parts_prop_.return_value = parts_
         pkg = OpcPackage()
         pkg.save(pkg_file_)
         for part in parts_:
             part.before_marshal.assert_called_once_with()
-        PackageWriter_.write.assert_called_once_with(pkg_file_, pkg._rels, parts_)
+        PackageWriter_.write.assert_called_once_with(pkg_file_, pkg.rels, parts_)
 
     def it_provides_access_to_the_core_properties(self, core_props_fixture):
         opc_package, core_properties_ = core_props_fixture
         core_properties = opc_package.core_properties
         assert core_properties is core_properties_
 
-    def it_provides_access_to_the_core_properties_part_to_help(
-        self, core_props_part_fixture
-    ):
+    def it_provides_access_to_the_core_properties_part_to_help(self, core_props_part_fixture):
         opc_package, core_properties_part_ = core_props_part_fixture
         core_properties_part = opc_package._core_properties_part
         assert core_properties_part is core_properties_part_
@@ -135,9 +149,7 @@ def it_creates_a_default_core_props_part_if_none_present(
         core_properties_part = opc_package._core_properties_part
 
         CorePropertiesPart_.default.assert_called_once_with(opc_package)
-        relate_to_.assert_called_once_with(
-            opc_package, core_properties_part_, RT.CORE_PROPERTIES
-        )
+        relate_to_.assert_called_once_with(opc_package, core_properties_part_, RT.CORE_PROPERTIES)
         assert core_properties_part is core_properties_part_
 
     # fixtures ---------------------------------------------
@@ -161,134 +173,106 @@ def core_props_part_fixture(self, part_related_by_, core_properties_part_):
     def next_partname_fixture(self, request, iter_parts_):
         existing_partname_ns, next_partname_n = request.param
         parts_ = [
-            instance_mock(
-                request, Part, name="part[%d]" % idx, partname="/foo/bar/baz%d.xml" % n
-            )
+            instance_mock(request, Part, name="part[%d]" % idx, partname="/foo/bar/baz%d.xml" % n)
             for idx, n in enumerate(existing_partname_ns)
         ]
         expected_value = "/foo/bar/baz%d.xml" % next_partname_n
         return parts_, expected_value
 
     @pytest.fixture
-    def relate_to_part_fixture_(self, request, pkg, rels_, reltype):
-        rId = "rId99"
-        rel_ = instance_mock(request, _Relationship, name="rel_", rId=rId)
-        rels_.get_or_add.return_value = rel_
-        pkg._rels = rels_
-        part_ = instance_mock(request, Part, name="part_")
-        return pkg, part_, reltype, rId
-
-    @pytest.fixture
-    def related_part_fixture_(self, request, rels_, reltype):
+    def related_part_fixture_(self, request: FixtureRequest, rels_prop_: Mock, rels_: Mock):
         related_part_ = instance_mock(request, Part, name="related_part_")
         rels_.part_with_reltype.return_value = related_part_
         pkg = OpcPackage()
-        pkg._rels = rels_
-        return pkg, reltype, related_part_
+        rels_prop_.return_value = rels_
+        return pkg, "http://rel/type", related_part_
 
     # fixture components -----------------------------------
 
     @pytest.fixture
-    def CorePropertiesPart_(self, request):
+    def CorePropertiesPart_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.CorePropertiesPart")
 
     @pytest.fixture
-    def core_properties_(self, request):
+    def core_properties_(self, request: FixtureRequest):
         return instance_mock(request, CoreProperties)
 
     @pytest.fixture
-    def core_properties_part_(self, request):
+    def core_properties_part_(self, request: FixtureRequest):
         return instance_mock(request, CorePropertiesPart)
 
     @pytest.fixture
-    def _core_properties_part_prop_(self, request):
+    def _core_properties_part_prop_(self, request: FixtureRequest):
         return property_mock(request, OpcPackage, "_core_properties_part")
 
     @pytest.fixture
-    def iter_parts_(self, request):
+    def iter_parts_(self, request: FixtureRequest):
         return method_mock(request, OpcPackage, "iter_parts")
 
     @pytest.fixture
-    def PackageReader_(self, request):
+    def PackageReader_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.PackageReader")
 
     @pytest.fixture
-    def PackURI_(self, request):
+    def PackURI_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.PackURI")
 
     @pytest.fixture
-    def packuri_(self, request):
+    def packuri_(self, request: FixtureRequest):
         return instance_mock(request, PackURI)
 
     @pytest.fixture
-    def PackageWriter_(self, request):
+    def PackageWriter_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.PackageWriter")
 
     @pytest.fixture
-    def PartFactory_(self, request):
+    def PartFactory_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.PartFactory")
 
     @pytest.fixture
-    def part_related_by_(self, request):
-        return method_mock(request, OpcPackage, "part_related_by")
+    def part_(self, request: FixtureRequest):
+        return instance_mock(request, Part)
 
     @pytest.fixture
-    def parts(self, parts_):
-        """
-        Return a mock patching property OpcPackage.parts, reversing the
-        patch after each use.
-        """
-        p = patch.object(
-            OpcPackage, "parts", new_callable=PropertyMock, return_value=parts_
-        )
-        yield p.start()
-        p.stop()
+    def part_related_by_(self, request: FixtureRequest):
+        return method_mock(request, OpcPackage, "part_related_by")
 
     @pytest.fixture
-    def parts_(self, request):
+    def parts_(self, request: FixtureRequest):
         part_ = instance_mock(request, Part, name="part_")
         part_2_ = instance_mock(request, Part, name="part_2_")
         return [part_, part_2_]
 
     @pytest.fixture
-    def pkg(self, request):
-        return OpcPackage()
+    def parts_prop_(self, request: FixtureRequest):
+        return property_mock(request, OpcPackage, "parts")
 
     @pytest.fixture
-    def pkg_file_(self, request):
+    def pkg_file_(self, request: FixtureRequest):
         return loose_mock(request)
 
     @pytest.fixture
-    def pkg_with_rels_(self, request, rels_):
-        pkg = OpcPackage()
-        pkg._rels = rels_
-        return pkg
-
-    @pytest.fixture
-    def Relationships_(self, request):
+    def Relationships_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.Relationships")
 
     @pytest.fixture
-    def rel_attrs_(self, request):
-        reltype = "http://rel/type"
-        target_ = instance_mock(request, Part, name="target_")
-        rId = "rId99"
-        return reltype, target_, rId
+    def rel_(self, request: FixtureRequest):
+        return instance_mock(request, _Relationship)
 
     @pytest.fixture
-    def relate_to_(self, request):
+    def relate_to_(self, request: FixtureRequest):
         return method_mock(request, OpcPackage, "relate_to")
 
     @pytest.fixture
-    def rels_(self, request):
+    def rels_(self, request: FixtureRequest):
         return instance_mock(request, Relationships)
 
     @pytest.fixture
-    def reltype(self, request):
-        return "http://rel/type"
+    def rels_prop_(self, request: FixtureRequest):
+        return property_mock(request, OpcPackage, "rels")
 
     @pytest.fixture
-    def Unmarshaller_(self, request):
+    def Unmarshaller_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.package.Unmarshaller")
 
 
@@ -306,9 +290,7 @@ def it_can_unmarshal_from_a_pkg_reader(
         Unmarshaller.unmarshal(pkg_reader_, pkg_, part_factory_)
 
         _unmarshal_parts_.assert_called_once_with(pkg_reader_, pkg_, part_factory_)
-        _unmarshal_relationships_.assert_called_once_with(
-            pkg_reader_, pkg_, parts_dict_
-        )
+        _unmarshal_relationships_.assert_called_once_with(pkg_reader_, pkg_, parts_dict_)
         for part in parts_dict_.values():
             part.after_unmarshal.assert_called_once_with()
         pkg_.after_unmarshal.assert_called_once_with()
@@ -406,13 +388,13 @@ def it_can_unmarshal_relationships(self):
     # fixtures ---------------------------------------------
 
     @pytest.fixture
-    def blobs_(self, request):
+    def blobs_(self, request: FixtureRequest):
         blob_ = loose_mock(request, spec=str, name="blob_")
         blob_2_ = loose_mock(request, spec=str, name="blob_2_")
         return blob_, blob_2_
 
     @pytest.fixture
-    def content_types_(self, request):
+    def content_types_(self, request: FixtureRequest):
         content_type_ = loose_mock(request, spec=str, name="content_type_")
         content_type_2_ = loose_mock(request, spec=str, name="content_type_2_")
         return content_type_, content_type_2_
@@ -424,13 +406,13 @@ def part_factory_(self, request, parts_):
         return part_factory_
 
     @pytest.fixture
-    def partnames_(self, request):
+    def partnames_(self, request: FixtureRequest):
         partname_ = loose_mock(request, spec=str, name="partname_")
         partname_2_ = loose_mock(request, spec=str, name="partname_2_")
         return partname_, partname_2_
 
     @pytest.fixture
-    def parts_(self, request):
+    def parts_(self, request: FixtureRequest):
         part_ = instance_mock(request, Part, name="part_")
         part_2_ = instance_mock(request, Part, name="part_2")
         return part_, part_2_
@@ -442,7 +424,7 @@ def parts_dict_(self, request, partnames_, parts_):
         return {partname_: part_, partname_2_: part_2_}
 
     @pytest.fixture
-    def pkg_(self, request):
+    def pkg_(self, request: FixtureRequest):
         return instance_mock(request, OpcPackage)
 
     @pytest.fixture
@@ -460,17 +442,15 @@ def pkg_reader_(self, request, partnames_, content_types_, reltypes_, blobs_):
         return pkg_reader_
 
     @pytest.fixture
-    def reltypes_(self, request):
+    def reltypes_(self, request: FixtureRequest):
         reltype_ = instance_mock(request, str, name="reltype_")
         reltype_2_ = instance_mock(request, str, name="reltype_2")
         return reltype_, reltype_2_
 
     @pytest.fixture
-    def _unmarshal_parts_(self, request):
+    def _unmarshal_parts_(self, request: FixtureRequest):
         return method_mock(request, Unmarshaller, "_unmarshal_parts", autospec=False)
 
     @pytest.fixture
-    def _unmarshal_relationships_(self, request):
-        return method_mock(
-            request, Unmarshaller, "_unmarshal_relationships", autospec=False
-        )
+    def _unmarshal_relationships_(self, request: FixtureRequest):
+        return method_mock(request, Unmarshaller, "_unmarshal_relationships", autospec=False)
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index 163912154..03eacd361 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -1,5 +1,9 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for docx.opc.part module"""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.opc.package import OpcPackage
@@ -11,6 +15,7 @@
 from ..unitutil.cxml import element
 from ..unitutil.mock import (
     ANY,
+    FixtureRequest,
     Mock,
     class_mock,
     cls_attr_mock,
@@ -18,6 +23,7 @@
     initializer_mock,
     instance_mock,
     loose_mock,
+    property_mock,
 )
 
 
@@ -117,150 +123,126 @@ def partname_(self, request):
 
 
 class DescribePartRelationshipManagementInterface:
-    def it_provides_access_to_its_relationships(self, rels_fixture):
-        part, Relationships_, partname_, rels_ = rels_fixture
+    """Unit-test suite for `docx.opc.package.Part` relationship behaviors."""
+
+    def it_provides_access_to_its_relationships(
+        self, Relationships_: Mock, partname_: Mock, rels_: Mock
+    ):
+        Relationships_.return_value = rels_
+        part = Part(partname_, "content_type")
+
         rels = part.rels
+
         Relationships_.assert_called_once_with(partname_.baseURI)
         assert rels is rels_
 
-    def it_can_load_a_relationship(self, load_rel_fixture):
-        part, rels_, reltype_, target_, rId_ = load_rel_fixture
-        part.load_rel(reltype_, target_, rId_)
-        rels_.add_relationship.assert_called_once_with(reltype_, target_, rId_, False)
-
-    def it_can_establish_a_relationship_to_another_part(self, relate_to_part_fixture):
-        part, target_, reltype_, rId_ = relate_to_part_fixture
-        rId = part.relate_to(target_, reltype_)
-        part.rels.get_or_add.assert_called_once_with(reltype_, target_)
-        assert rId is rId_
-
-    def it_can_establish_an_external_relationship(self, relate_to_url_fixture):
-        part, url_, reltype_, rId_ = relate_to_url_fixture
-        rId = part.relate_to(url_, reltype_, is_external=True)
-        part.rels.get_or_add_ext_rel.assert_called_once_with(reltype_, url_)
-        assert rId is rId_
-
-    def it_can_drop_a_relationship(self, drop_rel_fixture):
-        part, rId, rel_should_be_gone = drop_rel_fixture
-        part.drop_rel(rId)
-        if rel_should_be_gone:
-            assert rId not in part.rels
-        else:
-            assert rId in part.rels
-
-    def it_can_find_a_related_part_by_reltype(self, related_part_fixture):
-        part, reltype_, related_part_ = related_part_fixture
-        related_part = part.part_related_by(reltype_)
-        part.rels.part_with_reltype.assert_called_once_with(reltype_)
-        assert related_part is related_part_
-
-    def it_can_find_a_related_part_by_rId(self, related_parts_fixture):
-        part, related_parts_ = related_parts_fixture
-        assert part.related_parts is related_parts_
-
-    def it_can_find_the_uri_of_an_external_relationship(self, target_ref_fixture):
-        part, rId_, url_ = target_ref_fixture
-        url = part.target_ref(rId_)
-        assert url == url_
+    def it_can_load_a_relationship(self, rels_prop_: Mock, rels_: Mock, other_part_: Mock):
+        rels_prop_.return_value = rels_
+        part = Part("partname", "content_type")
 
-    # fixtures ---------------------------------------------
+        part.load_rel("http://rel/type", other_part_, "rId42")
+
+        rels_.add_relationship.assert_called_once_with(
+            "http://rel/type", other_part_, "rId42", False
+        )
+
+    def it_can_establish_a_relationship_to_another_part(
+        self, rels_prop_: Mock, rels_: Mock, rel_: Mock, other_part_: Mock
+    ):
+        rels_prop_.return_value = rels_
+        rels_.get_or_add.return_value = rel_
+        rel_.rId = "rId18"
+        part = Part("partname", "content_type")
+
+        rId = part.relate_to(other_part_, "http://rel/type")
 
-    @pytest.fixture(
-        params=[
+        rels_.get_or_add.assert_called_once_with("http://rel/type", other_part_)
+        assert rId == "rId18"
+
+    def it_can_establish_an_external_relationship(self, rels_prop_: Mock, rels_: Mock):
+        rels_prop_.return_value = rels_
+        rels_.get_or_add_ext_rel.return_value = "rId27"
+        part = Part("partname", "content_type")
+
+        rId = part.relate_to("https://hyper/link", "http://rel/type", is_external=True)
+
+        rels_.get_or_add_ext_rel.assert_called_once_with("http://rel/type", "https://hyper/link")
+        assert rId == "rId27"
+
+    @pytest.mark.parametrize(
+        ("part_cxml", "rel_should_be_dropped"),
+        [
             ("w:p", True),
             ("w:p/r:a{r:id=rId42}", True),
             ("w:p/r:a{r:id=rId42}/r:b{r:id=rId42}", False),
-        ]
+        ],
     )
-    def drop_rel_fixture(self, request, part):
-        part_cxml, rel_should_be_dropped = request.param
-        rId = "rId42"
-        part._element = element(part_cxml)
-        part._rels = {rId: None}
-        return part, rId, rel_should_be_dropped
+    def it_can_drop_a_relationship(
+        self, part_cxml: str, rel_should_be_dropped: bool, rels_prop_: Mock
+    ):
+        rels_prop_.return_value = {"rId42": None}
+        part = Part("partname", "content_type")
+        part._element = element(part_cxml)  # pyright: ignore[reportAttributeAccessIssue]
 
-    @pytest.fixture
-    def load_rel_fixture(self, part, rels_, reltype_, part_, rId_):
-        part._rels = rels_
-        return part, rels_, reltype_, part_, rId_
+        part.drop_rel("rId42")
 
-    @pytest.fixture
-    def relate_to_part_fixture(self, request, part, reltype_, part_, rels_, rId_):
-        part._rels = rels_
-        target_ = part_
-        return part, target_, reltype_, rId_
+        assert ("rId42" not in part.rels) is rel_should_be_dropped
 
-    @pytest.fixture
-    def relate_to_url_fixture(self, request, part, rels_, url_, reltype_, rId_):
-        part._rels = rels_
-        return part, url_, reltype_, rId_
+    def it_can_find_a_related_part_by_reltype(
+        self, rels_prop_: Mock, rels_: Mock, other_part_: Mock
+    ):
+        rels_prop_.return_value = rels_
+        rels_.part_with_reltype.return_value = other_part_
+        part = Part("partname", "content_type")
 
-    @pytest.fixture
-    def related_part_fixture(self, request, part, rels_, reltype_, part_):
-        part._rels = rels_
-        return part, reltype_, part_
+        related_part = part.part_related_by("http://rel/type")
 
-    @pytest.fixture
-    def related_parts_fixture(self, request, part, rels_, related_parts_):
-        part._rels = rels_
-        return part, related_parts_
+        rels_.part_with_reltype.assert_called_once_with("http://rel/type")
+        assert related_part is other_part_
 
-    @pytest.fixture
-    def rels_fixture(self, Relationships_, partname_, rels_):
-        part = Part(partname_, None)
-        return part, Relationships_, partname_, rels_
+    def it_can_find_a_related_part_by_rId(self, rels_prop_: Mock, rels_: Mock, other_part_: Mock):
+        rels_prop_.return_value = rels_
+        rels_.related_parts = {"rId24": other_part_}
+        part = Part("partname", "content_type")
 
-    @pytest.fixture
-    def target_ref_fixture(self, request, part, rId_, rel_, url_):
-        part._rels = {rId_: rel_}
-        return part, rId_, url_
+        assert part.related_parts["rId24"] is other_part_
 
-    # fixture components ---------------------------------------------
+    def it_can_find_the_uri_of_an_external_relationship(
+        self, rels_prop_: Mock, rel_: Mock, other_part_: Mock
+    ):
+        rels_prop_.return_value = {"rId7": rel_}
+        rel_.target_ref = "https://hyper/link"
+        part = Part("partname", "content_type")
 
-    @pytest.fixture
-    def part(self):
-        return Part(None, None)
+        url = part.target_ref("rId7")
 
-    @pytest.fixture
-    def part_(self, request):
-        return instance_mock(request, Part)
+        assert url == "https://hyper/link"
 
-    @pytest.fixture
-    def partname_(self, request):
-        return instance_mock(request, PackURI)
-
-    @pytest.fixture
-    def Relationships_(self, request, rels_):
-        return class_mock(request, "docx.opc.part.Relationships", return_value=rels_)
+    # fixtures ---------------------------------------------
 
     @pytest.fixture
-    def rel_(self, request, rId_, url_):
-        return instance_mock(request, _Relationship, rId=rId_, target_ref=url_)
+    def other_part_(self, request: FixtureRequest):
+        return instance_mock(request, Part)
 
     @pytest.fixture
-    def rels_(self, request, part_, rel_, rId_, related_parts_):
-        rels_ = instance_mock(request, Relationships)
-        rels_.part_with_reltype.return_value = part_
-        rels_.get_or_add.return_value = rel_
-        rels_.get_or_add_ext_rel.return_value = rId_
-        rels_.related_parts = related_parts_
-        return rels_
+    def partname_(self, request: FixtureRequest):
+        return instance_mock(request, PackURI)
 
     @pytest.fixture
-    def related_parts_(self, request):
-        return instance_mock(request, dict)
+    def Relationships_(self, request: FixtureRequest):
+        return class_mock(request, "docx.opc.part.Relationships")
 
     @pytest.fixture
-    def reltype_(self, request):
-        return instance_mock(request, str)
+    def rel_(self, request: FixtureRequest):
+        return instance_mock(request, _Relationship)
 
     @pytest.fixture
-    def rId_(self, request):
-        return instance_mock(request, str)
+    def rels_(self, request: FixtureRequest):
+        return instance_mock(request, Relationships)
 
     @pytest.fixture
-    def url_(self, request):
-        return instance_mock(request, str)
+    def rels_prop_(self, request: FixtureRequest):
+        return property_mock(request, Part, "rels")
 
 
 class DescribePartFactory:
@@ -278,9 +260,7 @@ def it_constructs_part_from_selector_if_defined(self, cls_selector_fixture):
         part = PartFactory(partname, content_type, reltype, blob, package)
         # verify -----------------------
         cls_selector_fn_.assert_called_once_with(content_type, reltype)
-        CustomPartClass_.load.assert_called_once_with(
-            partname, content_type, blob, package
-        )
+        CustomPartClass_.load.assert_called_once_with(partname, content_type, blob, package)
         assert part is part_of_custom_type_
 
     def it_constructs_custom_part_type_for_registered_content_types(
@@ -292,9 +272,7 @@ def it_constructs_custom_part_type_for_registered_content_types(
         PartFactory.part_type_for[content_type] = CustomPartClass_
         part = PartFactory(partname, content_type, reltype, blob, package)
         # verify -----------------------
-        CustomPartClass_.load.assert_called_once_with(
-            partname, content_type, blob, package
-        )
+        CustomPartClass_.load.assert_called_once_with(partname, content_type, blob, package)
         assert part is part_of_custom_type_
 
     def it_constructs_part_using_default_class_when_no_custom_registered(
@@ -302,9 +280,7 @@ def it_constructs_part_using_default_class_when_no_custom_registered(
     ):
         partname, content_type, reltype, blob, package = part_args_2_
         part = PartFactory(partname, content_type, reltype, blob, package)
-        DefaultPartClass_.load.assert_called_once_with(
-            partname, content_type, blob, package
-        )
+        DefaultPartClass_.load.assert_called_once_with(partname, content_type, blob, package)
         assert part is part_of_default_type_
 
     # fixtures ---------------------------------------------
@@ -319,9 +295,7 @@ def blob_2_(self, request):
 
     @pytest.fixture
     def cls_method_fn_(self, request, cls_selector_fn_):
-        return function_mock(
-            request, "docx.opc.part.cls_method_fn", return_value=cls_selector_fn_
-        )
+        return function_mock(request, "docx.opc.part.cls_method_fn", return_value=cls_selector_fn_)
 
     @pytest.fixture
     def cls_selector_fixture(
@@ -405,9 +379,7 @@ def part_args_(self, request, partname_, content_type_, reltype_, package_, blob
         return partname_, content_type_, reltype_, blob_, package_
 
     @pytest.fixture
-    def part_args_2_(
-        self, request, partname_2_, content_type_2_, reltype_2_, package_2_, blob_2_
-    ):
+    def part_args_2_(self, request, partname_2_, content_type_2_, reltype_2_, package_2_, blob_2_):
         return partname_2_, content_type_2_, reltype_2_, blob_2_, package_2_
 
     @pytest.fixture
@@ -426,9 +398,7 @@ def it_can_be_constructed_by_PartFactory(
         part = XmlPart.load(partname_, content_type_, blob_, package_)
 
         parse_xml_.assert_called_once_with(blob_)
-        __init_.assert_called_once_with(
-            ANY, partname_, content_type_, element_, package_
-        )
+        __init_.assert_called_once_with(ANY, partname_, content_type_, element_, package_)
         assert isinstance(part, XmlPart)
 
     def it_can_serialize_to_xml(self, blob_fixture):
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
index 747300f82..aff8b22d9 100644
--- a/tests/opc/test_pkgwriter.py
+++ b/tests/opc/test_pkgwriter.py
@@ -1,5 +1,9 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for opc.pkgwriter module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.opc.constants import CONTENT_TYPE as CT
@@ -7,9 +11,10 @@
 from docx.opc.part import Part
 from docx.opc.phys_pkg import _ZipPkgWriter
 from docx.opc.pkgwriter import PackageWriter, _ContentTypesItem
+from docx.opc.rel import Relationships
 
 from ..unitutil.mock import (
-    MagicMock,
+    FixtureRequest,
     Mock,
     call,
     class_mock,
@@ -54,41 +59,48 @@ def it_can_write_a_pkg_rels_item(self):
         # verify -----------------------
         phys_writer.write.assert_called_once_with("/_rels/.rels", pkg_rels.xml)
 
-    def it_can_write_a_list_of_parts(self):
-        # mockery ----------------------
-        phys_writer = Mock(name="phys_writer")
-        rels = MagicMock(name="rels")
-        rels.__len__.return_value = 1
-        part1 = Mock(name="part1", _rels=rels)
-        part2 = Mock(name="part2", _rels=[])
-        # exercise ---------------------
-        PackageWriter._write_parts(phys_writer, [part1, part2])
-        # verify -----------------------
+    def it_can_write_a_list_of_parts(
+        self, phys_pkg_writer_: Mock, part_: Mock, part_2_: Mock, rels_: Mock
+    ):
+        rels_.__len__.return_value = 1
+        part_.rels = rels_
+        part_2_.rels = []
+
+        PackageWriter._write_parts(phys_pkg_writer_, [part_, part_2_])
+
         expected_calls = [
-            call(part1.partname, part1.blob),
-            call(part1.partname.rels_uri, part1._rels.xml),
-            call(part2.partname, part2.blob),
+            call(part_.partname, part_.blob),
+            call(part_.partname.rels_uri, part_.rels.xml),
+            call(part_2_.partname, part_2_.blob),
         ]
-        assert phys_writer.write.mock_calls == expected_calls
+        assert phys_pkg_writer_.write.mock_calls == expected_calls
 
     # fixtures ---------------------------------------------
 
     @pytest.fixture
-    def blob_(self, request):
+    def blob_(self, request: FixtureRequest):
         return instance_mock(request, str)
 
     @pytest.fixture
-    def cti_(self, request, blob_):
+    def cti_(self, request: FixtureRequest, blob_):
         return instance_mock(request, _ContentTypesItem, blob=blob_)
 
     @pytest.fixture
-    def _ContentTypesItem_(self, request, cti_):
+    def _ContentTypesItem_(self, request: FixtureRequest, cti_):
         _ContentTypesItem_ = class_mock(request, "docx.opc.pkgwriter._ContentTypesItem")
         _ContentTypesItem_.from_parts.return_value = cti_
         return _ContentTypesItem_
 
     @pytest.fixture
-    def parts_(self, request):
+    def part_(self, request: FixtureRequest):
+        return instance_mock(request, Part)
+
+    @pytest.fixture
+    def part_2_(self, request: FixtureRequest):
+        return instance_mock(request, Part)
+
+    @pytest.fixture
+    def parts_(self, request: FixtureRequest):
         return instance_mock(request, list)
 
     @pytest.fixture
@@ -98,9 +110,13 @@ def PhysPkgWriter_(self):
         p.stop()
 
     @pytest.fixture
-    def phys_pkg_writer_(self, request):
+    def phys_pkg_writer_(self, request: FixtureRequest):
         return instance_mock(request, _ZipPkgWriter)
 
+    @pytest.fixture
+    def rels_(self, request: FixtureRequest):
+        return instance_mock(request, Relationships)
+
     @pytest.fixture
     def write_cti_fixture(self, _ContentTypesItem_, parts_, phys_pkg_writer_, blob_):
         return _ContentTypesItem_, parts_, phys_pkg_writer_, blob_
@@ -123,7 +139,7 @@ def _write_methods(self):
         patch3.stop()
 
     @pytest.fixture
-    def xml_for_(self, request):
+    def xml_for_(self, request: FixtureRequest):
         return method_mock(request, _ContentTypesItem, "xml_for")
 
 
@@ -135,11 +151,9 @@ def it_can_compose_content_types_element(self, xml_for_fixture):
 
     # fixtures ---------------------------------------------
 
-    def _mock_part(self, request, name, partname_str, content_type):
+    def _mock_part(self, request: FixtureRequest, name, partname_str, content_type):
         partname = PackURI(partname_str)
-        return instance_mock(
-            request, Part, name=name, partname=partname, content_type=content_type
-        )
+        return instance_mock(request, Part, name=name, partname=partname, content_type=content_type)
 
     @pytest.fixture(
         params=[
@@ -152,7 +166,7 @@ def _mock_part(self, request, name, partname_str, content_type):
             ("Override", "/zebra/foo.bar", "app/vnd.foobar"),
         ]
     )
-    def xml_for_fixture(self, request):
+    def xml_for_fixture(self, request: FixtureRequest):
         elm_type, partname_str, content_type = request.param
         part_ = self._mock_part(request, "part_", partname_str, content_type)
         cti = _ContentTypesItem.from_parts([part_])
@@ -168,9 +182,7 @@ def xml_for_fixture(self, request):
         types_bldr.with_child(
             a_Default().with_Extension("rels").with_ContentType(CT.OPC_RELATIONSHIPS)
         )
-        types_bldr.with_child(
-            a_Default().with_Extension("xml").with_ContentType(CT.XML)
-        )
+        types_bldr.with_child(a_Default().with_Extension("xml").with_ContentType(CT.XML))
 
         if elm_type == "Override":
             override_bldr = an_Override()

From 4e5dd915f054fa1374769eb3126a88045bd62aa6 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 16:07:59 -0700
Subject: [PATCH 317/367] feat(table): add _Row.grid_cols_before

---
 features/steps/table.py                  |  14 ++++++++++++++
 features/steps/test_files/tbl-props.docx | Bin 20178 -> 20397 bytes
 features/tbl-row-props.feature           |  11 +++++++++++
 src/docx/oxml/__init__.py                |   1 +
 src/docx/oxml/table.py                   |  17 +++++++++++++++++
 src/docx/table.py                        |  17 +++++++++++++++++
 tests/test_table.py                      |  15 +++++++++++++++
 7 files changed, 75 insertions(+)

diff --git a/features/steps/table.py b/features/steps/table.py
index 0b08f567c..0b7bab822 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -170,6 +170,13 @@ def given_a_table_row_having_height_rule_state(context: Context, state: str):
     context.row = table.rows[0]
 
 
+@given("a table row starting with {count} empty grid columns")
+def given_a_table_row_starting_with_count_empty_grid_columns(context: Context, count: str):
+    document = Document(test_docx("tbl-props"))
+    table = document.tables[7]
+    context.row = table.rows[int(count)]
+
+
 # when =====================================================
 
 
@@ -347,6 +354,13 @@ def then_can_iterate_over_row_collection(context: Context):
     assert actual_count == 2
 
 
+@then("row.grid_cols_before is {value}")
+def then_row_grid_cols_before_is_value(context: Context, value: str):
+    expected = int(value)
+    actual = context.row.grid_cols_before
+    assert actual == expected, "expected %s, got %s" % (expected, actual)
+
+
 @then("row.height is {value}")
 def then_row_height_is_value(context: Context, value: str):
     expected_height = None if value == "None" else int(value)
diff --git a/features/steps/test_files/tbl-props.docx b/features/steps/test_files/tbl-props.docx
index 9d2db676e37d73bbf58a8e00b9dd080e7b41fc3f..740896ff21833af8769d77998975da21601247be 100644
GIT binary patch
delta 1899
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

delta 1671
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
RfKMX|P6Ge{Zc6|F003({4j2Fc

diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
index 377f2853e..a1c23436b 100644
--- a/features/tbl-row-props.feature
+++ b/features/tbl-row-props.feature
@@ -4,6 +4,17 @@ Feature: Get and set table row properties
   I need a way to get and set the properties of a table row
 
 
+  Scenario Outline: Get Row.grid_cols_before
+    Given a table row starting with <count> empty grid columns
+     Then row.grid_cols_before is <count>
+
+    Examples: Row.grid_cols_before value cases
+      | count |
+      | 0     |
+      | 1     |
+      | 3     |
+
+
   Scenario Outline: Get Row.height_rule
     Given a table row having height rule <state>
      Then row.height_rule is <value>
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index a37ee9b8e..c694eb298 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -159,6 +159,7 @@
 )
 
 register_element_cls("w:bidiVisual", CT_OnOff)
+register_element_cls("w:gridBefore", CT_DecimalNumber)
 register_element_cls("w:gridCol", CT_TblGridCol)
 register_element_cls("w:gridSpan", CT_DecimalNumber)
 register_element_cls("w:tbl", CT_Tbl)
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 687c6e2e6..474374aa3 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -60,6 +60,14 @@ class CT_Row(BaseOxmlElement):
     trPr: CT_TrPr | None = ZeroOrOne("w:trPr")  # pyright: ignore[reportAssignmentType]
     tc = ZeroOrMore("w:tc")
 
+    @property
+    def grid_before(self) -> int:
+        """The number of unpopulated layout-grid cells at the start of this row."""
+        trPr = self.trPr
+        if trPr is None:
+            return 0
+        return trPr.grid_before
+
     def tc_at_grid_col(self, idx: int) -> CT_Tc:
         """`<w:tc>` element appearing at grid column `idx`.
 
@@ -885,11 +893,20 @@ class CT_TrPr(BaseOxmlElement):
         "w:del",
         "w:trPrChange",
     )
+    gridBefore: CT_DecimalNumber | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:gridBefore", successors=_tag_seq[3:]
+    )
     trHeight: CT_Height | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:trHeight", successors=_tag_seq[8:]
     )
     del _tag_seq
 
+    @property
+    def grid_before(self) -> int:
+        """The number of unpopulated layout-grid cells at the start of this row."""
+        gridBefore = self.gridBefore
+        return 0 if gridBefore is None else gridBefore.val
+
     @property
     def trHeight_hRule(self) -> WD_ROW_HEIGHT_RULE | None:
         """Return the value of `w:trHeight@w:hRule`, or |None| if not present."""
diff --git a/src/docx/table.py b/src/docx/table.py
index 709bc8dbb..a80a6e4b9 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -385,6 +385,23 @@ def cells(self) -> tuple[_Cell, ...]:
         """Sequence of |_Cell| instances corresponding to cells in this row."""
         return tuple(self.table.row_cells(self._index))
 
+    @property
+    def grid_cols_before(self) -> int:
+        """Count of unpopulated grid-columns before the first cell in this row.
+
+        Word allows a row to "start late", meaning that one or more cells are not present at the
+        beginning of that row.
+
+        Note these are not simply "empty" cells. The renderer reads this value and skips forward to
+        the table layout-grid position of the first cell in this row; the renderer "skips" this many
+        columns before drawing the first cell.
+
+        Note this also implies that not all rows are guaranteed to have the same number of cells,
+        e.g. `_Row.cells` could have length `n` for one row and `n - m` for the next row in the same
+        table.
+        """
+        return self._tr.grid_before
+
     @property
     def height(self) -> Length | None:
         """Return a |Length| object representing the height of this cell, or |None| if
diff --git a/tests/test_table.py b/tests/test_table.py
index 65f7cb423..7f164181f 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -645,6 +645,21 @@ def table_(self, request: FixtureRequest):
 class Describe_Row:
     """Unit-test suite for `docx.table._Row` objects."""
 
+    @pytest.mark.parametrize(
+        ("tr_cxml", "expected_value"),
+        [
+            ("w:tr", 0),
+            ("w:tr/w:trPr", 0),
+            ("w:tr/w:trPr/w:gridBefore{w:val=0}", 0),
+            ("w:tr/w:trPr/w:gridBefore{w:val=3}", 3),
+        ],
+    )
+    def it_knows_its_grid_cols_before(
+        self, tr_cxml: str, expected_value: int | None, parent_: Mock
+    ):
+        row = _Row(cast(CT_Row, element(tr_cxml)), parent_)
+        assert row.grid_cols_before == expected_value
+
     @pytest.mark.parametrize(
         ("tr_cxml", "expected_value"),
         [

From 1cfcee71f81c09570160f7c0d89614db506472bf Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 16:20:04 -0700
Subject: [PATCH 318/367] feat(table): add _Row.grid_cols_after

---
 features/steps/table.py                  |  14 ++++++++++++++
 features/steps/test_files/tbl-props.docx | Bin 20397 -> 20419 bytes
 features/tbl-row-props.feature           |  11 +++++++++++
 src/docx/oxml/__init__.py                |   1 +
 src/docx/oxml/table.py                   |  17 +++++++++++++++++
 src/docx/table.py                        |  17 +++++++++++++++++
 tests/test_table.py                      |  13 +++++++++++++
 7 files changed, 73 insertions(+)

diff --git a/features/steps/table.py b/features/steps/table.py
index 0b7bab822..7cdb50eab 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -154,6 +154,13 @@ def given_a_table_having_two_rows(context: Context):
     context.table_ = document.tables[0]
 
 
+@given("a table row ending with {count} empty grid columns")
+def given_a_table_row_ending_with_count_empty_grid_columns(context: Context, count: str):
+    document = Document(test_docx("tbl-props"))
+    table = document.tables[8]
+    context.row = table.rows[int(count)]
+
+
 @given("a table row having height of {state}")
 def given_a_table_row_having_height_of_state(context: Context, state: str):
     table_idx = {"no explicit setting": 0, "2 inches": 2, "3 inches": 3}[state]
@@ -354,6 +361,13 @@ def then_can_iterate_over_row_collection(context: Context):
     assert actual_count == 2
 
 
+@then("row.grid_cols_after is {value}")
+def then_row_grid_cols_after_is_value(context: Context, value: str):
+    expected = int(value)
+    actual = context.row.grid_cols_after
+    assert actual == expected, "expected %s, got %s" % (expected, actual)
+
+
 @then("row.grid_cols_before is {value}")
 def then_row_grid_cols_before_is_value(context: Context, value: str):
     expected = int(value)
diff --git a/features/steps/test_files/tbl-props.docx b/features/steps/test_files/tbl-props.docx
index 740896ff21833af8769d77998975da21601247be..e5fdd728f713d821b47cdee620b6eb1ea5460ade 100644
GIT binary patch
delta 1809
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

delta 1787
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

diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
index a1c23436b..1b006f204 100644
--- a/features/tbl-row-props.feature
+++ b/features/tbl-row-props.feature
@@ -4,6 +4,17 @@ Feature: Get and set table row properties
   I need a way to get and set the properties of a table row
 
 
+  Scenario Outline: Get Row.grid_cols_after
+    Given a table row ending with <count> empty grid columns
+     Then row.grid_cols_after is <count>
+
+    Examples: Row.grid_cols_after value cases
+      | count |
+      | 0     |
+      | 1     |
+      | 2     |
+
+
   Scenario Outline: Get Row.grid_cols_before
     Given a table row starting with <count> empty grid columns
      Then row.grid_cols_before is <count>
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index c694eb298..bf32932f9 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -159,6 +159,7 @@
 )
 
 register_element_cls("w:bidiVisual", CT_OnOff)
+register_element_cls("w:gridAfter", CT_DecimalNumber)
 register_element_cls("w:gridBefore", CT_DecimalNumber)
 register_element_cls("w:gridCol", CT_TblGridCol)
 register_element_cls("w:gridSpan", CT_DecimalNumber)
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 474374aa3..ddebee71b 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -60,6 +60,14 @@ class CT_Row(BaseOxmlElement):
     trPr: CT_TrPr | None = ZeroOrOne("w:trPr")  # pyright: ignore[reportAssignmentType]
     tc = ZeroOrMore("w:tc")
 
+    @property
+    def grid_after(self) -> int:
+        """The number of unpopulated layout-grid cells at the end of this row."""
+        trPr = self.trPr
+        if trPr is None:
+            return 0
+        return trPr.grid_after
+
     @property
     def grid_before(self) -> int:
         """The number of unpopulated layout-grid cells at the start of this row."""
@@ -893,6 +901,9 @@ class CT_TrPr(BaseOxmlElement):
         "w:del",
         "w:trPrChange",
     )
+    gridAfter: CT_DecimalNumber | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:gridAfter", successors=_tag_seq[4:]
+    )
     gridBefore: CT_DecimalNumber | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
         "w:gridBefore", successors=_tag_seq[3:]
     )
@@ -901,6 +912,12 @@ class CT_TrPr(BaseOxmlElement):
     )
     del _tag_seq
 
+    @property
+    def grid_after(self) -> int:
+        """The number of unpopulated layout-grid cells at the end of this row."""
+        gridAfter = self.gridAfter
+        return 0 if gridAfter is None else gridAfter.val
+
     @property
     def grid_before(self) -> int:
         """The number of unpopulated layout-grid cells at the start of this row."""
diff --git a/src/docx/table.py b/src/docx/table.py
index a80a6e4b9..9faf8e672 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -385,6 +385,23 @@ def cells(self) -> tuple[_Cell, ...]:
         """Sequence of |_Cell| instances corresponding to cells in this row."""
         return tuple(self.table.row_cells(self._index))
 
+    @property
+    def grid_cols_after(self) -> int:
+        """Count of unpopulated grid-columns after the last cell in this row.
+
+        Word allows a row to "end early", meaning that one or more cells are not present at the
+        end of that row.
+
+        Note these are not simply "empty" cells. The renderer reads this value and "skips" this
+        many columns after drawing the last cell.
+
+        Note this also implies that not all rows are guaranteed to have the same number of cells,
+        e.g. `_Row.cells` could have length `n` for one row and `n - m` for the next row in the same
+        table. Visually this appears as a column (at the beginning or end, not in the middle) with
+        one or more cells missing.
+        """
+        return self._tr.grid_after
+
     @property
     def grid_cols_before(self) -> int:
         """Count of unpopulated grid-columns before the first cell in this row.
diff --git a/tests/test_table.py b/tests/test_table.py
index 7f164181f..4eb1c8efb 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -645,6 +645,19 @@ def table_(self, request: FixtureRequest):
 class Describe_Row:
     """Unit-test suite for `docx.table._Row` objects."""
 
+    @pytest.mark.parametrize(
+        ("tr_cxml", "expected_value"),
+        [
+            ("w:tr", 0),
+            ("w:tr/w:trPr", 0),
+            ("w:tr/w:trPr/w:gridAfter{w:val=0}", 0),
+            ("w:tr/w:trPr/w:gridAfter{w:val=4}", 4),
+        ],
+    )
+    def it_knows_its_grid_cols_after(self, tr_cxml: str, expected_value: int | None, parent_: Mock):
+        row = _Row(cast(CT_Row, element(tr_cxml)), parent_)
+        assert row.grid_cols_after == expected_value
+
     @pytest.mark.parametrize(
         ("tr_cxml", "expected_value"),
         [

From 5a1d6143f1f30a50d09babf2934a6f0857f62c93 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 20:06:31 -0700
Subject: [PATCH 319/367] docs: update Table docs

---
 docs/index.rst       |   1 +
 docs/user/tables.rst | 202 +++++++++++++++++++++++++++++++++++++++++++
 src/docx/table.py    |  13 ++-
 3 files changed, 215 insertions(+), 1 deletion(-)
 create mode 100644 docs/user/tables.rst

diff --git a/docs/index.rst b/docs/index.rst
index cdb8b5455..1b1029787 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -74,6 +74,7 @@ User Guide
    user/install
    user/quickstart
    user/documents
+   user/tables
    user/text
    user/sections
    user/hdrftr
diff --git a/docs/user/tables.rst b/docs/user/tables.rst
new file mode 100644
index 000000000..40ef20933
--- /dev/null
+++ b/docs/user/tables.rst
@@ -0,0 +1,202 @@
+.. _tables:
+
+Working with Tables
+===================
+
+Word provides sophisticated capabilities to create tables. As usual, this power comes with
+additional conceptual complexity.
+
+This complexity becomes most apparent when *reading* tables, in particular from documents drawn from
+the wild where there is limited or no prior knowledge as to what the tables might contain or how
+they might be structured.
+
+These are some of the important concepts you'll need to understand.
+
+
+Concept: Simple (uniform) tables
+--------------------------------
+
+::
+
+  +---+---+---+
+  | a | b | c |
+  +---+---+---+
+  | d | e | f |
+  +---+---+---+
+  | g | h | i |
+  +---+---+---+
+
+The basic concept of a table is intuitive enough. You have *rows* and *columns*, and at each (row,
+column) position is a different *cell*. It can be described as a *grid* or a *matrix*. Let's call
+this concept a *uniform table*. A relational database table and a Pandas dataframe are both examples
+of a uniform table.
+
+The following invariants apply to uniform tables:
+
+* Each row has the same number of cells, one for each column.
+* Each column has the same number of cells, one for each row.
+
+
+Complication 1: Merged Cells
+----------------------------
+
+::
+
+  +---+---+---+   +---+---+---+
+  |   a   | b |   |   | b | c |
+  +---+---+---+   + a +---+---+
+  | c | d | e |   |   | d | e |
+  +---+---+---+   +---+---+---+
+  | f | g | h |   | f | g | h |
+  +---+---+---+   +---+---+---+
+
+While very suitable for data processing, a uniform table lacks expressive power desireable for
+tables intended for a human reader.
+
+Perhaps the most important characteristic a uniform table lacks is *merged cells*. It is very common
+to want to group multiple cells into one, for example to form a column-group heading or provide the
+same value for a sequence of cells rather than repeat it for each cell. These make a rendered table
+more *readable* by reducing the cognitive load on the human reader and make certain relationships
+explicit that might easily be missed otherwise.
+
+Unfortunately, accommodating merged cells breaks both the invariants of a uniform table:
+
+* Each row can have a different number of cells.
+* Each column can have a different number of cells.
+
+This challenges reading table contents programatically. One might naturally want to read the table
+into a uniform matrix data structure like a 3 x 3 "2D array" (list of lists perhaps), but this is
+not directly possible when the table is not known to be uniform.
+
+
+Concept: The layout grid
+------------------------
+
+::
+
+  + - + - + - +
+  |   |   |   |
+  + - + - + - +
+  |   |   |   |
+  + - + - + - +
+  |   |   |   |
+  + - + - + - +
+
+In Word, each table has a *layout grid*.
+
+- The layout grid is *uniform*. There is a layout position for every (layout-row, layout-column)
+  pair.
+- The layout grid itself is not visible. However it is represented and referenced by certain
+  elements and attributes within the table XML
+- Each table cell is located at a layout-grid position; i.e. the top-left corner of each cell is the
+  top-left corner of a layout-grid cell.
+- Each table cell occupies one or more whole layout-grid cells. A merged cell will occupy multiple
+  layout-grid cells. No table cell can occupy a partial layout-grid cell.
+- Another way of saying this is that every vertical boundary (left and right) of a cell aligns with
+  a layout-grid vertical boundary, likewise for horizontal boundaries. But not all layout-grid
+  boundaries need be occupied by a cell boundary of the table.
+
+
+Complication 2: Omitted Cells
+-----------------------------
+
+::
+
+      +---+---+   +---+---+---+
+      | a | b |   | a | b | c |
+  +---+---+---+   +---+---+---+
+  | c | d |           | d |
+  +---+---+       +---+---+---+
+      | e |       | e | f | g |
+      +---+       +---+---+---+
+
+Word is unusual in that it allows cells to be omitted from the beginning or end (but not the middle)
+of a row. A typical practical example is a table with both a row of column headings and a column of
+row headings, but no top-left cell (position 0, 0), such as this XOR truth table.
+
+::
+
+      +---+---+
+      | T | F |
+  +---+---+---+
+  | T | F | T |
+  +---+---+---+
+  | F | T | F |
+  +---+---+---+
+
+In `python-docx`, omitted cells in a |_Row| object are represented by the ``.grid_cols_before`` and
+``.grid_cols_after`` properties. In the example above, for the first row, ``.grid_cols_before``
+would equal ``1`` and ``.grid_cols_after`` would equal ``0``.
+
+Note that omitted cells are not just "empty" cells. They represent layout-grid positions that are
+unoccupied by a cell and they cannot be represented by a |_Cell| object. This distinction becomes
+important when trying to produce a uniform representation (e.g. a 2D array) for an arbitrary Word
+table.
+
+
+Concept: `python-docx` approximates uniform tables by default
+-------------------------------------------------------------
+
+To accurately represent an arbitrary table would require a complex graph data structure. Navigating
+this data structure would be at least as complex as navigating the `python-docx` object graph for a
+table. When extracting content from a collection of arbitrary Word files, such as for indexing the
+document, it is common to choose a simpler data structure and *approximate* the table in that
+structure.
+
+Reflecting on how a relational table or dataframe represents tabular information, a straightforward
+approximation would simply repeat merged-cell values for each layout-grid cell occupied by the
+merged cell::
+
+
+  +---+---+---+      +---+---+---+
+  |   a   | b |  ->  | a | a | b |
+  +---+---+---+      +---+---+---+
+  |   | d | e |  ->  | c | d | e |
+  + c +---+---+      +---+---+---+
+  |   | f | g |  ->  | c | f | g |
+  +---+---+---+      +---+---+---+
+
+This is what ``_Row.cells`` does by default. Conceptually::
+
+  >>> [tuple(c.text for c in r.cells) for r in table.rows]
+  [
+    (a, a, b),
+    (c, d, e),
+    (c, f, g),
+  ]
+
+Note this only produces a uniform "matrix" of cells when there are no omitted cells. Dealing with
+omitted cells requires a more sophisticated approach when maintaining column integrity is required::
+
+  #     +---+---+
+  #     | a | b |
+  # +---+---+---+
+  # | c | d |
+  # +---+---+
+  #     | e |
+  #     +---+
+
+  def iter_row_cell_texts(row: _Row) -> Iterator[str]:
+      for _ in range(row.grid_cols_before):
+          yield ""
+      for c in row.cells:
+          yield c.text
+      for _ in range(row.grid_cols_after):
+          yield ""
+
+  >>> [tuple(iter_row_cell_texts(r)) for r in table.rows]
+  [
+    ("",  "a", "b"),
+    ("c", "d", ""),
+    ("",  "e", ""),
+  ]
+
+
+Complication 3: Tables are Recursive
+------------------------------------
+
+Further complicating table processing is their recursive nature. In Word, as in HTML, a table cell
+can itself include one or more tables.
+
+These can be detected using ``_Cell.tables`` or ``_Cell.iter_inner_content()``. The latter preserves
+the document order of the table with respect to paragraphs also in the cell.
diff --git a/src/docx/table.py b/src/docx/table.py
index 9faf8e672..a272560bc 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -382,7 +382,18 @@ def __init__(self, tr: CT_Row, parent: TableParent):
 
     @property
     def cells(self) -> tuple[_Cell, ...]:
-        """Sequence of |_Cell| instances corresponding to cells in this row."""
+        """Sequence of |_Cell| instances corresponding to cells in this row.
+
+        Note that Word allows table rows to start later than the first column and end before the
+        last column.
+
+        - Only cells actually present are included in the return value.
+        - This implies the length of this cell sequence may differ between rows of the same table.
+        - If you are reading the cells from each row to form a rectangular "matrix" data structure
+          of the table cell values, you will need to account for empty leading and/or trailing
+          layout-grid positions using `.grid_cols_before` and `.grid_cols_after`.
+
+        """
         return tuple(self.table.row_cells(self._index))
 
     @property

From 6d49a690bb22fcec30614ef30156242ba0ececd5 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 28 Apr 2024 17:39:35 -0700
Subject: [PATCH 320/367] rfctr(table): reimplement CT_Tc._tr_above

Use XPath rather than oxml structures.
---
 src/docx/oxml/table.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index ddebee71b..963f3ebf7 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -748,11 +748,10 @@ def _tr_above(self) -> CT_Row:
 
         Raises |ValueError| if called on a cell in the top-most row.
         """
-        tr_lst = self._tbl.tr_lst
-        tr_idx = tr_lst.index(self._tr)
-        if tr_idx == 0:
-            raise ValueError("no tr above topmost tr")
-        return tr_lst[tr_idx - 1]
+        tr_aboves = self.xpath("./ancestor::w:tr[position()=1]/preceding-sibling::w:tr[1]")
+        if not tr_aboves:
+            raise ValueError("no tr above topmost tr in w:tbl")
+        return tr_aboves[0]
 
     @property
     def _tr_below(self) -> CT_Row | None:

From 382d43e41964d935e8a30d885592205d3ecf22d2 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 22:46:14 -0700
Subject: [PATCH 321/367] feat(table): add _Cell.grid_span

---
 features/steps/table.py                       |  16 +++++++++++++++-
 features/steps/test_files/tbl-cell-props.docx | Bin 0 -> 13773 bytes
 features/tbl-cell-props.feature               |  11 +++++++++++
 src/docx/table.py                             |   9 +++++++++
 tests/test_table.py                           |  13 +++++++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 features/steps/test_files/tbl-cell-props.docx

diff --git a/features/steps/table.py b/features/steps/table.py
index 7cdb50eab..38d49ee0a 100644
--- a/features/steps/table.py
+++ b/features/steps/table.py
@@ -13,7 +13,7 @@
     WD_TABLE_DIRECTION,
 )
 from docx.shared import Inches
-from docx.table import Table, _Column, _Columns, _Row, _Rows
+from docx.table import Table, _Cell, _Column, _Columns, _Row, _Rows
 
 from helpers import test_docx
 
@@ -37,6 +37,13 @@ def given_a_3x3_table_having_span_state(context: Context, span_state: str):
     context.table_ = document.tables[table_idx]
 
 
+@given("a _Cell object spanning {count} layout-grid cells")
+def given_a_Cell_object_spanning_count_layout_grid_cells(context: Context, count: str):
+    document = Document(test_docx("tbl-cell-props"))
+    table = document.tables[0]
+    context.cell = _Cell(table._tbl.tr_lst[int(count)].tc_lst[0], table)
+
+
 @given("a _Cell object with {state} vertical alignment as cell")
 def given_a_Cell_object_with_vertical_alignment_as_cell(context: Context, state: str):
     table_idx = {
@@ -292,6 +299,13 @@ def when_I_set_the_table_autofit_to_setting(context: Context, setting: str):
 # then =====================================================
 
 
+@then("cell.grid_span is {count}")
+def then_cell_grid_span_is_count(context: Context, count: str):
+    expected = int(count)
+    actual = context.cell.grid_span
+    assert actual == expected, f"expected {expected}, got {actual}"
+
+
 @then("cell.tables[0] is a 2 x 2 table")
 def then_cell_tables_0_is_a_2x2_table(context: Context):
     cell = context.cell
diff --git a/features/steps/test_files/tbl-cell-props.docx b/features/steps/test_files/tbl-cell-props.docx
new file mode 100644
index 0000000000000000000000000000000000000000..627fb66fc388257cd6a4659ddc433d3f88c6b9d9
GIT binary patch
literal 13773
zcmbum19Y8R+cvsl+iq;zZfv8m?Z!>gu(55sv27cTZJW(W_kO>3@Ag0c8Q&Nu$yym}
zu5sPZ{mgsL=ejlJr9ePY0RR9bpekufgc5ZC+7$=@*arguP~Jzigl%n{jBT8BmEG)&
z9Y4{zT3gk{Ny&8!pa$H(e3M}Rl;qMGz!=yqWM52TpdC4*g?Y-u<mmS5VGD!o$Aj%F
zgW_<`xzC;7wE9yh(F&Z8!m_$Cw%!o@<C1o=J$grEM(lGE7%CY?K5JB;6r_E}!cjy5
zJTP$;lm?5S6G9pUClIZW1s-M!>b#}z%}ity%9U1_?|S|6XKl@|dJJ8|#7A|Q$9#f>
z1*Fwoeq^jtBJfBa+U2U|8YF4d@u=d4Ix>%h#X(HCQ{&R@JxOJcii-2x`Z?N-oY+^p
zdaWoqPIFcGWk!`ZCT+vMZ~+4t+2%nL<r8i;yUMY2ylV~!#kA0*`ni=WX${CiSsl`e
zhbB1zOj>a8IiT7Jh;#_mSJtu@*>+46&{2z^AA|Cy3%=Bb0|P~Ws8n!2UGX=7&$Lwo
z`N3q{ttfvZ?wMfc78CA_0-py1Txz;+6}Pk}LPd+v=Ik30^CtGV-l9;9QgYgv%k?;C
zD>U?ak|3X+hkM0)`AH}9Q0Evz{x?IxpOrelz8mNS7yy8I|F7#{Y~@H#_v^hpW=s-<
z5z*(|>syqR?5b61@SuqYQZ{?^6TpzE1!wgoO1jR=BR9BNzFaTz`u>uUdCX$}<6Ri#
z@<zP6a-H6RGsFD7<ch7$UZS5du&o{}e*B^#da29&$|j_;$(5d=3D{Q67KlP?4AU_X
z-VT+>P5yMij*n!LJC-27V5Eb_0tS<p>4i)GBIwBc$IDta(=_Wlq_?0%cqmvzaXjR4
zL#mk&nmyp4Sz<~XzjoTgmo)`6rbK?O^tV+?r}Q~jyqo##LSc(W;v4X>b5+D`q~box
z`~o~(K6*kdbG~UY|AfLeTsW=!jjjlY`fH6+eBwJ>+3>U%Gj0#C-)G4#4GlNweL2H|
z004;Zvt(pzDDPlv=SZ(_XZLF@rz^@>t}r0BomV0@Jxr^wDGEX91XO3&PR4a|4Y@`2
z*B7-%krDp9kGC3Ft!;Q>xn4Us9IIJMRkK`#>CbE9R(@_S#^gGTcj?J?KWNwSu23hk
zgAV)bT0|y27rt0`KLrt%$5>UiF}-O(0=<w%&Y2USY`SDza6bjS%Lc!4-<IHdyjvqG
z_F_1rZSP6y1U+ZG2uhFMcZ~6*tFUW)nTX#)X~bJ)Sav!I4&uLM%4ub>J5=u}ypJTO
z$7QW>!d$}|&>RG$<eQiyAjemNrTGmQPb~NYWg%sSruRJBl@#PhsVv;u#u=uk9S?)g
zAL@uRKdKsOdh@Bs?)J%2Wabt~u+Z|`!n_K%^ergTs1m~>bvHh(HVb8tVDju)i6D^a
zkGuh{f!Dz8VmXdTc)4XlCJPWwT4J5oOi33!zT^i@J}x7#mE7Wc5)8%`T%rnW=}x6>
z)^tc`4Qtu_WXqadzj_NR(2hl0@j0?S(KQHvv3FZCcq_KKVuyGMJayn%E=6fs|J`U!
z)DJeg??#({U)o6jHkzTWgYjQhi($0wW<U)1>@C_GLs<oaCZvFzr^tv_jI3PV+;j&-
z7h?DWg7B?f_5&qkLB#(3>h)uK?2qEXHeyU_srV-aaW4c^`T*tS*)O{Ee#Pe+Mv~uK
zm7|_m)xRXbAy*jcV7oHsgMURX+YgHiZ;}n-7QsU?c!Y;G5f-B$w~<t0aLWIIJob=b
z?Hfjs9t9i)6&S`6=zE42gdx@CA?3y3X8D1`7Z+OIOak@ePNXP9fY;(Am6{P@)%*qG
zX>SIf#*eQmDgkqiqN^`RkJ{}OONHQytP1v+CLj}1ppgm&@Oh;to6is&cdYE4-&uY@
zZ$hr6QL2#d9JO|7k9!oAPD3u=Lw#Qn54SPS`|4m~e>h(s{UPI6YsBMm+Gv9!wa+vc
z{b=Nx*IH*^U%-{l_aRNK&@*hG{<x0;XX=15EA~T5g*j@Zx%8phbwuh<oQW-_p$-{t
zkb9(|Rk=~{j^C|e-^bP&`2K{^qXhsk{%s8>GiPf98+~&tItx2v(^FM9btN@){vi)S
z3QSN9RO()^?E1kRKNw`7A81jcW#!WVAR@vp5*iChR5Yr2BCg@u*B1f%I4(^w)H*s5
zAW^MSMQF%+p-C#`IDllXe`^!HzS3dsy3@}?_NK=*?vAwQmi-LJv!N!!GsH0lw$6cd
z2ntl_hin8y+MAl6Iywr3*<E};rCO&z0c}a?X`{JJKrs&n`bCxGj(r}~$v5Cx-JlEr
zDF(fP;22&Zp#%Un3C0>Gud@K5aro=t^_x9ruY(990M*MMtSTpo#D50JtTo9f8&lvM
zXnH~hg`8OW3yi)Jp#!4681jJSr2(>-<s~#6InOMN{xrr%X<%-2eW>p9j|ejZ2tAqv
zEIqS{J^PSNjM7XPghGP2i33=BXXnyyUD3T#Sc?<Tyn#8r-vvlc2NzNNy|Z5%83Ir7
z0xwwnD@j9nC0?EUmz9u-c@Q&z1Xx2*o<z(Zl^brMHlra^iE&5Jo`dd>7p`-^`qfz$
zLm-3sX1}IcG7{0pF(>(5w1GyvA(!*N-wV1&?4!^k6=7fHIv@H6Nw{nL?=^f~)Z&&9
zC>8n;{vWJDE(U}I&A!i@o&bXOaZ2hUKgpm6-8}o$UAYNL)w0=xi{*tV<YJKfKbtRX
z(HS@eFV#H^b5ulr;n$5BotY)Ng5#%<h6+E}UonAc^Qv>Xpo8bnStqmhr14-(UQUK=
z>2ZL@;rQTVb`t@_cLRhX)P=zlEe%eX5&}YZ5f%8=gj2jHKg?Go4<{KTXVdHwkyxju
zIbJ*51uHpsHM=~MxRcgS%oE)meM9OZ;6d9HpTQoz9rE)42JtD6XV=D3l>T$9M;+Xf
z1`OpO)sPl^1~;wJN#NZG>PLG+n_Vg$4O-V8({UgE9%cYhoG(zp>%~JU2}VD{kD|T_
zZ+Sy?Qs0gB5&Bc0@_5zIHMm-WAk5m9T7s!UAf6~&o^UaVgH4MUM7V1`SJ=cUVsJM1
z5hOW=u>0W%`<L_tVP+#Tjvs=&f>DoWQS()6mm!Ab+uj3TBO-N2u7WkXT@3RVMNceG
za9u!>7D-Q-$a*Ra2CA-m#*Z3~4KGeuFX2U`#>3();V&>V!a~A|!}?$?1K|vZqId(r
zdO|h_zKb%WKulOac=s4?c6%J~M$JXvPhSyD(qK%pAO*8v?e#P-9CdtQwF%(f{8_1T
zs$HD`f$6^H9(v2;Q_L=Gn~@Q#0|<e5nW+(Vyq;WsjxPy)42R_CQSaHVT~Nl;DBU?y
z9!rDdFpzCdvZ~eb+i@1M@$^eNJUKWRz7bGE3p$*LOn#(`9ouGPRU#^gBHn^j;;dr!
zZH1_#ZRS>X>`)lBg*)t(0z&5#<vqTOvN4A4R6z3SJ0VQRI|?xY1DJj?Q1mZ;<;@g&
zgcm?%AJKRon?$)S@Bp0(e?s%Z5YWXJyutqv+)iZlCgvl>BLr`7?qq}8Ih}8`0O8e1
znIJ%{mOGHnWRLhPe<BY;&WQFQ6~?uLujq?y$Io+33EDh(28v~vDj?}O`H+?k(Vrd<
zN?%#7Os(aErS!_=MClAr4YRP77!08mpymhFQW6;KsuYVbWoL4aBeAW0AoC4<CA%1?
zBBsnZpu?|_QXp26OqhNQ3EQqPv3U(^D(%a-J>M3(XEa)&YnCUmQEMh~TGTf6JwPR}
z%~+qVWiWa~gdVTBUALioJU=`=Lih)W(L{<2;Gm3zgvxDHAcZI?&P*?queTaos@@GO
zJGh+wT+V2F{PK2k4I&EhW`AIJnJ6YHn?c3vwRf_xKTJ(ksa@Xe@|t>X>0MM_+A%Xp
zVcYb!u^$wvx$J#-a^!v2y05kynrNhr+6gX9z(^Md3XL|vm?qmVnq3eLYM93MLt>)W
z5G%dSWd(I#=BXgV?O9G6pVe8lsGCMpop;G|$*M_)94m#anjc+#?+e-wJw0K2RzJc(
z=y6PDaP*=%7kTkj4s53_da50)8B!@!_{7xjBEZs2R&km0ai#~<bV-?2o)pi6C;O6)
zU(7EhD?%^tNbdXTZfAnpHmhS&a>bS-$96t*Tx9Za&bKDENN0NIN@R1aZIp~>?;~b4
z7HEof=01oz#V>R7N<ndaFBUCuFwv0EWmzde)MIJ3ZK$ndc;x^JY*GO`Qf3sV9yYF$
zp+7BKBg`_e*e3?QI|Z>!A5*iI<seq^uRfcFNc5uTlM@(kqV_-_&`pV{?I>>-SYN$;
zEgFd4qtmw}vUU6<64T_%4UCL2Zfm8$?`3+{^Xa}F>vk^tLVCGXw8q%MO*tfMVs<bL
z;FeLH>XXXOj!ij3yxj4j6Q_kprQf6xY0|42QAsQLR+c==UBNWY-Org$YHkf0)W~+M
zk<J5s3td7W;rvw#lqLy*CVh%MjBaJ}<shVu=;SAglX@X^eTB=~rzXXO<emB~j@R#*
z(h9dBMo0Y1H2KThT;|nf`zW$QG&A{Vx2r4t=Oy)$p0ON?6?(J_KlkpoS~9JRJ(`i8
zDfN5TndW0kYqz~5Z0Vc%H}&wB>Ax1Y8#`>8jGS02J%1bSr@c6K__l~7)HdZk6j2Yi
z#nzmN{9RO)&WnwkHyrTf4g|zTSi~VF(SSIal64@@oWWWQBL6}rF41{v;TCJ5m?~Wd
z5nmVXjtlf0N@X+*#yX9`EWZb=QV;6-Xd;DX9t3&tO`tEe5?0l8mkHABOrXOTLQLKp
z7ZuFQu#61J?h$|Z`qnNgL2O8ao^}--@%v*AHBig9&B|@`SE^%FUa?(ifnw1Xi9)7z
zW<t%T!kVX2D95`dm2eD}G%Ki!M?N{_qv%9V&YlfjLh}fY`L)Y0$)#`ES~1gm5?x(&
zia#&=DJ3dKB)us{Poa*NvBq|xk}w?hs&*u>K4VQ?n!30>s~RmoUgEl)#E71$5bOGU
z{86@-<7lsoJJML6qVmbz%DeB|(Y{{@vgBBrN<9*}+}nqC%zEYd&z-BaRUylb4SMP3
zpS;ui4r6R%=lcpVGb%nGHrp(^d1(*H63fj(C3!99mp2%v!N(I@vK;r>pl&~m@!o-=
zy4~%Lpe8E2fbzf!35w#Za^|k-Pu5`9c}OdWbebAHKO~{8-Z<0?_kcSwV#e>67!Jwi
zGC!p#<gPF^gi)!6$lRe6>h#nrs}3dKWo{wx+AxjVH9d38X$KmIed*Y&azi-Yxg1vE
zTMvV>aAM#%DlyYGT)VdXbX#IhPBp)YJ`%CQw1c7fC71^@)n4?DhOlHu?bh|Ue7@v(
z2haLo$}%G5=g%<P)Hni@B*_+Q1$(Zk<#qB-Q_IS)%Iy+OVLmuJq@T>ageFbRr@WCk
zr4pZ!H>B70xpFJ9^UqboRRbx<N5V7G4sPWVhd)v02yEGL_Z8_oMw*^pGj8wPrjlN#
z+-JAAG_jB$-DKqGUQOg1hkS8p|ACZ(nUvJndSa!jr(h7{GjV8OixcYX$#?bkqap%t
z{wbz`J9THEp(&LTCw6{8E$#<NvhCuU{sqVMYRSw?=$4bh?#p1BQY=y1afC|?25LjO
zvMqOQfBxQJU75h0)|@Z+0=Z2bkC>bKkcD+38I&>&1nQY6>RCL|ZJ`RUbCFduq`X(D
zL_)+3mxPg<6ziFS+m9Xhxt#>O5Z*^G@_qG4nFV1}tz))Bal8GQc?4vdn(^~U#eT62
z{-&+&?uL_74>ke~!$;q+RAOE4bMqvLxlwSX6NVBhk7Lu~vKiCa`Ntx!GO}ecR-ksq
zwh+ZfnBtV&Lu9V;52l-CCK?`XtsiPmPGx@--o?PB<7oQvM~lP6*YEBhH8gSOedcX`
za)_iU9d!?nw>$+a1cBmj$UOSA>sd#p-PE>w7Al!oiZgx=nc<u((>byH5dDJ)J4pyq
zl-x<^|MIs*Pg)iN4tQYy-E~LPkRC;S52QxlqhH*2*Zs4tgAx7TiGue)*xC9$uk$OM
z`a5Y5J0{!1farhj20en285|1?md()yP^?7k{oy<>Az~nQcNN<(fC^o_M1|{+rg1uI
zYMx%s*PPJmdmYZ|mv7$<iD^92uk6Q*c5k{6<{DQJSI+uj5s*=SMd9J2YOr|eJmY~Z
z6oygz@x+$nz9dlgY4J|4TSRL?0(M%ZHStJPwG%_4ddDVB@H#lEO}&~9%=!2#Eymzr
zlmAln_+wYON+lj9&vZBMhrou%D9TS@6bIuW!sxr?lyrM}u0dnlK!by6dQEAuqFP@A
zR%$QAt}JEjX!dtHzjGTb4%;%PcZ!?xBI0UdW)7&zA=1bqI)yvTYlT-;ugX2D9nMWn
z?}Hz6mkVwRzM0hu4?V0AjONPyGn@9+sp<u(F*Y~vA!!lZudo#N@7etKJgO)|0YFSv
zXiZGtU(T*D03guY_u2m|yVj=GX0yzIxb})#h9MVWG++)#tQrUk$Ak(Qbq8ejEe2C6
zPhi?*hVoz~TR0FNkK1K*v2ZB%M*MXOE{BRuPk>|f@{G^>Gm+@w&52_|4r}~3C_aL)
zh!>!owBV>qSH6dv%U3%t0ZBvrEoD0{f)xc;4jA{sR1Jzjs$6YifenlLp`q4Hv-Alb
zxoCeAbv)xR@obU2$lyU9B+)Q=TVkVw@YiVDI&Em7c)!DOMqR@>`c0-OINF{(#esHy
zu+&TJZBF87CHQgiL0C%$V^}PQrr{u;WWzCZ8sn#Ny|!}w`RkvOR~jLVWo}7nScpmG
zHMP*_)>U9rSE|N?bR?m1q1C$y8RX{B{$OfQBdP7D-@wQ7fX!(aDP3YC$)0&{U_#jK
zECDT(2%&j2v`G!b5ijs^y#ljXpD3&*G#KqM)=e7b8^^-$k5BVaOIrmEpR+$*8i#|?
z`z`3jPYlw^oQmy{b#Yo{g^gAi(2?lmbwYAQjD9<T;Pu}Ct3%vOS18ZMFrTdXXsjcN
z4!#?V7plLZoo8m4&>3=m-}bdpjyFhF@P5oreV>ol)5E>7vSJ<Y=3Mqn&A(h*U7`#&
z+{wV3tLY2ZK}Y>XaeQ=qRlEeu&+XDnB!hex%iZZ=jE!?{>05dpA#-bE+F9LZe61>^
zt+C*3uLGYG9e%4byT-cU-Ff605<oHzVfZ9ay(Kk+qGqxdl<%oqDBks8gxluZRT=5B
zW#yQ|h9>x2f6EYKP<liEVJp91y4pr^@F__mir08?@^>kPsfe-Q&!bZCi@o*(WYu1&
zt}TYl2@qEO_5&t)&uqlpdJ3@-qL<^M*3r}mZNq*nl~ZV>&B?PI+o|+@L!8)=<lY1~
zpf|CHy}V*FD-bkY#bBOd5oDryM)o;fX;1UokmaKDjY`;@YyMkN-58H8RjkB>wTAuF
z)?=p{A>wEpDiKh$LZ9eg$le3B(O!-=lN7-1c7t=&p@`D=s&D7$xhfs%g6H)AY@c75
z<yi_YFt+#YQw9kDApg(9$mBh{tgLTf^;cSFRi)*9kD#u;qWPoCREcXy;C4A|G^0)C
z3vYS@WR%zx_&{Uox95Ive>UUKK9~glbj1!{y@xS8SzSt0zm0CD6zBKh3jgZhYD0Tv
zd^dhW?_-_5qzR!#H=?}6Z1B)~^oX@Xeu{`0x(n$@YK~4<1V!HxKF&iMR}0>_J)P%g
z)YZGh6iy^ermQ!kOd1bQ6NkRooR2RCeB3Z|<xintFcKKX+!Aa6IpO#1BSBBjH$S8&
z?damH>8I=Hf)z$8bFwlPocc#bE604Xd{uw!?FyQQ6gfSz1{Ml80TRrq;i7J~RpXK{
zo_OwvtV}3;fZ%kZVKEE7Lkd^~#Q__js21c}*<f?aizYBdKhmwXR}t&mN+8yr2EZ_>
zQ)$t`7I<Q1q5P{^ORDsDwpp9cJ=m&xT@MBzo5d=u-;ENa*%o12P_<K7SH4#X7n(rU
zY=Aitk6-KI32H>Gh{afww7*@uD@V^yAZ@w5Ab;9X0iC;hAo!e9$I;@{-16x3`5J7c
z{mbX)&28^Gm#|lhy8F`n_|ED;Nn;3iNr=#xv#IZTYEHFcom40{!UBtd`>aj%z&Qh;
zVV2Rl$abBetQ%<QUl)GbK)_;n<fglC_u1T$1crJz_uPKkX-&_92yAg(v3s<|s@P}R
z2~u|7Q<iMiJl<bdD89W{E*W;Hdui76*7~GdnUMMBX%Ees^Ym6S&bK#u>nrR%;>GG-
z$g6-OU?+xiaQnH|m-xj+8fS4-y5SP<_f^JvB21h8PIqTef9DSWqC7`qCns|oQ^&um
z7pluP%N&Sa6Kas|mm^#;czqg>_TN}4KBM$5XG!w=#PqYVxBBLtH0rKrlSnf8vGk)q
z8`+O1GYdPI930D4rh#!!21+s#$c%3*0CJ*8(NZ4|p06EV_9++=f@2sc_4v4au)LZ%
zTh<D}%S02P<OP%BFs|(^%O!IMQMERD)1<(FyXt1s)U}UfdPBU6XB(rmk)#}li+Dw5
zI5Gmt!_tD{(aotD_i87n2kV^ainS}vfleduCkuP6wb84KI3Tse!dMta1)*#5hh15J
z>dqmqxJR#6vQ=%5Uf;z&_@AET({V>CO*_I%jsS;s!EB9^i;EI)xDn6x@eM4VqFYir
zW%k~xWj5&-l1vLkvMh)Y1ZrFmwXH)ION{H`8?bGTX&~w;yhg=9JS+RsT^Q|e?l8gU
zqW91aIh%xl8DWBjH4(wVfQvZgA<yR-+$HZM$3us3`xWcRcqAK0u~5<+NJj&so#lPk
zWRj!Z<)2>D_p;z=A0LXs<1t@USmdATR>kIOYK~jY(NP6Y(8V7TRAoB~gCn=Z1_y!a
zwqF*L`5r^6%JO9C{xs&#XU@|ZnImE4AS31KVw&*-<SVHSPcHw4Y8*m*6{_*E_d_@f
z-zcy@%p022?qil7R4-osBR}!{eUp)LdC|P$dMGl?@jbDQSWoG|0f(T}%<h)zdS2}s
zbwq5RQwj~lA(te=0LG9NlLtmWU!x>n2h5ib-p)Z=x=+0=+Ldlcd-Jh2c&Yi+VLt5R
zpZ)h!V)S<VwPvRrUayj&<%WS;@Ygyu;ywCZc?96d!)U9Zc(D;WW3cOdoNe`}bJ)Gg
z2-P|eHgR1KZdPf4UK11IvE}bliVARfY-31-;iyiCckx+NGVmT@a4kSuk#`r;?}B)E
z)LRikcU9O|h>I<2?f{HGGn%@A4Nl6ljqra;^&`l=78!6k20&5gC@alAnlK??ty-P-
zx@l_1KNQS|dNNyAnTN~Zl<7ou;{jJMN3OBm)&re)FVneeZCOj$w%pW@tg&6!C)Ze4
zjj_TXVOX)g9iCVYC9McQeva&5ycJ%(y|6aU&m1|0Wm|P!Lk0^qxp^jw3$OD+l>RQY
ziKdH6Q49x?Yc@1Qt>ebic63(jtbhB!=U@iO+Q(U9SQn$tlqNbA9d+K!E-^o$B3Ok}
z4Kndee$cwikqZuy(hV^pdAiBZ!z1zH_<3Ro9R1x5P>rSAYK}Q>JSC`0t;zg-Ka(IV
zD64@30GfgT0K)&UhNF|4mGNJ@c{f$cahn2h;QX3Wx%naPlG!Egn<>?VObHWnvVFBj
zKctp2$t3W&A>V6OBCVLqY_+@Nk5n+HH*B*@F*=UNCuHz(6r~g?MssKW&zkTk%I?}U
zWaUB6rC)Osa^aBhq4M-%=c#APD|PwOc?c}8u^CR)J+dQ(x$M0RbGBWylrjTEz9b-_
z)H~3rh=+M8hq{Q*ZZmOZF@*(hGUMA_FP%Aa39~!qe$d(R9H(rFa>8QLM}Dq1@V%u7
zxO2;Mw4Fe-olta(j)^n3e#Qka?ufFha+tx3!wpEID&Af3tWO^zlGN6?wjqB+1Ft}t
z-cAjO`Zfy8W?xQxKSDlG^>tsuy=%`13llGq#P~?o*w|b_Cy76QLQV0#3`>9_!`aa=
zr9ME|5O%DT-DGKrIkl(ks94rII=to1Z__vzW1&RBw~haK8OP~$x!#?qtM?R6Qf1%W
z)L5XGsM2U_LtitjMxLc+Fhpv$>&EGHGw%~-;EBFr7R?7uG*T1$Qg-1q5q+y}>6z9#
zxWyOMX|X+-@baWaJa$^o#wI0gs?=1J&phMMg)}=0E7$K4;c9F4Mbp5~%VgKdQLV(c
zR>>>sYw=yh#r3wS$xi_|X6IJ{)fBQC%OX*(lN|%9f>t>&-+KpQDupFs*0N%|zc|{k
z6SRJ!$c%n~``jE~%Scq-Fz4pQ??u87Lc$*;?j0!Z{ZZUIBI+d!=ZP_<AX)Qfia>Z&
zk`jWM+8A@REKZ)GM)7CosN^B=`vAoI04zhz^om-lLJUtLEW)wz7%w|esrGs^=7@O#
z^EjS@QMULFca>zKyoyc1NU|^3swkwpMI36Vq-teQXEQ8urddU)Ip&N#fo(%t2kJeQ
zTM+k6xt|>d;;<){t2F2RN#DutPK#3kQZ_CF6y~+p2u8bofp;~T8gdXf88B$m?vgT!
zixad6K<3O&>_`={oiUQW$1@M$k*81ab*6L=HpOmB!q;i<J0s|1tUii3&tp_Z7`8Bg
zm(v3FP)+zwE1&LUpY7xm?&*Df=7>PaBNL#KD))8m5e;HK`Bmo`4YamC?9OAK9bJDv
zPVrd~T4J}L)E-WG#<&R_+SIE8s8^%N5`d(7f?fNXaHe|_a_rgj>C2k4{<;>H!IuG_
z*`=WuZAqmzi8K8dXM18;loU<|BLc(w=IlIHG6F$G%SpuAI&e5aBg;wb652F>k``7U
z$S19@fggHV&4RzdF5c@?G64ee2LY%RL?Awm-(DEk<yp-j36$QyMh0XNN_Gx-n$Ber
zN(it*X#fKRM4$kZh@=1k;W$928fOA1KwcdgAh0P300dJ50Y2n_0{(*o_yke_0kCsG
zU+&+Ux+DhQJxU_U{|>_P$pQl?XrKUDcBBA6Z~S}lR{<En@-OKCxL*S#P(@^fQt!h5
zmi0@x-Glx674;<mfPi0DtN;c0{H^JKh5tu||5Ih3&4FJqQlR&{eTOyvuG7CXCjpux
zG5Y18{C%eY>y9}RzOQ%;5T1HXp>D&V-qP5+0N15CU8`|a6jZxbu&*iib>QgRpijwh
zk?<#y0$;@TX16ajI*lDDj_N=$RWkJ6?9a4o=8}im@5$>yk#$|Eb!?@EtGQF^o7}?7
z7K&V@N2Jbaj7&#j1KHP(ke8@hIq=C_niA*A4JUHcMWbAQd@E=-R_dAMJ~%<|J7Umq
z2r{tzz<s7w2BL+aZljp?{q_WdhOGc+k{Cso$+eJuh}8dR$|=U>Jdh86A(EGpy++T=
zgT<>IDZ}|WE#Gko<@~)Pp!EkQjGwL1^<HuG)N_G3S51>dsx!CPIcu7Pp%LUoQB0d<
zz=&(bT7P<czVO9Qqi@C>hEyKQF6~%Dhue6L$@nt;86WkaZOA@3c)M991%xtMo`k6{
zAyiEj+!Q3XII5pSOs|YkbES8QR<bubFd|<{Q$<p?ks_g}dKz=%_^qR`zgjX7#Tna}
zw>l>^8kz6hu~_dJ#dnXb>_DxJ!eF?-FS5pDcBDQG>9n#t-t((#sPbDEz5#ycAU)FS
zprv;XY83$huz%+uHFGC3Q4<qmL#O}J(H6&Fbfn$B6Ss*4Im@7wY{Von$HOFC?SWq3
zS+W?T79-4*>Ag!%2ENkY)^q|zQ~bOTv-AWb`E+r}c~MSIg@)qkGVQU>TSf8Nf8@c!
z<;w1hm%FzCrA(ugXV>A$PC!Yl9KpJmx?H^XWpQ;FuiA|B!KjtovE9-k#Xv5Q!a2yE
zcy_O1$7hjAq!Cg_GgI2U<-^Y&t2<g00mAW2-=(@UgR7Z8`}(-S1jl|k{oJy@mweeR
z#!7^wXhW4K1TK;)*2IK<#Rx4IJ`rVBug5n-Usb8Fxo2)779+<@P$-I9H8u;%;068C
zTE#KT2FLO|NJ~O8IJ+asp&-yC+kGs4l<EVfh7ZHO?NY|Bbhs-E@6tH?!+8;>KJ|uL
zVt&tX8xgrZ6&uVO`%yo#jZW{Q0Y(5AiNCc8z69sv`~aMco1NNe|6M7nLgQusl3UAe
zWB`2)EX!s5m_n0f$tMQKNdG-B=(NMrZ!i+*?ID9<jcBHMub1h@$-6^n<7l5^1{bL4
zB!+j=M~A0#S{c4bW>$hN3~S1TIAFH0Ut*mDF=wU1R3uqjP$)bJF)CKP#KiaA>a5rm
z=I1&UKQKEcul~p><u8~+dCx6>Q7>**_MrCaR&yiWEkw9>NXyR&5FEE6lH13?K_KAD
z*B`{M2OkD>=TI<)YPDf+kw9A~#JQEg765(nMj0n|-d|E4J*h}X=UZ8mAj{LRFugO1
zK^r&kv`IQv<g4*;6Fy^1{CTSIGpneD^36HDH9T2NOk~CLJW|XBsiJa)egYnDn{=9G
zlLY^UpemjqwFsH!5~)f?+`Nn0N%28${B-wg1H!HXvSra+X}%1i`D^-k>ND1dM=YX8
zPT?zNp)2N(SB?=orqk1r=&~ur#spuXddp%Q7-}Q~yGE&?z?e&S5Jt;l=-vlhI!CF7
z0L-PMUTw+3G5g;(HEPP5OqUAlj<paBImev(n~7t}NT7JBRS%&{#>aRx&D1A({j>Hp
zzq!(D_8i?Ksq6Yp5`Qap$L@Dp8StPxE;X{DJ-3Q%pF=$J+>)1jpo^d9^_mysd?YM$
z6UPNl0u6io*{_;WKYBJBfGFniPKl5GaTVkzhp54Tl$EKB*>Xb9Lb_1DzbJ7E@O7qg
zA9nd~N-Sf2r$hyuzbR4c7bV)lVa*ChXysP~d-}J9Zf~#MNo~S3g?V0-F!7zG({p?u
z$Gu;|K%89q^>JO(zZ_<Okzbs!c*TX)#>b+ChFxH@Yy!@Q1I8KTL-)5;AD5Ns*Hk{n
zc-zL*i599;4@+U(6RfC@+{wDpleeimeEqr@4cbZ-MPS143@(*gl1qA5NF;SYaDrMm
zlZYbqK;`*M-4f!}%Yfjl4mdMNp%tINqCp=of&?NEdG&9w0-ID!fZ)<W+iRQ>Ah^u|
zWsr9^`$ZBLY#lY&lTjpD8U8fCbKb`PA4**RUsEFapOkp#^1r1--alB}XKML>ONqC?
zQQ~RiFG@UBf_bOJpnp-~x|0OyF8qco3^?n#B?wJF)XjttkLGu3ps&2iGhqYhd?-WN
zMTyXQ+8%zd`}xkoq0I4>XL2WyB<&Zf?Q02f#tm6Aj<3krmHLlK38`xugX0P0aJH*k
z$eKtxxRLRzD<em2Ri+B4NF+KgId~J_@nm*^oLoY4IHVI+vKO%iGoH~?JJ~=IQsc<2
zn4d{Q%MZbC#0L^#;cv*A{N?#mRHx7M4q_#)7h@gTF4!ByX7;ttup5qP(q}RnCrBW6
z#^{RAzmPAp%hf?5q!t`XCvsWOA7>C)G$Lw-0yY%LJQlDMFSXkuxT&RrHZF{=DAeVX
z+pIm-!**^iGn%9$$qeO)8NeE1={P%DnMbGllHgnfVNc1|EtK45N>@3lKZ{ZA?V+un
zU6ia7=qzJ~JZOj~O4bqoV#IYW96x?$?srBcfgfApx}4WHi4_lBHD4N+i0(f9#falD
z+a~Y_aPN$`^otSI{$j*$l?5|zz`rwMoFGwS|2reLPyqmF|HFt*X2#aW^nblG{>rqR
zYRcFyvthR1t06Y;%swqUe`^*!Sv;LDfJ1H&j;s~YvZ7G<a7fY)cWU41qrdvS2l}MG
z=X<#T%*pg?iVa>p{DCee<&SR^3J!aHGE1Zo14NHJo*lZ17jwr!_(0FW_R_C+n!Ac_
za39tS;O_=b>pZ^x?3>5l0DgienH4*&qujDwsQlCjT?vWd1}WY+QQ29)3yq{r8Q(}7
zMA#t$vNO_zWQ>n`6&)@G{}m!;o;cs4X@$lO@frOhJ7{TsbqaDB5*9Vz`4kx7_!B>x
zpnb!F2Dc7sxvnQYR-8HoL5;&B{!!^+w6IkQb1^8-dgv9;ok1X|8yM7qkbFs%^QA_T
zQA~n38dZcQM|$$Mhd-T85K&Tn?r_l+^IGNU_I4!I+`J@(1?)nna^X~Ex`ljmvOZsw
z`VsZkyL4JYA_};V1uVvCB-~+DJT|@{L9S-)&<XpPEJZW0AVY43iv1Wz1x1Eec!uJ;
zjA`z&b&44_R*DIq%-fZFjZL08nVGiVYnvxBTHT?*%m-wKoE;NJDXHpO#i`2NS@AR%
zd!mRUdUT^42m;0V#N*mkDAYv=1MDoMTG9#_D10VQ62V63uHKm0w6W{`ICY<8Scn{J
zFI)i)gNXTdugC4>#EGs_F?t=|r`@^jflB;WZO{&=S9|22d(ZSgy`Lx_jvqhUW_Z>C
z24g$dzdW5Z=yquPAWHNeS7yFmZv8m6<$JphA{T9h0}ql|0eA#|<vswM$jedb){<gZ
zlV*cpY>_zi5I7zPgVFij`j>W{NfY{t`oK@)*<}tHXazSix)o8@9ao2l4<rOO?z&?e
zgep#Fmn{Ms;xHwaWnM0Un-)o+7JcnH<jZWR{M};(_OR(z@{WmQ;;o5tp(COrLFFBt
z5VDD0K*Ctxtn^bAWW|7aI<r9Rs|X=nDMk-c7h@wb(1+=SC2J1my(Y8s?0RHsD}{}k
zg%lg1h*B_YIzxPPs#GV5B?hf2R)j=d3P<O02LfOV7>Q7CaC_YdALvpos8(a@>;;Xi
zql*iLlR7;DqL!nkNsMC8oIf3a^||Y>%lPqac`zw`SS-j<=PTL&?w$}4@N+A;IWk(k
zT4=S$Z~-^W!lWD85lx{jP<jY5r`M%~(8N9U=<_1KYR9!vi`24J{Httz^ujvdYbV!g
zV6DD>b>Z`}kU(>(Go|B2(9|s3X7Bn(Cf^B<B{w<lb92+8LfSIP(sLvCg>PqHu3J{8
zoF}xLmT~ljT>9d&mbGntv{U*IM}Fi^neps|(&zY6cUUaNg{g<&GGoF6f9xYyZ)~B1
z&67r>uIov%tnSVIkfptrN$W+WTXfTW@QRv{0FS|Xb1%k4fT}ecGCw!G7m%HE?WMGp
z5ZBs7H9I>`p8xUm%Dh-11XE5tQgS=Vedpm+_Yf&OuUk6(X(w4OL7Y;i2HTvx1{ry$
zh(QMIktc1!AxzC74Iim_QgA>c@w<1vOMPw;LviBdeQi#8E5%Z`pKa0Vw|RDSr>(DF
z>+9Bv*l6^6vaG{*@Wi}tftv`_%8_EK*6Xdhrl%}Uzy|K4ZJwPSa|%JqtuzxX@6z7W
zD&S$EGJ~tZ9NO{qbeC`iC2U8-q@{H#=5v~}n(_B4p$9{Vn`SIR^$Z`~45;dySq!OK
zoQM#Yozp=WNKooQ@|}+qxVVx=Ks20xb{hE>PcW&_U+e)Vc%R!AIc^Gx17nOs%Tjl&
zi8%cT3*MFU=*qg9vK#(bTK(x1Z;7t3I&Jyv#+tnpZ%~Yt+z?VrM-~&bgrk;r*k8)H
z1xDNIKDl)!NjXjxP@O~x0uXw=;1_-_?&nM--<q(J+EI}{*<jRDXVc$g@~`h3U3;@x
zkeqYPf`nPLij@u+T@uouU`R3zzC*$)GFVf#srKQvmHp9Ny6Fha##**8zuEZK(S|&~
zzFRD>l<gf8wBbIbLS>Jr#ZPN3w>6q6pXV;!pn?M?de(uz2STBp#kb=I&7AsyI=7vx
z65$|Xlp9f3#ixu6L#t*Q9|1l;TvMZbcFiL6{+!4{zW*Sn<}rZ?$&&Ma-Ks3zpNKlR
zE|72*_R*_VT*<J&8%amDt#?G6HR{ngi3<phKoW|53Q|^lYu|t;N;o8=_p7z4Bo9I{
z^PCuDq`QVgm?^w@@46tdPr9%$QC^Pz-AwVxuF<}D_2ML>r8Va~R?wyZ7PDHSVT6WL
z@@_Ge3H&+<y&gGuGI4|v1qm#Ex~KttV7+dWTw?7MaAtzq-VCYXg})~ieBy=qN#Dgw
z=8#VQcDCMk?zhck8YqWIj@Qah4}WysA876>0p4r6_3y7=hbI0iFMKvOQ2JMeA$+pS
zqK5$%FzM0Wy%VFfZ4|~R6vKpx*AgdKk6?#O%2-Eh*fjQZ&#b|Q*>Xchct}{h_62*4
zZbKs5x|)fe30!q6>txo5;5=y6u%7~w8!{X{<petJbU9C_1ndc3C^)>A$e@_1T4Enj
zyN`1SD=Z5aZ&4k03J1yHh}_1XKYdj;$DXK2#~iKVrGf%~I{dPMf+Iq*n|Zhf2xs2y
zOi&Doc5HYmvVJ9p_5fmE0a&4R;J|hQ()dgA)lUMWxEpbfKpy-W>sm$oR+{<2gE%aW
zHd*wx16CGu|7kXT8gF^C@R8-q0NY0&G1&CRP84T*I5>!WLUhZY`^(l>?;ZF+z^EYq
z_ai0m)ArYo&-)zyzaB98Q^21`9sY&`06sv)?;`$n@ZnG3pWXle04LrHk$;{A_!IqS
z8~Q(Jf6#xS|EDSaPxzmG)BnJc-#w@QUi|ki>OY12*}?ITkg@m9`2Vkdj$e}S|6_&!
zvwH#aFG0Tykmrl@e$MAFNx%0pfc@Re@JAoRp9=n2)%{07P4xeW{jJ9PC;rcR-9Pxw
zcOCyy>)+M8KjD9t2mXOay*Ir44gYVk;7{<Md7Xd2sKmd4|H$(EDd$gb_#ZiB@BZ;$
rO8n^?|0&|n=gL1K2pIn(;*Y0{ycF2`G6DeL-hWNr3!Vy0zdrpx*Pz*A

literal 0
HcmV?d00001

diff --git a/features/tbl-cell-props.feature b/features/tbl-cell-props.feature
index 609d2f442..456ed39a4 100644
--- a/features/tbl-cell-props.feature
+++ b/features/tbl-cell-props.feature
@@ -4,6 +4,17 @@ Feature: Get and set table cell properties
   I need a way to get and set the properties of a table cell
 
 
+  Scenario Outline: Get _Cell.grid_span
+    Given a _Cell object spanning <count> layout-grid cells
+     Then cell.grid_span is <count>
+
+    Examples: Cell.grid_span value cases
+      | count |
+      | 1     |
+      | 2     |
+      | 4     |
+
+
   Scenario Outline: Get _Cell.vertical_alignment
     Given a _Cell object with <state> vertical alignment as cell
      Then cell.vertical_alignment is <value>
diff --git a/src/docx/table.py b/src/docx/table.py
index a272560bc..e88232840 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -222,6 +222,15 @@ def add_table(  # pyright: ignore[reportIncompatibleMethodOverride]
         self.add_paragraph()
         return table
 
+    @property
+    def grid_span(self) -> int:
+        """Number of layout-grid cells this cell spans horizontally.
+
+        A "normal" cell has a grid-span of 1. A horizontally merged cell has a grid-span of 2 or
+        more.
+        """
+        return self._tc.grid_span
+
     def merge(self, other_cell: _Cell):
         """Return a merged cell created by spanning the rectangular region having this
         cell and `other_cell` as diagonal corners.
diff --git a/tests/test_table.py b/tests/test_table.py
index 4eb1c8efb..993fb3f23 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -326,6 +326,19 @@ def table(self, document_: Mock):
 class Describe_Cell:
     """Unit-test suite for `docx.table._Cell` objects."""
 
+    @pytest.mark.parametrize(
+        ("tc_cxml", "expected_value"),
+        [
+            ("w:tc", 1),
+            ("w:tc/w:tcPr", 1),
+            ("w:tc/w:tcPr/w:gridSpan{w:val=1}", 1),
+            ("w:tc/w:tcPr/w:gridSpan{w:val=4}", 4),
+        ],
+    )
+    def it_knows_its_grid_span(self, tc_cxml: str, expected_value: int, parent_: Mock):
+        cell = _Cell(cast(CT_Tc, element(tc_cxml)), parent_)
+        assert cell.grid_span == expected_value
+
     @pytest.mark.parametrize(
         ("tc_cxml", "expected_text"),
         [

From 7508051c7664a8a5ce8828e7fa33e1075578617c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 23:06:00 -0700
Subject: [PATCH 322/367] feat(table): add CT_Tc.grid_offset

This property was formerly known as `._grid_col` but that didn't account
for `.grid_before` in the computation.
---
 src/docx/oxml/table.py   | 28 ++++++++++++++++------------
 tests/oxml/test_table.py | 16 ++++++++++++++++
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 963f3ebf7..4715900e6 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -450,6 +450,18 @@ def clear_content(self):
         for e in self.xpath("./*[not(self::w:tcPr)]"):
             self.remove(e)
 
+    @property
+    def grid_offset(self) -> int:
+        """Starting offset of `tc` in the layout-grid columns of its table.
+
+        A cell in the leftmost grid-column has offset 0.
+        """
+        grid_before = self._tr.grid_before
+        preceding_tc_grid_spans = sum(
+            tc.grid_span for tc in self.xpath("./preceding-sibling::w:tc")
+        )
+        return grid_before + preceding_tc_grid_spans
+
     @property
     def grid_span(self) -> int:
         """The integer number of columns this cell spans.
@@ -484,7 +496,7 @@ def iter_block_items(self):
     @property
     def left(self) -> int:
         """The grid column index at which this ``<w:tc>`` element appears."""
-        return self._grid_col
+        return self.grid_offset
 
     def merge(self, other_tc: CT_Tc) -> CT_Tc:
         """Return top-left `w:tc` element of a new span.
@@ -510,7 +522,7 @@ def right(self) -> int:
         This is one greater than the index of the right-most column of the span, similar
         to how a slice of the cell's columns would be specified.
         """
-        return self._grid_col + self.grid_span
+        return self.grid_offset + self.grid_span
 
     @property
     def top(self) -> int:
@@ -553,14 +565,6 @@ def _add_width_of(self, other_tc: CT_Tc):
         if self.width and other_tc.width:
             self.width = Length(self.width + other_tc.width)
 
-    @property
-    def _grid_col(self) -> int:
-        """The grid column at which this cell begins."""
-        tr = self._tr
-        idx = tr.tc_lst.index(self)
-        preceding_tcs = tr.tc_lst[:idx]
-        return sum(tc.grid_span for tc in preceding_tcs)
-
     def _grow_to(self, width: int, height: int, top_tc: CT_Tc | None = None):
         """Grow this cell to `width` grid columns and `height` rows.
 
@@ -727,7 +731,7 @@ def _tbl(self) -> CT_Tbl:
     @property
     def _tc_above(self) -> CT_Tc:
         """The `w:tc` element immediately above this one in its grid column."""
-        return self._tr_above.tc_at_grid_col(self._grid_col)
+        return self._tr_above.tc_at_grid_col(self.grid_offset)
 
     @property
     def _tc_below(self) -> CT_Tc | None:
@@ -735,7 +739,7 @@ def _tc_below(self) -> CT_Tc | None:
         tr_below = self._tr_below
         if tr_below is None:
             return None
-        return tr_below.tc_at_grid_col(self._grid_col)
+        return tr_below.tc_at_grid_col(self.grid_offset)
 
     @property
     def _tr(self) -> CT_Row:
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 6a177ab77..937496346 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -52,6 +52,22 @@ def it_raises_on_tc_at_grid_col(
 class DescribeCT_Tc:
     """Unit-test suite for `docx.oxml.table.CT_Tc` objects."""
 
+    @pytest.mark.parametrize(
+        ("tr_cxml", "tc_idx", "expected_value"),
+        [
+            ("w:tr/(w:tc/w:p,w:tc/w:p)", 0, 0),
+            ("w:tr/(w:tc/w:p,w:tc/w:p)", 1, 1),
+            ("w:tr/(w:trPr/w:gridBefore{w:val=2},w:tc/w:p,w:tc/w:p)", 0, 2),
+            ("w:tr/(w:trPr/w:gridBefore{w:val=2},w:tc/w:p,w:tc/w:p)", 1, 3),
+            ("w:tr/(w:trPr/w:gridBefore{w:val=4},w:tc/w:p,w:tc/w:p,w:tc/w:p,w:tc/w:p)", 2, 6),
+        ],
+    )
+    def it_knows_its_grid_offset(self, tr_cxml: str, tc_idx: int, expected_value: int):
+        tr = cast(CT_Row, element(tr_cxml))
+        tc = tr.tc_lst[tc_idx]
+
+        assert tc.grid_offset == expected_value
+
     def it_can_merge_to_another_tc(
         self, tr_: Mock, _span_dimensions_: Mock, _tbl_: Mock, _grow_to_: Mock, top_tc_: Mock
     ):

From 512f269b7560c02f81c16c7858ed67bfdc956dae Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sat, 27 Apr 2024 23:33:38 -0700
Subject: [PATCH 323/367] rfctr(table): reimplement CT_Tc.tc_at_grid_offset

This method was formerly named `.tc_at_grid_col()`. New implementation
takes `CT_Tr.grid_before` into account.
---
 src/docx/oxml/table.py   | 31 +++++++++++++++++++------------
 tests/oxml/test_table.py | 20 ++++++--------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 4715900e6..42e8cc95c 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -76,19 +76,26 @@ def grid_before(self) -> int:
             return 0
         return trPr.grid_before
 
-    def tc_at_grid_col(self, idx: int) -> CT_Tc:
-        """`<w:tc>` element appearing at grid column `idx`.
+    def tc_at_grid_offset(self, grid_offset: int) -> CT_Tc:
+        """The `tc` element in this tr at exact `grid offset`.
 
-        Raises |ValueError| if no `w:tc` element begins at that grid column.
+        Raises ValueError when this `w:tr` contains no `w:tc` with exact starting `grid_offset`.
         """
-        grid_col = 0
+        # -- account for omitted cells at the start of the row --
+        remaining_offset = grid_offset - self.grid_before
+
         for tc in self.tc_lst:
-            if grid_col == idx:
+            # -- We've gone past grid_offset without finding a tc, no sense searching further. --
+            if remaining_offset < 0:
+                break
+            # -- We've arrived at grid_offset, this is the `w:tc` we're looking for. --
+            if remaining_offset == 0:
                 return tc
-            grid_col += tc.grid_span
-            if grid_col > idx:
-                raise ValueError("no cell on grid column %d" % idx)
-        raise ValueError("index out of bounds")
+            # -- We're not there yet, skip forward the number of layout-grid cells this cell
+            # -- occupies.
+            remaining_offset -= tc.grid_span
+
+        raise ValueError(f"no `tc` element at grid_offset={grid_offset}")
 
     @property
     def tr_idx(self) -> int:
@@ -505,7 +512,7 @@ def merge(self, other_tc: CT_Tc) -> CT_Tc:
         element and `other_tc` as diagonal corners.
         """
         top, left, height, width = self._span_dimensions(other_tc)
-        top_tc = self._tbl.tr_lst[top].tc_at_grid_col(left)
+        top_tc = self._tbl.tr_lst[top].tc_at_grid_offset(left)
         top_tc._grow_to(width, height)
         return top_tc
 
@@ -731,7 +738,7 @@ def _tbl(self) -> CT_Tbl:
     @property
     def _tc_above(self) -> CT_Tc:
         """The `w:tc` element immediately above this one in its grid column."""
-        return self._tr_above.tc_at_grid_col(self.grid_offset)
+        return self._tr_above.tc_at_grid_offset(self.grid_offset)
 
     @property
     def _tc_below(self) -> CT_Tc | None:
@@ -739,7 +746,7 @@ def _tc_below(self) -> CT_Tc | None:
         tr_below = self._tr_below
         if tr_below is None:
             return None
-        return tr_below.tc_at_grid_col(self.grid_offset)
+        return tr_below.tc_at_grid_offset(self.grid_offset)
 
     @property
     def _tr(self) -> CT_Row:
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 937496346..46b2f4ed1 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -34,19 +34,11 @@ def it_can_add_a_trPr(self, tr_cxml: str, expected_cxml: str):
         tr._add_trPr()
         assert tr.xml == xml(expected_cxml)
 
-    @pytest.mark.parametrize(
-        ("snippet_idx", "row_idx", "col_idx", "err_msg"),
-        [
-            (0, 0, 3, "index out of bounds"),
-            (1, 0, 1, "no cell on grid column 1"),
-        ],
-    )
-    def it_raises_on_tc_at_grid_col(
-        self, snippet_idx: int, row_idx: int, col_idx: int, err_msg: str
-    ):
+    @pytest.mark.parametrize(("snippet_idx", "row_idx", "col_idx"), [(0, 0, 3), (1, 0, 1)])
+    def it_raises_on_tc_at_grid_col(self, snippet_idx: int, row_idx: int, col_idx: int):
         tr = cast(CT_Tbl, parse_xml(snippet_seq("tbl-cells")[snippet_idx])).tr_lst[row_idx]
-        with pytest.raises(ValueError, match=err_msg):
-            tr.tc_at_grid_col(col_idx)
+        with pytest.raises(ValueError, match=f"no `tc` element at grid_offset={col_idx}"):
+            tr.tc_at_grid_offset(col_idx)
 
 
 class DescribeCT_Tc:
@@ -76,12 +68,12 @@ def it_can_merge_to_another_tc(
         top, left, height, width = 0, 1, 2, 3
         _span_dimensions_.return_value = top, left, height, width
         _tbl_.return_value.tr_lst = [tr_]
-        tr_.tc_at_grid_col.return_value = top_tc_
+        tr_.tc_at_grid_offset.return_value = top_tc_
 
         merged_tc = tc.merge(other_tc)
 
         _span_dimensions_.assert_called_once_with(tc, other_tc)
-        top_tr_.tc_at_grid_col.assert_called_once_with(left)
+        top_tr_.tc_at_grid_offset.assert_called_once_with(left)
         top_tc_._grow_to.assert_called_once_with(width, height)
         assert merged_tc is top_tc_
 

From f4a48b5565a3a09087f541e3ac36a447693927b4 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 28 Apr 2024 12:45:09 -0700
Subject: [PATCH 324/367] fix(table): fix _Row.cells can raise IndexError

The original implementation of `_Row.cells` did not take into account
the fact that rows could include unoccupied grid cells at the beginning
and/or end of the row.

This "advanced" feature of tables is sometimes used by the Word table
layout algorithm when the user does not carefully align the right
boundary of cells during resizing, so while quite unusual to be used on
purpose, this arises with some frequency in human-authored documents in
the wild.

The prior implementation of `_Row.cells` assumed that `Table.cells()`
was uniform and the cells for a row could be reliably be computed from
the table column-count and row and column offsets. That assumption
does not always hold and can raise `IndexError` when omitted cells are
present.

This reimplementation remedies that situation. As a side-effect it
should also perform much better when reading large tables.
---
 src/docx/table.py   | 38 +++++++++++++++++++++++++++++++++++---
 tests/test_table.py | 39 +++++++++++++++++++++++++++++++--------
 2 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/docx/table.py b/src/docx/table.py
index e88232840..556e66be8 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, cast, overload
+from typing import TYPE_CHECKING, Iterator, cast, overload
 
 from typing_extensions import TypeAlias
 
@@ -102,7 +102,10 @@ def columns(self):
         return _Columns(self._tbl, self)
 
     def row_cells(self, row_idx: int) -> list[_Cell]:
-        """Sequence of cells in the row at `row_idx` in this table."""
+        """DEPRECATED: Use `table.rows[row_idx].cells` instead.
+
+        Sequence of cells in the row at `row_idx` in this table.
+        """
         column_count = self._column_count
         start = row_idx * column_count
         end = start + column_count
@@ -403,7 +406,36 @@ def cells(self) -> tuple[_Cell, ...]:
           layout-grid positions using `.grid_cols_before` and `.grid_cols_after`.
 
         """
-        return tuple(self.table.row_cells(self._index))
+
+        def iter_tc_cells(tc: CT_Tc) -> Iterator[_Cell]:
+            """Generate a cell object for each layout-grid cell in `tc`.
+
+            In particular, a `<w:tc>` element with a horizontal "span" with generate the same cell
+            multiple times, one for each grid-cell being spanned. This approximates a row in a
+            "uniform" table, where each row has a cell for each column in the table.
+            """
+            # -- a cell comprising the second or later row of a vertical span is indicated by
+            # -- tc.vMerge="continue" (the default value of the `w:vMerge` attribute, when it is
+            # -- present in the XML). The `w:tc` element at the same grid-offset in the prior row
+            # -- is guaranteed to be the same width (gridSpan). So we can delegate content
+            # -- discovery to that prior-row `w:tc` element (recursively) until we arrive at the
+            # -- "root" cell -- for the vertical span.
+            if tc.vMerge == "continue":
+                yield from iter_tc_cells(tc._tc_above)  # pyright: ignore[reportPrivateUsage]
+                return
+
+            # -- Otherwise, vMerge is either "restart" or None, meaning this `tc` holds the actual
+            # -- content of the cell (whether it is vertically merged or not).
+            cell = _Cell(tc, self.table)
+            for _ in range(tc.grid_span):
+                yield cell
+
+        def _iter_row_cells() -> Iterator[_Cell]:
+            """Generate `_Cell` instance for each populated layout-grid cell in this row."""
+            for tc in self._tr.tc_lst:
+                yield from iter_tc_cells(tc)
+
+        return tuple(_iter_row_cells())
 
     @property
     def grid_cols_after(self) -> int:
diff --git a/tests/test_table.py b/tests/test_table.py
index 993fb3f23..479d670c6 100644
--- a/tests/test_table.py
+++ b/tests/test_table.py
@@ -782,18 +782,41 @@ def it_can_change_its_height_rule(
         row.height_rule = new_value
         assert row._tr.xml == xml(expected_cxml)
 
+    @pytest.mark.parametrize(
+        ("tbl_cxml", "row_idx", "expected_len"),
+        [
+            # -- cell corresponds to single layout-grid cell --
+            ("w:tbl/w:tr/w:tc/w:p", 0, 1),
+            # -- cell has a horizontal span --
+            ("w:tbl/w:tr/w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p)", 0, 2),
+            # -- cell is in latter row of vertical span --
+            (
+                "w:tbl/(w:tr/w:tc/(w:tcPr/w:vMerge{w:val=restart},w:p),"
+                "w:tr/w:tc/(w:tcPr/w:vMerge,w:p))",
+                1,
+                1,
+            ),
+            # -- cell both has horizontal span and is latter row of vertical span --
+            (
+                "w:tbl/(w:tr/w:tc/(w:tcPr/(w:gridSpan{w:val=2},w:vMerge{w:val=restart}),w:p),"
+                "w:tr/w:tc/(w:tcPr/(w:gridSpan{w:val=2},w:vMerge),w:p))",
+                1,
+                2,
+            ),
+        ],
+    )
     def it_provides_access_to_its_cells(
-        self, _index_prop_: Mock, table_prop_: Mock, table_: Mock, parent_: Mock
+        self, tbl_cxml: str, row_idx: int, expected_len: int, parent_: Mock
     ):
-        row = _Row(cast(CT_Row, element("w:tr")), parent_)
-        _index_prop_.return_value = row_idx = 6
-        expected_cells = (1, 2, 3)
-        table_.row_cells.return_value = list(expected_cells)
+        tbl = cast(CT_Tbl, element(tbl_cxml))
+        tr = tbl.tr_lst[row_idx]
+        table = Table(tbl, parent_)
+        row = _Row(tr, table)
 
         cells = row.cells
 
-        table_.row_cells.assert_called_once_with(row_idx)
-        assert cells == expected_cells
+        assert len(cells) == expected_len
+        assert all(type(c) is _Cell for c in cells)
 
     def it_provides_access_to_the_table_it_belongs_to(self, parent_: Mock, table_: Mock):
         parent_.table = table_
@@ -821,7 +844,7 @@ def table_(self, request: FixtureRequest):
 
     @pytest.fixture
     def table_prop_(self, request: FixtureRequest, table_: Mock):
-        return property_mock(request, _Row, "table", return_value=table_)
+        return property_mock(request, _Row, "table")
 
 
 class Describe_Rows:

From 89b399b8c4147c0214d8348469209547d50962c8 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Sun, 28 Apr 2024 18:03:06 -0700
Subject: [PATCH 325/367] feat(typing): add py.typed, improve public types

---
 src/docx/api.py              | 10 +++++---
 src/docx/oxml/text/parfmt.py | 45 +++++++++++++++++++++++++-----------
 src/docx/parts/document.py   |  3 ++-
 src/docx/py.typed            |  0
 4 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 src/docx/py.typed

diff --git a/src/docx/api.py b/src/docx/api.py
index a17c1dad4..aea876458 100644
--- a/src/docx/api.py
+++ b/src/docx/api.py
@@ -6,13 +6,17 @@
 from __future__ import annotations
 
 import os
-from typing import IO
+from typing import IO, TYPE_CHECKING, cast
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.package import Package
 
+if TYPE_CHECKING:
+    from docx.document import Document as DocumentObject
+    from docx.parts.document import DocumentPart
 
-def Document(docx: str | IO[bytes] | None = None):
+
+def Document(docx: str | IO[bytes] | None = None) -> DocumentObject:
     """Return a |Document| object loaded from `docx`, where `docx` can be either a path
     to a ``.docx`` file (a string) or a file-like object.
 
@@ -20,7 +24,7 @@ def Document(docx: str | IO[bytes] | None = None):
     loaded.
     """
     docx = _default_docx_path() if docx is None else docx
-    document_part = Package.open(docx).main_document_part
+    document_part = cast("DocumentPart", Package.open(docx).main_document_part)
     if document_part.content_type != CT.WML_DOCUMENT_MAIN:
         tmpl = "file '%s' is not a Word file, content type is '%s'"
         raise ValueError(tmpl % (docx, document_part.content_type))
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index 94e802938..de5609636 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -28,10 +28,18 @@
 class CT_Ind(BaseOxmlElement):
     """``<w:ind>`` element, specifying paragraph indentation."""
 
-    left = OptionalAttribute("w:left", ST_SignedTwipsMeasure)
-    right = OptionalAttribute("w:right", ST_SignedTwipsMeasure)
-    firstLine = OptionalAttribute("w:firstLine", ST_TwipsMeasure)
-    hanging = OptionalAttribute("w:hanging", ST_TwipsMeasure)
+    left: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:left", ST_SignedTwipsMeasure
+    )
+    right: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:right", ST_SignedTwipsMeasure
+    )
+    firstLine: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:firstLine", ST_TwipsMeasure
+    )
+    hanging: Length | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:hanging", ST_TwipsMeasure
+    )
 
 
 class CT_Jc(BaseOxmlElement):
@@ -45,6 +53,7 @@ class CT_Jc(BaseOxmlElement):
 class CT_PPr(BaseOxmlElement):
     """``<w:pPr>`` element, containing the properties for a paragraph."""
 
+    get_or_add_ind: Callable[[], CT_Ind]
     get_or_add_pStyle: Callable[[], CT_String]
     _insert_sectPr: Callable[[CT_SectPr], None]
     _remove_pStyle: Callable[[], None]
@@ -98,13 +107,15 @@ class CT_PPr(BaseOxmlElement):
     numPr = ZeroOrOne("w:numPr", successors=_tag_seq[7:])
     tabs = ZeroOrOne("w:tabs", successors=_tag_seq[11:])
     spacing = ZeroOrOne("w:spacing", successors=_tag_seq[22:])
-    ind = ZeroOrOne("w:ind", successors=_tag_seq[23:])
+    ind: CT_Ind | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:ind", successors=_tag_seq[23:]
+    )
     jc = ZeroOrOne("w:jc", successors=_tag_seq[27:])
     sectPr = ZeroOrOne("w:sectPr", successors=_tag_seq[35:])
     del _tag_seq
 
     @property
-    def first_line_indent(self):
+    def first_line_indent(self) -> Length | None:
         """A |Length| value calculated from the values of `w:ind/@w:firstLine` and
         `w:ind/@w:hanging`.
 
@@ -122,7 +133,7 @@ def first_line_indent(self):
         return firstLine
 
     @first_line_indent.setter
-    def first_line_indent(self, value):
+    def first_line_indent(self, value: Length | None):
         if self.ind is None and value is None:
             return
         ind = self.get_or_add_ind()
@@ -135,7 +146,7 @@ def first_line_indent(self, value):
             ind.firstLine = value
 
     @property
-    def ind_left(self):
+    def ind_left(self) -> Length | None:
         """The value of `w:ind/@w:left` or |None| if not present."""
         ind = self.ind
         if ind is None:
@@ -143,14 +154,14 @@ def ind_left(self):
         return ind.left
 
     @ind_left.setter
-    def ind_left(self, value):
+    def ind_left(self, value: Length | None):
         if value is None and self.ind is None:
             return
         ind = self.get_or_add_ind()
         ind.left = value
 
     @property
-    def ind_right(self):
+    def ind_right(self) -> Length | None:
         """The value of `w:ind/@w:right` or |None| if not present."""
         ind = self.ind
         if ind is None:
@@ -158,7 +169,7 @@ def ind_right(self):
         return ind.right
 
     @ind_right.setter
-    def ind_right(self, value):
+    def ind_right(self, value: Length | None):
         if value is None and self.ind is None:
             return
         ind = self.get_or_add_ind()
@@ -340,9 +351,15 @@ class CT_TabStop(BaseOxmlElement):
     only needs a __str__ method.
     """
 
-    val = RequiredAttribute("w:val", WD_TAB_ALIGNMENT)
-    leader = OptionalAttribute("w:leader", WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES)
-    pos = RequiredAttribute("w:pos", ST_SignedTwipsMeasure)
+    val: WD_TAB_ALIGNMENT = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", WD_TAB_ALIGNMENT
+    )
+    leader: WD_TAB_LEADER | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:leader", WD_TAB_LEADER, default=WD_TAB_LEADER.SPACES
+    )
+    pos: Length = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:pos", ST_SignedTwipsMeasure
+    )
 
     def __str__(self) -> str:
         """Text equivalent of a `w:tab` element appearing in a run.
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index a157764b9..81e621c1a 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -16,6 +16,7 @@
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from docx.opc.coreprops import CoreProperties
     from docx.styles.style import BaseStyle
 
 
@@ -41,7 +42,7 @@ def add_header_part(self):
         return header_part, rId
 
     @property
-    def core_properties(self):
+    def core_properties(self) -> CoreProperties:
         """A |CoreProperties| object providing read/write access to the core properties
         of this document."""
         return self.package.core_properties
diff --git a/src/docx/py.typed b/src/docx/py.typed
new file mode 100644
index 000000000..e69de29bb

From 94802e4af62cf68469bcc0176789f158b39e3404 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 29 Apr 2024 16:57:06 -0700
Subject: [PATCH 326/367] fix: fix some shortlist issues

---
 pyproject.toml               |  2 +-
 src/docx/enum/base.py        | 11 +++++------
 src/docx/image/image.py      | 32 ++++++++++++--------------------
 src/docx/oxml/ns.py          |  6 +++---
 src/docx/oxml/simpletypes.py | 18 ++++++------------
 src/docx/text/paragraph.py   | 12 +++---------
 6 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8c0518a96..8d483f00b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ classifiers = [
 ]
 dependencies = [
     "lxml>=3.1.0",
-    "typing_extensions",
+    "typing_extensions>=4.9.0",
 ]
 description = "Create, read, and update Microsoft Word .docx files."
 dynamic = ["version"]
diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index e37e74299..bc96ab6a2 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -4,9 +4,10 @@
 
 import enum
 import textwrap
-from typing import Any, Dict, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Dict, Type, TypeVar
 
-from typing_extensions import Self
+if TYPE_CHECKING:
+    from typing_extensions import Self
 
 _T = TypeVar("_T", bound="BaseXmlEnum")
 
@@ -69,7 +70,7 @@ def to_xml(cls: Type[_T], value: int | _T | None) -> str | None:
         """XML value of this enum member, generally an XML attribute value."""
         # -- presence of multi-arg `__new__()` method fools type-checker, but getting a
         # -- member by its value using EnumCls(val) works as usual.
-        return cls(value).xml_value  # pyright: ignore[reportGeneralTypeIssues]
+        return cls(value).xml_value
 
 
 class DocsPageFormatter:
@@ -129,9 +130,7 @@ def _member_defs(self):
         """A single string containing the aggregated member definitions section of the
         documentation page."""
         members = self._clsdict["__members__"]
-        member_defs = [
-            self._member_def(member) for member in members if member.name is not None
-        ]
+        member_defs = [self._member_def(member) for member in members if member.name is not None]
         return "\n".join(member_defs)
 
     @property
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 945432872..710546fdb 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -11,8 +11,6 @@
 import os
 from typing import IO, Tuple
 
-from typing_extensions import Self
-
 from docx.image.exceptions import UnrecognizedImageError
 from docx.shared import Emu, Inches, Length, lazyproperty
 
@@ -28,14 +26,14 @@ def __init__(self, blob: bytes, filename: str, image_header: BaseImageHeader):
         self._image_header = image_header
 
     @classmethod
-    def from_blob(cls, blob: bytes) -> Self:
+    def from_blob(cls, blob: bytes) -> Image:
         """Return a new |Image| subclass instance parsed from the image binary contained
         in `blob`."""
         stream = io.BytesIO(blob)
         return cls._from_stream(stream, blob)
 
     @classmethod
-    def from_file(cls, image_descriptor):
+    def from_file(cls, image_descriptor: str | IO[bytes]):
         """Return a new |Image| subclass instance loaded from the image file identified
         by `image_descriptor`, a path or file-like object."""
         if isinstance(image_descriptor, str):
@@ -57,7 +55,7 @@ def blob(self):
         return self._blob
 
     @property
-    def content_type(self):
+    def content_type(self) -> str:
         """MIME content type for this image, e.g. ``'image/jpeg'`` for a JPEG image."""
         return self._image_header.content_type
 
@@ -167,12 +165,11 @@ def _from_stream(
         return cls(blob, filename, image_header)
 
 
-def _ImageHeaderFactory(stream):
-    """Return a |BaseImageHeader| subclass instance that knows how to parse the headers
-    of the image in `stream`."""
+def _ImageHeaderFactory(stream: IO[bytes]):
+    """A |BaseImageHeader| subclass instance that can parse headers of image in `stream`."""
     from docx.image import SIGNATURES
 
-    def read_32(stream):
+    def read_32(stream: IO[bytes]):
         stream.seek(0)
         return stream.read(32)
 
@@ -188,32 +185,27 @@ def read_32(stream):
 class BaseImageHeader:
     """Base class for image header subclasses like |Jpeg| and |Tiff|."""
 
-    def __init__(self, px_width, px_height, horz_dpi, vert_dpi):
+    def __init__(self, px_width: int, px_height: int, horz_dpi: int, vert_dpi: int):
         self._px_width = px_width
         self._px_height = px_height
         self._horz_dpi = horz_dpi
         self._vert_dpi = vert_dpi
 
     @property
-    def content_type(self):
+    def content_type(self) -> str:
         """Abstract property definition, must be implemented by all subclasses."""
-        msg = (
-            "content_type property must be implemented by all subclasses of "
-            "BaseImageHeader"
-        )
+        msg = "content_type property must be implemented by all subclasses of " "BaseImageHeader"
         raise NotImplementedError(msg)
 
     @property
-    def default_ext(self):
+    def default_ext(self) -> str:
         """Default filename extension for images of this type.
 
         An abstract property definition, must be implemented by all subclasses.
         """
-        msg = (
-            "default_ext property must be implemented by all subclasses of "
-            "BaseImageHeader"
+        raise NotImplementedError(
+            "default_ext property must be implemented by all subclasses of " "BaseImageHeader"
         )
-        raise NotImplementedError(msg)
 
     @property
     def px_width(self):
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index 3238864e9..5bed1e6a0 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -1,8 +1,8 @@
 """Namespace-related objects."""
 
-from typing import Any, Dict
+from __future__ import annotations
 
-from typing_extensions import Self
+from typing import Any, Dict
 
 nsmap = {
     "a": "http://schemas.openxmlformats.org/drawingml/2006/main",
@@ -41,7 +41,7 @@ def clark_name(self) -> str:
         return "{%s}%s" % (self._ns_uri, self._local_part)
 
     @classmethod
-    def from_clark_name(cls, clark_name: str) -> Self:
+    def from_clark_name(cls, clark_name: str) -> NamespacePrefixedTag:
         nsuri, local_name = clark_name[1:].split("}")
         nstag = "%s:%s" % (pfxmap[nsuri], local_name)
         return cls(nstag)
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index debb5dc3c..dd10ab910 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -36,12 +36,10 @@ def convert_from_xml(cls, str_value: str) -> Any:
         return int(str_value)
 
     @classmethod
-    def convert_to_xml(cls, value: Any) -> str:
-        ...
+    def convert_to_xml(cls, value: Any) -> str: ...
 
     @classmethod
-    def validate(cls, value: Any) -> None:
-        ...
+    def validate(cls, value: Any) -> None: ...
 
     @classmethod
     def validate_int(cls, value: object):
@@ -49,9 +47,7 @@ def validate_int(cls, value: object):
             raise TypeError("value must be <type 'int'>, got %s" % type(value))
 
     @classmethod
-    def validate_int_in_range(
-        cls, value: int, min_inclusive: int, max_inclusive: int
-    ) -> None:
+    def validate_int_in_range(cls, value: int, min_inclusive: int, max_inclusive: int) -> None:
         cls.validate_int(value)
         if value < min_inclusive or value > max_inclusive:
             raise ValueError(
@@ -129,8 +125,7 @@ def convert_to_xml(cls, value: bool) -> str:
     def validate(cls, value: Any) -> None:
         if value not in (True, False):
             raise TypeError(
-                "only True or False (and possibly None) may be assigned, got"
-                " '%s'" % value
+                "only True or False (and possibly None) may be assigned, got" " '%s'" % value
             )
 
 
@@ -248,8 +243,7 @@ def validate(cls, value: Any) -> None:
         # must be an RGBColor object ---
         if not isinstance(value, RGBColor):
             raise ValueError(
-                "rgb color value must be RGBColor object, got %s %s"
-                % (type(value), value)
+                "rgb color value must be RGBColor object, got %s %s" % (type(value), value)
             )
 
 
@@ -316,7 +310,7 @@ class ST_SignedTwipsMeasure(XsdInt):
     def convert_from_xml(cls, str_value: str) -> Length:
         if "i" in str_value or "m" in str_value or "p" in str_value:
             return ST_UniversalMeasure.convert_from_xml(str_value)
-        return Twips(int(str_value))
+        return Twips(int(round(float(str_value))))
 
     @classmethod
     def convert_to_xml(cls, value: int | Length) -> str:
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 0a5d67674..89c032586 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -4,8 +4,6 @@
 
 from typing import TYPE_CHECKING, Iterator, List, cast
 
-from typing_extensions import Self
-
 from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.oxml.text.run import CT_R
@@ -29,9 +27,7 @@ def __init__(self, p: CT_P, parent: t.ProvidesStoryPart):
         super(Paragraph, self).__init__(parent)
         self._p = self._element = p
 
-    def add_run(
-        self, text: str | None = None, style: str | CharacterStyle | None = None
-    ) -> Run:
+    def add_run(self, text: str | None = None, style: str | CharacterStyle | None = None) -> Run:
         """Append run containing `text` and having character-style `style`.
 
         `text` can contain tab (``\\t``) characters, which are converted to the
@@ -82,7 +78,7 @@ def hyperlinks(self) -> List[Hyperlink]:
 
     def insert_paragraph_before(
         self, text: str | None = None, style: str | ParagraphStyle | None = None
-    ) -> Self:
+    ) -> Paragraph:
         """Return a newly created paragraph, inserted directly before this paragraph.
 
         If `text` is supplied, the new paragraph contains that text in a single run. If
@@ -123,9 +119,7 @@ def rendered_page_breaks(self) -> List[RenderedPageBreak]:
         Most often an empty list, sometimes contains one page-break, but can contain
         more than one is rare or contrived cases.
         """
-        return [
-            RenderedPageBreak(lrpb, self) for lrpb in self._p.lastRenderedPageBreaks
-        ]
+        return [RenderedPageBreak(lrpb, self) for lrpb in self._p.lastRenderedPageBreaks]
 
     @property
     def runs(self) -> List[Run]:

From 5a80006553f982ef47ebc9b4eb3652452b3c07e7 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 29 Apr 2024 17:53:03 -0700
Subject: [PATCH 327/367] fix(packaging): small packaging and doc tweaks

`lxml` won't install on Apple Silicon after `4.9.2`.

Dropping testing for Python 3.7.
---
 pyproject.toml        | 2 +-
 requirements-docs.txt | 1 +
 tox.ini               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8d483f00b..ad89abd19 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = [
-    "lxml>=3.1.0",
+    "lxml>=3.1.0,<=4.9.2",
     "typing_extensions>=4.9.0",
 ]
 description = "Create, read, and update Microsoft Word .docx files."
diff --git a/requirements-docs.txt b/requirements-docs.txt
index 11f9d2cd2..90edd8e31 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -1,4 +1,5 @@
 Sphinx==1.8.6
 Jinja2==2.11.3
 MarkupSafe==0.23
+alabaster<0.7.14
 -e .
diff --git a/tox.ini b/tox.ini
index 1c4e3aea7..f8595ba45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py38, py39, py310, py311
 
 [testenv]
 deps = -rrequirements-test.txt

From 0a09474b4d1def9fef65267ac27c9f5a48346d25 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 29 Apr 2024 18:42:34 -0700
Subject: [PATCH 328/367] rfctr: resolve some import cycles

---
 src/docx/blkcntnr.py         | 12 +++---------
 src/docx/document.py         |  6 ++----
 src/docx/drawing/__init__.py |  6 +++++-
 src/docx/shared.py           |  6 ++----
 src/docx/table.py            |  4 ++--
 src/docx/text/hyperlink.py   | 10 ++++++----
 src/docx/text/pagebreak.py   |  2 +-
 src/docx/text/paragraph.py   |  2 +-
 src/docx/text/run.py         | 10 +++-------
 9 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index 1327e6d08..a9969f6f6 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -18,7 +18,7 @@
 from docx.text.paragraph import Paragraph
 
 if TYPE_CHECKING:
-    from docx import types as t
+    import docx.types as t
     from docx.oxml.document import CT_Body
     from docx.oxml.section import CT_HdrFtr
     from docx.oxml.table import CT_Tc
@@ -41,9 +41,7 @@ def __init__(self, element: BlockItemElement, parent: t.ProvidesStoryPart):
         super(BlockItemContainer, self).__init__(parent)
         self._element = element
 
-    def add_paragraph(
-        self, text: str = "", style: str | ParagraphStyle | None = None
-    ) -> Paragraph:
+    def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = None) -> Paragraph:
         """Return paragraph newly added to the end of the content in this container.
 
         The paragraph has `text` in a single run if present, and is given paragraph
@@ -77,11 +75,7 @@ def iter_inner_content(self) -> Iterator[Paragraph | Table]:
         from docx.table import Table
 
         for element in self._element.inner_content_elements:
-            yield (
-                Paragraph(element, self)
-                if isinstance(element, CT_P)
-                else Table(element, self)
-            )
+            yield (Paragraph(element, self) if isinstance(element, CT_P) else Table(element, self))
 
     @property
     def paragraphs(self):
diff --git a/src/docx/document.py b/src/docx/document.py
index 4deb8aa8e..8944a0e50 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -14,7 +14,7 @@
 from docx.shared import ElementProxy, Emu
 
 if TYPE_CHECKING:
-    from docx import types as t
+    import docx.types as t
     from docx.oxml.document import CT_Body, CT_Document
     from docx.parts.document import DocumentPart
     from docx.settings import Settings
@@ -56,9 +56,7 @@ def add_page_break(self):
         paragraph.add_run().add_break(WD_BREAK.PAGE)
         return paragraph
 
-    def add_paragraph(
-        self, text: str = "", style: str | ParagraphStyle | None = None
-    ) -> Paragraph:
+    def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = None) -> Paragraph:
         """Return paragraph newly added to the end of the document.
 
         The paragraph is populated with `text` and having paragraph style `style`.
diff --git a/src/docx/drawing/__init__.py b/src/docx/drawing/__init__.py
index 03c9c5ab8..f40205747 100644
--- a/src/docx/drawing/__init__.py
+++ b/src/docx/drawing/__init__.py
@@ -2,10 +2,14 @@
 
 from __future__ import annotations
 
-from docx import types as t
+from typing import TYPE_CHECKING
+
 from docx.oxml.drawing import CT_Drawing
 from docx.shared import Parented
 
+if TYPE_CHECKING:
+    import docx.types as t
+
 
 class Drawing(Parented):
     """Container for a DrawingML object."""
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 7b696202f..491d42741 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -16,7 +16,7 @@
 )
 
 if TYPE_CHECKING:
-    from docx import types as t
+    import docx.types as t
     from docx.opc.part import XmlPart
     from docx.oxml.xmlchemy import BaseOxmlElement
     from docx.parts.story import StoryPart
@@ -284,9 +284,7 @@ class ElementProxy:
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    def __init__(
-        self, element: BaseOxmlElement, parent: t.ProvidesXmlPart | None = None
-    ):
+    def __init__(self, element: BaseOxmlElement, parent: t.ProvidesXmlPart | None = None):
         self._element = element
         self._parent = parent
 
diff --git a/src/docx/table.py b/src/docx/table.py
index 556e66be8..545c46884 100644
--- a/src/docx/table.py
+++ b/src/docx/table.py
@@ -6,7 +6,6 @@
 
 from typing_extensions import TypeAlias
 
-from docx import types as t
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT
@@ -15,6 +14,7 @@
 from docx.shared import Inches, Parented, StoryChild, lazyproperty
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.enum.table import WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
     from docx.oxml.table import CT_Row, CT_Tbl, CT_TblPr, CT_Tc
     from docx.shared import Length
@@ -193,7 +193,7 @@ class _Cell(BlockItemContainer):
     """Table cell."""
 
     def __init__(self, tc: CT_Tc, parent: TableParent):
-        super(_Cell, self).__init__(tc, cast(t.ProvidesStoryPart, parent))
+        super(_Cell, self).__init__(tc, cast("t.ProvidesStoryPart", parent))
         self._parent = parent
         self._tc = self._element = tc
 
diff --git a/src/docx/text/hyperlink.py b/src/docx/text/hyperlink.py
index 705a97ee4..a23df1c74 100644
--- a/src/docx/text/hyperlink.py
+++ b/src/docx/text/hyperlink.py
@@ -7,13 +7,15 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import TYPE_CHECKING
 
-from docx import types as t
-from docx.oxml.text.hyperlink import CT_Hyperlink
 from docx.shared import Parented
 from docx.text.run import Run
 
+if TYPE_CHECKING:
+    import docx.types as t
+    from docx.oxml.text.hyperlink import CT_Hyperlink
+
 
 class Hyperlink(Parented):
     """Proxy object wrapping a `<w:hyperlink>` element.
@@ -78,7 +80,7 @@ def fragment(self) -> str:
         return self._hyperlink.anchor or ""
 
     @property
-    def runs(self) -> List[Run]:
+    def runs(self) -> list[Run]:
         """List of |Run| instances in this hyperlink.
 
         Together these define the visible text of the hyperlink. The text of a hyperlink
diff --git a/src/docx/text/pagebreak.py b/src/docx/text/pagebreak.py
index a5e68b5aa..0977ccea9 100644
--- a/src/docx/text/pagebreak.py
+++ b/src/docx/text/pagebreak.py
@@ -4,11 +4,11 @@
 
 from typing import TYPE_CHECKING
 
-from docx import types as t
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.shared import Parented
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.text.paragraph import Paragraph
 
 
diff --git a/src/docx/text/paragraph.py b/src/docx/text/paragraph.py
index 89c032586..234ea66cb 100644
--- a/src/docx/text/paragraph.py
+++ b/src/docx/text/paragraph.py
@@ -4,7 +4,6 @@
 
 from typing import TYPE_CHECKING, Iterator, List, cast
 
-from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.oxml.text.run import CT_R
 from docx.shared import StoryChild
@@ -15,6 +14,7 @@
 from docx.text.run import Run
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
     from docx.oxml.text.paragraph import CT_P
     from docx.styles.style import CharacterStyle
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 44c41c0fe..daa604e87 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -4,7 +4,6 @@
 
 from typing import IO, TYPE_CHECKING, Iterator, cast
 
-from docx import types as t
 from docx.drawing import Drawing
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK
@@ -17,6 +16,7 @@
 from docx.text.pagebreak import RenderedPageBreak
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.enum.text import WD_UNDERLINE
     from docx.oxml.text.run import CT_R, CT_Text
     from docx.shared import Length
@@ -170,9 +170,7 @@ def iter_inner_content(self) -> Iterator[str | Drawing | RenderedPageBreak]:
                 yield item
             elif isinstance(item, CT_LastRenderedPageBreak):
                 yield RenderedPageBreak(item, self)
-            elif isinstance(  # pyright: ignore[reportUnnecessaryIsInstance]
-                item, CT_Drawing
-            ):
+            elif isinstance(item, CT_Drawing):  # pyright: ignore[reportUnnecessaryIsInstance]
                 yield Drawing(item, self)
 
     @property
@@ -185,9 +183,7 @@ def style(self) -> CharacterStyle:
         property to |None| removes any directly-applied character style.
         """
         style_id = self._r.style
-        return cast(
-            CharacterStyle, self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
-        )
+        return cast(CharacterStyle, self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER))
 
     @style.setter
     def style(self, style_or_name: str | CharacterStyle | None):

From e531576191d7709e27b77e9f8aecae7fd68e07a0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 29 Apr 2024 19:47:22 -0700
Subject: [PATCH 329/367] release: prepare v1.1.1 release

---
 HISTORY.rst          | 8 ++++++++
 src/docx/__init__.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 8e0b1a588..51262c4b3 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,14 @@
 Release History
 ---------------
 
+1.1.1 (2024-04-29)
+++++++++++++++++++
+
+- Fix #531, #1146 Index error on table with misaligned borders
+- Fix #1335 Tolerate invalid float value in bottom-margin
+- Fix #1337 Do not require typing-extensions at runtime
+
+
 1.1.0 (2023-11-03)
 ++++++++++++++++++
 
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index b214045d1..7a4d0bbe8 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -13,7 +13,7 @@
 if TYPE_CHECKING:
     from docx.opc.part import Part
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 
 __all__ = ["Document"]

From 3f56b7d4f045c92a984491ac45cbfed50f15cdc2 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 1 May 2024 12:19:31 -0700
Subject: [PATCH 330/367] rfctr(dev): use more performant `fd` for clean

---
 Makefile              | 3 ++-
 requirements-test.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0478b2bce..da0d7a4ac 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ build:
 	$(BUILD)
 
 clean:
-	find . -type f -name \*.pyc -exec rm {} \;
+	# find . -type f -name \*.pyc -exec rm {} \;
+	fd -e pyc -I -x rm
 	rm -rf dist *.egg-info .coverage .DS_Store
 
 cleandocs:
diff --git a/requirements-test.txt b/requirements-test.txt
index 9ee78b43f..b542c1af7 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,5 +2,6 @@
 behave>=1.2.3
 pyparsing>=2.0.1
 pytest>=2.5
+pytest-coverage
 pytest-xdist
 ruff

From e4934749b8c94bec743467f7c0e26384eacbd9a4 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 30 Apr 2024 23:13:57 -0700
Subject: [PATCH 331/367] fix: XmlPart._rel_ref_count

`.rel_ref_count()` as implemented was only applicable to `XmlPart` where
references to a related part could be present in the XML. Longer term it
probably makes sense to override `Part.drop_rel()` in `XmlPart` and not
have a `_rel_ref_count()` method in `part` at all, but this works and is
less potentially disruptive.
---
 src/docx/opc/part.py   | 19 +++++++++++++------
 tests/opc/test_part.py | 39 +++++++++++++++++++++++++--------------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index 142f49dd1..1353bb850 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, Dict, Type
+from typing import TYPE_CHECKING, Callable, Dict, Type, cast
 
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
@@ -149,11 +149,12 @@ def target_ref(self, rId: str) -> str:
         rel = self.rels[rId]
         return rel.target_ref
 
-    def _rel_ref_count(self, rId):
-        """Return the count of references in this part's XML to the relationship
-        identified by `rId`."""
-        rIds = self._element.xpath("//@r:id")
-        return len([_rId for _rId in rIds if _rId == rId])
+    def _rel_ref_count(self, rId: str) -> int:
+        """Return the count of references in this part to the relationship identified by `rId`.
+
+        Only an XML part can contain references, so this is 0 for `Part`.
+        """
+        return 0
 
 
 class PartFactory:
@@ -231,3 +232,9 @@ def part(self):
         That chain of delegation ends here for child objects.
         """
         return self
+
+    def _rel_ref_count(self, rId: str) -> int:
+        """Return the count of references in this part's XML to the relationship
+        identified by `rId`."""
+        rIds = cast("list[str]", self._element.xpath("//@r:id"))
+        return len([_rId for _rId in rIds if _rId == rId])
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index 03eacd361..b156a63f8 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -169,24 +169,13 @@ def it_can_establish_an_external_relationship(self, rels_prop_: Mock, rels_: Moc
         rels_.get_or_add_ext_rel.assert_called_once_with("http://rel/type", "https://hyper/link")
         assert rId == "rId27"
 
-    @pytest.mark.parametrize(
-        ("part_cxml", "rel_should_be_dropped"),
-        [
-            ("w:p", True),
-            ("w:p/r:a{r:id=rId42}", True),
-            ("w:p/r:a{r:id=rId42}/r:b{r:id=rId42}", False),
-        ],
-    )
-    def it_can_drop_a_relationship(
-        self, part_cxml: str, rel_should_be_dropped: bool, rels_prop_: Mock
-    ):
+    def it_can_drop_a_relationship(self, rels_prop_: Mock):
         rels_prop_.return_value = {"rId42": None}
-        part = Part("partname", "content_type")
-        part._element = element(part_cxml)  # pyright: ignore[reportAttributeAccessIssue]
+        part = Part(PackURI("/partname"), "content_type")
 
         part.drop_rel("rId42")
 
-        assert ("rId42" not in part.rels) is rel_should_be_dropped
+        assert "rId42" not in part.rels
 
     def it_can_find_a_related_part_by_reltype(
         self, rels_prop_: Mock, rels_: Mock, other_part_: Mock
@@ -411,6 +400,24 @@ def it_knows_its_the_part_for_its_child_objects(self, part_fixture):
         xml_part = part_fixture
         assert xml_part.part is xml_part
 
+    @pytest.mark.parametrize(
+        ("part_cxml", "rel_should_be_dropped"),
+        [
+            ("w:p", True),
+            ("w:p/r:a{r:id=rId42}", True),
+            ("w:p/r:a{r:id=rId42}/r:b{r:id=rId42}", False),
+        ],
+    )
+    def it_only_drops_a_relationship_with_zero_reference_count(
+        self, part_cxml: str, rel_should_be_dropped: bool, rels_prop_: Mock, package_: Mock
+    ):
+        rels_prop_.return_value = {"rId42": None}
+        part = XmlPart(PackURI("/partname"), "content_type", element(part_cxml), package_)
+
+        part.drop_rel("rId42")
+
+        assert ("rId42" not in part.rels) is rel_should_be_dropped
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
@@ -452,6 +459,10 @@ def parse_xml_(self, request, element_):
     def partname_(self, request):
         return instance_mock(request, PackURI)
 
+    @pytest.fixture
+    def rels_prop_(self, request: FixtureRequest):
+        return property_mock(request, XmlPart, "rels")
+
     @pytest.fixture
     def serialize_part_xml_(self, request):
         return function_mock(request, "docx.opc.part.serialize_part_xml")

From f246fde2534e0e0de3c942164db7251f0693d962 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 30 Apr 2024 11:07:39 -0700
Subject: [PATCH 332/367] rfctr: improve typing

---
 features/steps/coreprops.py       |  17 +-
 src/docx/enum/__init__.py         |  11 --
 src/docx/image/image.py           |   2 +-
 src/docx/opc/coreprops.py         |  33 ++--
 src/docx/opc/oxml.py              |  13 +-
 src/docx/opc/package.py           |  18 ++-
 src/docx/opc/packuri.py           |  18 +--
 src/docx/opc/part.py              |  29 ++--
 src/docx/opc/parts/coreprops.py   |  21 ++-
 src/docx/opc/rel.py               |  35 ++--
 src/docx/oxml/coreprops.py        |  71 ++++----
 src/docx/oxml/document.py         |   2 +-
 src/docx/oxml/parser.py           |   2 +-
 src/docx/oxml/settings.py         |  25 ++-
 src/docx/oxml/shape.py            |  56 ++++---
 src/docx/oxml/shared.py           |   6 +-
 src/docx/oxml/styles.py           |   8 +-
 src/docx/oxml/table.py            |   2 +-
 src/docx/oxml/text/font.py        |  32 ++--
 src/docx/package.py               |  21 ++-
 src/docx/parts/document.py        |  11 +-
 src/docx/parts/hdrftr.py          |  18 ++-
 src/docx/parts/image.py           |  15 +-
 src/docx/parts/settings.py        |  31 ++--
 src/docx/parts/story.py           |   8 +-
 src/docx/section.py               |  12 +-
 src/docx/settings.py              |  21 ++-
 src/docx/shape.py                 |  26 ++-
 src/docx/text/run.py              |   4 +-
 tests/opc/parts/test_coreprops.py |  35 ++--
 tests/opc/test_coreprops.py       | 258 +++++++++++++++---------------
 tests/opc/test_part.py            | 101 ++++--------
 32 files changed, 501 insertions(+), 461 deletions(-)

diff --git a/features/steps/coreprops.py b/features/steps/coreprops.py
index 0f6b6a854..0d4e55eb7 100644
--- a/features/steps/coreprops.py
+++ b/features/steps/coreprops.py
@@ -3,6 +3,7 @@
 from datetime import datetime, timedelta
 
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
 from docx.opc.coreprops import CoreProperties
@@ -13,12 +14,12 @@
 
 
 @given("a document having known core properties")
-def given_a_document_having_known_core_properties(context):
+def given_a_document_having_known_core_properties(context: Context):
     context.document = Document(test_docx("doc-coreprops"))
 
 
 @given("a document having no core properties part")
-def given_a_document_having_no_core_properties_part(context):
+def given_a_document_having_no_core_properties_part(context: Context):
     context.document = Document(test_docx("doc-no-coreprops"))
 
 
@@ -26,12 +27,12 @@ def given_a_document_having_no_core_properties_part(context):
 
 
 @when("I access the core properties object")
-def when_I_access_the_core_properties_object(context):
+def when_I_access_the_core_properties_object(context: Context):
     context.document.core_properties
 
 
 @when("I assign new values to the properties")
-def when_I_assign_new_values_to_the_properties(context):
+def when_I_assign_new_values_to_the_properties(context: Context):
     context.propvals = (
         ("author", "Creator"),
         ("category", "Category"),
@@ -58,7 +59,7 @@ def when_I_assign_new_values_to_the_properties(context):
 
 
 @then("a core properties part with default values is added")
-def then_a_core_properties_part_with_default_values_is_added(context):
+def then_a_core_properties_part_with_default_values_is_added(context: Context):
     core_properties = context.document.core_properties
     assert core_properties.title == "Word Document"
     assert core_properties.last_modified_by == "python-docx"
@@ -71,14 +72,14 @@ def then_a_core_properties_part_with_default_values_is_added(context):
 
 
 @then("I can access the core properties object")
-def then_I_can_access_the_core_properties_object(context):
+def then_I_can_access_the_core_properties_object(context: Context):
     document = context.document
     core_properties = document.core_properties
     assert isinstance(core_properties, CoreProperties)
 
 
 @then("the core property values match the known values")
-def then_the_core_property_values_match_the_known_values(context):
+def then_the_core_property_values_match_the_known_values(context: Context):
     known_propvals = (
         ("author", "Steve Canny"),
         ("category", "Category"),
@@ -106,7 +107,7 @@ def then_the_core_property_values_match_the_known_values(context):
 
 
 @then("the core property values match the new values")
-def then_the_core_property_values_match_the_new_values(context):
+def then_the_core_property_values_match_the_new_values(context: Context):
     core_properties = context.document.core_properties
     for name, expected_value in context.propvals:
         value = getattr(core_properties, name)
diff --git a/src/docx/enum/__init__.py b/src/docx/enum/__init__.py
index bfab52d36..e69de29bb 100644
--- a/src/docx/enum/__init__.py
+++ b/src/docx/enum/__init__.py
@@ -1,11 +0,0 @@
-"""Enumerations used in python-docx."""
-
-
-class Enumeration:
-    @classmethod
-    def from_xml(cls, xml_val):
-        return cls._xml_to_idx[xml_val]
-
-    @classmethod
-    def to_xml(cls, enum_val):
-        return cls._idx_to_xml[enum_val]
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 710546fdb..0022b5b45 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -114,7 +114,7 @@ def height(self) -> Inches:
         return Inches(self.px_height / self.vert_dpi)
 
     def scaled_dimensions(
-        self, width: int | None = None, height: int | None = None
+        self, width: int | Length | None = None, height: int | Length | None = None
     ) -> Tuple[Length, Length]:
         """(cx, cy) pair representing scaled dimensions of this image.
 
diff --git a/src/docx/opc/coreprops.py b/src/docx/opc/coreprops.py
index 2fd9a75c8..c564550d4 100644
--- a/src/docx/opc/coreprops.py
+++ b/src/docx/opc/coreprops.py
@@ -3,12 +3,21 @@
 These are broadly-standardized attributes like author, last-modified, etc.
 """
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from docx.oxml.coreprops import CT_CoreProperties
+
+if TYPE_CHECKING:
+    from docx.oxml.coreprops import CT_CoreProperties
+
 
 class CoreProperties:
     """Corresponds to part named ``/docProps/core.xml``, containing the core document
     properties for this document package."""
 
-    def __init__(self, element):
+    def __init__(self, element: CT_CoreProperties):
         self._element = element
 
     @property
@@ -16,7 +25,7 @@ def author(self):
         return self._element.author_text
 
     @author.setter
-    def author(self, value):
+    def author(self, value: str):
         self._element.author_text = value
 
     @property
@@ -24,7 +33,7 @@ def category(self):
         return self._element.category_text
 
     @category.setter
-    def category(self, value):
+    def category(self, value: str):
         self._element.category_text = value
 
     @property
@@ -32,7 +41,7 @@ def comments(self):
         return self._element.comments_text
 
     @comments.setter
-    def comments(self, value):
+    def comments(self, value: str):
         self._element.comments_text = value
 
     @property
@@ -40,7 +49,7 @@ def content_status(self):
         return self._element.contentStatus_text
 
     @content_status.setter
-    def content_status(self, value):
+    def content_status(self, value: str):
         self._element.contentStatus_text = value
 
     @property
@@ -56,7 +65,7 @@ def identifier(self):
         return self._element.identifier_text
 
     @identifier.setter
-    def identifier(self, value):
+    def identifier(self, value: str):
         self._element.identifier_text = value
 
     @property
@@ -64,7 +73,7 @@ def keywords(self):
         return self._element.keywords_text
 
     @keywords.setter
-    def keywords(self, value):
+    def keywords(self, value: str):
         self._element.keywords_text = value
 
     @property
@@ -72,7 +81,7 @@ def language(self):
         return self._element.language_text
 
     @language.setter
-    def language(self, value):
+    def language(self, value: str):
         self._element.language_text = value
 
     @property
@@ -80,7 +89,7 @@ def last_modified_by(self):
         return self._element.lastModifiedBy_text
 
     @last_modified_by.setter
-    def last_modified_by(self, value):
+    def last_modified_by(self, value: str):
         self._element.lastModifiedBy_text = value
 
     @property
@@ -112,7 +121,7 @@ def subject(self):
         return self._element.subject_text
 
     @subject.setter
-    def subject(self, value):
+    def subject(self, value: str):
         self._element.subject_text = value
 
     @property
@@ -120,7 +129,7 @@ def title(self):
         return self._element.title_text
 
     @title.setter
-    def title(self, value):
+    def title(self, value: str):
         self._element.title_text = value
 
     @property
@@ -128,5 +137,5 @@ def version(self):
         return self._element.version_text
 
     @version.setter
-    def version(self, value):
+    def version(self, value: str):
         self._element.version_text = value
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index 0249de918..7da72f50d 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -7,6 +7,10 @@
 deleted or only hold the package related custom element classes.
 """
 
+from __future__ import annotations
+
+from typing import cast
+
 from lxml import etree
 
 from docx.opc.constants import NAMESPACE as NS
@@ -138,7 +142,7 @@ class CT_Relationship(BaseOxmlElement):
     target part."""
 
     @staticmethod
-    def new(rId, reltype, target, target_mode=RTM.INTERNAL):
+    def new(rId: str, reltype: str, target: str, target_mode: str = RTM.INTERNAL):
         """Return a new ``<Relationship>`` element."""
         xml = '<Relationship xmlns="%s"/>' % nsmap["pr"]
         relationship = parse_xml(xml)
@@ -178,7 +182,7 @@ def target_mode(self):
 class CT_Relationships(BaseOxmlElement):
     """``<Relationships>`` element, the root element in a .rels file."""
 
-    def add_rel(self, rId, reltype, target, is_external=False):
+    def add_rel(self, rId: str, reltype: str, target: str, is_external: bool = False):
         """Add a child ``<Relationship>`` element with attributes set according to
         parameter values."""
         target_mode = RTM.EXTERNAL if is_external else RTM.INTERNAL
@@ -186,11 +190,10 @@ def add_rel(self, rId, reltype, target, is_external=False):
         self.append(relationship)
 
     @staticmethod
-    def new():
+    def new() -> CT_Relationships:
         """Return a new ``<Relationships>`` element."""
         xml = '<Relationships xmlns="%s"/>' % nsmap["pr"]
-        relationships = parse_xml(xml)
-        return relationships
+        return cast(CT_Relationships, parse_xml(xml))
 
     @property
     def Relationship_lst(self):
diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index 148cd39b1..3b1eef256 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import IO, TYPE_CHECKING, Iterator
+from typing import IO, TYPE_CHECKING, Iterator, cast
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.packuri import PACKAGE_URI, PackURI
@@ -14,7 +14,9 @@
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from docx.opc.coreprops import CoreProperties
     from docx.opc.part import Part
+    from docx.opc.rel import _Relationship  # pyright: ignore[reportPrivateUsage]
 
 
 class OpcPackage:
@@ -37,16 +39,18 @@ def after_unmarshal(self):
         pass
 
     @property
-    def core_properties(self):
+    def core_properties(self) -> CoreProperties:
         """|CoreProperties| object providing read/write access to the Dublin Core
         properties for this document."""
         return self._core_properties_part.core_properties
 
-    def iter_rels(self):
+    def iter_rels(self) -> Iterator[_Relationship]:
         """Generate exactly one reference to each relationship in the package by
         performing a depth-first traversal of the rels graph."""
 
-        def walk_rels(source, visited=None):
+        def walk_rels(
+            source: OpcPackage | Part, visited: list[Part] | None = None
+        ) -> Iterator[_Relationship]:
             visited = [] if visited is None else visited
             for rel in source.rels.values():
                 yield rel
@@ -103,7 +107,7 @@ def main_document_part(self):
         """
         return self.part_related_by(RT.OFFICE_DOCUMENT)
 
-    def next_partname(self, template):
+    def next_partname(self, template: str) -> PackURI:
         """Return a |PackURI| instance representing partname matching `template`.
 
         The returned part-name has the next available numeric suffix to distinguish it
@@ -163,13 +167,13 @@ def save(self, pkg_file: str | IO[bytes]):
         PackageWriter.write(pkg_file, self.rels, self.parts)
 
     @property
-    def _core_properties_part(self):
+    def _core_properties_part(self) -> CorePropertiesPart:
         """|CorePropertiesPart| object related to this package.
 
         Creates a default core properties part if one is not present (not common).
         """
         try:
-            return self.part_related_by(RT.CORE_PROPERTIES)
+            return cast(CorePropertiesPart, self.part_related_by(RT.CORE_PROPERTIES))
         except KeyError:
             core_properties_part = CorePropertiesPart.default(self)
             self.relate_to(core_properties_part, RT.CORE_PROPERTIES)
diff --git a/src/docx/opc/packuri.py b/src/docx/opc/packuri.py
index fe330d89b..fdbb67ed8 100644
--- a/src/docx/opc/packuri.py
+++ b/src/docx/opc/packuri.py
@@ -3,6 +3,8 @@
 Also some useful known pack URI strings such as PACKAGE_URI.
 """
 
+from __future__ import annotations
+
 import posixpath
 import re
 
@@ -16,22 +18,21 @@ class PackURI(str):
 
     _filename_re = re.compile("([a-zA-Z]+)([1-9][0-9]*)?")
 
-    def __new__(cls, pack_uri_str):
+    def __new__(cls, pack_uri_str: str):
         if pack_uri_str[0] != "/":
             tmpl = "PackURI must begin with slash, got '%s'"
             raise ValueError(tmpl % pack_uri_str)
         return str.__new__(cls, pack_uri_str)
 
     @staticmethod
-    def from_rel_ref(baseURI, relative_ref):
-        """Return a |PackURI| instance containing the absolute pack URI formed by
-        translating `relative_ref` onto `baseURI`."""
+    def from_rel_ref(baseURI: str, relative_ref: str) -> PackURI:
+        """The absolute PackURI formed by translating `relative_ref` onto `baseURI`."""
         joined_uri = posixpath.join(baseURI, relative_ref)
         abs_uri = posixpath.abspath(joined_uri)
         return PackURI(abs_uri)
 
     @property
-    def baseURI(self):
+    def baseURI(self) -> str:
         """The base URI of this pack URI, the directory portion, roughly speaking.
 
         E.g. ``'/ppt/slides'`` for ``'/ppt/slides/slide1.xml'``. For the package pseudo-
@@ -40,9 +41,8 @@ def baseURI(self):
         return posixpath.split(self)[0]
 
     @property
-    def ext(self):
-        """The extension portion of this pack URI, e.g. ``'xml'`` for
-        ``'/word/document.xml'``.
+    def ext(self) -> str:
+        """The extension portion of this pack URI, e.g. ``'xml'`` for ``'/word/document.xml'``.
 
         Note the period is not included.
         """
@@ -84,7 +84,7 @@ def membername(self):
         """
         return self[1:]
 
-    def relative_ref(self, baseURI):
+    def relative_ref(self, baseURI: str):
         """Return string containing relative reference to package item from `baseURI`.
 
         E.g. PackURI('/ppt/slideLayouts/slideLayout1.xml') would return
diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index 1353bb850..e3887ef41 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -1,8 +1,10 @@
+# pyright: reportImportCycles=false
+
 """Open Packaging Convention (OPC) objects related to package parts."""
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, Dict, Type, cast
+from typing import TYPE_CHECKING, Callable, Type, cast
 
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
@@ -12,6 +14,7 @@
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from docx.oxml.xmlchemy import BaseOxmlElement
     from docx.package import Package
 
 
@@ -24,7 +27,7 @@ class Part:
 
     def __init__(
         self,
-        partname: str,
+        partname: PackURI,
         content_type: str,
         blob: bytes | None = None,
         package: Package | None = None,
@@ -56,13 +59,13 @@ def before_marshal(self):
         pass
 
     @property
-    def blob(self):
+    def blob(self) -> bytes:
         """Contents of this package part as a sequence of bytes.
 
         May be text or binary. Intended to be overridden by subclasses. Default behavior
         is to return load blob.
         """
-        return self._blob
+        return self._blob or b""
 
     @property
     def content_type(self):
@@ -79,7 +82,7 @@ def drop_rel(self, rId: str):
             del self.rels[rId]
 
     @classmethod
-    def load(cls, partname: str, content_type: str, blob: bytes, package: Package):
+    def load(cls, partname: PackURI, content_type: str, blob: bytes, package: Package):
         return cls(partname, content_type, blob, package)
 
     def load_rel(self, reltype: str, target: Part | str, rId: str, is_external: bool = False):
@@ -105,7 +108,7 @@ def partname(self):
         return self._partname
 
     @partname.setter
-    def partname(self, partname):
+    def partname(self, partname: str):
         if not isinstance(partname, PackURI):
             tmpl = "partname must be instance of PackURI, got '%s'"
             raise TypeError(tmpl % type(partname).__name__)
@@ -127,9 +130,9 @@ def relate_to(self, target: Part | str, reltype: str, is_external: bool = False)
         new relationship is created.
         """
         if is_external:
-            return self.rels.get_or_add_ext_rel(reltype, target)
+            return self.rels.get_or_add_ext_rel(reltype, cast(str, target))
         else:
-            rel = self.rels.get_or_add(reltype, target)
+            rel = self.rels.get_or_add(reltype, cast(Part, target))
             return rel.rId
 
     @property
@@ -171,12 +174,12 @@ class PartFactory:
     """
 
     part_class_selector: Callable[[str, str], Type[Part] | None] | None
-    part_type_for: Dict[str, Type[Part]] = {}
+    part_type_for: dict[str, Type[Part]] = {}
     default_part_type = Part
 
     def __new__(
         cls,
-        partname: str,
+        partname: PackURI,
         content_type: str,
         reltype: str,
         blob: bytes,
@@ -206,7 +209,9 @@ class XmlPart(Part):
     reserializing the XML payload and managing relationships to other parts.
     """
 
-    def __init__(self, partname, content_type, element, package):
+    def __init__(
+        self, partname: PackURI, content_type: str, element: BaseOxmlElement, package: Package
+    ):
         super(XmlPart, self).__init__(partname, content_type, package=package)
         self._element = element
 
@@ -220,7 +225,7 @@ def element(self):
         return self._element
 
     @classmethod
-    def load(cls, partname, content_type, blob, package):
+    def load(cls, partname: PackURI, content_type: str, blob: bytes, package: Package):
         element = parse_xml(blob)
         return cls(partname, content_type, element, package)
 
diff --git a/src/docx/opc/parts/coreprops.py b/src/docx/opc/parts/coreprops.py
index 6e26e1d05..0d818f18d 100644
--- a/src/docx/opc/parts/coreprops.py
+++ b/src/docx/opc/parts/coreprops.py
@@ -1,6 +1,9 @@
 """Core properties part, corresponds to ``/docProps/core.xml`` part in package."""
 
-from datetime import datetime
+from __future__ import annotations
+
+import datetime as dt
+from typing import TYPE_CHECKING
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.coreprops import CoreProperties
@@ -8,13 +11,19 @@
 from docx.opc.part import XmlPart
 from docx.oxml.coreprops import CT_CoreProperties
 
+if TYPE_CHECKING:
+    from docx.opc.package import OpcPackage
+
 
 class CorePropertiesPart(XmlPart):
-    """Corresponds to part named ``/docProps/core.xml``, containing the core document
-    properties for this document package."""
+    """Corresponds to part named ``/docProps/core.xml``.
+
+    The "core" is short for "Dublin Core" and contains document metadata relatively common across
+    documents of all types, not just DOCX.
+    """
 
     @classmethod
-    def default(cls, package):
+    def default(cls, package: OpcPackage):
         """Return a new |CorePropertiesPart| object initialized with default values for
         its base properties."""
         core_properties_part = cls._new(package)
@@ -22,7 +31,7 @@ def default(cls, package):
         core_properties.title = "Word Document"
         core_properties.last_modified_by = "python-docx"
         core_properties.revision = 1
-        core_properties.modified = datetime.utcnow()
+        core_properties.modified = dt.datetime.utcnow()
         return core_properties_part
 
     @property
@@ -32,7 +41,7 @@ def core_properties(self):
         return CoreProperties(self.element)
 
     @classmethod
-    def _new(cls, package):
+    def _new(cls, package: OpcPackage) -> CorePropertiesPart:
         partname = PackURI("/docProps/core.xml")
         content_type = CT.OPC_CORE_PROPERTIES
         coreProperties = CT_CoreProperties.new()
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index 5fae7ad9c..47e8860d8 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any, Dict, cast
 
 from docx.opc.oxml import CT_Relationships
 
@@ -16,7 +16,7 @@ class Relationships(Dict[str, "_Relationship"]):
     def __init__(self, baseURI: str):
         super(Relationships, self).__init__()
         self._baseURI = baseURI
-        self._target_parts_by_rId: Dict[str, Any] = {}
+        self._target_parts_by_rId: dict[str, Any] = {}
 
     def add_relationship(
         self, reltype: str, target: Part | str, rId: str, is_external: bool = False
@@ -37,7 +37,7 @@ def get_or_add(self, reltype: str, target_part: Part) -> _Relationship:
             rel = self.add_relationship(reltype, target_part, rId)
         return rel
 
-    def get_or_add_ext_rel(self, reltype, target_ref):
+    def get_or_add_ext_rel(self, reltype: str, target_ref: str) -> str:
         """Return rId of external relationship of `reltype` to `target_ref`, newly added
         if not already present in collection."""
         rel = self._get_matching(reltype, target_ref, is_external=True)
@@ -46,7 +46,7 @@ def get_or_add_ext_rel(self, reltype, target_ref):
             rel = self.add_relationship(reltype, target_ref, rId, is_external=True)
         return rel.rId
 
-    def part_with_reltype(self, reltype):
+    def part_with_reltype(self, reltype: str) -> Part:
         """Return target part of rel with matching `reltype`, raising |KeyError| if not
         found and |ValueError| if more than one matching relationship is found."""
         rel = self._get_rel_of_type(reltype)
@@ -59,7 +59,7 @@ def related_parts(self):
         return self._target_parts_by_rId
 
     @property
-    def xml(self):
+    def xml(self) -> str:
         """Serialize this relationship collection into XML suitable for storage as a
         .rels file in an OPC package."""
         rels_elm = CT_Relationships.new()
@@ -73,7 +73,7 @@ def _get_matching(
         """Return relationship of matching `reltype`, `target`, and `is_external` from
         collection, or None if not found."""
 
-        def matches(rel, reltype, target, is_external):
+        def matches(rel: _Relationship, reltype: str, target: Part | str, is_external: bool):
             if rel.reltype != reltype:
                 return False
             if rel.is_external != is_external:
@@ -88,7 +88,7 @@ def matches(rel, reltype, target, is_external):
                 return rel
         return None
 
-    def _get_rel_of_type(self, reltype):
+    def _get_rel_of_type(self, reltype: str):
         """Return single relationship of type `reltype` from the collection.
 
         Raises |KeyError| if no matching relationship is found. Raises |ValueError| if
@@ -104,7 +104,7 @@ def _get_rel_of_type(self, reltype):
         return matching[0]
 
     @property
-    def _next_rId(self) -> str:
+    def _next_rId(self) -> str:  # pyright: ignore[reportReturnType]
         """Next available rId in collection, starting from 'rId1' and making use of any
         gaps in numbering, e.g. 'rId2' for rIds ['rId1', 'rId3']."""
         for n in range(1, len(self) + 2):
@@ -116,7 +116,9 @@ def _next_rId(self) -> str:
 class _Relationship:
     """Value object for relationship to part."""
 
-    def __init__(self, rId: str, reltype, target, baseURI, external=False):
+    def __init__(
+        self, rId: str, reltype: str, target: Part | str, baseURI: str, external: bool = False
+    ):
         super(_Relationship, self).__init__()
         self._rId = rId
         self._reltype = reltype
@@ -125,28 +127,29 @@ def __init__(self, rId: str, reltype, target, baseURI, external=False):
         self._is_external = bool(external)
 
     @property
-    def is_external(self):
+    def is_external(self) -> bool:
         return self._is_external
 
     @property
-    def reltype(self):
+    def reltype(self) -> str:
         return self._reltype
 
     @property
-    def rId(self):
+    def rId(self) -> str:
         return self._rId
 
     @property
-    def target_part(self):
+    def target_part(self) -> Part:
         if self._is_external:
             raise ValueError(
                 "target_part property on _Relationship is undef" "ined when target mode is External"
             )
-        return self._target
+        return cast("Part", self._target)
 
     @property
     def target_ref(self) -> str:
         if self._is_external:
-            return self._target
+            return cast(str, self._target)
         else:
-            return self._target.partname.relative_ref(self._baseURI)
+            target = cast("Part", self._target)
+            return target.partname.relative_ref(self._baseURI)
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 2cafcd960..93f8890c7 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -1,13 +1,18 @@
 """Custom element classes for core properties-related XML elements."""
 
+from __future__ import annotations
+
+import datetime as dt
 import re
-from datetime import datetime, timedelta
-from typing import Any
+from typing import TYPE_CHECKING, Any, Callable
 
 from docx.oxml.ns import nsdecls, qn
 from docx.oxml.parser import parse_xml
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
+if TYPE_CHECKING:
+    from lxml.etree import _Element as etree_Element  # pyright: ignore[reportPrivateUsage]
+
 
 class CT_CoreProperties(BaseOxmlElement):
     """`<cp:coreProperties>` element, the root element of the Core Properties part.
@@ -17,6 +22,8 @@ class CT_CoreProperties(BaseOxmlElement):
     present in the XML. String elements are limited in length to 255 unicode characters.
     """
 
+    get_or_add_revision: Callable[[], etree_Element]
+
     category = ZeroOrOne("cp:category", successors=())
     contentStatus = ZeroOrOne("cp:contentStatus", successors=())
     created = ZeroOrOne("dcterms:created", successors=())
@@ -28,7 +35,9 @@ class CT_CoreProperties(BaseOxmlElement):
     lastModifiedBy = ZeroOrOne("cp:lastModifiedBy", successors=())
     lastPrinted = ZeroOrOne("cp:lastPrinted", successors=())
     modified = ZeroOrOne("dcterms:modified", successors=())
-    revision = ZeroOrOne("cp:revision", successors=())
+    revision: etree_Element | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "cp:revision", successors=()
+    )
     subject = ZeroOrOne("dc:subject", successors=())
     title = ZeroOrOne("dc:title", successors=())
     version = ZeroOrOne("cp:version", successors=())
@@ -80,7 +89,7 @@ def created_datetime(self):
         return self._datetime_of_element("created")
 
     @created_datetime.setter
-    def created_datetime(self, value):
+    def created_datetime(self, value: dt.datetime):
         self._set_element_datetime("created", value)
 
     @property
@@ -88,7 +97,7 @@ def identifier_text(self):
         return self._text_of_element("identifier")
 
     @identifier_text.setter
-    def identifier_text(self, value):
+    def identifier_text(self, value: str):
         self._set_element_text("identifier", value)
 
     @property
@@ -96,7 +105,7 @@ def keywords_text(self):
         return self._text_of_element("keywords")
 
     @keywords_text.setter
-    def keywords_text(self, value):
+    def keywords_text(self, value: str):
         self._set_element_text("keywords", value)
 
     @property
@@ -104,7 +113,7 @@ def language_text(self):
         return self._text_of_element("language")
 
     @language_text.setter
-    def language_text(self, value):
+    def language_text(self, value: str):
         self._set_element_text("language", value)
 
     @property
@@ -112,7 +121,7 @@ def lastModifiedBy_text(self):
         return self._text_of_element("lastModifiedBy")
 
     @lastModifiedBy_text.setter
-    def lastModifiedBy_text(self, value):
+    def lastModifiedBy_text(self, value: str):
         self._set_element_text("lastModifiedBy", value)
 
     @property
@@ -120,15 +129,15 @@ def lastPrinted_datetime(self):
         return self._datetime_of_element("lastPrinted")
 
     @lastPrinted_datetime.setter
-    def lastPrinted_datetime(self, value):
+    def lastPrinted_datetime(self, value: dt.datetime):
         self._set_element_datetime("lastPrinted", value)
 
     @property
-    def modified_datetime(self):
+    def modified_datetime(self) -> dt.datetime | None:
         return self._datetime_of_element("modified")
 
     @modified_datetime.setter
-    def modified_datetime(self, value):
+    def modified_datetime(self, value: dt.datetime):
         self._set_element_datetime("modified", value)
 
     @property
@@ -137,7 +146,7 @@ def revision_number(self):
         revision = self.revision
         if revision is None:
             return 0
-        revision_str = revision.text
+        revision_str = str(revision.text)
         try:
             revision = int(revision_str)
         except ValueError:
@@ -149,9 +158,9 @@ def revision_number(self):
         return revision
 
     @revision_number.setter
-    def revision_number(self, value):
+    def revision_number(self, value: int):
         """Set revision property to string value of integer `value`."""
-        if not isinstance(value, int) or value < 1:
+        if not isinstance(value, int) or value < 1:  # pyright: ignore[reportUnnecessaryIsInstance]
             tmpl = "revision property requires positive int, got '%s'"
             raise ValueError(tmpl % value)
         revision = self.get_or_add_revision()
@@ -162,7 +171,7 @@ def subject_text(self):
         return self._text_of_element("subject")
 
     @subject_text.setter
-    def subject_text(self, value):
+    def subject_text(self, value: str):
         self._set_element_text("subject", value)
 
     @property
@@ -170,7 +179,7 @@ def title_text(self):
         return self._text_of_element("title")
 
     @title_text.setter
-    def title_text(self, value):
+    def title_text(self, value: str):
         self._set_element_text("title", value)
 
     @property
@@ -178,10 +187,10 @@ def version_text(self):
         return self._text_of_element("version")
 
     @version_text.setter
-    def version_text(self, value):
+    def version_text(self, value: str):
         self._set_element_text("version", value)
 
-    def _datetime_of_element(self, property_name):
+    def _datetime_of_element(self, property_name: str) -> dt.datetime | None:
         element = getattr(self, property_name)
         if element is None:
             return None
@@ -192,7 +201,7 @@ def _datetime_of_element(self, property_name):
             # invalid datetime strings are ignored
             return None
 
-    def _get_or_add(self, prop_name):
+    def _get_or_add(self, prop_name: str) -> BaseOxmlElement:
         """Return element returned by "get_or_add_" method for `prop_name`."""
         get_or_add_method_name = "get_or_add_%s" % prop_name
         get_or_add_method = getattr(self, get_or_add_method_name)
@@ -200,8 +209,8 @@ def _get_or_add(self, prop_name):
         return element
 
     @classmethod
-    def _offset_dt(cls, dt, offset_str):
-        """A |datetime| instance offset from `dt` by timezone offset in `offset_str`.
+    def _offset_dt(cls, dt_: dt.datetime, offset_str: str) -> dt.datetime:
+        """A |datetime| instance offset from `dt_` by timezone offset in `offset_str`.
 
         `offset_str` is like `"-07:00"`.
         """
@@ -212,13 +221,13 @@ def _offset_dt(cls, dt, offset_str):
         sign_factor = -1 if sign == "+" else 1
         hours = int(hours_str) * sign_factor
         minutes = int(minutes_str) * sign_factor
-        td = timedelta(hours=hours, minutes=minutes)
-        return dt + td
+        td = dt.timedelta(hours=hours, minutes=minutes)
+        return dt_ + td
 
     _offset_pattern = re.compile(r"([+-])(\d\d):(\d\d)")
 
     @classmethod
-    def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
+    def _parse_W3CDTF_to_datetime(cls, w3cdtf_str: str) -> dt.datetime:
         # valid W3CDTF date cases:
         # yyyy e.g. "2003"
         # yyyy-mm e.g. "2003-12"
@@ -235,22 +244,22 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str):
         # "-07:30", so we have to do it ourselves
         parseable_part = w3cdtf_str[:19]
         offset_str = w3cdtf_str[19:]
-        dt = None
+        dt_ = None
         for tmpl in templates:
             try:
-                dt = datetime.strptime(parseable_part, tmpl)
+                dt_ = dt.datetime.strptime(parseable_part, tmpl)
             except ValueError:
                 continue
-        if dt is None:
+        if dt_ is None:
             tmpl = "could not parse W3CDTF datetime string '%s'"
             raise ValueError(tmpl % w3cdtf_str)
         if len(offset_str) == 6:
-            return cls._offset_dt(dt, offset_str)
-        return dt
+            return cls._offset_dt(dt_, offset_str)
+        return dt_
 
-    def _set_element_datetime(self, prop_name, value):
+    def _set_element_datetime(self, prop_name: str, value: dt.datetime):
         """Set date/time value of child element having `prop_name` to `value`."""
-        if not isinstance(value, datetime):
+        if not isinstance(value, dt.datetime):  # pyright: ignore[reportUnnecessaryIsInstance]
             tmpl = "property requires <type 'datetime.datetime'> object, got %s"
             raise ValueError(tmpl % type(value))
         element = self._get_or_add(prop_name)
diff --git a/src/docx/oxml/document.py b/src/docx/oxml/document.py
index ff3736f65..36819ef75 100644
--- a/src/docx/oxml/document.py
+++ b/src/docx/oxml/document.py
@@ -15,7 +15,7 @@
 class CT_Document(BaseOxmlElement):
     """``<w:document>`` element, the root element of a document.xml file."""
 
-    body = ZeroOrOne("w:body")
+    body: CT_Body = ZeroOrOne("w:body")  # pyright: ignore[reportAssignmentType]
 
     @property
     def sectPr_lst(self) -> List[CT_SectPr]:
diff --git a/src/docx/oxml/parser.py b/src/docx/oxml/parser.py
index a38362676..e16ba30ba 100644
--- a/src/docx/oxml/parser.py
+++ b/src/docx/oxml/parser.py
@@ -20,7 +20,7 @@
 oxml_parser.set_element_class_lookup(element_class_lookup)
 
 
-def parse_xml(xml: str) -> "BaseOxmlElement":
+def parse_xml(xml: str | bytes) -> "BaseOxmlElement":
     """Root lxml element obtained by parsing XML character string `xml`.
 
     The custom parser is used, so custom element classes are produced for elements in
diff --git a/src/docx/oxml/settings.py b/src/docx/oxml/settings.py
index fd39fbd99..d5bb41a6d 100644
--- a/src/docx/oxml/settings.py
+++ b/src/docx/oxml/settings.py
@@ -1,11 +1,21 @@
 """Custom element classes related to document settings."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Callable
+
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
 
+if TYPE_CHECKING:
+    from docx.oxml.shared import CT_OnOff
+
 
 class CT_Settings(BaseOxmlElement):
     """`w:settings` element, root element for the settings part."""
 
+    get_or_add_evenAndOddHeaders: Callable[[], CT_OnOff]
+    _remove_evenAndOddHeaders: Callable[[], None]
+
     _tag_seq = (
         "w:writeProtection",
         "w:view",
@@ -106,11 +116,13 @@ class CT_Settings(BaseOxmlElement):
         "w:decimalSymbol",
         "w:listSeparator",
     )
-    evenAndOddHeaders = ZeroOrOne("w:evenAndOddHeaders", successors=_tag_seq[48:])
+    evenAndOddHeaders: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:evenAndOddHeaders", successors=_tag_seq[48:]
+    )
     del _tag_seq
 
     @property
-    def evenAndOddHeaders_val(self):
+    def evenAndOddHeaders_val(self) -> bool:
         """Value of `w:evenAndOddHeaders/@w:val` or |None| if not present."""
         evenAndOddHeaders = self.evenAndOddHeaders
         if evenAndOddHeaders is None:
@@ -118,8 +130,9 @@ def evenAndOddHeaders_val(self):
         return evenAndOddHeaders.val
 
     @evenAndOddHeaders_val.setter
-    def evenAndOddHeaders_val(self, value):
-        if value in [None, False]:
+    def evenAndOddHeaders_val(self, value: bool | None):
+        if value is None or value is False:
             self._remove_evenAndOddHeaders()
-        else:
-            self.get_or_add_evenAndOddHeaders().val = value
+            return
+
+        self.get_or_add_evenAndOddHeaders().val = value
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index 05c96697a..289d35579 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 from docx.oxml.ns import nsdecls
 from docx.oxml.parser import parse_xml
@@ -34,48 +34,58 @@ class CT_Blip(BaseOxmlElement):
     """``<a:blip>`` element, specifies image source and adjustments such as alpha and
     tint."""
 
-    embed = OptionalAttribute("r:embed", ST_RelationshipId)
-    link = OptionalAttribute("r:link", ST_RelationshipId)
+    embed: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "r:embed", ST_RelationshipId
+    )
+    link: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "r:link", ST_RelationshipId
+    )
 
 
 class CT_BlipFillProperties(BaseOxmlElement):
     """``<pic:blipFill>`` element, specifies picture properties."""
 
-    blip = ZeroOrOne("a:blip", successors=("a:srcRect", "a:tile", "a:stretch"))
+    blip: CT_Blip = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "a:blip", successors=("a:srcRect", "a:tile", "a:stretch")
+    )
 
 
 class CT_GraphicalObject(BaseOxmlElement):
     """``<a:graphic>`` element, container for a DrawingML object."""
 
-    graphicData = OneAndOnlyOne("a:graphicData")
+    graphicData: CT_GraphicalObjectData = OneAndOnlyOne(  # pyright: ignore[reportAssignmentType]
+        "a:graphicData"
+    )
 
 
 class CT_GraphicalObjectData(BaseOxmlElement):
     """``<a:graphicData>`` element, container for the XML of a DrawingML object."""
 
-    pic = ZeroOrOne("pic:pic")
-    uri = RequiredAttribute("uri", XsdToken)
+    pic: CT_Picture = ZeroOrOne("pic:pic")  # pyright: ignore[reportAssignmentType]
+    uri: str = RequiredAttribute("uri", XsdToken)  # pyright: ignore[reportAssignmentType]
 
 
 class CT_Inline(BaseOxmlElement):
     """`<wp:inline>` element, container for an inline shape."""
 
-    extent = OneAndOnlyOne("wp:extent")
-    docPr = OneAndOnlyOne("wp:docPr")
-    graphic = OneAndOnlyOne("a:graphic")
+    extent: CT_PositiveSize2D = OneAndOnlyOne("wp:extent")  # pyright: ignore[reportAssignmentType]
+    docPr: CT_NonVisualDrawingProps = OneAndOnlyOne(  # pyright: ignore[reportAssignmentType]
+        "wp:docPr"
+    )
+    graphic: CT_GraphicalObject = OneAndOnlyOne(  # pyright: ignore[reportAssignmentType]
+        "a:graphic"
+    )
 
     @classmethod
     def new(cls, cx: Length, cy: Length, shape_id: int, pic: CT_Picture) -> CT_Inline:
         """Return a new ``<wp:inline>`` element populated with the values passed as
         parameters."""
-        inline = parse_xml(cls._inline_xml())
+        inline = cast(CT_Inline, parse_xml(cls._inline_xml()))
         inline.extent.cx = cx
         inline.extent.cy = cy
         inline.docPr.id = shape_id
         inline.docPr.name = "Picture %d" % shape_id
-        inline.graphic.graphicData.uri = (
-            "http://schemas.openxmlformats.org/drawingml/2006/picture"
-        )
+        inline.graphic.graphicData.uri = "http://schemas.openxmlformats.org/drawingml/2006/picture"
         inline.graphic.graphicData._insert_pic(pic)
         return inline
 
@@ -126,9 +136,13 @@ class CT_NonVisualPictureProperties(BaseOxmlElement):
 class CT_Picture(BaseOxmlElement):
     """``<pic:pic>`` element, a DrawingML picture."""
 
-    nvPicPr = OneAndOnlyOne("pic:nvPicPr")
-    blipFill = OneAndOnlyOne("pic:blipFill")
-    spPr = OneAndOnlyOne("pic:spPr")
+    nvPicPr: CT_PictureNonVisual = OneAndOnlyOne(  # pyright: ignore[reportAssignmentType]
+        "pic:nvPicPr"
+    )
+    blipFill: CT_BlipFillProperties = OneAndOnlyOne(  # pyright: ignore[reportAssignmentType]
+        "pic:blipFill"
+    )
+    spPr: CT_ShapeProperties = OneAndOnlyOne("pic:spPr")  # pyright: ignore[reportAssignmentType]
 
     @classmethod
     def new(cls, pic_id, filename, rId, cx, cy):
@@ -190,8 +204,12 @@ class CT_PositiveSize2D(BaseOxmlElement):
     Specifies the size of a DrawingML drawing.
     """
 
-    cx = RequiredAttribute("cx", ST_PositiveCoordinate)
-    cy = RequiredAttribute("cy", ST_PositiveCoordinate)
+    cx: Length = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "cx", ST_PositiveCoordinate
+    )
+    cy: Length = RequiredAttribute(  # pyright: ignore[reportAssignmentType]
+        "cy", ST_PositiveCoordinate
+    )
 
 
 class CT_PresetGeometry2D(BaseOxmlElement):
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index a74abc4ac..8c2ebc9a9 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -18,7 +18,7 @@ class CT_DecimalNumber(BaseOxmlElement):
     val: int = RequiredAttribute("w:val", ST_DecimalNumber)  # pyright: ignore[reportAssignmentType]
 
     @classmethod
-    def new(cls, nsptagname, val):
+    def new(cls, nsptagname: str, val: int):
         """Return a new ``CT_DecimalNumber`` element having tagname `nsptagname` and
         ``val`` attribute set to `val`."""
         return OxmlElement(nsptagname, attrs={qn("w:val"): str(val)})
@@ -31,7 +31,7 @@ class CT_OnOff(BaseOxmlElement):
     "off". Defaults to `True`, so `<w:b>` for example means "bold is turned on".
     """
 
-    val: bool = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    val: bool = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:val", ST_OnOff, default=True
     )
 
@@ -42,7 +42,7 @@ class CT_String(BaseOxmlElement):
     In those cases, it containing a style name in its `val` attribute.
     """
 
-    val: str = RequiredAttribute("w:val", ST_String)  # pyright: ignore[reportGeneralTypeIssues]
+    val: str = RequiredAttribute("w:val", ST_String)  # pyright: ignore[reportAssignmentType]
 
     @classmethod
     def new(cls, nsptagname: str, val: str):
diff --git a/src/docx/oxml/styles.py b/src/docx/oxml/styles.py
index e0a3eaeaf..fb0e5d0dd 100644
--- a/src/docx/oxml/styles.py
+++ b/src/docx/oxml/styles.py
@@ -128,12 +128,10 @@ class CT_Style(BaseOxmlElement):
     rPr = ZeroOrOne("w:rPr", successors=_tag_seq[18:])
     del _tag_seq
 
-    type: WD_STYLE_TYPE | None = (
-        OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-            "w:type", WD_STYLE_TYPE
-        )
+    type: WD_STYLE_TYPE | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:type", WD_STYLE_TYPE
     )
-    styleId: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    styleId: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:styleId", ST_String
     )
     default = OptionalAttribute("w:default", ST_OnOff)
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index 42e8cc95c..e38d58562 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -973,5 +973,5 @@ class CT_VMerge(BaseOxmlElement):
     """``<w:vMerge>`` element, specifying vertical merging behavior of a cell."""
 
     val: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
-        "w:val", ST_Merge, default=ST_Merge.CONTINUE  # pyright: ignore[reportArgumentType]
+        "w:val", ST_Merge, default=ST_Merge.CONTINUE
     )
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 0e183cf65..140086aab 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -39,10 +39,10 @@ class CT_Fonts(BaseOxmlElement):
     Specifies typeface name for the various language types.
     """
 
-    ascii: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    ascii: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:ascii", ST_String
     )
-    hAnsi: str | None = OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
+    hAnsi: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:hAnsi", ST_String
     )
 
@@ -148,18 +148,14 @@ class CT_RPr(BaseOxmlElement):
     sz: CT_HpsMeasure | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
         "w:sz", successors=_tag_seq[24:]
     )
-    highlight: CT_Highlight | None = (
-        ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-            "w:highlight", successors=_tag_seq[26:]
-        )
+    highlight: CT_Highlight | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:highlight", successors=_tag_seq[26:]
     )
     u: CT_Underline | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
         "w:u", successors=_tag_seq[27:]
     )
-    vertAlign: CT_VerticalAlignRun | None = (
-        ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-            "w:vertAlign", successors=_tag_seq[32:]
-        )
+    vertAlign: CT_VerticalAlignRun | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
+        "w:vertAlign", successors=_tag_seq[32:]
     )
     rtl = ZeroOrOne("w:rtl", successors=_tag_seq[33:])
     cs = ZeroOrOne("w:cs", successors=_tag_seq[34:])
@@ -268,10 +264,7 @@ def subscript(self, value: bool | None) -> None:
         elif bool(value) is True:
             self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUBSCRIPT
         # -- assert bool(value) is False --
-        elif (
-            self.vertAlign is not None
-            and self.vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT
-        ):
+        elif self.vertAlign is not None and self.vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
             self._remove_vertAlign()
 
     @property
@@ -295,10 +288,7 @@ def superscript(self, value: bool | None):
         elif bool(value) is True:
             self.get_or_add_vertAlign().val = ST_VerticalAlignRun.SUPERSCRIPT
         # -- assert bool(value) is False --
-        elif (
-            self.vertAlign is not None
-            and self.vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT
-        ):
+        elif self.vertAlign is not None and self.vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
             self._remove_vertAlign()
 
     @property
@@ -353,10 +343,8 @@ def _set_bool_val(self, name: str, value: bool | None):
 class CT_Underline(BaseOxmlElement):
     """`<w:u>` element, specifying the underlining style for a run."""
 
-    val: WD_UNDERLINE | None = (
-        OptionalAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-            "w:val", WD_UNDERLINE
-        )
+    val: WD_UNDERLINE | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:val", WD_UNDERLINE
     )
 
 
diff --git a/src/docx/package.py b/src/docx/package.py
index 12a166bf3..7ea47e6e1 100644
--- a/src/docx/package.py
+++ b/src/docx/package.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import IO
+from typing import IO, cast
 
 from docx.image.image import Image
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
@@ -44,16 +44,16 @@ def _gather_image_parts(self):
                 continue
             if rel.target_part in self.image_parts:
                 continue
-            self.image_parts.append(rel.target_part)
+            self.image_parts.append(cast("ImagePart", rel.target_part))
 
 
 class ImageParts:
     """Collection of |ImagePart| objects corresponding to images in the package."""
 
     def __init__(self):
-        self._image_parts = []
+        self._image_parts: list[ImagePart] = []
 
-    def __contains__(self, item):
+    def __contains__(self, item: object):
         return self._image_parts.__contains__(item)
 
     def __iter__(self):
@@ -62,7 +62,7 @@ def __iter__(self):
     def __len__(self):
         return self._image_parts.__len__()
 
-    def append(self, item):
+    def append(self, item: ImagePart):
         self._image_parts.append(item)
 
     def get_or_add_image_part(self, image_descriptor: str | IO[bytes]) -> ImagePart:
@@ -77,15 +77,14 @@ def get_or_add_image_part(self, image_descriptor: str | IO[bytes]) -> ImagePart:
             return matching_image_part
         return self._add_image_part(image)
 
-    def _add_image_part(self, image):
-        """Return an |ImagePart| instance newly created from image and appended to the
-        collection."""
+    def _add_image_part(self, image: Image):
+        """Return |ImagePart| instance newly created from `image` and appended to the collection."""
         partname = self._next_image_partname(image.ext)
         image_part = ImagePart.from_image(image, partname)
         self.append(image_part)
         return image_part
 
-    def _get_by_sha1(self, sha1):
+    def _get_by_sha1(self, sha1: str) -> ImagePart | None:
         """Return the image part in this collection having a SHA1 hash matching `sha1`,
         or |None| if not found."""
         for image_part in self._image_parts:
@@ -93,7 +92,7 @@ def _get_by_sha1(self, sha1):
                 return image_part
         return None
 
-    def _next_image_partname(self, ext):
+    def _next_image_partname(self, ext: str) -> PackURI:
         """The next available image partname, starting from ``/word/media/image1.{ext}``
         where unused numbers are reused.
 
@@ -101,7 +100,7 @@ def _next_image_partname(self, ext):
         not include the leading period.
         """
 
-        def image_partname(n):
+        def image_partname(n: int) -> PackURI:
             return PackURI("/word/media/image%d.%s" % (n, ext))
 
         used_numbers = [image_part.partname.idx for image_part in self]
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 81e621c1a..416bb1a27 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, cast
+from typing import IO, TYPE_CHECKING, cast
 
 from docx.document import Document
 from docx.enum.style import WD_STYLE_TYPE
@@ -17,6 +17,7 @@
 
 if TYPE_CHECKING:
     from docx.opc.coreprops import CoreProperties
+    from docx.settings import Settings
     from docx.styles.style import BaseStyle
 
 
@@ -101,13 +102,13 @@ def numbering_part(self):
             self.relate_to(numbering_part, RT.NUMBERING)
             return numbering_part
 
-    def save(self, path_or_stream):
+    def save(self, path_or_stream: str | IO[bytes]):
         """Save this document to `path_or_stream`, which can be either a path to a
         filesystem location (a string) or a file-like object."""
         self.package.save(path_or_stream)
 
     @property
-    def settings(self):
+    def settings(self) -> Settings:
         """A |Settings| object providing access to the settings in the settings part of
         this document."""
         return self._settings_part.settings
@@ -119,14 +120,14 @@ def styles(self):
         return self._styles_part.styles
 
     @property
-    def _settings_part(self):
+    def _settings_part(self) -> SettingsPart:
         """A |SettingsPart| object providing access to the document-level settings for
         this document.
 
         Creates a default settings part if one is not present.
         """
         try:
-            return self.part_related_by(RT.SETTINGS)
+            return cast(SettingsPart, self.part_related_by(RT.SETTINGS))
         except KeyError:
             settings_part = SettingsPart.default(self.package)
             self.relate_to(settings_part, RT.SETTINGS)
diff --git a/src/docx/parts/hdrftr.py b/src/docx/parts/hdrftr.py
index 46821d780..35113801c 100644
--- a/src/docx/parts/hdrftr.py
+++ b/src/docx/parts/hdrftr.py
@@ -1,17 +1,23 @@
 """Header and footer part objects."""
 
+from __future__ import annotations
+
 import os
+from typing import TYPE_CHECKING
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.oxml.parser import parse_xml
 from docx.parts.story import StoryPart
 
+if TYPE_CHECKING:
+    from docx.package import Package
+
 
 class FooterPart(StoryPart):
     """Definition of a section footer."""
 
     @classmethod
-    def new(cls, package):
+    def new(cls, package: Package):
         """Return newly created footer part."""
         partname = package.next_partname("/word/footer%d.xml")
         content_type = CT.WML_FOOTER
@@ -21,9 +27,7 @@ def new(cls, package):
     @classmethod
     def _default_footer_xml(cls):
         """Return bytes containing XML for a default footer part."""
-        path = os.path.join(
-            os.path.split(__file__)[0], "..", "templates", "default-footer.xml"
-        )
+        path = os.path.join(os.path.split(__file__)[0], "..", "templates", "default-footer.xml")
         with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
@@ -33,7 +37,7 @@ class HeaderPart(StoryPart):
     """Definition of a section header."""
 
     @classmethod
-    def new(cls, package):
+    def new(cls, package: Package):
         """Return newly created header part."""
         partname = package.next_partname("/word/header%d.xml")
         content_type = CT.WML_HEADER
@@ -43,9 +47,7 @@ def new(cls, package):
     @classmethod
     def _default_header_xml(cls):
         """Return bytes containing XML for a default header part."""
-        path = os.path.join(
-            os.path.split(__file__)[0], "..", "templates", "default-header.xml"
-        )
+        path = os.path.join(os.path.split(__file__)[0], "..", "templates", "default-header.xml")
         with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
diff --git a/src/docx/parts/image.py b/src/docx/parts/image.py
index e4580df74..5aec07077 100644
--- a/src/docx/parts/image.py
+++ b/src/docx/parts/image.py
@@ -3,11 +3,16 @@
 from __future__ import annotations
 
 import hashlib
+from typing import TYPE_CHECKING
 
 from docx.image.image import Image
 from docx.opc.part import Part
 from docx.shared import Emu, Inches
 
+if TYPE_CHECKING:
+    from docx.opc.package import OpcPackage
+    from docx.opc.packuri import PackURI
+
 
 class ImagePart(Part):
     """An image part.
@@ -16,7 +21,7 @@ class ImagePart(Part):
     """
 
     def __init__(
-        self, partname: str, content_type: str, blob: bytes, image: Image | None = None
+        self, partname: PackURI, content_type: str, blob: bytes, image: Image | None = None
     ):
         super(ImagePart, self).__init__(partname, content_type, blob)
         self._image = image
@@ -36,7 +41,7 @@ def default_cy(self):
         vertical dots per inch (dpi)."""
         px_height = self.image.px_height
         horz_dpi = self.image.horz_dpi
-        height_in_emu = 914400 * px_height / horz_dpi
+        height_in_emu = int(round(914400 * px_height / horz_dpi))
         return Emu(height_in_emu)
 
     @property
@@ -52,7 +57,7 @@ def filename(self):
         return "image.%s" % self.partname.ext
 
     @classmethod
-    def from_image(cls, image, partname):
+    def from_image(cls, image: Image, partname: PackURI):
         """Return an |ImagePart| instance newly created from `image` and assigned
         `partname`."""
         return ImagePart(partname, image.content_type, image.blob, image)
@@ -64,7 +69,7 @@ def image(self) -> Image:
         return self._image
 
     @classmethod
-    def load(cls, partname, content_type, blob, package):
+    def load(cls, partname: PackURI, content_type: str, blob: bytes, package: OpcPackage):
         """Called by ``docx.opc.package.PartFactory`` to load an image part from a
         package being opened by ``Document(...)`` call."""
         return cls(partname, content_type, blob)
@@ -72,4 +77,4 @@ def load(cls, partname, content_type, blob, package):
     @property
     def sha1(self):
         """SHA1 hash digest of the blob of this image part."""
-        return hashlib.sha1(self._blob).hexdigest()
+        return hashlib.sha1(self.blob).hexdigest()
diff --git a/src/docx/parts/settings.py b/src/docx/parts/settings.py
index d83c9d5ca..116facca2 100644
--- a/src/docx/parts/settings.py
+++ b/src/docx/parts/settings.py
@@ -1,6 +1,9 @@
 """|SettingsPart| and closely related objects."""
 
+from __future__ import annotations
+
 import os
+from typing import TYPE_CHECKING, cast
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
@@ -8,31 +11,41 @@
 from docx.oxml.parser import parse_xml
 from docx.settings import Settings
 
+if TYPE_CHECKING:
+    from docx.oxml.settings import CT_Settings
+    from docx.package import Package
+
 
 class SettingsPart(XmlPart):
     """Document-level settings part of a WordprocessingML (WML) package."""
 
+    def __init__(
+        self, partname: PackURI, content_type: str, element: CT_Settings, package: Package
+    ):
+        super().__init__(partname, content_type, element, package)
+        self._settings = element
+
     @classmethod
-    def default(cls, package):
+    def default(cls, package: Package):
         """Return a newly created settings part, containing a default `w:settings`
         element tree."""
         partname = PackURI("/word/settings.xml")
         content_type = CT.WML_SETTINGS
-        element = parse_xml(cls._default_settings_xml())
+        element = cast("CT_Settings", parse_xml(cls._default_settings_xml()))
         return cls(partname, content_type, element, package)
 
     @property
-    def settings(self):
-        """A |Settings| proxy object for the `w:settings` element in this part,
-        containing the document-level settings for this document."""
-        return Settings(self.element)
+    def settings(self) -> Settings:
+        """A |Settings| proxy object for the `w:settings` element in this part.
+
+        Contains the document-level settings for this document.
+        """
+        return Settings(self._settings)
 
     @classmethod
     def _default_settings_xml(cls):
         """Return a bytestream containing XML for a default settings part."""
-        path = os.path.join(
-            os.path.split(__file__)[0], "..", "templates", "default-settings.xml"
-        )
+        path = os.path.join(os.path.split(__file__)[0], "..", "templates", "default-settings.xml")
         with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
diff --git a/src/docx/parts/story.py b/src/docx/parts/story.py
index b5c8ac882..7482c91a8 100644
--- a/src/docx/parts/story.py
+++ b/src/docx/parts/story.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import IO, TYPE_CHECKING, Tuple
+from typing import IO, TYPE_CHECKING, Tuple, cast
 
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import XmlPart
@@ -60,8 +60,8 @@ def get_style_id(
     def new_pic_inline(
         self,
         image_descriptor: str | IO[bytes],
-        width: Length | None = None,
-        height: Length | None = None,
+        width: int | Length | None = None,
+        height: int | Length | None = None,
     ) -> CT_Inline:
         """Return a newly-created `w:inline` element.
 
@@ -92,4 +92,4 @@ def _document_part(self) -> DocumentPart:
         """|DocumentPart| object for this package."""
         package = self.package
         assert package is not None
-        return package.main_document_part
+        return cast("DocumentPart", package.main_document_part)
diff --git a/src/docx/section.py b/src/docx/section.py
index f72b60867..982a14370 100644
--- a/src/docx/section.py
+++ b/src/docx/section.py
@@ -160,11 +160,7 @@ def iter_inner_content(self) -> Iterator[Paragraph | Table]:
         Items appear in document order.
         """
         for element in self._sectPr.iter_inner_content():
-            yield (
-                Paragraph(element, self)  # pyright: ignore[reportGeneralTypeIssues]
-                if isinstance(element, CT_P)
-                else Table(element, self)
-            )
+            yield (Paragraph(element, self) if isinstance(element, CT_P) else Table(element, self))
 
     @property
     def left_margin(self) -> Length | None:
@@ -269,12 +265,10 @@ def __init__(self, document_elm: CT_Document, document_part: DocumentPart):
         self._document_part = document_part
 
     @overload
-    def __getitem__(self, key: int) -> Section:
-        ...
+    def __getitem__(self, key: int) -> Section: ...
 
     @overload
-    def __getitem__(self, key: slice) -> List[Section]:
-        ...
+    def __getitem__(self, key: slice) -> List[Section]: ...
 
     def __getitem__(self, key: int | slice) -> Section | List[Section]:
         if isinstance(key, slice):
diff --git a/src/docx/settings.py b/src/docx/settings.py
index 78f816e87..0a5aa2f36 100644
--- a/src/docx/settings.py
+++ b/src/docx/settings.py
@@ -1,7 +1,16 @@
 """Settings object, providing access to document-level settings."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
+
 from docx.shared import ElementProxy
 
+if TYPE_CHECKING:
+    import docx.types as t
+    from docx.oxml.settings import CT_Settings
+    from docx.oxml.xmlchemy import BaseOxmlElement
+
 
 class Settings(ElementProxy):
     """Provides access to document-level settings for a document.
@@ -9,14 +18,18 @@ class Settings(ElementProxy):
     Accessed using the :attr:`.Document.settings` property.
     """
 
+    def __init__(self, element: BaseOxmlElement, parent: t.ProvidesXmlPart | None = None):
+        super().__init__(element, parent)
+        self._settings = cast("CT_Settings", element)
+
     @property
-    def odd_and_even_pages_header_footer(self):
+    def odd_and_even_pages_header_footer(self) -> bool:
         """True if this document has distinct odd and even page headers and footers.
 
         Read/write.
         """
-        return self._element.evenAndOddHeaders_val
+        return self._settings.evenAndOddHeaders_val
 
     @odd_and_even_pages_header_footer.setter
-    def odd_and_even_pages_header_footer(self, value):
-        self._element.evenAndOddHeaders_val = value
+    def odd_and_even_pages_header_footer(self, value: bool):
+        self._settings.evenAndOddHeaders_val = value
diff --git a/src/docx/shape.py b/src/docx/shape.py
index b91ecbf64..cd35deb35 100644
--- a/src/docx/shape.py
+++ b/src/docx/shape.py
@@ -3,26 +3,36 @@
 A shape is a visual object that appears on the drawing layer of a document.
 """
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from docx.enum.shape import WD_INLINE_SHAPE
 from docx.oxml.ns import nsmap
 from docx.shared import Parented
 
+if TYPE_CHECKING:
+    from docx.oxml.document import CT_Body
+    from docx.oxml.shape import CT_Inline
+    from docx.parts.story import StoryPart
+    from docx.shared import Length
+
 
 class InlineShapes(Parented):
-    """Sequence of |InlineShape| instances, supporting len(), iteration, and indexed
-    access."""
+    """Sequence of |InlineShape| instances, supporting len(), iteration, and indexed access."""
 
-    def __init__(self, body_elm, parent):
+    def __init__(self, body_elm: CT_Body, parent: StoryPart):
         super(InlineShapes, self).__init__(parent)
         self._body = body_elm
 
-    def __getitem__(self, idx):
+    def __getitem__(self, idx: int):
         """Provide indexed access, e.g. 'inline_shapes[idx]'."""
         try:
             inline = self._inline_lst[idx]
         except IndexError:
             msg = "inline shape index [%d] out of range" % idx
             raise IndexError(msg)
+
         return InlineShape(inline)
 
     def __iter__(self):
@@ -42,12 +52,12 @@ class InlineShape:
     """Proxy for an ``<wp:inline>`` element, representing the container for an inline
     graphical object."""
 
-    def __init__(self, inline):
+    def __init__(self, inline: CT_Inline):
         super(InlineShape, self).__init__()
         self._inline = inline
 
     @property
-    def height(self):
+    def height(self) -> Length:
         """Read/write.
 
         The display height of this inline shape as an |Emu| instance.
@@ -55,7 +65,7 @@ def height(self):
         return self._inline.extent.cy
 
     @height.setter
-    def height(self, cy):
+    def height(self, cy: Length):
         self._inline.extent.cy = cy
         self._inline.graphic.graphicData.pic.spPr.cy = cy
 
@@ -88,6 +98,6 @@ def width(self):
         return self._inline.extent.cx
 
     @width.setter
-    def width(self, cx):
+    def width(self, cx: Length):
         self._inline.extent.cx = cx
         self._inline.graphic.graphicData.pic.spPr.cx = cx
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index daa604e87..0e2f5bc17 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -59,8 +59,8 @@ def add_break(self, break_type: WD_BREAK = WD_BREAK.LINE):
     def add_picture(
         self,
         image_path_or_stream: str | IO[bytes],
-        width: Length | None = None,
-        height: Length | None = None,
+        width: int | Length | None = None,
+        height: int | Length | None = None,
     ) -> InlineShape:
         """Return |InlineShape| containing image identified by `image_path_or_stream`.
 
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
index 1db650353..5bcf49651 100644
--- a/tests/opc/parts/test_coreprops.py
+++ b/tests/opc/parts/test_coreprops.py
@@ -5,22 +5,32 @@
 import pytest
 
 from docx.opc.coreprops import CoreProperties
+from docx.opc.package import OpcPackage
+from docx.opc.packuri import PackURI
 from docx.opc.parts.coreprops import CorePropertiesPart
-from docx.oxml.coreprops import CT_CoreProperties
 
-from ...unitutil.mock import class_mock, instance_mock
+from ...unitutil.cxml import element
+from ...unitutil.mock import FixtureRequest, Mock, class_mock, instance_mock
 
 
 class DescribeCorePropertiesPart:
-    def it_provides_access_to_its_core_props_object(self, coreprops_fixture):
-        core_properties_part, CoreProperties_ = coreprops_fixture
+    """Unit-test suite for `docx.opc.parts.coreprops.CorePropertiesPart` objects."""
+
+    def it_provides_access_to_its_core_props_object(self, CoreProperties_: Mock, package_: Mock):
+        core_properties_part = CorePropertiesPart(
+            PackURI("/part/name"), "content/type", element("cp:coreProperties"), package_
+        )
+
         core_properties = core_properties_part.core_properties
+
         CoreProperties_.assert_called_once_with(core_properties_part.element)
         assert isinstance(core_properties, CoreProperties)
 
-    def it_can_create_a_default_core_properties_part(self):
-        core_properties_part = CorePropertiesPart.default(None)
+    def it_can_create_a_default_core_properties_part(self, package_: Mock):
+        core_properties_part = CorePropertiesPart.default(package_)
+
         assert isinstance(core_properties_part, CorePropertiesPart)
+        # --
         core_properties = core_properties_part.core_properties
         assert core_properties.title == "Word Document"
         assert core_properties.last_modified_by == "python-docx"
@@ -32,16 +42,9 @@ def it_can_create_a_default_core_properties_part(self):
     # fixtures ---------------------------------------------
 
     @pytest.fixture
-    def coreprops_fixture(self, element_, CoreProperties_):
-        core_properties_part = CorePropertiesPart(None, None, element_, None)
-        return core_properties_part, CoreProperties_
-
-    # fixture components -----------------------------------
-
-    @pytest.fixture
-    def CoreProperties_(self, request):
+    def CoreProperties_(self, request: FixtureRequest):
         return class_mock(request, "docx.opc.parts.coreprops.CoreProperties")
 
     @pytest.fixture
-    def element_(self, request):
-        return instance_mock(request, CT_CoreProperties)
+    def package_(self, request: FixtureRequest):
+        return instance_mock(request, OpcPackage)
diff --git a/tests/opc/test_coreprops.py b/tests/opc/test_coreprops.py
index 2978ad5ae..0214cdbdf 100644
--- a/tests/opc/test_coreprops.py
+++ b/tests/opc/test_coreprops.py
@@ -1,160 +1,153 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for the docx.opc.coreprops module."""
 
-from datetime import datetime
+from __future__ import annotations
+
+import datetime as dt
+from typing import TYPE_CHECKING, cast
 
 import pytest
 
 from docx.opc.coreprops import CoreProperties
 from docx.oxml.parser import parse_xml
 
+if TYPE_CHECKING:
+    from docx.oxml.coreprops import CT_CoreProperties
+
 
 class DescribeCoreProperties:
-    def it_knows_the_string_property_values(self, text_prop_get_fixture):
-        core_properties, prop_name, expected_value = text_prop_get_fixture
+    """Unit-test suite for `docx.opc.coreprops.CoreProperties` objects."""
+
+    @pytest.mark.parametrize(
+        ("prop_name", "expected_value"),
+        [
+            ("author", "python-docx"),
+            ("category", ""),
+            ("comments", ""),
+            ("content_status", "DRAFT"),
+            ("identifier", "GXS 10.2.1ab"),
+            ("keywords", "foo bar baz"),
+            ("language", "US-EN"),
+            ("last_modified_by", "Steve Canny"),
+            ("subject", "Spam"),
+            ("title", "Word Document"),
+            ("version", "1.2.88"),
+        ],
+    )
+    def it_knows_the_string_property_values(
+        self, prop_name: str, expected_value: str, core_properties: CoreProperties
+    ):
         actual_value = getattr(core_properties, prop_name)
         assert actual_value == expected_value
 
-    def it_can_change_the_string_property_values(self, text_prop_set_fixture):
-        core_properties, prop_name, value, expected_xml = text_prop_set_fixture
-        setattr(core_properties, prop_name, value)
-        assert core_properties._element.xml == expected_xml
-
-    def it_knows_the_date_property_values(self, date_prop_get_fixture):
-        core_properties, prop_name, expected_datetime = date_prop_get_fixture
-        actual_datetime = getattr(core_properties, prop_name)
-        assert actual_datetime == expected_datetime
+    @pytest.mark.parametrize(
+        ("prop_name", "tagname", "value"),
+        [
+            ("author", "dc:creator", "scanny"),
+            ("category", "cp:category", "silly stories"),
+            ("comments", "dc:description", "Bar foo to you"),
+            ("content_status", "cp:contentStatus", "FINAL"),
+            ("identifier", "dc:identifier", "GT 5.2.xab"),
+            ("keywords", "cp:keywords", "dog cat moo"),
+            ("language", "dc:language", "GB-EN"),
+            ("last_modified_by", "cp:lastModifiedBy", "Billy Bob"),
+            ("subject", "dc:subject", "Eggs"),
+            ("title", "dc:title", "Dissertation"),
+            ("version", "cp:version", "81.2.8"),
+        ],
+    )
+    def it_can_change_the_string_property_values(self, prop_name: str, tagname: str, value: str):
+        coreProperties = self.coreProperties(tagname="", str_val="")
+        core_properties = CoreProperties(cast("CT_CoreProperties", parse_xml(coreProperties)))
 
-    def it_can_change_the_date_property_values(self, date_prop_set_fixture):
-        core_properties, prop_name, value, expected_xml = date_prop_set_fixture
         setattr(core_properties, prop_name, value)
-        assert core_properties._element.xml == expected_xml
-
-    def it_knows_the_revision_number(self, revision_get_fixture):
-        core_properties, expected_revision = revision_get_fixture
-        assert core_properties.revision == expected_revision
-
-    def it_can_change_the_revision_number(self, revision_set_fixture):
-        core_properties, revision, expected_xml = revision_set_fixture
-        core_properties.revision = revision
-        assert core_properties._element.xml == expected_xml
 
-    # fixtures -------------------------------------------------------
+        assert core_properties._element.xml == self.coreProperties(tagname, value)
 
-    @pytest.fixture(
-        params=[
-            ("created", datetime(2012, 11, 17, 16, 37, 40)),
-            ("last_printed", datetime(2014, 6, 4, 4, 28)),
+    @pytest.mark.parametrize(
+        ("prop_name", "expected_datetime"),
+        [
+            ("created", dt.datetime(2012, 11, 17, 16, 37, 40)),
+            ("last_printed", dt.datetime(2014, 6, 4, 4, 28)),
             ("modified", None),
-        ]
+        ],
     )
-    def date_prop_get_fixture(self, request, core_properties):
-        prop_name, expected_datetime = request.param
-        return core_properties, prop_name, expected_datetime
+    def it_knows_the_date_property_values(
+        self, prop_name: str, expected_datetime: dt.datetime, core_properties: CoreProperties
+    ):
+        actual_datetime = getattr(core_properties, prop_name)
+        assert actual_datetime == expected_datetime
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("prop_name", "tagname", "value", "str_val", "attrs"),
+        [
             (
                 "created",
                 "dcterms:created",
-                datetime(2001, 2, 3, 4, 5),
+                dt.datetime(2001, 2, 3, 4, 5),
                 "2001-02-03T04:05:00Z",
                 ' xsi:type="dcterms:W3CDTF"',
             ),
             (
                 "last_printed",
                 "cp:lastPrinted",
-                datetime(2014, 6, 4, 4),
+                dt.datetime(2014, 6, 4, 4),
                 "2014-06-04T04:00:00Z",
                 "",
             ),
             (
                 "modified",
                 "dcterms:modified",
-                datetime(2005, 4, 3, 2, 1),
+                dt.datetime(2005, 4, 3, 2, 1),
                 "2005-04-03T02:01:00Z",
                 ' xsi:type="dcterms:W3CDTF"',
             ),
-        ]
+        ],
     )
-    def date_prop_set_fixture(self, request):
-        prop_name, tagname, value, str_val, attrs = request.param
-        coreProperties = self.coreProperties(None, None)
-        core_properties = CoreProperties(parse_xml(coreProperties))
+    def it_can_change_the_date_property_values(
+        self, prop_name: str, tagname: str, value: dt.datetime, str_val: str, attrs: str
+    ):
+        coreProperties = self.coreProperties(tagname="", str_val="")
+        core_properties = CoreProperties(cast("CT_CoreProperties", parse_xml(coreProperties)))
         expected_xml = self.coreProperties(tagname, str_val, attrs)
-        return core_properties, prop_name, value, expected_xml
 
-    @pytest.fixture(
-        params=[("42", 42), (None, 0), ("foobar", 0), ("-17", 0), ("32.7", 0)]
-    )
-    def revision_get_fixture(self, request):
-        str_val, expected_revision = request.param
-        tagname = "" if str_val is None else "cp:revision"
-        coreProperties = self.coreProperties(tagname, str_val)
-        core_properties = CoreProperties(parse_xml(coreProperties))
-        return core_properties, expected_revision
-
-    @pytest.fixture(
-        params=[
-            (42, "42"),
-        ]
+        setattr(core_properties, prop_name, value)
+
+        assert core_properties._element.xml == expected_xml
+
+    @pytest.mark.parametrize(
+        ("str_val", "expected_value"),
+        [("42", 42), (None, 0), ("foobar", 0), ("-17", 0), ("32.7", 0)],
     )
-    def revision_set_fixture(self, request):
-        value, str_val = request.param
-        coreProperties = self.coreProperties(None, None)
-        core_properties = CoreProperties(parse_xml(coreProperties))
+    def it_knows_the_revision_number(self, str_val: str | None, expected_value: int):
+        tagname, str_val = ("cp:revision", str_val) if str_val else ("", "")
+        coreProperties = self.coreProperties(tagname, str_val or "")
+        core_properties = CoreProperties(cast("CT_CoreProperties", parse_xml(coreProperties)))
+
+        assert core_properties.revision == expected_value
+
+    @pytest.mark.parametrize(("value", "str_val"), [(42, "42")])
+    def it_can_change_the_revision_number(self, value: int, str_val: str):
+        coreProperties = self.coreProperties(tagname="", str_val="")
+        core_properties = CoreProperties(cast("CT_CoreProperties", parse_xml(coreProperties)))
         expected_xml = self.coreProperties("cp:revision", str_val)
-        return core_properties, value, expected_xml
 
-    @pytest.fixture(
-        params=[
-            ("author", "python-docx"),
-            ("category", ""),
-            ("comments", ""),
-            ("content_status", "DRAFT"),
-            ("identifier", "GXS 10.2.1ab"),
-            ("keywords", "foo bar baz"),
-            ("language", "US-EN"),
-            ("last_modified_by", "Steve Canny"),
-            ("subject", "Spam"),
-            ("title", "Word Document"),
-            ("version", "1.2.88"),
-        ]
-    )
-    def text_prop_get_fixture(self, request, core_properties):
-        prop_name, expected_value = request.param
-        return core_properties, prop_name, expected_value
+        core_properties.revision = value
 
-    @pytest.fixture(
-        params=[
-            ("author", "dc:creator", "scanny"),
-            ("category", "cp:category", "silly stories"),
-            ("comments", "dc:description", "Bar foo to you"),
-            ("content_status", "cp:contentStatus", "FINAL"),
-            ("identifier", "dc:identifier", "GT 5.2.xab"),
-            ("keywords", "cp:keywords", "dog cat moo"),
-            ("language", "dc:language", "GB-EN"),
-            ("last_modified_by", "cp:lastModifiedBy", "Billy Bob"),
-            ("subject", "dc:subject", "Eggs"),
-            ("title", "dc:title", "Dissertation"),
-            ("version", "cp:version", "81.2.8"),
-        ]
-    )
-    def text_prop_set_fixture(self, request):
-        prop_name, tagname, value = request.param
-        coreProperties = self.coreProperties(None, None)
-        core_properties = CoreProperties(parse_xml(coreProperties))
-        expected_xml = self.coreProperties(tagname, value)
-        return core_properties, prop_name, value, expected_xml
+        assert core_properties._element.xml == expected_xml
 
-    # fixture components ---------------------------------------------
+    # fixtures -------------------------------------------------------
 
-    def coreProperties(self, tagname, str_val, attrs=""):
+    def coreProperties(self, tagname: str, str_val: str, attrs: str = "") -> str:
         tmpl = (
-            '<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/'
-            'package/2006/metadata/core-properties" xmlns:dc="http://purl.or'
-            'g/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype'
-            '/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://'
-            'www.w3.org/2001/XMLSchema-instance">%s</cp:coreProperties>\n'
+            "<cp:coreProperties"
+            ' xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"'
+            ' xmlns:dc="http://purl.org/dc/elements/1.1/"'
+            ' xmlns:dcmitype="http://purl.org/dc/dcmitype/"'
+            ' xmlns:dcterms="http://purl.org/dc/terms/"'
+            ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
+            ">%s</cp:coreProperties>\n"
         )
         if not tagname:
             child_element = ""
@@ -166,27 +159,30 @@ def coreProperties(self, tagname, str_val, attrs=""):
 
     @pytest.fixture
     def core_properties(self):
-        element = parse_xml(
-            b"<?xml version='1.0' encoding='UTF-8' standalone='yes'?>"
-            b'\n<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.o'
-            b'rg/package/2006/metadata/core-properties" xmlns:dc="http://pur'
-            b'l.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcm'
-            b'itype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="h'
-            b'ttp://www.w3.org/2001/XMLSchema-instance">\n'
-            b"  <cp:contentStatus>DRAFT</cp:contentStatus>\n"
-            b"  <dc:creator>python-docx</dc:creator>\n"
-            b'  <dcterms:created xsi:type="dcterms:W3CDTF">2012-11-17T11:07:'
-            b"40-05:30</dcterms:created>\n"
-            b"  <dc:description/>\n"
-            b"  <dc:identifier>GXS 10.2.1ab</dc:identifier>\n"
-            b"  <dc:language>US-EN</dc:language>\n"
-            b"  <cp:lastPrinted>2014-06-04T04:28:00Z</cp:lastPrinted>\n"
-            b"  <cp:keywords>foo bar baz</cp:keywords>\n"
-            b"  <cp:lastModifiedBy>Steve Canny</cp:lastModifiedBy>\n"
-            b"  <cp:revision>4</cp:revision>\n"
-            b"  <dc:subject>Spam</dc:subject>\n"
-            b"  <dc:title>Word Document</dc:title>\n"
-            b"  <cp:version>1.2.88</cp:version>\n"
-            b"</cp:coreProperties>\n"
+        element = cast(
+            "CT_CoreProperties",
+            parse_xml(
+                b"<?xml version='1.0' encoding='UTF-8' standalone='yes'?>"
+                b'\n<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.o'
+                b'rg/package/2006/metadata/core-properties" xmlns:dc="http://pur'
+                b'l.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcm'
+                b'itype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="h'
+                b'ttp://www.w3.org/2001/XMLSchema-instance">\n'
+                b"  <cp:contentStatus>DRAFT</cp:contentStatus>\n"
+                b"  <dc:creator>python-docx</dc:creator>\n"
+                b'  <dcterms:created xsi:type="dcterms:W3CDTF">2012-11-17T11:07:'
+                b"40-05:30</dcterms:created>\n"
+                b"  <dc:description/>\n"
+                b"  <dc:identifier>GXS 10.2.1ab</dc:identifier>\n"
+                b"  <dc:language>US-EN</dc:language>\n"
+                b"  <cp:lastPrinted>2014-06-04T04:28:00Z</cp:lastPrinted>\n"
+                b"  <cp:keywords>foo bar baz</cp:keywords>\n"
+                b"  <cp:lastModifiedBy>Steve Canny</cp:lastModifiedBy>\n"
+                b"  <cp:revision>4</cp:revision>\n"
+                b"  <dc:subject>Spam</dc:subject>\n"
+                b"  <dc:title>Word Document</dc:title>\n"
+                b"  <cp:version>1.2.88</cp:version>\n"
+                b"</cp:coreProperties>\n"
+            ),
         )
         return CoreProperties(element)
diff --git a/tests/opc/test_part.py b/tests/opc/test_part.py
index b156a63f8..dbbcaf262 100644
--- a/tests/opc/test_part.py
+++ b/tests/opc/test_part.py
@@ -28,99 +28,54 @@
 
 
 class DescribePart:
-    def it_can_be_constructed_by_PartFactory(
-        self, partname_, content_type_, blob_, package_, __init_
-    ):
-        part = Part.load(partname_, content_type_, blob_, package_)
+    """Unit-test suite for `docx.opc.part.Part` objects."""
 
-        __init_.assert_called_once_with(ANY, partname_, content_type_, blob_, package_)
+    def it_can_be_constructed_by_PartFactory(self, package_: Mock, init__: Mock):
+        part = Part.load(PackURI("/part/name"), "content/type", b"1be2", package_)
+
+        init__.assert_called_once_with(ANY, "/part/name", "content/type", b"1be2", package_)
         assert isinstance(part, Part)
 
-    def it_knows_its_partname(self, partname_get_fixture):
-        part, expected_partname = partname_get_fixture
-        assert part.partname == expected_partname
+    def it_knows_its_partname(self):
+        part = Part(PackURI("/part/name"), "content/type")
+        assert part.partname == "/part/name"
 
-    def it_can_change_its_partname(self, partname_set_fixture):
-        part, new_partname = partname_set_fixture
-        part.partname = new_partname
-        assert part.partname == new_partname
+    def it_can_change_its_partname(self):
+        part = Part(PackURI("/old/part/name"), "content/type")
+        part.partname = PackURI("/new/part/name")
+        assert part.partname == "/new/part/name"
 
-    def it_knows_its_content_type(self, content_type_fixture):
-        part, expected_content_type = content_type_fixture
-        assert part.content_type == expected_content_type
+    def it_knows_its_content_type(self):
+        part = Part(PackURI("/part/name"), "content/type")
+        assert part.content_type == "content/type"
 
-    def it_knows_the_package_it_belongs_to(self, package_get_fixture):
-        part, expected_package = package_get_fixture
-        assert part.package == expected_package
+    def it_knows_the_package_it_belongs_to(self, package_: Mock):
+        part = Part(PackURI("/part/name"), "content/type", package=package_)
+        assert part.package is package_
 
-    def it_can_be_notified_after_unmarshalling_is_complete(self, part):
+    def it_can_be_notified_after_unmarshalling_is_complete(self):
+        part = Part(PackURI("/part/name"), "content/type")
         part.after_unmarshal()
 
-    def it_can_be_notified_before_marshalling_is_started(self, part):
+    def it_can_be_notified_before_marshalling_is_started(self):
+        part = Part(PackURI("/part/name"), "content/type")
         part.before_marshal()
 
-    def it_uses_the_load_blob_as_its_blob(self, blob_fixture):
-        part, load_blob = blob_fixture
-        assert part.blob is load_blob
+    def it_uses_the_load_blob_as_its_blob(self):
+        blob = b"abcde"
+        part = Part(PackURI("/part/name"), "content/type", blob)
+        assert part.blob is blob
 
     # fixtures ---------------------------------------------
 
     @pytest.fixture
-    def blob_fixture(self, blob_):
-        part = Part(None, None, blob_, None)
-        return part, blob_
-
-    @pytest.fixture
-    def content_type_fixture(self):
-        content_type = "content/type"
-        part = Part(None, content_type, None, None)
-        return part, content_type
-
-    @pytest.fixture
-    def package_get_fixture(self, package_):
-        part = Part(None, None, None, package_)
-        return part, package_
-
-    @pytest.fixture
-    def part(self):
-        part = Part(None, None)
-        return part
-
-    @pytest.fixture
-    def partname_get_fixture(self):
-        partname = PackURI("/part/name")
-        part = Part(partname, None, None, None)
-        return part, partname
-
-    @pytest.fixture
-    def partname_set_fixture(self):
-        old_partname = PackURI("/old/part/name")
-        new_partname = PackURI("/new/part/name")
-        part = Part(old_partname, None, None, None)
-        return part, new_partname
-
-    # fixture components ---------------------------------------------
-
-    @pytest.fixture
-    def blob_(self, request):
-        return instance_mock(request, bytes)
-
-    @pytest.fixture
-    def content_type_(self, request):
-        return instance_mock(request, str)
-
-    @pytest.fixture
-    def __init_(self, request):
+    def init__(self, request: FixtureRequest):
         return initializer_mock(request, Part)
 
     @pytest.fixture
-    def package_(self, request):
+    def package_(self, request: FixtureRequest):
         return instance_mock(request, OpcPackage)
 
-    @pytest.fixture
-    def partname_(self, request):
-        return instance_mock(request, PackURI)
-
 
 class DescribePartRelationshipManagementInterface:
     """Unit-test suite for `docx.opc.package.Part` relationship behaviors."""

From 0ec5dcd1eb1c9483947621040d72573d4d35398a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 30 Apr 2024 11:08:45 -0700
Subject: [PATCH 333/367] fix(pkg): pull lxml pin

Looks like this cure is worse than the disease.

While it may ease installation on Apple Silicon in some instances, it
breaks installation on Python 3.12. Pull this pin and we'll just have to
live with troublesome `lxml` install on certain Mac/version
combinations.
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index ad89abd19..8d483f00b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = [
-    "lxml>=3.1.0,<=4.9.2",
+    "lxml>=3.1.0",
     "typing_extensions>=4.9.0",
 ]
 description = "Create, read, and update Microsoft Word .docx files."

From 4cbbdab6cf627309a77ca1b8e201e89c70950340 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Tue, 30 Apr 2024 11:28:34 -0700
Subject: [PATCH 334/367] fix: accommodate docxtpl use of Part._rels

---
 src/docx/opc/part.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/docx/opc/part.py b/src/docx/opc/part.py
index e3887ef41..cbb4ab556 100644
--- a/src/docx/opc/part.py
+++ b/src/docx/opc/part.py
@@ -145,7 +145,9 @@ def related_parts(self):
     @lazyproperty
     def rels(self):
         """|Relationships| instance holding the relationships for this part."""
-        return Relationships(self._partname.baseURI)
+        # -- prevent breakage in `python-docx-template` by retaining legacy `._rels` attribute --
+        self._rels = Relationships(self._partname.baseURI)
+        return self._rels
 
     def target_ref(self, rId: str) -> str:
         """Return URL contained in target ref of relationship identified by `rId`."""

From 0a8e9c40729bc734fa65f354d72d1159c345becc Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 1 May 2024 11:10:48 -0700
Subject: [PATCH 335/367] fix: Python 3.12 fixes

---
 features/steps/coreprops.py       | 18 +++++++++---------
 pyproject.toml                    | 11 +++++++++++
 pyrightconfig.json                | 21 ---------------------
 src/docx/opc/parts/coreprops.py   |  2 +-
 src/docx/oxml/coreprops.py        |  4 ++--
 tests/opc/parts/test_coreprops.py |  9 ++++++---
 tests/opc/test_coreprops.py       |  4 ++--
 tox.ini                           |  2 +-
 8 files changed, 32 insertions(+), 39 deletions(-)
 delete mode 100644 pyrightconfig.json

diff --git a/features/steps/coreprops.py b/features/steps/coreprops.py
index 0d4e55eb7..90467fb67 100644
--- a/features/steps/coreprops.py
+++ b/features/steps/coreprops.py
@@ -1,6 +1,6 @@
 """Gherkin step implementations for core properties-related features."""
 
-from datetime import datetime, timedelta
+import datetime as dt
 
 from behave import given, then, when
 from behave.runner import Context
@@ -38,13 +38,13 @@ def when_I_assign_new_values_to_the_properties(context: Context):
         ("category", "Category"),
         ("comments", "Description"),
         ("content_status", "Content Status"),
-        ("created", datetime(2013, 6, 15, 12, 34, 56)),
+        ("created", dt.datetime(2013, 6, 15, 12, 34, 56, tzinfo=dt.timezone.utc)),
         ("identifier", "Identifier"),
         ("keywords", "key; word; keyword"),
         ("language", "Language"),
         ("last_modified_by", "Last Modified By"),
-        ("last_printed", datetime(2013, 6, 15, 12, 34, 56)),
-        ("modified", datetime(2013, 6, 15, 12, 34, 56)),
+        ("last_printed", dt.datetime(2013, 6, 15, 12, 34, 56, tzinfo=dt.timezone.utc)),
+        ("modified", dt.datetime(2013, 6, 15, 12, 34, 56, tzinfo=dt.timezone.utc)),
         ("revision", 9),
         ("subject", "Subject"),
         ("title", "Title"),
@@ -66,8 +66,8 @@ def then_a_core_properties_part_with_default_values_is_added(context: Context):
     assert core_properties.revision == 1
     # core_properties.modified only stores time with seconds resolution, so
     # comparison needs to be a little loose (within two seconds)
-    modified_timedelta = datetime.utcnow() - core_properties.modified
-    max_expected_timedelta = timedelta(seconds=2)
+    modified_timedelta = dt.datetime.now(dt.timezone.utc) - core_properties.modified
+    max_expected_timedelta = dt.timedelta(seconds=2)
     assert modified_timedelta < max_expected_timedelta
 
 
@@ -85,13 +85,13 @@ def then_the_core_property_values_match_the_known_values(context: Context):
         ("category", "Category"),
         ("comments", "Description"),
         ("content_status", "Content Status"),
-        ("created", datetime(2014, 12, 13, 22, 2, 0)),
+        ("created", dt.datetime(2014, 12, 13, 22, 2, 0, tzinfo=dt.timezone.utc)),
         ("identifier", "Identifier"),
         ("keywords", "key; word; keyword"),
         ("language", "Language"),
         ("last_modified_by", "Steve Canny"),
-        ("last_printed", datetime(2014, 12, 13, 22, 2, 42)),
-        ("modified", datetime(2014, 12, 13, 22, 6, 0)),
+        ("last_printed", dt.datetime(2014, 12, 13, 22, 2, 42, tzinfo=dt.timezone.utc)),
+        ("modified", dt.datetime(2014, 12, 13, 22, 6, 0, tzinfo=dt.timezone.utc)),
         ("revision", 2),
         ("subject", "Subject"),
         ("title", "Title"),
diff --git a/pyproject.toml b/pyproject.toml
index 8d483f00b..91bac83d5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,6 +42,17 @@ Repository = "https://github.com/python-openxml/python-docx"
 line-length = 100
 target-version = ["py37", "py38", "py39", "py310", "py311"]
 
+[tool.pyright]
+include = ["src/docx", "tests"]
+pythonPlatform = "All"
+pythonVersion = "3.8"
+reportImportCycles = true
+reportUnnecessaryCast = true
+reportUnnecessaryTypeIgnoreComment = true
+stubPath = "./typings"
+typeCheckingMode = "strict"
+verboseOutput = true
+
 [tool.pytest.ini_options]
 filterwarnings = [
     # -- exit on any warning not explicitly ignored here --
diff --git a/pyrightconfig.json b/pyrightconfig.json
deleted file mode 100644
index 21afeb97b..000000000
--- a/pyrightconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "exclude": [
-        "**/__pycache__",
-        "**/.*"
-    ],
-    "ignore":  [
-    ],
-    "include": [
-        "src/docx",
-        "tests"
-    ],
-    "pythonPlatform": "All",
-    "pythonVersion": "3.7",
-    "reportImportCycles": true,
-    "reportUnnecessaryCast": true,
-    "reportUnnecessaryTypeIgnoreComment": true,
-    "stubPath": "./typings",
-    "typeCheckingMode": "strict",
-    "useLibraryCodeForTypes": true,
-    "verboseOutput": true
-}
diff --git a/src/docx/opc/parts/coreprops.py b/src/docx/opc/parts/coreprops.py
index 0d818f18d..fda011218 100644
--- a/src/docx/opc/parts/coreprops.py
+++ b/src/docx/opc/parts/coreprops.py
@@ -31,7 +31,7 @@ def default(cls, package: OpcPackage):
         core_properties.title = "Word Document"
         core_properties.last_modified_by = "python-docx"
         core_properties.revision = 1
-        core_properties.modified = dt.datetime.utcnow()
+        core_properties.modified = dt.datetime.now(dt.timezone.utc)
         return core_properties_part
 
     @property
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 93f8890c7..8ba9ff42e 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -254,8 +254,8 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str: str) -> dt.datetime:
             tmpl = "could not parse W3CDTF datetime string '%s'"
             raise ValueError(tmpl % w3cdtf_str)
         if len(offset_str) == 6:
-            return cls._offset_dt(dt_, offset_str)
-        return dt_
+            dt_ = cls._offset_dt(dt_, offset_str)
+        return dt_.replace(tzinfo=dt.timezone.utc)
 
     def _set_element_datetime(self, prop_name: str, value: dt.datetime):
         """Set date/time value of child element having `prop_name` to `value`."""
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
index 5bcf49651..b754d2d7e 100644
--- a/tests/opc/parts/test_coreprops.py
+++ b/tests/opc/parts/test_coreprops.py
@@ -1,6 +1,8 @@
 """Unit test suite for the docx.opc.parts.coreprops module."""
 
-from datetime import datetime, timedelta
+from __future__ import annotations
+
+import datetime as dt
 
 import pytest
 
@@ -35,8 +37,9 @@ def it_can_create_a_default_core_properties_part(self, package_: Mock):
         assert core_properties.title == "Word Document"
         assert core_properties.last_modified_by == "python-docx"
         assert core_properties.revision == 1
-        delta = datetime.utcnow() - core_properties.modified
-        max_expected_delta = timedelta(seconds=2)
+        assert core_properties.modified is not None
+        delta = dt.datetime.now(dt.timezone.utc) - core_properties.modified
+        max_expected_delta = dt.timedelta(seconds=2)
         assert delta < max_expected_delta
 
     # fixtures ---------------------------------------------
diff --git a/tests/opc/test_coreprops.py b/tests/opc/test_coreprops.py
index 0214cdbdf..5d9743397 100644
--- a/tests/opc/test_coreprops.py
+++ b/tests/opc/test_coreprops.py
@@ -68,8 +68,8 @@ def it_can_change_the_string_property_values(self, prop_name: str, tagname: str,
     @pytest.mark.parametrize(
         ("prop_name", "expected_datetime"),
         [
-            ("created", dt.datetime(2012, 11, 17, 16, 37, 40)),
-            ("last_printed", dt.datetime(2014, 6, 4, 4, 28)),
+            ("created", dt.datetime(2012, 11, 17, 16, 37, 40, tzinfo=dt.timezone.utc)),
+            ("last_printed", dt.datetime(2014, 6, 4, 4, 28, tzinfo=dt.timezone.utc)),
             ("modified", None),
         ],
     )
diff --git a/tox.ini b/tox.ini
index f8595ba45..37acaa5fa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38, py39, py310, py311
+envlist = py38, py39, py310, py311, py312
 
 [testenv]
 deps = -rrequirements-test.txt

From 0cf6d71fb47ede07ecd5de2a8655f9f46c5f083d Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 1 May 2024 12:31:09 -0700
Subject: [PATCH 336/367] release: prepare v1.1.2 release

---
 HISTORY.rst          | 7 +++++++
 src/docx/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 51262c4b3..0dab17d87 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ---------------
 
+1.1.2 (2024-05-01)
+++++++++++++++++++
+
+- Fix #1383 Revert lxml<=4.9.2 pin that breaks Python 3.12 install
+- Fix #1385 Support use of Part._rels by python-docx-template
+- Add support and testing for Python 3.12
+
 1.1.1 (2024-04-29)
 ++++++++++++++++++
 
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index 7a4d0bbe8..205221027 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -13,7 +13,7 @@
 if TYPE_CHECKING:
     from docx.opc.part import Part
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 
 
 __all__ = ["Document"]

From 3228bc581dfc5891dfeb2db338e7c43be015df88 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 6 Jun 2025 11:26:43 -0700
Subject: [PATCH 337/367] proj: modernize project environment

Primarily introducing `uv`. Also bump minimum Python to 3.9.

- remove reportImportCycles from pyright config because that doesn't
  respect the `TYPE_CHECKING` flag so doesn't actually report useful
  cycles in a project like this where some types are recursive.
---
 .fdignore         |   7 +
 .projections.json |  14 ++
 .rgignore         |   9 +
 pyproject.toml    |  23 ++-
 uv.lock           | 415 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 460 insertions(+), 8 deletions(-)
 create mode 100644 .fdignore
 create mode 100644 .projections.json
 create mode 100644 .rgignore
 create mode 100644 uv.lock

diff --git a/.fdignore b/.fdignore
new file mode 100644
index 000000000..41bdd3828
--- /dev/null
+++ b/.fdignore
@@ -0,0 +1,7 @@
+.tox
+Session.vim
+build/
+docs/.build
+features/_scratch
+__pycache__/
+src/*.egg-info
diff --git a/.projections.json b/.projections.json
new file mode 100644
index 000000000..7d68dd4c5
--- /dev/null
+++ b/.projections.json
@@ -0,0 +1,14 @@
+{
+  "src/docx/*.py" : {
+    "alternate" : [
+      "tests/{dirname}/test_{basename}.py"
+    ],
+    "type" : "source"
+  },
+  "tests/**/test_*.py" : {
+    "alternate" : [
+      "src/docx/{dirname}/{basename}.py"
+    ],
+    "type" : "test"
+  }
+}
diff --git a/.rgignore b/.rgignore
new file mode 100644
index 000000000..12d71b5b4
--- /dev/null
+++ b/.rgignore
@@ -0,0 +1,9 @@
+.tox
+Session.vim
+build/
+docs/.build
+features/_scratch
+__pycache__/
+ref/
+src/*.egg-info
+tests/test_files
diff --git a/pyproject.toml b/pyproject.toml
index 91bac83d5..7c343f2e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ dynamic = ["version"]
 keywords = ["docx", "office", "openxml", "word"]
 license = { text = "MIT" }
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 
 [project.urls]
 Changelog = "https://github.com/python-openxml/python-docx/blob/master/HISTORY.rst"
@@ -38,20 +38,18 @@ Documentation = "https://python-docx.readthedocs.org/en/latest/"
 Homepage = "https://github.com/python-openxml/python-docx"
 Repository = "https://github.com/python-openxml/python-docx"
 
-[tool.black]
-line-length = 100
-target-version = ["py37", "py38", "py39", "py310", "py311"]
-
 [tool.pyright]
 include = ["src/docx", "tests"]
 pythonPlatform = "All"
-pythonVersion = "3.8"
-reportImportCycles = true
+pythonVersion = "3.9"
+reportImportCycles = false
 reportUnnecessaryCast = true
 reportUnnecessaryTypeIgnoreComment = true
 stubPath = "./typings"
 typeCheckingMode = "strict"
 verboseOutput = true
+venvPath = "."
+venv = ".venv"
 
 [tool.pytest.ini_options]
 filterwarnings = [
@@ -88,7 +86,6 @@ target-version = "py38"
 ignore = [
     "COM812",   # -- over-aggressively insists on trailing commas where not desired --
     "PT001",    # -- wants @pytest.fixture() instead of @pytest.fixture --
-    "PT005",    # -- wants @pytest.fixture() instead of @pytest.fixture --
 ]
 select = [
     "C4",       # -- flake8-comprehensions --
@@ -111,3 +108,13 @@ known-local-folder = ["helpers"]
 
 [tool.setuptools.dynamic]
 version = {attr = "docx.__version__"}
+
+[dependency-groups]
+dev = [
+    "behave>=1.2.6",
+    "pyparsing>=3.2.3",
+    "pyright>=1.1.401",
+    "pytest>=8.4.0",
+    "ruff>=0.11.13",
+    "types-lxml-multi-subclass>=2025.3.30",
+]
diff --git a/uv.lock b/uv.lock
new file mode 100644
index 000000000..bbef867c8
--- /dev/null
+++ b/uv.lock
@@ -0,0 +1,415 @@
+version = 1
+revision = 1
+requires-python = ">=3.9"
+
+[[package]]
+name = "beautifulsoup4"
+version = "4.13.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "soupsieve" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d8/e4/0c4c39e18fd76d6a628d4dd8da40543d136ce2d1752bd6eeeab0791f4d6b/beautifulsoup4-4.13.4.tar.gz", hash = "sha256:dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195", size = 621067 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/50/cd/30110dc0ffcf3b131156077b90e9f60ed75711223f306da4db08eff8403b/beautifulsoup4-4.13.4-py3-none-any.whl", hash = "sha256:9bbbb14bfde9d79f38b8cd5f8c7c85f4b8f2523190ebed90e950a8dea4cb1c4b", size = 187285 },
+]
+
+[[package]]
+name = "behave"
+version = "1.2.6"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "parse" },
+    { name = "parse-type" },
+    { name = "six" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c8/4b/d0a8c23b6c8985e5544ea96d27105a273ea22051317f850c2cdbf2029fe4/behave-1.2.6.tar.gz", hash = "sha256:b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86", size = 701696 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a8/6c/ec9169548b6c4cb877aaa6773408ca08ae2a282805b958dbc163cb19822d/behave-1.2.6-py2.py3-none-any.whl", hash = "sha256:ebda1a6c9e5bfe95c5f9f0a2794e01c7098b3dde86c10a95d8621c5907ff6f1c", size = 136779 },
+]
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 },
+]
+
+[[package]]
+name = "cssselect"
+version = "1.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/0a/c3ea9573b1dc2e151abfe88c7fe0c26d1892fe6ed02d0cdb30f0d57029d5/cssselect-1.3.0.tar.gz", hash = "sha256:57f8a99424cfab289a1b6a816a43075a4b00948c86b4dcf3ef4ee7e15f7ab0c7", size = 42870 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ee/58/257350f7db99b4ae12b614a36256d9cc870d71d9e451e79c2dc3b23d7c3c/cssselect-1.3.0-py3-none-any.whl", hash = "sha256:56d1bf3e198080cc1667e137bc51de9cadfca259f03c2d4e09037b3e01e30f0d", size = 18786 },
+]
+
+[[package]]
+name = "exceptiongroup"
+version = "1.3.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/36/f4/c6e662dade71f56cd2f3735141b265c3c79293c109549c1e6933b0651ffc/exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10", size = 16674 },
+]
+
+[[package]]
+name = "iniconfig"
+version = "2.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f2/97/ebf4da567aa6827c909642694d71c9fcf53e5b504f2d96afea02718862f3/iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", size = 4793 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050 },
+]
+
+[[package]]
+name = "lxml"
+version = "5.4.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/76/3d/14e82fc7c8fb1b7761f7e748fd47e2ec8276d137b6acfe5a4bb73853e08f/lxml-5.4.0.tar.gz", hash = "sha256:d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd", size = 3679479 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f5/1f/a3b6b74a451ceb84b471caa75c934d2430a4d84395d38ef201d539f38cd1/lxml-5.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e7bc6df34d42322c5289e37e9971d6ed114e3776b45fa879f734bded9d1fea9c", size = 8076838 },
+    { url = "https://files.pythonhosted.org/packages/36/af/a567a55b3e47135b4d1f05a1118c24529104c003f95851374b3748139dc1/lxml-5.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6854f8bd8a1536f8a1d9a3655e6354faa6406621cf857dc27b681b69860645c7", size = 4381827 },
+    { url = "https://files.pythonhosted.org/packages/50/ba/4ee47d24c675932b3eb5b6de77d0f623c2db6dc466e7a1f199792c5e3e3a/lxml-5.4.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:696ea9e87442467819ac22394ca36cb3d01848dad1be6fac3fb612d3bd5a12cf", size = 5204098 },
+    { url = "https://files.pythonhosted.org/packages/f2/0f/b4db6dfebfefe3abafe360f42a3d471881687fd449a0b86b70f1f2683438/lxml-5.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ef80aeac414f33c24b3815ecd560cee272786c3adfa5f31316d8b349bfade28", size = 4930261 },
+    { url = "https://files.pythonhosted.org/packages/0b/1f/0bb1bae1ce056910f8db81c6aba80fec0e46c98d77c0f59298c70cd362a3/lxml-5.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b9c2754cef6963f3408ab381ea55f47dabc6f78f4b8ebb0f0b25cf1ac1f7609", size = 5529621 },
+    { url = "https://files.pythonhosted.org/packages/21/f5/e7b66a533fc4a1e7fa63dd22a1ab2ec4d10319b909211181e1ab3e539295/lxml-5.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7a62cc23d754bb449d63ff35334acc9f5c02e6dae830d78dab4dd12b78a524f4", size = 4983231 },
+    { url = "https://files.pythonhosted.org/packages/11/39/a38244b669c2d95a6a101a84d3c85ba921fea827e9e5483e93168bf1ccb2/lxml-5.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f82125bc7203c5ae8633a7d5d20bcfdff0ba33e436e4ab0abc026a53a8960b7", size = 5084279 },
+    { url = "https://files.pythonhosted.org/packages/db/64/48cac242347a09a07740d6cee7b7fd4663d5c1abd65f2e3c60420e231b27/lxml-5.4.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:b67319b4aef1a6c56576ff544b67a2a6fbd7eaee485b241cabf53115e8908b8f", size = 4927405 },
+    { url = "https://files.pythonhosted.org/packages/98/89/97442835fbb01d80b72374f9594fe44f01817d203fa056e9906128a5d896/lxml-5.4.0-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:a8ef956fce64c8551221f395ba21d0724fed6b9b6242ca4f2f7beb4ce2f41997", size = 5550169 },
+    { url = "https://files.pythonhosted.org/packages/f1/97/164ca398ee654eb21f29c6b582685c6c6b9d62d5213abc9b8380278e9c0a/lxml-5.4.0-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:0a01ce7d8479dce84fc03324e3b0c9c90b1ece9a9bb6a1b6c9025e7e4520e78c", size = 5062691 },
+    { url = "https://files.pythonhosted.org/packages/d0/bc/712b96823d7feb53482d2e4f59c090fb18ec7b0d0b476f353b3085893cda/lxml-5.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:91505d3ddebf268bb1588eb0f63821f738d20e1e7f05d3c647a5ca900288760b", size = 5133503 },
+    { url = "https://files.pythonhosted.org/packages/d4/55/a62a39e8f9da2a8b6002603475e3c57c870cd9c95fd4b94d4d9ac9036055/lxml-5.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a3bcdde35d82ff385f4ede021df801b5c4a5bcdfb61ea87caabcebfc4945dc1b", size = 4999346 },
+    { url = "https://files.pythonhosted.org/packages/ea/47/a393728ae001b92bb1a9e095e570bf71ec7f7fbae7688a4792222e56e5b9/lxml-5.4.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:aea7c06667b987787c7d1f5e1dfcd70419b711cdb47d6b4bb4ad4b76777a0563", size = 5627139 },
+    { url = "https://files.pythonhosted.org/packages/5e/5f/9dcaaad037c3e642a7ea64b479aa082968de46dd67a8293c541742b6c9db/lxml-5.4.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:a7fb111eef4d05909b82152721a59c1b14d0f365e2be4c742a473c5d7372f4f5", size = 5465609 },
+    { url = "https://files.pythonhosted.org/packages/a7/0a/ebcae89edf27e61c45023005171d0ba95cb414ee41c045ae4caf1b8487fd/lxml-5.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:43d549b876ce64aa18b2328faff70f5877f8c6dede415f80a2f799d31644d776", size = 5192285 },
+    { url = "https://files.pythonhosted.org/packages/42/ad/cc8140ca99add7d85c92db8b2354638ed6d5cc0e917b21d36039cb15a238/lxml-5.4.0-cp310-cp310-win32.whl", hash = "sha256:75133890e40d229d6c5837b0312abbe5bac1c342452cf0e12523477cd3aa21e7", size = 3477507 },
+    { url = "https://files.pythonhosted.org/packages/e9/39/597ce090da1097d2aabd2f9ef42187a6c9c8546d67c419ce61b88b336c85/lxml-5.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:de5b4e1088523e2b6f730d0509a9a813355b7f5659d70eb4f319c76beea2e250", size = 3805104 },
+    { url = "https://files.pythonhosted.org/packages/81/2d/67693cc8a605a12e5975380d7ff83020dcc759351b5a066e1cced04f797b/lxml-5.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:98a3912194c079ef37e716ed228ae0dcb960992100461b704aea4e93af6b0bb9", size = 8083240 },
+    { url = "https://files.pythonhosted.org/packages/73/53/b5a05ab300a808b72e848efd152fe9c022c0181b0a70b8bca1199f1bed26/lxml-5.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0ea0252b51d296a75f6118ed0d8696888e7403408ad42345d7dfd0d1e93309a7", size = 4387685 },
+    { url = "https://files.pythonhosted.org/packages/d8/cb/1a3879c5f512bdcd32995c301886fe082b2edd83c87d41b6d42d89b4ea4d/lxml-5.4.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b92b69441d1bd39f4940f9eadfa417a25862242ca2c396b406f9272ef09cdcaa", size = 4991164 },
+    { url = "https://files.pythonhosted.org/packages/f9/94/bbc66e42559f9d04857071e3b3d0c9abd88579367fd2588a4042f641f57e/lxml-5.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20e16c08254b9b6466526bc1828d9370ee6c0d60a4b64836bc3ac2917d1e16df", size = 4746206 },
+    { url = "https://files.pythonhosted.org/packages/66/95/34b0679bee435da2d7cae895731700e519a8dfcab499c21662ebe671603e/lxml-5.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7605c1c32c3d6e8c990dd28a0970a3cbbf1429d5b92279e37fda05fb0c92190e", size = 5342144 },
+    { url = "https://files.pythonhosted.org/packages/e0/5d/abfcc6ab2fa0be72b2ba938abdae1f7cad4c632f8d552683ea295d55adfb/lxml-5.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ecf4c4b83f1ab3d5a7ace10bafcb6f11df6156857a3c418244cef41ca9fa3e44", size = 4825124 },
+    { url = "https://files.pythonhosted.org/packages/5a/78/6bd33186c8863b36e084f294fc0a5e5eefe77af95f0663ef33809cc1c8aa/lxml-5.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cef4feae82709eed352cd7e97ae062ef6ae9c7b5dbe3663f104cd2c0e8d94ba", size = 4876520 },
+    { url = "https://files.pythonhosted.org/packages/3b/74/4d7ad4839bd0fc64e3d12da74fc9a193febb0fae0ba6ebd5149d4c23176a/lxml-5.4.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:df53330a3bff250f10472ce96a9af28628ff1f4efc51ccba351a8820bca2a8ba", size = 4765016 },
+    { url = "https://files.pythonhosted.org/packages/24/0d/0a98ed1f2471911dadfc541003ac6dd6879fc87b15e1143743ca20f3e973/lxml-5.4.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:aefe1a7cb852fa61150fcb21a8c8fcea7b58c4cb11fbe59c97a0a4b31cae3c8c", size = 5362884 },
+    { url = "https://files.pythonhosted.org/packages/48/de/d4f7e4c39740a6610f0f6959052b547478107967362e8424e1163ec37ae8/lxml-5.4.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:ef5a7178fcc73b7d8c07229e89f8eb45b2908a9238eb90dcfc46571ccf0383b8", size = 4902690 },
+    { url = "https://files.pythonhosted.org/packages/07/8c/61763abd242af84f355ca4ef1ee096d3c1b7514819564cce70fd18c22e9a/lxml-5.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d2ed1b3cb9ff1c10e6e8b00941bb2e5bb568b307bfc6b17dffbbe8be5eecba86", size = 4944418 },
+    { url = "https://files.pythonhosted.org/packages/f9/c5/6d7e3b63e7e282619193961a570c0a4c8a57fe820f07ca3fe2f6bd86608a/lxml-5.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:72ac9762a9f8ce74c9eed4a4e74306f2f18613a6b71fa065495a67ac227b3056", size = 4827092 },
+    { url = "https://files.pythonhosted.org/packages/71/4a/e60a306df54680b103348545706a98a7514a42c8b4fbfdcaa608567bb065/lxml-5.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f5cb182f6396706dc6cc1896dd02b1c889d644c081b0cdec38747573db88a7d7", size = 5418231 },
+    { url = "https://files.pythonhosted.org/packages/27/f2/9754aacd6016c930875854f08ac4b192a47fe19565f776a64004aa167521/lxml-5.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:3a3178b4873df8ef9457a4875703488eb1622632a9cee6d76464b60e90adbfcd", size = 5261798 },
+    { url = "https://files.pythonhosted.org/packages/38/a2/0c49ec6941428b1bd4f280650d7b11a0f91ace9db7de32eb7aa23bcb39ff/lxml-5.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e094ec83694b59d263802ed03a8384594fcce477ce484b0cbcd0008a211ca751", size = 4988195 },
+    { url = "https://files.pythonhosted.org/packages/7a/75/87a3963a08eafc46a86c1131c6e28a4de103ba30b5ae903114177352a3d7/lxml-5.4.0-cp311-cp311-win32.whl", hash = "sha256:4329422de653cdb2b72afa39b0aa04252fca9071550044904b2e7036d9d97fe4", size = 3474243 },
+    { url = "https://files.pythonhosted.org/packages/fa/f9/1f0964c4f6c2be861c50db380c554fb8befbea98c6404744ce243a3c87ef/lxml-5.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:fd3be6481ef54b8cfd0e1e953323b7aa9d9789b94842d0e5b142ef4bb7999539", size = 3815197 },
+    { url = "https://files.pythonhosted.org/packages/f8/4c/d101ace719ca6a4ec043eb516fcfcb1b396a9fccc4fcd9ef593df34ba0d5/lxml-5.4.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b5aff6f3e818e6bdbbb38e5967520f174b18f539c2b9de867b1e7fde6f8d95a4", size = 8127392 },
+    { url = "https://files.pythonhosted.org/packages/11/84/beddae0cec4dd9ddf46abf156f0af451c13019a0fa25d7445b655ba5ccb7/lxml-5.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:942a5d73f739ad7c452bf739a62a0f83e2578afd6b8e5406308731f4ce78b16d", size = 4415103 },
+    { url = "https://files.pythonhosted.org/packages/d0/25/d0d93a4e763f0462cccd2b8a665bf1e4343dd788c76dcfefa289d46a38a9/lxml-5.4.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:460508a4b07364d6abf53acaa0a90b6d370fafde5693ef37602566613a9b0779", size = 5024224 },
+    { url = "https://files.pythonhosted.org/packages/31/ce/1df18fb8f7946e7f3388af378b1f34fcf253b94b9feedb2cec5969da8012/lxml-5.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:529024ab3a505fed78fe3cc5ddc079464e709f6c892733e3f5842007cec8ac6e", size = 4769913 },
+    { url = "https://files.pythonhosted.org/packages/4e/62/f4a6c60ae7c40d43657f552f3045df05118636be1165b906d3423790447f/lxml-5.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ca56ebc2c474e8f3d5761debfd9283b8b18c76c4fc0967b74aeafba1f5647f9", size = 5290441 },
+    { url = "https://files.pythonhosted.org/packages/9e/aa/04f00009e1e3a77838c7fc948f161b5d2d5de1136b2b81c712a263829ea4/lxml-5.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a81e1196f0a5b4167a8dafe3a66aa67c4addac1b22dc47947abd5d5c7a3f24b5", size = 4820165 },
+    { url = "https://files.pythonhosted.org/packages/c9/1f/e0b2f61fa2404bf0f1fdf1898377e5bd1b74cc9b2cf2c6ba8509b8f27990/lxml-5.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00b8686694423ddae324cf614e1b9659c2edb754de617703c3d29ff568448df5", size = 4932580 },
+    { url = "https://files.pythonhosted.org/packages/24/a2/8263f351b4ffe0ed3e32ea7b7830f845c795349034f912f490180d88a877/lxml-5.4.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:c5681160758d3f6ac5b4fea370495c48aac0989d6a0f01bb9a72ad8ef5ab75c4", size = 4759493 },
+    { url = "https://files.pythonhosted.org/packages/05/00/41db052f279995c0e35c79d0f0fc9f8122d5b5e9630139c592a0b58c71b4/lxml-5.4.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:2dc191e60425ad70e75a68c9fd90ab284df64d9cd410ba8d2b641c0c45bc006e", size = 5324679 },
+    { url = "https://files.pythonhosted.org/packages/1d/be/ee99e6314cdef4587617d3b3b745f9356d9b7dd12a9663c5f3b5734b64ba/lxml-5.4.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:67f779374c6b9753ae0a0195a892a1c234ce8416e4448fe1e9f34746482070a7", size = 4890691 },
+    { url = "https://files.pythonhosted.org/packages/ad/36/239820114bf1d71f38f12208b9c58dec033cbcf80101cde006b9bde5cffd/lxml-5.4.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:79d5bfa9c1b455336f52343130b2067164040604e41f6dc4d8313867ed540079", size = 4955075 },
+    { url = "https://files.pythonhosted.org/packages/d4/e1/1b795cc0b174efc9e13dbd078a9ff79a58728a033142bc6d70a1ee8fc34d/lxml-5.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3d3c30ba1c9b48c68489dc1829a6eede9873f52edca1dda900066542528d6b20", size = 4838680 },
+    { url = "https://files.pythonhosted.org/packages/72/48/3c198455ca108cec5ae3662ae8acd7fd99476812fd712bb17f1b39a0b589/lxml-5.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1af80c6316ae68aded77e91cd9d80648f7dd40406cef73df841aa3c36f6907c8", size = 5391253 },
+    { url = "https://files.pythonhosted.org/packages/d6/10/5bf51858971c51ec96cfc13e800a9951f3fd501686f4c18d7d84fe2d6352/lxml-5.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:4d885698f5019abe0de3d352caf9466d5de2baded00a06ef3f1216c1a58ae78f", size = 5261651 },
+    { url = "https://files.pythonhosted.org/packages/2b/11/06710dd809205377da380546f91d2ac94bad9ff735a72b64ec029f706c85/lxml-5.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aea53d51859b6c64e7c51d522c03cc2c48b9b5d6172126854cc7f01aa11f52bc", size = 5024315 },
+    { url = "https://files.pythonhosted.org/packages/f5/b0/15b6217834b5e3a59ebf7f53125e08e318030e8cc0d7310355e6edac98ef/lxml-5.4.0-cp312-cp312-win32.whl", hash = "sha256:d90b729fd2732df28130c064aac9bb8aff14ba20baa4aee7bd0795ff1187545f", size = 3486149 },
+    { url = "https://files.pythonhosted.org/packages/91/1e/05ddcb57ad2f3069101611bd5f5084157d90861a2ef460bf42f45cced944/lxml-5.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:1dc4ca99e89c335a7ed47d38964abcb36c5910790f9bd106f2a8fa2ee0b909d2", size = 3817095 },
+    { url = "https://files.pythonhosted.org/packages/87/cb/2ba1e9dd953415f58548506fa5549a7f373ae55e80c61c9041b7fd09a38a/lxml-5.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:773e27b62920199c6197130632c18fb7ead3257fce1ffb7d286912e56ddb79e0", size = 8110086 },
+    { url = "https://files.pythonhosted.org/packages/b5/3e/6602a4dca3ae344e8609914d6ab22e52ce42e3e1638c10967568c5c1450d/lxml-5.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ce9c671845de9699904b1e9df95acfe8dfc183f2310f163cdaa91a3535af95de", size = 4404613 },
+    { url = "https://files.pythonhosted.org/packages/4c/72/bf00988477d3bb452bef9436e45aeea82bb40cdfb4684b83c967c53909c7/lxml-5.4.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9454b8d8200ec99a224df8854786262b1bd6461f4280064c807303c642c05e76", size = 5012008 },
+    { url = "https://files.pythonhosted.org/packages/92/1f/93e42d93e9e7a44b2d3354c462cd784dbaaf350f7976b5d7c3f85d68d1b1/lxml-5.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cccd007d5c95279e529c146d095f1d39ac05139de26c098166c4beb9374b0f4d", size = 4760915 },
+    { url = "https://files.pythonhosted.org/packages/45/0b/363009390d0b461cf9976a499e83b68f792e4c32ecef092f3f9ef9c4ba54/lxml-5.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fce1294a0497edb034cb416ad3e77ecc89b313cff7adbee5334e4dc0d11f422", size = 5283890 },
+    { url = "https://files.pythonhosted.org/packages/19/dc/6056c332f9378ab476c88e301e6549a0454dbee8f0ae16847414f0eccb74/lxml-5.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:24974f774f3a78ac12b95e3a20ef0931795ff04dbb16db81a90c37f589819551", size = 4812644 },
+    { url = "https://files.pythonhosted.org/packages/ee/8a/f8c66bbb23ecb9048a46a5ef9b495fd23f7543df642dabeebcb2eeb66592/lxml-5.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:497cab4d8254c2a90bf988f162ace2ddbfdd806fce3bda3f581b9d24c852e03c", size = 4921817 },
+    { url = "https://files.pythonhosted.org/packages/04/57/2e537083c3f381f83d05d9b176f0d838a9e8961f7ed8ddce3f0217179ce3/lxml-5.4.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:e794f698ae4c5084414efea0f5cc9f4ac562ec02d66e1484ff822ef97c2cadff", size = 4753916 },
+    { url = "https://files.pythonhosted.org/packages/d8/80/ea8c4072109a350848f1157ce83ccd9439601274035cd045ac31f47f3417/lxml-5.4.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:2c62891b1ea3094bb12097822b3d44b93fc6c325f2043c4d2736a8ff09e65f60", size = 5289274 },
+    { url = "https://files.pythonhosted.org/packages/b3/47/c4be287c48cdc304483457878a3f22999098b9a95f455e3c4bda7ec7fc72/lxml-5.4.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:142accb3e4d1edae4b392bd165a9abdee8a3c432a2cca193df995bc3886249c8", size = 4874757 },
+    { url = "https://files.pythonhosted.org/packages/2f/04/6ef935dc74e729932e39478e44d8cfe6a83550552eaa072b7c05f6f22488/lxml-5.4.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:1a42b3a19346e5601d1b8296ff6ef3d76038058f311902edd574461e9c036982", size = 4947028 },
+    { url = "https://files.pythonhosted.org/packages/cb/f9/c33fc8daa373ef8a7daddb53175289024512b6619bc9de36d77dca3df44b/lxml-5.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4291d3c409a17febf817259cb37bc62cb7eb398bcc95c1356947e2871911ae61", size = 4834487 },
+    { url = "https://files.pythonhosted.org/packages/8d/30/fc92bb595bcb878311e01b418b57d13900f84c2b94f6eca9e5073ea756e6/lxml-5.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4f5322cf38fe0e21c2d73901abf68e6329dc02a4994e483adbcf92b568a09a54", size = 5381688 },
+    { url = "https://files.pythonhosted.org/packages/43/d1/3ba7bd978ce28bba8e3da2c2e9d5ae3f8f521ad3f0ca6ea4788d086ba00d/lxml-5.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:0be91891bdb06ebe65122aa6bf3fc94489960cf7e03033c6f83a90863b23c58b", size = 5242043 },
+    { url = "https://files.pythonhosted.org/packages/ee/cd/95fa2201041a610c4d08ddaf31d43b98ecc4b1d74b1e7245b1abdab443cb/lxml-5.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:15a665ad90054a3d4f397bc40f73948d48e36e4c09f9bcffc7d90c87410e478a", size = 5021569 },
+    { url = "https://files.pythonhosted.org/packages/2d/a6/31da006fead660b9512d08d23d31e93ad3477dd47cc42e3285f143443176/lxml-5.4.0-cp313-cp313-win32.whl", hash = "sha256:d5663bc1b471c79f5c833cffbc9b87d7bf13f87e055a5c86c363ccd2348d7e82", size = 3485270 },
+    { url = "https://files.pythonhosted.org/packages/fc/14/c115516c62a7d2499781d2d3d7215218c0731b2c940753bf9f9b7b73924d/lxml-5.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:bcb7a1096b4b6b24ce1ac24d4942ad98f983cd3810f9711bcd0293f43a9d8b9f", size = 3814606 },
+    { url = "https://files.pythonhosted.org/packages/1e/04/acd238222ea25683e43ac7113facc380b3aaf77c53e7d88c4f544cef02ca/lxml-5.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bda3ea44c39eb74e2488297bb39d47186ed01342f0022c8ff407c250ac3f498e", size = 8082189 },
+    { url = "https://files.pythonhosted.org/packages/d6/4e/cc7fe9ccb9999cc648492ce970b63c657606aefc7d0fba46b17aa2ba93fb/lxml-5.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ceaf423b50ecfc23ca00b7f50b64baba85fb3fb91c53e2c9d00bc86150c7e40", size = 4384950 },
+    { url = "https://files.pythonhosted.org/packages/56/bf/acd219c489346d0243a30769b9d446b71e5608581db49a18c8d91a669e19/lxml-5.4.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:664cdc733bc87449fe781dbb1f309090966c11cc0c0cd7b84af956a02a8a4729", size = 5209823 },
+    { url = "https://files.pythonhosted.org/packages/57/51/ec31cd33175c09aa7b93d101f56eed43d89e15504455d884d021df7166a7/lxml-5.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:67ed8a40665b84d161bae3181aa2763beea3747f748bca5874b4af4d75998f87", size = 4931808 },
+    { url = "https://files.pythonhosted.org/packages/e5/68/865d229f191514da1777125598d028dc88a5ea300d68c30e1f120bfd01bd/lxml-5.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9b4a3bd174cc9cdaa1afbc4620c049038b441d6ba07629d89a83b408e54c35cd", size = 5086067 },
+    { url = "https://files.pythonhosted.org/packages/82/01/4c958c5848b4e263cd9e83dff6b49f975a5a0854feb1070dfe0bdcdf70a0/lxml-5.4.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:b0989737a3ba6cf2a16efb857fb0dfa20bc5c542737fddb6d893fde48be45433", size = 4929026 },
+    { url = "https://files.pythonhosted.org/packages/55/31/5327d8af74d7f35e645b40ae6658761e1fee59ebecaa6a8d295e495c2ca9/lxml-5.4.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:dc0af80267edc68adf85f2a5d9be1cdf062f973db6790c1d065e45025fa26140", size = 5134245 },
+    { url = "https://files.pythonhosted.org/packages/6f/c9/204eba2400beb0016dacc2c5335ecb1e37f397796683ffdb7f471e86bddb/lxml-5.4.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:639978bccb04c42677db43c79bdaa23785dc7f9b83bfd87570da8207872f1ce5", size = 5001020 },
+    { url = "https://files.pythonhosted.org/packages/07/53/979165f50a853dab1cf3b9e53105032d55f85c5993f94afc4d9a61a22877/lxml-5.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a99d86351f9c15e4a901fc56404b485b1462039db59288b203f8c629260a142", size = 5192346 },
+    { url = "https://files.pythonhosted.org/packages/17/2b/f37b5ae28949143f863ba3066b30eede6107fc9a503bd0d01677d4e2a1e0/lxml-5.4.0-cp39-cp39-win32.whl", hash = "sha256:3e6d5557989cdc3ebb5302bbdc42b439733a841891762ded9514e74f60319ad6", size = 3478275 },
+    { url = "https://files.pythonhosted.org/packages/9a/d5/b795a183680126147665a8eeda8e802c180f2f7661aa9a550bba5bcdae63/lxml-5.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:a8c9b7f16b63e65bbba889acb436a1034a82d34fa09752d754f88d708eca80e1", size = 3806275 },
+    { url = "https://files.pythonhosted.org/packages/c6/b0/e4d1cbb8c078bc4ae44de9c6a79fec4e2b4151b1b4d50af71d799e76b177/lxml-5.4.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1b717b00a71b901b4667226bba282dd462c42ccf618ade12f9ba3674e1fabc55", size = 3892319 },
+    { url = "https://files.pythonhosted.org/packages/5b/aa/e2bdefba40d815059bcb60b371a36fbfcce970a935370e1b367ba1cc8f74/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27a9ded0f0b52098ff89dd4c418325b987feed2ea5cc86e8860b0f844285d740", size = 4211614 },
+    { url = "https://files.pythonhosted.org/packages/3c/5f/91ff89d1e092e7cfdd8453a939436ac116db0a665e7f4be0cd8e65c7dc5a/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b7ce10634113651d6f383aa712a194179dcd496bd8c41e191cec2099fa09de5", size = 4306273 },
+    { url = "https://files.pythonhosted.org/packages/be/7c/8c3f15df2ca534589717bfd19d1e3482167801caedfa4d90a575facf68a6/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:53370c26500d22b45182f98847243efb518d268374a9570409d2e2276232fd37", size = 4208552 },
+    { url = "https://files.pythonhosted.org/packages/7d/d8/9567afb1665f64d73fc54eb904e418d1138d7f011ed00647121b4dd60b38/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c6364038c519dffdbe07e3cf42e6a7f8b90c275d4d1617a69bb59734c1a2d571", size = 4331091 },
+    { url = "https://files.pythonhosted.org/packages/f1/ab/fdbbd91d8d82bf1a723ba88ec3e3d76c022b53c391b0c13cad441cdb8f9e/lxml-5.4.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b12cb6527599808ada9eb2cd6e0e7d3d8f13fe7bbb01c6311255a15ded4c7ab4", size = 3487862 },
+    { url = "https://files.pythonhosted.org/packages/ad/fb/d19b67e4bb63adc20574ba3476cf763b3514df1a37551084b890254e4b15/lxml-5.4.0-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9459e6892f59ecea2e2584ee1058f5d8f629446eab52ba2305ae13a32a059530", size = 3891034 },
+    { url = "https://files.pythonhosted.org/packages/c9/5d/6e1033ee0cdb2f9bc93164f9df14e42cb5bbf1bbed3bf67f687de2763104/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:47fb24cc0f052f0576ea382872b3fc7e1f7e3028e53299ea751839418ade92a6", size = 4207420 },
+    { url = "https://files.pythonhosted.org/packages/f3/4b/23ac79efc32d913259d66672c5f93daac7750a3d97cdc1c1a9a5d1c1b46c/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50441c9de951a153c698b9b99992e806b71c1f36d14b154592580ff4a9d0d877", size = 4305106 },
+    { url = "https://files.pythonhosted.org/packages/a4/7a/fe558bee63a62f7a75a52111c0a94556c1c1bdcf558cd7d52861de558759/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:ab339536aa798b1e17750733663d272038bf28069761d5be57cb4a9b0137b4f8", size = 4205587 },
+    { url = "https://files.pythonhosted.org/packages/ed/5b/3207e6bd8d67c952acfec6bac9d1fa0ee353202e7c40b335ebe00879ab7d/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:9776af1aad5a4b4a1317242ee2bea51da54b2a7b7b48674be736d463c999f37d", size = 4329077 },
+    { url = "https://files.pythonhosted.org/packages/a1/25/d381abcfd00102d3304aa191caab62f6e3bcbac93ee248771db6be153dfd/lxml-5.4.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:63e7968ff83da2eb6fdda967483a7a023aa497d85ad8f05c3ad9b1f2e8c84987", size = 3486416 },
+]
+
+[[package]]
+name = "nodeenv"
+version = "1.9.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/43/16/fc88b08840de0e0a72a2f9d8c6bae36be573e475a6326ae854bcc549fc45/nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f", size = 47437 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d2/1d/1b658dbd2b9fa9c4c9f32accbfc0205d532c8c6194dc0f2a4c0428e7128a/nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9", size = 22314 },
+]
+
+[[package]]
+name = "packaging"
+version = "25.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469 },
+]
+
+[[package]]
+name = "parse"
+version = "1.20.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/4f/78/d9b09ba24bb36ef8b83b71be547e118d46214735b6dfb39e4bfde0e9b9dd/parse-1.20.2.tar.gz", hash = "sha256:b41d604d16503c79d81af5165155c0b20f6c8d6c559efa66b4b695c3e5a0a0ce", size = 29391 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d0/31/ba45bf0b2aa7898d81cbbfac0e88c267befb59ad91a19e36e1bc5578ddb1/parse-1.20.2-py2.py3-none-any.whl", hash = "sha256:967095588cb802add9177d0c0b6133b5ba33b1ea9007ca800e526f42a85af558", size = 20126 },
+]
+
+[[package]]
+name = "parse-type"
+version = "0.6.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "parse" },
+    { name = "six" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/17/e9/a3b2ae5f8a852542788ac1f1865dcea0c549cc40af243f42cabfa0acf24d/parse_type-0.6.4.tar.gz", hash = "sha256:5e1ec10440b000c3f818006033372939e693a9ec0176f446d9303e4db88489a6", size = 96480 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d5/b3/f6cc950042bfdbe98672e7c834d930f85920fb7d3359f59096e8d2799617/parse_type-0.6.4-py2.py3-none-any.whl", hash = "sha256:83d41144a82d6b8541127bf212dd76c7f01baff680b498ce8a4d052a7a5bce4c", size = 27442 },
+]
+
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538 },
+]
+
+[[package]]
+name = "pygments"
+version = "2.19.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7c/2d/c3338d48ea6cc0feb8446d8e6937e1408088a72a39937982cc6111d17f84/pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f", size = 4968581 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293 },
+]
+
+[[package]]
+name = "pyparsing"
+version = "3.2.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bb/22/f1129e69d94ffff626bdb5c835506b3a5b4f3d070f17ea295e12c2c6f60f/pyparsing-3.2.3.tar.gz", hash = "sha256:b9c13f1ab8b3b542f72e28f634bad4de758ab3ce4546e4301970ad6fa77c38be", size = 1088608 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/05/e7/df2285f3d08fee213f2d041540fa4fc9ca6c2d44cf36d3a035bf2a8d2bcc/pyparsing-3.2.3-py3-none-any.whl", hash = "sha256:a749938e02d6fd0b59b356ca504a24982314bb090c383e3cf201c95ef7e2bfcf", size = 111120 },
+]
+
+[[package]]
+name = "pyright"
+version = "1.1.401"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "nodeenv" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/79/9a/7ab2b333b921b2d6bfcffe05a0e0a0bbeff884bd6fb5ed50cd68e2898e53/pyright-1.1.401.tar.gz", hash = "sha256:788a82b6611fa5e34a326a921d86d898768cddf59edde8e93e56087d277cc6f1", size = 3894193 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0d/e6/1f908fce68b0401d41580e0f9acc4c3d1b248adcff00dfaad75cd21a1370/pyright-1.1.401-py3-none-any.whl", hash = "sha256:6fde30492ba5b0d7667c16ecaf6c699fab8d7a1263f6a18549e0b00bf7724c06", size = 5629193 },
+]
+
+[[package]]
+name = "pytest"
+version = "8.4.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
+    { name = "iniconfig" },
+    { name = "packaging" },
+    { name = "pluggy" },
+    { name = "pygments" },
+    { name = "tomli", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/fb/aa/405082ce2749be5398045152251ac69c0f3578c7077efc53431303af97ce/pytest-8.4.0.tar.gz", hash = "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6", size = 1515232 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2f/de/afa024cbe022b1b318a3d224125aa24939e99b4ff6f22e0ba639a2eaee47/pytest-8.4.0-py3-none-any.whl", hash = "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e", size = 363797 },
+]
+
+[[package]]
+name = "python-docx"
+source = { editable = "." }
+dependencies = [
+    { name = "lxml" },
+    { name = "typing-extensions" },
+]
+
+[package.dev-dependencies]
+dev = [
+    { name = "behave" },
+    { name = "pyparsing" },
+    { name = "pyright" },
+    { name = "pytest" },
+    { name = "ruff" },
+    { name = "types-lxml-multi-subclass" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "lxml", specifier = ">=3.1.0" },
+    { name = "typing-extensions", specifier = ">=4.9.0" },
+]
+
+[package.metadata.requires-dev]
+dev = [
+    { name = "behave", specifier = ">=1.2.6" },
+    { name = "pyparsing", specifier = ">=3.2.3" },
+    { name = "pyright", specifier = ">=1.1.401" },
+    { name = "pytest", specifier = ">=8.4.0" },
+    { name = "ruff", specifier = ">=0.11.13" },
+    { name = "types-lxml-multi-subclass", specifier = ">=2025.3.30" },
+]
+
+[[package]]
+name = "ruff"
+version = "0.11.13"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ed/da/9c6f995903b4d9474b39da91d2d626659af3ff1eeb43e9ae7c119349dba6/ruff-0.11.13.tar.gz", hash = "sha256:26fa247dc68d1d4e72c179e08889a25ac0c7ba4d78aecfc835d49cbfd60bf514", size = 4282054 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7d/ce/a11d381192966e0b4290842cc8d4fac7dc9214ddf627c11c1afff87da29b/ruff-0.11.13-py3-none-linux_armv6l.whl", hash = "sha256:4bdfbf1240533f40042ec00c9e09a3aade6f8c10b6414cf11b519488d2635d46", size = 10292516 },
+    { url = "https://files.pythonhosted.org/packages/78/db/87c3b59b0d4e753e40b6a3b4a2642dfd1dcaefbff121ddc64d6c8b47ba00/ruff-0.11.13-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:aef9c9ed1b5ca28bb15c7eac83b8670cf3b20b478195bd49c8d756ba0a36cf48", size = 11106083 },
+    { url = "https://files.pythonhosted.org/packages/77/79/d8cec175856ff810a19825d09ce700265f905c643c69f45d2b737e4a470a/ruff-0.11.13-py3-none-macosx_11_0_arm64.whl", hash = "sha256:53b15a9dfdce029c842e9a5aebc3855e9ab7771395979ff85b7c1dedb53ddc2b", size = 10436024 },
+    { url = "https://files.pythonhosted.org/packages/8b/5b/f6d94f2980fa1ee854b41568368a2e1252681b9238ab2895e133d303538f/ruff-0.11.13-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ab153241400789138d13f362c43f7edecc0edfffce2afa6a68434000ecd8f69a", size = 10646324 },
+    { url = "https://files.pythonhosted.org/packages/6c/9c/b4c2acf24ea4426016d511dfdc787f4ce1ceb835f3c5fbdbcb32b1c63bda/ruff-0.11.13-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6c51f93029d54a910d3d24f7dd0bb909e31b6cd989a5e4ac513f4eb41629f0dc", size = 10174416 },
+    { url = "https://files.pythonhosted.org/packages/f3/10/e2e62f77c65ede8cd032c2ca39c41f48feabedb6e282bfd6073d81bb671d/ruff-0.11.13-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1808b3ed53e1a777c2ef733aca9051dc9bf7c99b26ece15cb59a0320fbdbd629", size = 11724197 },
+    { url = "https://files.pythonhosted.org/packages/bb/f0/466fe8469b85c561e081d798c45f8a1d21e0b4a5ef795a1d7f1a9a9ec182/ruff-0.11.13-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d28ce58b5ecf0f43c1b71edffabe6ed7f245d5336b17805803312ec9bc665933", size = 12511615 },
+    { url = "https://files.pythonhosted.org/packages/17/0e/cefe778b46dbd0cbcb03a839946c8f80a06f7968eb298aa4d1a4293f3448/ruff-0.11.13-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:55e4bc3a77842da33c16d55b32c6cac1ec5fb0fbec9c8c513bdce76c4f922165", size = 12117080 },
+    { url = "https://files.pythonhosted.org/packages/5d/2c/caaeda564cbe103bed145ea557cb86795b18651b0f6b3ff6a10e84e5a33f/ruff-0.11.13-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:633bf2c6f35678c56ec73189ba6fa19ff1c5e4807a78bf60ef487b9dd272cc71", size = 11326315 },
+    { url = "https://files.pythonhosted.org/packages/75/f0/782e7d681d660eda8c536962920c41309e6dd4ebcea9a2714ed5127d44bd/ruff-0.11.13-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ffbc82d70424b275b089166310448051afdc6e914fdab90e08df66c43bb5ca9", size = 11555640 },
+    { url = "https://files.pythonhosted.org/packages/5d/d4/3d580c616316c7f07fb3c99dbecfe01fbaea7b6fd9a82b801e72e5de742a/ruff-0.11.13-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4a9ddd3ec62a9a89578c85842b836e4ac832d4a2e0bfaad3b02243f930ceafcc", size = 10507364 },
+    { url = "https://files.pythonhosted.org/packages/5a/dc/195e6f17d7b3ea6b12dc4f3e9de575db7983db187c378d44606e5d503319/ruff-0.11.13-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d237a496e0778d719efb05058c64d28b757c77824e04ffe8796c7436e26712b7", size = 10141462 },
+    { url = "https://files.pythonhosted.org/packages/f4/8e/39a094af6967faa57ecdeacb91bedfb232474ff8c3d20f16a5514e6b3534/ruff-0.11.13-py3-none-musllinux_1_2_i686.whl", hash = "sha256:26816a218ca6ef02142343fd24c70f7cd8c5aa6c203bca284407adf675984432", size = 11121028 },
+    { url = "https://files.pythonhosted.org/packages/5a/c0/b0b508193b0e8a1654ec683ebab18d309861f8bd64e3a2f9648b80d392cb/ruff-0.11.13-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:51c3f95abd9331dc5b87c47ac7f376db5616041173826dfd556cfe3d4977f492", size = 11602992 },
+    { url = "https://files.pythonhosted.org/packages/7c/91/263e33ab93ab09ca06ce4f8f8547a858cc198072f873ebc9be7466790bae/ruff-0.11.13-py3-none-win32.whl", hash = "sha256:96c27935418e4e8e77a26bb05962817f28b8ef3843a6c6cc49d8783b5507f250", size = 10474944 },
+    { url = "https://files.pythonhosted.org/packages/46/f4/7c27734ac2073aae8efb0119cae6931b6fb48017adf048fdf85c19337afc/ruff-0.11.13-py3-none-win_amd64.whl", hash = "sha256:29c3189895a8a6a657b7af4e97d330c8a3afd2c9c8f46c81e2fc5a31866517e3", size = 11548669 },
+    { url = "https://files.pythonhosted.org/packages/ec/bf/b273dd11673fed8a6bd46032c0ea2a04b2ac9bfa9c628756a5856ba113b0/ruff-0.11.13-py3-none-win_arm64.whl", hash = "sha256:b4385285e9179d608ff1d2fb9922062663c658605819a6876d8beef0c30b7f3b", size = 10683928 },
+]
+
+[[package]]
+name = "six"
+version = "1.17.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050 },
+]
+
+[[package]]
+name = "soupsieve"
+version = "2.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3f/f4/4a80cd6ef364b2e8b65b15816a843c0980f7a5a2b4dc701fc574952aa19f/soupsieve-2.7.tar.gz", hash = "sha256:ad282f9b6926286d2ead4750552c8a6142bc4c783fd66b0293547c8fe6ae126a", size = 103418 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e7/9c/0e6afc12c269578be5c0c1c9f4b49a8d32770a080260c333ac04cc1c832d/soupsieve-2.7-py3-none-any.whl", hash = "sha256:6e60cc5c1ffaf1cebcc12e8188320b72071e922c2e897f737cadce79ad5d30c4", size = 36677 },
+]
+
+[[package]]
+name = "tomli"
+version = "2.2.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff/tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", size = 17175 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/43/ca/75707e6efa2b37c77dadb324ae7d9571cb424e61ea73fad7c56c2d14527f/tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", size = 131077 },
+    { url = "https://files.pythonhosted.org/packages/c7/16/51ae563a8615d472fdbffc43a3f3d46588c264ac4f024f63f01283becfbb/tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", size = 123429 },
+    { url = "https://files.pythonhosted.org/packages/f1/dd/4f6cd1e7b160041db83c694abc78e100473c15d54620083dbd5aae7b990e/tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", size = 226067 },
+    { url = "https://files.pythonhosted.org/packages/a9/6b/c54ede5dc70d648cc6361eaf429304b02f2871a345bbdd51e993d6cdf550/tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", size = 236030 },
+    { url = "https://files.pythonhosted.org/packages/1f/47/999514fa49cfaf7a92c805a86c3c43f4215621855d151b61c602abb38091/tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", size = 240898 },
+    { url = "https://files.pythonhosted.org/packages/73/41/0a01279a7ae09ee1573b423318e7934674ce06eb33f50936655071d81a24/tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", size = 229894 },
+    { url = "https://files.pythonhosted.org/packages/55/18/5d8bc5b0a0362311ce4d18830a5d28943667599a60d20118074ea1b01bb7/tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", size = 245319 },
+    { url = "https://files.pythonhosted.org/packages/92/a3/7ade0576d17f3cdf5ff44d61390d4b3febb8a9fc2b480c75c47ea048c646/tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", size = 238273 },
+    { url = "https://files.pythonhosted.org/packages/72/6f/fa64ef058ac1446a1e51110c375339b3ec6be245af9d14c87c4a6412dd32/tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", size = 98310 },
+    { url = "https://files.pythonhosted.org/packages/6a/1c/4a2dcde4a51b81be3530565e92eda625d94dafb46dbeb15069df4caffc34/tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", size = 108309 },
+    { url = "https://files.pythonhosted.org/packages/52/e1/f8af4c2fcde17500422858155aeb0d7e93477a0d59a98e56cbfe75070fd0/tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", size = 132762 },
+    { url = "https://files.pythonhosted.org/packages/03/b8/152c68bb84fc00396b83e7bbddd5ec0bd3dd409db4195e2a9b3e398ad2e3/tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", size = 123453 },
+    { url = "https://files.pythonhosted.org/packages/c8/d6/fc9267af9166f79ac528ff7e8c55c8181ded34eb4b0e93daa767b8841573/tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", size = 233486 },
+    { url = "https://files.pythonhosted.org/packages/5c/51/51c3f2884d7bab89af25f678447ea7d297b53b5a3b5730a7cb2ef6069f07/tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", size = 242349 },
+    { url = "https://files.pythonhosted.org/packages/ab/df/bfa89627d13a5cc22402e441e8a931ef2108403db390ff3345c05253935e/tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", size = 252159 },
+    { url = "https://files.pythonhosted.org/packages/9e/6e/fa2b916dced65763a5168c6ccb91066f7639bdc88b48adda990db10c8c0b/tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", size = 237243 },
+    { url = "https://files.pythonhosted.org/packages/b4/04/885d3b1f650e1153cbb93a6a9782c58a972b94ea4483ae4ac5cedd5e4a09/tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", size = 259645 },
+    { url = "https://files.pythonhosted.org/packages/9c/de/6b432d66e986e501586da298e28ebeefd3edc2c780f3ad73d22566034239/tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", size = 244584 },
+    { url = "https://files.pythonhosted.org/packages/1c/9a/47c0449b98e6e7d1be6cbac02f93dd79003234ddc4aaab6ba07a9a7482e2/tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", size = 98875 },
+    { url = "https://files.pythonhosted.org/packages/ef/60/9b9638f081c6f1261e2688bd487625cd1e660d0a85bd469e91d8db969734/tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", size = 109418 },
+    { url = "https://files.pythonhosted.org/packages/04/90/2ee5f2e0362cb8a0b6499dc44f4d7d48f8fff06d28ba46e6f1eaa61a1388/tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7", size = 132708 },
+    { url = "https://files.pythonhosted.org/packages/c0/ec/46b4108816de6b385141f082ba99e315501ccd0a2ea23db4a100dd3990ea/tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", size = 123582 },
+    { url = "https://files.pythonhosted.org/packages/a0/bd/b470466d0137b37b68d24556c38a0cc819e8febe392d5b199dcd7f578365/tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", size = 232543 },
+    { url = "https://files.pythonhosted.org/packages/d9/e5/82e80ff3b751373f7cead2815bcbe2d51c895b3c990686741a8e56ec42ab/tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", size = 241691 },
+    { url = "https://files.pythonhosted.org/packages/05/7e/2a110bc2713557d6a1bfb06af23dd01e7dde52b6ee7dadc589868f9abfac/tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", size = 251170 },
+    { url = "https://files.pythonhosted.org/packages/64/7b/22d713946efe00e0adbcdfd6d1aa119ae03fd0b60ebed51ebb3fa9f5a2e5/tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", size = 236530 },
+    { url = "https://files.pythonhosted.org/packages/38/31/3a76f67da4b0cf37b742ca76beaf819dca0ebef26d78fc794a576e08accf/tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", size = 258666 },
+    { url = "https://files.pythonhosted.org/packages/07/10/5af1293da642aded87e8a988753945d0cf7e00a9452d3911dd3bb354c9e2/tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", size = 243954 },
+    { url = "https://files.pythonhosted.org/packages/5b/b9/1ed31d167be802da0fc95020d04cd27b7d7065cc6fbefdd2f9186f60d7bd/tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", size = 98724 },
+    { url = "https://files.pythonhosted.org/packages/c7/32/b0963458706accd9afcfeb867c0f9175a741bf7b19cd424230714d722198/tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", size = 109383 },
+    { url = "https://files.pythonhosted.org/packages/6e/c2/61d3e0f47e2b74ef40a68b9e6ad5984f6241a942f7cd3bbfbdbd03861ea9/tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", size = 14257 },
+]
+
+[[package]]
+name = "types-html5lib"
+version = "1.1.11.20250516"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d0/ed/9f092ff479e2b5598941855f314a22953bb04b5fb38bcba3f880feb833ba/types_html5lib-1.1.11.20250516.tar.gz", hash = "sha256:65043a6718c97f7d52567cc0cdf41efbfc33b1f92c6c0c5e19f60a7ec69ae720", size = 16136 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cc/3b/cb5b23c7b51bf48b8c9f175abb9dce2f1ecd2d2c25f92ea9f4e3720e9398/types_html5lib-1.1.11.20250516-py3-none-any.whl", hash = "sha256:5e407b14b1bd2b9b1107cbd1e2e19d4a0c46d60febd231c7ab7313d7405663c1", size = 21770 },
+]
+
+[[package]]
+name = "types-lxml-multi-subclass"
+version = "2025.3.30"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "beautifulsoup4" },
+    { name = "cssselect" },
+    { name = "types-html5lib" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b7/3a/7f6d1d3b921404efef20ed1ddc2b6f1333e3f0bc5b91da37874e786ff835/types_lxml_multi_subclass-2025.3.30.tar.gz", hash = "sha256:7ac7a78e592fdba16951668968b21511adda49bbefbc0f130e55501b70e068b4", size = 153188 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cf/8e/106b4c5a67e6d52475ef51008e6c27d4ad472690d619dc32e079d28a540b/types_lxml_multi_subclass-2025.3.30-py3-none-any.whl", hash = "sha256:b0563e4e49e66eb8093c44e74b262c59e3be6d3bb3437511e3a4843fd74044d1", size = 93475 },
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.14.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d1/bc/51647cd02527e87d05cb083ccc402f93e441606ff1f01739a62c8ad09ba5/typing_extensions-4.14.0.tar.gz", hash = "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4", size = 107423 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/69/e0/552843e0d356fbb5256d21449fa957fa4eff3bbc135a74a691ee70c7c5da/typing_extensions-4.14.0-py3-none-any.whl", hash = "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af", size = 43839 },
+]

From 4262f4de7985ab5647b364c397ed038e00560098 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 6 Jun 2025 15:26:58 -0700
Subject: [PATCH 338/367] modn: improve type annotation

---
 src/docx/opc/coreprops.py    |  9 +++++----
 src/docx/opc/oxml.py         | 25 ++++++++++++-------------
 src/docx/oxml/__init__.py    |  1 +
 src/docx/oxml/coreprops.py   | 32 ++++++++++++++++----------------
 src/docx/oxml/ns.py          |  4 ++--
 src/docx/oxml/shape.py       |  6 ++----
 src/docx/oxml/text/parfmt.py |  5 +++++
 src/docx/oxml/xmlchemy.py    | 24 +++++++-----------------
 src/docx/parts/document.py   |  2 +-
 9 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/src/docx/opc/coreprops.py b/src/docx/opc/coreprops.py
index c564550d4..62f0c5ab1 100644
--- a/src/docx/opc/coreprops.py
+++ b/src/docx/opc/coreprops.py
@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import datetime as dt
 from typing import TYPE_CHECKING
 
 from docx.oxml.coreprops import CT_CoreProperties
@@ -57,7 +58,7 @@ def created(self):
         return self._element.created_datetime
 
     @created.setter
-    def created(self, value):
+    def created(self, value: dt.datetime):
         self._element.created_datetime = value
 
     @property
@@ -97,7 +98,7 @@ def last_printed(self):
         return self._element.lastPrinted_datetime
 
     @last_printed.setter
-    def last_printed(self, value):
+    def last_printed(self, value: dt.datetime):
         self._element.lastPrinted_datetime = value
 
     @property
@@ -105,7 +106,7 @@ def modified(self):
         return self._element.modified_datetime
 
     @modified.setter
-    def modified(self, value):
+    def modified(self, value: dt.datetime):
         self._element.modified_datetime = value
 
     @property
@@ -113,7 +114,7 @@ def revision(self):
         return self._element.revision_number
 
     @revision.setter
-    def revision(self, value):
+    def revision(self, value: int):
         self._element.revision_number = value
 
     @property
diff --git a/src/docx/opc/oxml.py b/src/docx/opc/oxml.py
index 7da72f50d..7d3c489d6 100644
--- a/src/docx/opc/oxml.py
+++ b/src/docx/opc/oxml.py
@@ -38,7 +38,7 @@ def parse_xml(text: str) -> etree._Element:
     return etree.fromstring(text, oxml_parser)
 
 
-def qn(tag):
+def qn(tag: str) -> str:
     """Stands for "qualified name", a utility function to turn a namespace prefixed tag
     name into a Clark-notation qualified tag name for lxml.
 
@@ -50,7 +50,7 @@ def qn(tag):
     return "{%s}%s" % (uri, tagroot)
 
 
-def serialize_part_xml(part_elm: etree._Element):
+def serialize_part_xml(part_elm: etree._Element) -> bytes:
     """Serialize `part_elm` etree element to XML suitable for storage as an XML part.
 
     That is to say, no insignificant whitespace added for readability, and an
@@ -59,7 +59,7 @@ def serialize_part_xml(part_elm: etree._Element):
     return etree.tostring(part_elm, encoding="UTF-8", standalone=True)
 
 
-def serialize_for_reading(element):
+def serialize_for_reading(element: etree._Element) -> str:
     """Serialize `element` to human-readable XML suitable for tests.
 
     No XML declaration.
@@ -77,7 +77,7 @@ class BaseOxmlElement(etree.ElementBase):
     classes in one place."""
 
     @property
-    def xml(self):
+    def xml(self) -> str:
         """Return XML string for this element, suitable for testing purposes.
 
         Pretty printed for readability and without an XML declaration at the top.
@@ -86,8 +86,10 @@ def xml(self):
 
 
 class CT_Default(BaseOxmlElement):
-    """``<Default>`` element, specifying the default content type to be applied to a
-    part with the specified extension."""
+    """`<Default>` element that appears in `[Content_Types].xml` part.
+
+    Used to specify a default content type to be applied to any part with the specified extension.
+    """
 
     @property
     def content_type(self):
@@ -101,9 +103,8 @@ def extension(self):
         return self.get("Extension")
 
     @staticmethod
-    def new(ext, content_type):
-        """Return a new ``<Default>`` element with attributes set to parameter
-        values."""
+    def new(ext: str, content_type: str):
+        """Return a new ``<Default>`` element with attributes set to parameter values."""
         xml = '<Default xmlns="%s"/>' % nsmap["ct"]
         default = parse_xml(xml)
         default.set("Extension", ext)
@@ -123,8 +124,7 @@ def content_type(self):
 
     @staticmethod
     def new(partname, content_type):
-        """Return a new ``<Override>`` element with attributes set to parameter
-        values."""
+        """Return a new ``<Override>`` element with attributes set to parameter values."""
         xml = '<Override xmlns="%s"/>' % nsmap["ct"]
         override = parse_xml(xml)
         override.set("PartName", partname)
@@ -138,8 +138,7 @@ def partname(self):
 
 
 class CT_Relationship(BaseOxmlElement):
-    """``<Relationship>`` element, representing a single relationship from a source to a
-    target part."""
+    """`<Relationship>` element, representing a single relationship from source to target part."""
 
     @staticmethod
     def new(rId: str, reltype: str, target: str, target_mode: str = RTM.INTERNAL):
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index bf32932f9..3fbc114ae 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -234,6 +234,7 @@
 register_element_cls("w:jc", CT_Jc)
 register_element_cls("w:keepLines", CT_OnOff)
 register_element_cls("w:keepNext", CT_OnOff)
+register_element_cls("w:outlineLvl", CT_DecimalNumber)
 register_element_cls("w:pageBreakBefore", CT_OnOff)
 register_element_cls("w:pPr", CT_PPr)
 register_element_cls("w:pStyle", CT_String)
diff --git a/src/docx/oxml/coreprops.py b/src/docx/oxml/coreprops.py
index 8ba9ff42e..fcff0c7ba 100644
--- a/src/docx/oxml/coreprops.py
+++ b/src/docx/oxml/coreprops.py
@@ -4,7 +4,7 @@
 
 import datetime as dt
 import re
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any, Callable, cast
 
 from docx.oxml.ns import nsdecls, qn
 from docx.oxml.parser import parse_xml
@@ -45,14 +45,14 @@ class CT_CoreProperties(BaseOxmlElement):
     _coreProperties_tmpl = "<cp:coreProperties %s/>\n" % nsdecls("cp", "dc", "dcterms")
 
     @classmethod
-    def new(cls):
+    def new(cls) -> CT_CoreProperties:
         """Return a new `<cp:coreProperties>` element."""
         xml = cls._coreProperties_tmpl
-        coreProperties = parse_xml(xml)
+        coreProperties = cast(CT_CoreProperties, parse_xml(xml))
         return coreProperties
 
     @property
-    def author_text(self):
+    def author_text(self) -> str:
         """The text in the `dc:creator` child element."""
         return self._text_of_element("creator")
 
@@ -77,7 +77,7 @@ def comments_text(self, value: str):
         self._set_element_text("description", value)
 
     @property
-    def contentStatus_text(self):
+    def contentStatus_text(self) -> str:
         return self._text_of_element("contentStatus")
 
     @contentStatus_text.setter
@@ -85,7 +85,7 @@ def contentStatus_text(self, value: str):
         self._set_element_text("contentStatus", value)
 
     @property
-    def created_datetime(self):
+    def created_datetime(self) -> dt.datetime | None:
         return self._datetime_of_element("created")
 
     @created_datetime.setter
@@ -93,7 +93,7 @@ def created_datetime(self, value: dt.datetime):
         self._set_element_datetime("created", value)
 
     @property
-    def identifier_text(self):
+    def identifier_text(self) -> str:
         return self._text_of_element("identifier")
 
     @identifier_text.setter
@@ -101,7 +101,7 @@ def identifier_text(self, value: str):
         self._set_element_text("identifier", value)
 
     @property
-    def keywords_text(self):
+    def keywords_text(self) -> str:
         return self._text_of_element("keywords")
 
     @keywords_text.setter
@@ -109,7 +109,7 @@ def keywords_text(self, value: str):
         self._set_element_text("keywords", value)
 
     @property
-    def language_text(self):
+    def language_text(self) -> str:
         return self._text_of_element("language")
 
     @language_text.setter
@@ -117,7 +117,7 @@ def language_text(self, value: str):
         self._set_element_text("language", value)
 
     @property
-    def lastModifiedBy_text(self):
+    def lastModifiedBy_text(self) -> str:
         return self._text_of_element("lastModifiedBy")
 
     @lastModifiedBy_text.setter
@@ -125,7 +125,7 @@ def lastModifiedBy_text(self, value: str):
         self._set_element_text("lastModifiedBy", value)
 
     @property
-    def lastPrinted_datetime(self):
+    def lastPrinted_datetime(self) -> dt.datetime | None:
         return self._datetime_of_element("lastPrinted")
 
     @lastPrinted_datetime.setter
@@ -141,7 +141,7 @@ def modified_datetime(self, value: dt.datetime):
         self._set_element_datetime("modified", value)
 
     @property
-    def revision_number(self):
+    def revision_number(self) -> int:
         """Integer value of revision property."""
         revision = self.revision
         if revision is None:
@@ -167,7 +167,7 @@ def revision_number(self, value: int):
         revision.text = str(value)
 
     @property
-    def subject_text(self):
+    def subject_text(self) -> str:
         return self._text_of_element("subject")
 
     @subject_text.setter
@@ -175,7 +175,7 @@ def subject_text(self, value: str):
         self._set_element_text("subject", value)
 
     @property
-    def title_text(self):
+    def title_text(self) -> str:
         return self._text_of_element("title")
 
     @title_text.setter
@@ -183,7 +183,7 @@ def title_text(self, value: str):
         self._set_element_text("title", value)
 
     @property
-    def version_text(self):
+    def version_text(self) -> str:
         return self._text_of_element("version")
 
     @version_text.setter
@@ -257,7 +257,7 @@ def _parse_W3CDTF_to_datetime(cls, w3cdtf_str: str) -> dt.datetime:
             dt_ = cls._offset_dt(dt_, offset_str)
         return dt_.replace(tzinfo=dt.timezone.utc)
 
-    def _set_element_datetime(self, prop_name: str, value: dt.datetime):
+    def _set_element_datetime(self, prop_name: str, value: dt.datetime) -> None:
         """Set date/time value of child element having `prop_name` to `value`."""
         if not isinstance(value, dt.datetime):  # pyright: ignore[reportUnnecessaryIsInstance]
             tmpl = "property requires <type 'datetime.datetime'> object, got %s"
diff --git a/src/docx/oxml/ns.py b/src/docx/oxml/ns.py
index 5bed1e6a0..ce03940f7 100644
--- a/src/docx/oxml/ns.py
+++ b/src/docx/oxml/ns.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Dict
 
 nsmap = {
     "a": "http://schemas.openxmlformats.org/drawingml/2006/main",
@@ -29,7 +29,7 @@
 class NamespacePrefixedTag(str):
     """Value object that knows the semantics of an XML tag having a namespace prefix."""
 
-    def __new__(cls, nstag: str, *args: Any):
+    def __new__(cls, nstag: str):
         return super(NamespacePrefixedTag, cls).__new__(cls, nstag)
 
     def __init__(self, nstag: str):
diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index 289d35579..00e7593a9 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -145,10 +145,8 @@ class CT_Picture(BaseOxmlElement):
     spPr: CT_ShapeProperties = OneAndOnlyOne("pic:spPr")  # pyright: ignore[reportAssignmentType]
 
     @classmethod
-    def new(cls, pic_id, filename, rId, cx, cy):
-        """Return a new ``<pic:pic>`` element populated with the minimal contents
-        required to define a viable picture element, based on the values passed as
-        parameters."""
+    def new(cls, pic_id: int, filename: str, rId: str, cx: Length, cy: Length) -> CT_Picture:
+        """A new minimum viable `<pic:pic>` (picture) element."""
         pic = parse_xml(cls._pic_xml())
         pic.nvPicPr.cNvPr.id = pic_id
         pic.nvPicPr.cNvPr.name = filename
diff --git a/src/docx/oxml/text/parfmt.py b/src/docx/oxml/text/parfmt.py
index de5609636..2133686b2 100644
--- a/src/docx/oxml/text/parfmt.py
+++ b/src/docx/oxml/text/parfmt.py
@@ -10,6 +10,7 @@
     WD_TAB_ALIGNMENT,
     WD_TAB_LEADER,
 )
+from docx.oxml.shared import CT_DecimalNumber
 from docx.oxml.simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
 from docx.oxml.xmlchemy import (
     BaseOxmlElement,
@@ -55,6 +56,7 @@ class CT_PPr(BaseOxmlElement):
 
     get_or_add_ind: Callable[[], CT_Ind]
     get_or_add_pStyle: Callable[[], CT_String]
+    get_or_add_sectPr: Callable[[], CT_SectPr]
     _insert_sectPr: Callable[[CT_SectPr], None]
     _remove_pStyle: Callable[[], None]
     _remove_sectPr: Callable[[], None]
@@ -111,6 +113,9 @@ class CT_PPr(BaseOxmlElement):
         "w:ind", successors=_tag_seq[23:]
     )
     jc = ZeroOrOne("w:jc", successors=_tag_seq[27:])
+    outlineLvl: CT_DecimalNumber = ZeroOrOne(  # pyright: ignore[reportAssignmentType]
+        "w:outlineLvl", successors=_tag_seq[31:]
+    )
     sectPr = ZeroOrOne("w:sectPr", successors=_tag_seq[35:])
     del _tag_seq
 
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index 077bcd583..bc33e1f58 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -5,17 +5,7 @@
 from __future__ import annotations
 
 import re
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict,
-    List,
-    Sequence,
-    Tuple,
-    Type,
-    TypeVar,
-)
+from typing import TYPE_CHECKING, Any, Callable, Sequence, Type, TypeVar
 
 from lxml import etree
 from lxml.etree import ElementBase, _Element  # pyright: ignore[reportPrivateUsage]
@@ -65,7 +55,7 @@ def __eq__(self, other: object) -> bool:
     def __ne__(self, other: object) -> bool:
         return not self.__eq__(other)
 
-    def _attr_seq(self, attrs: str) -> List[str]:
+    def _attr_seq(self, attrs: str) -> list[str]:
         """Return a sequence of attribute strings parsed from `attrs`.
 
         Each attribute string is stripped of whitespace on both ends.
@@ -90,7 +80,7 @@ def _eq_elm_strs(self, line: str, line_2: str):
         return True
 
     @classmethod
-    def _parse_line(cls, line: str) -> Tuple[str, str, str, str]:
+    def _parse_line(cls, line: str) -> tuple[str, str, str, str]:
         """(front, attrs, close, text) 4-tuple result of parsing XML element `line`."""
         match = cls._xml_elm_line_patt.match(line)
         if match is None:
@@ -105,7 +95,7 @@ def _parse_line(cls, line: str) -> Tuple[str, str, str, str]:
 class MetaOxmlElement(type):
     """Metaclass for BaseOxmlElement."""
 
-    def __init__(cls, clsname: str, bases: Tuple[type, ...], namespace: Dict[str, Any]):
+    def __init__(cls, clsname: str, bases: tuple[type, ...], namespace: dict[str, Any]):
         dispatchable = (
             OneAndOnlyOne,
             OneOrMore,
@@ -280,7 +270,7 @@ class _BaseChildElement:
     and ZeroOrMore.
     """
 
-    def __init__(self, nsptagname: str, successors: Tuple[str, ...] = ()):
+    def __init__(self, nsptagname: str, successors: tuple[str, ...] = ()):
         super(_BaseChildElement, self).__init__()
         self._nsptagname = nsptagname
         self._successors = successors
@@ -446,7 +436,7 @@ def populate_class_members(  # pyright: ignore[reportIncompatibleMethodOverride]
         self,
         element_cls: MetaOxmlElement,
         group_prop_name: str,
-        successors: Tuple[str, ...],
+        successors: tuple[str, ...],
     ) -> None:
         """Add the appropriate methods to `element_cls`."""
         self._element_cls = element_cls
@@ -597,7 +587,7 @@ class ZeroOrOneChoice(_BaseChildElement):
     """Correspondes to an ``EG_*`` element group where at most one of its members may
     appear as a child."""
 
-    def __init__(self, choices: Sequence[Choice], successors: Tuple[str, ...] = ()):
+    def __init__(self, choices: Sequence[Choice], successors: tuple[str, ...] = ()):
         self._choices = choices
         self._successors = successors
 
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 416bb1a27..648b58aa2 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -5,7 +5,6 @@
 from typing import IO, TYPE_CHECKING, cast
 
 from docx.document import Document
-from docx.enum.style import WD_STYLE_TYPE
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
@@ -16,6 +15,7 @@
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from docx.enum.style import WD_STYLE_TYPE
     from docx.opc.coreprops import CoreProperties
     from docx.settings import Settings
     from docx.styles.style import BaseStyle

From afa670a9716b1ac64e6e312ac7ab5efef01ec84a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 6 Jun 2025 11:33:58 -0700
Subject: [PATCH 339/367] modn: modernize tests

- inline single-test fixtures
- remove obsolete pre-cxml XML builders
---
 src/docx/dml/color.py        |  88 ++++---
 src/docx/document.py         |  10 +-
 src/docx/enum/base.py        |  10 +-
 src/docx/opc/package.py      |   7 +-
 src/docx/oxml/text/font.py   |  63 ++---
 src/docx/parts/document.py   |   7 +-
 src/docx/parts/numbering.py  |   5 +-
 src/docx/shared.py           |   8 +-
 src/docx/text/run.py         |   2 +-
 tests/dml/test_color.py      | 149 ++++++------
 tests/oxml/unitdata/dml.py   |  63 -----
 tests/parts/test_document.py | 266 ++++++++++++--------
 tests/test_api.py            |  67 +++--
 tests/test_blkcntnr.py       | 172 +++++++------
 tests/test_document.py       | 410 +++++++++++++++----------------
 tests/test_package.py        | 120 +++++----
 tests/test_section.py        | 156 +++++-------
 tests/test_settings.py       |  67 ++---
 tests/test_shape.py          | 269 ++++++++------------
 tests/test_shared.py         | 128 +++++-----
 tests/text/test_run.py       | 460 +++++++++++++++++------------------
 21 files changed, 1180 insertions(+), 1347 deletions(-)
 delete mode 100644 tests/oxml/unitdata/dml.py

diff --git a/src/docx/dml/color.py b/src/docx/dml/color.py
index d7ee0a21c..a8322d21a 100644
--- a/src/docx/dml/color.py
+++ b/src/docx/dml/color.py
@@ -1,83 +1,95 @@
 """DrawingML objects related to color, ColorFormat being the most prominent."""
 
-from ..enum.dml import MSO_COLOR_TYPE
-from ..oxml.simpletypes import ST_HexColorAuto
-from ..shared import ElementProxy
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
+
+from typing_extensions import TypeAlias
+
+from docx.enum.dml import MSO_COLOR_TYPE
+from docx.oxml.simpletypes import ST_HexColorAuto
+from docx.shared import ElementProxy, RGBColor
+
+if TYPE_CHECKING:
+    from docx.enum.dml import MSO_THEME_COLOR
+    from docx.oxml.text.font import CT_Color
+    from docx.oxml.text.run import CT_R
+
+# -- other element types can be a parent of an `w:rPr` element, but for now only `w:r` is --
+RPrParent: TypeAlias = "CT_R"
 
 
 class ColorFormat(ElementProxy):
-    """Provides access to color settings such as RGB color, theme color, and luminance
-    adjustments."""
+    """Provides access to color settings like RGB color, theme color, and luminance adjustments."""
 
-    def __init__(self, rPr_parent):
+    def __init__(self, rPr_parent: RPrParent):
         super(ColorFormat, self).__init__(rPr_parent)
+        self._element = rPr_parent
 
     @property
-    def rgb(self):
+    def rgb(self) -> RGBColor | None:
         """An |RGBColor| value or |None| if no RGB color is specified.
 
-        When :attr:`type` is `MSO_COLOR_TYPE.RGB`, the value of this property will
-        always be an |RGBColor| value. It may also be an |RGBColor| value if
-        :attr:`type` is `MSO_COLOR_TYPE.THEME`, as Word writes the current value of a
-        theme color when one is assigned. In that case, the RGB value should be
-        interpreted as no more than a good guess however, as the theme color takes
-        precedence at rendering time. Its value is |None| whenever :attr:`type` is
-        either |None| or `MSO_COLOR_TYPE.AUTO`.
-
-        Assigning an |RGBColor| value causes :attr:`type` to become `MSO_COLOR_TYPE.RGB`
-        and any theme color is removed. Assigning |None| causes any color to be removed
-        such that the effective color is inherited from the style hierarchy.
+        When :attr:`type` is `MSO_COLOR_TYPE.RGB`, the value of this property will always be an
+        |RGBColor| value. It may also be an |RGBColor| value if :attr:`type` is
+        `MSO_COLOR_TYPE.THEME`, as Word writes the current value of a theme color when one is
+        assigned. In that case, the RGB value should be interpreted as no more than a good guess
+        however, as the theme color takes precedence at rendering time. Its value is |None|
+        whenever :attr:`type` is either |None| or `MSO_COLOR_TYPE.AUTO`.
+
+        Assigning an |RGBColor| value causes :attr:`type` to become `MSO_COLOR_TYPE.RGB` and any
+        theme color is removed. Assigning |None| causes any color to be removed such that the
+        effective color is inherited from the style hierarchy.
         """
         color = self._color
         if color is None:
             return None
         if color.val == ST_HexColorAuto.AUTO:
             return None
-        return color.val
+        return cast(RGBColor, color.val)
 
     @rgb.setter
-    def rgb(self, value):
+    def rgb(self, value: RGBColor | None):
         if value is None and self._color is None:
             return
         rPr = self._element.get_or_add_rPr()
-        rPr._remove_color()
+        rPr._remove_color()  # pyright: ignore[reportPrivateUsage]
         if value is not None:
             rPr.get_or_add_color().val = value
 
     @property
-    def theme_color(self):
+    def theme_color(self) -> MSO_THEME_COLOR | None:
         """Member of :ref:`MsoThemeColorIndex` or |None| if no theme color is specified.
 
-        When :attr:`type` is `MSO_COLOR_TYPE.THEME`, the value of this property will
-        always be a member of :ref:`MsoThemeColorIndex`. When :attr:`type` has any other
-        value, the value of this property is |None|.
+        When :attr:`type` is `MSO_COLOR_TYPE.THEME`, the value of this property will always be a
+        member of :ref:`MsoThemeColorIndex`. When :attr:`type` has any other value, the value of
+        this property is |None|.
 
         Assigning a member of :ref:`MsoThemeColorIndex` causes :attr:`type` to become
-        `MSO_COLOR_TYPE.THEME`. Any existing RGB value is retained but ignored by Word.
-        Assigning |None| causes any color specification to be removed such that the
-        effective color is inherited from the style hierarchy.
+        `MSO_COLOR_TYPE.THEME`. Any existing RGB value is retained but ignored by Word. Assigning
+        |None| causes any color specification to be removed such that the effective color is
+        inherited from the style hierarchy.
         """
         color = self._color
-        if color is None or color.themeColor is None:
+        if color is None:
             return None
         return color.themeColor
 
     @theme_color.setter
-    def theme_color(self, value):
+    def theme_color(self, value: MSO_THEME_COLOR | None):
         if value is None:
-            if self._color is not None:
-                self._element.rPr._remove_color()
+            if self._color is not None and self._element.rPr is not None:
+                self._element.rPr._remove_color()  # pyright: ignore[reportPrivateUsage]
             return
         self._element.get_or_add_rPr().get_or_add_color().themeColor = value
 
     @property
-    def type(self) -> MSO_COLOR_TYPE:
+    def type(self) -> MSO_COLOR_TYPE | None:
         """Read-only.
 
-        A member of :ref:`MsoColorType`, one of RGB, THEME, or AUTO, corresponding to
-        the way this color is defined. Its value is |None| if no color is applied at
-        this level, which causes the effective color to be inherited from the style
-        hierarchy.
+        A member of :ref:`MsoColorType`, one of RGB, THEME, or AUTO, corresponding to the way this
+        color is defined. Its value is |None| if no color is applied at this level, which causes
+        the effective color to be inherited from the style hierarchy.
         """
         color = self._color
         if color is None:
@@ -89,7 +101,7 @@ def type(self) -> MSO_COLOR_TYPE:
         return MSO_COLOR_TYPE.RGB
 
     @property
-    def _color(self):
+    def _color(self) -> CT_Color | None:
         """Return `w:rPr/w:color` or |None| if not present.
 
         Helper to factor out repetitive element access.
diff --git a/src/docx/document.py b/src/docx/document.py
index 8944a0e50..2cf0a1c38 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -11,14 +11,13 @@
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.section import Section, Sections
-from docx.shared import ElementProxy, Emu
+from docx.shared import ElementProxy, Emu, Inches, Length
 
 if TYPE_CHECKING:
     import docx.types as t
     from docx.oxml.document import CT_Body, CT_Document
     from docx.parts.document import DocumentPart
     from docx.settings import Settings
-    from docx.shared import Length
     from docx.styles.style import ParagraphStyle, _TableStyle
     from docx.table import Table
     from docx.text.paragraph import Paragraph
@@ -178,7 +177,10 @@ def tables(self) -> List[Table]:
     def _block_width(self) -> Length:
         """A |Length| object specifying the space between margins in last section."""
         section = self.sections[-1]
-        return Emu(section.page_width - section.left_margin - section.right_margin)
+        page_width = section.page_width or Inches(8.5)
+        left_margin = section.left_margin or Inches(1)
+        right_margin = section.right_margin or Inches(1)
+        return Emu(page_width - left_margin - right_margin)
 
     @property
     def _body(self) -> _Body:
@@ -198,7 +200,7 @@ def __init__(self, body_elm: CT_Body, parent: t.ProvidesStoryPart):
         super(_Body, self).__init__(body_elm, parent)
         self._body = body_elm
 
-    def clear_content(self):
+    def clear_content(self) -> _Body:
         """Return this |_Body| instance after clearing it of all content.
 
         Section properties for the main document story, if present, are preserved.
diff --git a/src/docx/enum/base.py b/src/docx/enum/base.py
index bc96ab6a2..66e989757 100644
--- a/src/docx/enum/base.py
+++ b/src/docx/enum/base.py
@@ -37,9 +37,9 @@ class BaseXmlEnum(int, enum.Enum):
     corresponding member in the MS API enum of the same name.
     """
 
-    xml_value: str
+    xml_value: str | None
 
-    def __new__(cls, ms_api_value: int, xml_value: str, docstr: str):
+    def __new__(cls, ms_api_value: int, xml_value: str | None, docstr: str):
         self = int.__new__(cls, ms_api_value)
         self._value_ = ms_api_value
         self.xml_value = xml_value
@@ -70,7 +70,11 @@ def to_xml(cls: Type[_T], value: int | _T | None) -> str | None:
         """XML value of this enum member, generally an XML attribute value."""
         # -- presence of multi-arg `__new__()` method fools type-checker, but getting a
         # -- member by its value using EnumCls(val) works as usual.
-        return cls(value).xml_value
+        member = cls(value)
+        xml_value = member.xml_value
+        if not xml_value:
+            raise ValueError(f"{cls.__name__}.{member.name} has no XML representation")
+        return xml_value
 
 
 class DocsPageFormatter:
diff --git a/src/docx/opc/package.py b/src/docx/opc/package.py
index 3b1eef256..3c1cdca22 100644
--- a/src/docx/opc/package.py
+++ b/src/docx/opc/package.py
@@ -14,6 +14,8 @@
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from typing_extensions import Self
+
     from docx.opc.coreprops import CoreProperties
     from docx.opc.part import Part
     from docx.opc.rel import _Relationship  # pyright: ignore[reportPrivateUsage]
@@ -26,9 +28,6 @@ class OpcPackage:
     to a package file or file-like object containing one.
     """
 
-    def __init__(self):
-        super(OpcPackage, self).__init__()
-
     def after_unmarshal(self):
         """Entry point for any post-unmarshaling processing.
 
@@ -122,7 +121,7 @@ def next_partname(self, template: str) -> PackURI:
                 return PackURI(candidate_partname)
 
     @classmethod
-    def open(cls, pkg_file: str | IO[bytes]) -> OpcPackage:
+    def open(cls, pkg_file: str | IO[bytes]) -> Self:
         """Return an |OpcPackage| instance loaded with the contents of `pkg_file`."""
         pkg_reader = PackageReader.from_file(pkg_file)
         package = cls()
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index 140086aab..c5dc9bd2e 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -1,3 +1,5 @@
+# pyright: reportAssignmentType=false
+
 """Custom element classes related to run properties (font)."""
 
 from __future__ import annotations
@@ -20,6 +22,7 @@
     RequiredAttribute,
     ZeroOrOne,
 )
+from docx.shared import RGBColor
 
 if TYPE_CHECKING:
     from docx.oxml.shared import CT_OnOff, CT_String
@@ -29,8 +32,8 @@
 class CT_Color(BaseOxmlElement):
     """`w:color` element, specifying the color of a font and perhaps other objects."""
 
-    val = RequiredAttribute("w:val", ST_HexColor)
-    themeColor = OptionalAttribute("w:themeColor", MSO_THEME_COLOR)
+    val: RGBColor | str = RequiredAttribute("w:val", ST_HexColor)
+    themeColor: MSO_THEME_COLOR | None = OptionalAttribute("w:themeColor", MSO_THEME_COLOR)
 
 
 class CT_Fonts(BaseOxmlElement):
@@ -39,39 +42,33 @@ class CT_Fonts(BaseOxmlElement):
     Specifies typeface name for the various language types.
     """
 
-    ascii: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
-        "w:ascii", ST_String
-    )
-    hAnsi: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
-        "w:hAnsi", ST_String
-    )
+    ascii: str | None = OptionalAttribute("w:ascii", ST_String)
+    hAnsi: str | None = OptionalAttribute("w:hAnsi", ST_String)
 
 
 class CT_Highlight(BaseOxmlElement):
     """`w:highlight` element, specifying font highlighting/background color."""
 
-    val: WD_COLOR_INDEX = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:val", WD_COLOR_INDEX
-    )
+    val: WD_COLOR_INDEX = RequiredAttribute("w:val", WD_COLOR_INDEX)
 
 
 class CT_HpsMeasure(BaseOxmlElement):
     """Used for `<w:sz>` element and others, specifying font size in half-points."""
 
-    val: Length = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:val", ST_HpsMeasure
-    )
+    val: Length = RequiredAttribute("w:val", ST_HpsMeasure)
 
 
 class CT_RPr(BaseOxmlElement):
     """`<w:rPr>` element, containing the properties for a run."""
 
+    get_or_add_color: Callable[[], CT_Color]
     get_or_add_highlight: Callable[[], CT_Highlight]
     get_or_add_rFonts: Callable[[], CT_Fonts]
     get_or_add_sz: Callable[[], CT_HpsMeasure]
     get_or_add_vertAlign: Callable[[], CT_VerticalAlignRun]
     _add_rStyle: Callable[..., CT_String]
     _add_u: Callable[[], CT_Underline]
+    _remove_color: Callable[[], None]
     _remove_highlight: Callable[[], None]
     _remove_rFonts: Callable[[], None]
     _remove_rStyle: Callable[[], None]
@@ -120,15 +117,9 @@ class CT_RPr(BaseOxmlElement):
         "w:specVanish",
         "w:oMath",
     )
-    rStyle: CT_String | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:rStyle", successors=_tag_seq[1:]
-    )
-    rFonts: CT_Fonts | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:rFonts", successors=_tag_seq[2:]
-    )
-    b: CT_OnOff | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:b", successors=_tag_seq[3:]
-    )
+    rStyle: CT_String | None = ZeroOrOne("w:rStyle", successors=_tag_seq[1:])
+    rFonts: CT_Fonts | None = ZeroOrOne("w:rFonts", successors=_tag_seq[2:])
+    b: CT_OnOff | None = ZeroOrOne("w:b", successors=_tag_seq[3:])
     bCs = ZeroOrOne("w:bCs", successors=_tag_seq[4:])
     i = ZeroOrOne("w:i", successors=_tag_seq[5:])
     iCs = ZeroOrOne("w:iCs", successors=_tag_seq[6:])
@@ -144,19 +135,11 @@ class CT_RPr(BaseOxmlElement):
     snapToGrid = ZeroOrOne("w:snapToGrid", successors=_tag_seq[16:])
     vanish = ZeroOrOne("w:vanish", successors=_tag_seq[17:])
     webHidden = ZeroOrOne("w:webHidden", successors=_tag_seq[18:])
-    color = ZeroOrOne("w:color", successors=_tag_seq[19:])
-    sz: CT_HpsMeasure | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:sz", successors=_tag_seq[24:]
-    )
-    highlight: CT_Highlight | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:highlight", successors=_tag_seq[26:]
-    )
-    u: CT_Underline | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:u", successors=_tag_seq[27:]
-    )
-    vertAlign: CT_VerticalAlignRun | None = ZeroOrOne(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:vertAlign", successors=_tag_seq[32:]
-    )
+    color: CT_Color | None = ZeroOrOne("w:color", successors=_tag_seq[19:])
+    sz: CT_HpsMeasure | None = ZeroOrOne("w:sz", successors=_tag_seq[24:])
+    highlight: CT_Highlight | None = ZeroOrOne("w:highlight", successors=_tag_seq[26:])
+    u: CT_Underline | None = ZeroOrOne("w:u", successors=_tag_seq[27:])
+    vertAlign: CT_VerticalAlignRun | None = ZeroOrOne("w:vertAlign", successors=_tag_seq[32:])
     rtl = ZeroOrOne("w:rtl", successors=_tag_seq[33:])
     cs = ZeroOrOne("w:cs", successors=_tag_seq[34:])
     specVanish = ZeroOrOne("w:specVanish", successors=_tag_seq[38:])
@@ -343,14 +326,10 @@ def _set_bool_val(self, name: str, value: bool | None):
 class CT_Underline(BaseOxmlElement):
     """`<w:u>` element, specifying the underlining style for a run."""
 
-    val: WD_UNDERLINE | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
-        "w:val", WD_UNDERLINE
-    )
+    val: WD_UNDERLINE | None = OptionalAttribute("w:val", WD_UNDERLINE)
 
 
 class CT_VerticalAlignRun(BaseOxmlElement):
     """`<w:vertAlign>` element, specifying subscript or superscript."""
 
-    val: str = RequiredAttribute(  # pyright: ignore[reportGeneralTypeIssues]
-        "w:val", ST_VerticalAlignRun
-    )
+    val: str = RequiredAttribute("w:val", ST_VerticalAlignRun)
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 648b58aa2..dea0845f7 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -89,14 +89,13 @@ def inline_shapes(self):
         return InlineShapes(self._element.body, self)
 
     @lazyproperty
-    def numbering_part(self):
-        """A |NumberingPart| object providing access to the numbering definitions for
-        this document.
+    def numbering_part(self) -> NumberingPart:
+        """A |NumberingPart| object providing access to the numbering definitions for this document.
 
         Creates an empty numbering part if one is not present.
         """
         try:
-            return self.part_related_by(RT.NUMBERING)
+            return cast(NumberingPart, self.part_related_by(RT.NUMBERING))
         except KeyError:
             numbering_part = NumberingPart.new()
             self.relate_to(numbering_part, RT.NUMBERING)
diff --git a/src/docx/parts/numbering.py b/src/docx/parts/numbering.py
index 54a430c1b..745c8458a 100644
--- a/src/docx/parts/numbering.py
+++ b/src/docx/parts/numbering.py
@@ -9,9 +9,8 @@ class NumberingPart(XmlPart):
     or glossary."""
 
     @classmethod
-    def new(cls):
-        """Return newly created empty numbering part, containing only the root
-        ``<w:numbering>`` element."""
+    def new(cls) -> "NumberingPart":
+        """Newly created numbering part, containing only the root ``<w:numbering>`` element."""
         raise NotImplementedError
 
     @lazyproperty
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 491d42741..1d561227b 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -127,11 +127,9 @@ class RGBColor(Tuple[int, int, int]):
     def __new__(cls, r: int, g: int, b: int):
         msg = "RGBColor() takes three integer values 0-255"
         for val in (r, g, b):
-            if (
-                not isinstance(val, int)  # pyright: ignore[reportUnnecessaryIsInstance]
-                or val < 0
-                or val > 255
-            ):
+            if not isinstance(val, int):  # pyright: ignore[reportUnnecessaryIsInstance]
+                raise TypeError(msg)
+            if val < 0 or val > 255:
                 raise ValueError(msg)
         return super(RGBColor, cls).__new__(cls, (r, g, b))
 
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index 0e2f5bc17..d35988370 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -233,7 +233,7 @@ def underline(self) -> bool | WD_UNDERLINE | None:
         return self.font.underline
 
     @underline.setter
-    def underline(self, value: bool):
+    def underline(self, value: bool | WD_UNDERLINE | None):
         self.font.underline = value
 
 
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
index ea848e7d6..f9fcae0c6 100644
--- a/tests/dml/test_color.py
+++ b/tests/dml/test_color.py
@@ -1,57 +1,59 @@
-"""Test suite for docx.dml.color module."""
+# pyright: reportPrivateUsage=false
+
+"""Unit-test suite for the `docx.dml.color` module."""
+
+from __future__ import annotations
+
+from typing import cast
 
 import pytest
 
 from docx.dml.color import ColorFormat
 from docx.enum.dml import MSO_COLOR_TYPE, MSO_THEME_COLOR
+from docx.oxml.text.run import CT_R
 from docx.shared import RGBColor
 
 from ..unitutil.cxml import element, xml
 
 
 class DescribeColorFormat:
-    def it_knows_its_color_type(self, type_fixture):
-        color_format, expected_value = type_fixture
-        assert color_format.type == expected_value
-
-    def it_knows_its_RGB_value(self, rgb_get_fixture):
-        color_format, expected_value = rgb_get_fixture
-        assert color_format.rgb == expected_value
-
-    def it_can_change_its_RGB_value(self, rgb_set_fixture):
-        color_format, new_value, expected_xml = rgb_set_fixture
-        color_format.rgb = new_value
-        assert color_format._element.xml == expected_xml
-
-    def it_knows_its_theme_color(self, theme_color_get_fixture):
-        color_format, expected_value = theme_color_get_fixture
-        assert color_format.theme_color == expected_value
-
-    def it_can_change_its_theme_color(self, theme_color_set_fixture):
-        color_format, new_value, expected_xml = theme_color_set_fixture
-        color_format.theme_color = new_value
-        assert color_format._element.xml == expected_xml
+    """Unit-test suite for `docx.dml.color.ColorFormat` objects."""
 
-    # fixtures ---------------------------------------------
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", None),
+            ("w:r/w:rPr", None),
+            ("w:r/w:rPr/w:color{w:val=auto}", MSO_COLOR_TYPE.AUTO),
+            ("w:r/w:rPr/w:color{w:val=4224FF}", MSO_COLOR_TYPE.RGB),
+            ("w:r/w:rPr/w:color{w:themeColor=dark1}", MSO_COLOR_TYPE.THEME),
+            (
+                "w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}",
+                MSO_COLOR_TYPE.THEME,
+            ),
+        ],
+    )
+    def it_knows_its_color_type(self, r_cxml: str, expected_value: MSO_COLOR_TYPE | None):
+        assert ColorFormat(cast(CT_R, element(r_cxml))).type == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "rgb"),
+        [
             ("w:r", None),
             ("w:r/w:rPr", None),
             ("w:r/w:rPr/w:color{w:val=auto}", None),
             ("w:r/w:rPr/w:color{w:val=4224FF}", "4224ff"),
             ("w:r/w:rPr/w:color{w:val=auto,w:themeColor=accent1}", None),
             ("w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}", "f00ba9"),
-        ]
+        ],
     )
-    def rgb_get_fixture(self, request):
-        r_cxml, rgb = request.param
-        color_format = ColorFormat(element(r_cxml))
-        expected_value = None if rgb is None else RGBColor.from_string(rgb)
-        return color_format, expected_value
+    def it_knows_its_RGB_value(self, r_cxml: str, rgb: str | None):
+        expected_value = RGBColor.from_string(rgb) if rgb else None
+        assert ColorFormat(cast(CT_R, element(r_cxml))).rgb == expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "new_value", "expected_cxml"),
+        [
             ("w:r", RGBColor(10, 20, 30), "w:r/w:rPr/w:color{w:val=0A141E}"),
             ("w:r/w:rPr", RGBColor(1, 2, 3), "w:r/w:rPr/w:color{w:val=010203}"),
             (
@@ -71,73 +73,60 @@ def rgb_get_fixture(self, request):
             ),
             ("w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}", None, "w:r/w:rPr"),
             ("w:r", None, "w:r"),
-        ]
+        ],
     )
-    def rgb_set_fixture(self, request):
-        r_cxml, new_value, expected_cxml = request.param
-        color_format = ColorFormat(element(r_cxml))
-        expected_xml = xml(expected_cxml)
-        return color_format, new_value, expected_xml
+    def it_can_change_its_RGB_value(
+        self, r_cxml: str, new_value: RGBColor | None, expected_cxml: str
+    ):
+        color_format = ColorFormat(cast(CT_R, element(r_cxml)))
+        color_format.rgb = new_value
+        assert color_format._element.xml == xml(expected_cxml)
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
             ("w:r", None),
             ("w:r/w:rPr", None),
             ("w:r/w:rPr/w:color{w:val=auto}", None),
             ("w:r/w:rPr/w:color{w:val=4224FF}", None),
-            ("w:r/w:rPr/w:color{w:themeColor=accent1}", "ACCENT_1"),
-            ("w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=dark1}", "DARK_1"),
-        ]
+            ("w:r/w:rPr/w:color{w:themeColor=accent1}", MSO_THEME_COLOR.ACCENT_1),
+            ("w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=dark1}", MSO_THEME_COLOR.DARK_1),
+        ],
     )
-    def theme_color_get_fixture(self, request):
-        r_cxml, value = request.param
-        color_format = ColorFormat(element(r_cxml))
-        expected_value = None if value is None else getattr(MSO_THEME_COLOR, value)
-        return color_format, expected_value
+    def it_knows_its_theme_color(self, r_cxml: str, expected_value: MSO_THEME_COLOR | None):
+        color_format = ColorFormat(cast(CT_R, element(r_cxml)))
+        assert color_format.theme_color == expected_value
 
-    @pytest.fixture(
-        params=[
-            ("w:r", "ACCENT_1", "w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent1}"),
+    @pytest.mark.parametrize(
+        ("r_cxml", "new_value", "expected_cxml"),
+        [
+            (
+                "w:r",
+                MSO_THEME_COLOR.ACCENT_1,
+                "w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent1}",
+            ),
             (
                 "w:r/w:rPr",
-                "ACCENT_2",
+                MSO_THEME_COLOR.ACCENT_2,
                 "w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent2}",
             ),
             (
                 "w:r/w:rPr/w:color{w:val=101112}",
-                "ACCENT_3",
+                MSO_THEME_COLOR.ACCENT_3,
                 "w:r/w:rPr/w:color{w:val=101112,w:themeColor=accent3}",
             ),
             (
                 "w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}",
-                "LIGHT_2",
+                MSO_THEME_COLOR.LIGHT_2,
                 "w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=light2}",
             ),
             ("w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}", None, "w:r/w:rPr"),
             ("w:r", None, "w:r"),
-        ]
-    )
-    def theme_color_set_fixture(self, request):
-        r_cxml, member, expected_cxml = request.param
-        color_format = ColorFormat(element(r_cxml))
-        new_value = None if member is None else getattr(MSO_THEME_COLOR, member)
-        expected_xml = xml(expected_cxml)
-        return color_format, new_value, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:r", None),
-            ("w:r/w:rPr", None),
-            ("w:r/w:rPr/w:color{w:val=auto}", MSO_COLOR_TYPE.AUTO),
-            ("w:r/w:rPr/w:color{w:val=4224FF}", MSO_COLOR_TYPE.RGB),
-            ("w:r/w:rPr/w:color{w:themeColor=dark1}", MSO_COLOR_TYPE.THEME),
-            (
-                "w:r/w:rPr/w:color{w:val=F00BA9,w:themeColor=accent1}",
-                MSO_COLOR_TYPE.THEME,
-            ),
-        ]
+        ],
     )
-    def type_fixture(self, request):
-        r_cxml, expected_value = request.param
-        color_format = ColorFormat(element(r_cxml))
-        return color_format, expected_value
+    def it_can_change_its_theme_color(
+        self, r_cxml: str, new_value: MSO_THEME_COLOR | None, expected_cxml: str
+    ):
+        color_format = ColorFormat(cast(CT_R, element(r_cxml)))
+        color_format.theme_color = new_value
+        assert color_format._element.xml == xml(expected_cxml)
diff --git a/tests/oxml/unitdata/dml.py b/tests/oxml/unitdata/dml.py
deleted file mode 100644
index 325a3f690..000000000
--- a/tests/oxml/unitdata/dml.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""Test data builders for DrawingML XML elements."""
-
-from ...unitdata import BaseBuilder
-
-
-class CT_BlipBuilder(BaseBuilder):
-    __tag__ = "a:blip"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("r:embed", "r:link", "cstate")
-
-
-class CT_BlipFillPropertiesBuilder(BaseBuilder):
-    __tag__ = "pic:blipFill"
-    __nspfxs__ = ("pic",)
-    __attrs__ = ()
-
-
-class CT_GraphicalObjectBuilder(BaseBuilder):
-    __tag__ = "a:graphic"
-    __nspfxs__ = ("a",)
-    __attrs__ = ()
-
-
-class CT_GraphicalObjectDataBuilder(BaseBuilder):
-    __tag__ = "a:graphicData"
-    __nspfxs__ = ("a",)
-    __attrs__ = ("uri",)
-
-
-class CT_InlineBuilder(BaseBuilder):
-    __tag__ = "wp:inline"
-    __nspfxs__ = ("wp",)
-    __attrs__ = ("distT", "distB", "distL", "distR")
-
-
-class CT_PictureBuilder(BaseBuilder):
-    __tag__ = "pic:pic"
-    __nspfxs__ = ("pic",)
-    __attrs__ = ()
-
-
-def a_blip():
-    return CT_BlipBuilder()
-
-
-def a_blipFill():
-    return CT_BlipFillPropertiesBuilder()
-
-
-def a_graphic():
-    return CT_GraphicalObjectBuilder()
-
-
-def a_graphicData():
-    return CT_GraphicalObjectDataBuilder()
-
-
-def a_pic():
-    return CT_PictureBuilder()
-
-
-def an_inline():
-    return CT_InlineBuilder()
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index 3a86b5168..cfe9e870c 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -1,10 +1,14 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for the docx.parts.document module."""
 
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
+from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
+from docx.opc.packuri import PackURI
 from docx.package import Package
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
@@ -15,15 +19,26 @@
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
 
-from ..oxml.parts.unitdata.document import a_body, a_document
-from ..unitutil.mock import class_mock, instance_mock, method_mock, property_mock
+from ..unitutil.cxml import element
+from ..unitutil.mock import (
+    FixtureRequest,
+    Mock,
+    class_mock,
+    instance_mock,
+    method_mock,
+    property_mock,
+)
 
 
 class DescribeDocumentPart:
-    def it_can_add_a_footer_part(self, package_, FooterPart_, footer_part_, relate_to_):
+    def it_can_add_a_footer_part(
+        self, package_: Mock, FooterPart_: Mock, footer_part_: Mock, relate_to_: Mock
+    ):
         FooterPart_.new.return_value = footer_part_
         relate_to_.return_value = "rId12"
-        document_part = DocumentPart(None, None, None, package_)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         footer_part, rId = document_part.add_footer_part()
 
@@ -32,10 +47,14 @@ def it_can_add_a_footer_part(self, package_, FooterPart_, footer_part_, relate_t
         assert footer_part is footer_part_
         assert rId == "rId12"
 
-    def it_can_add_a_header_part(self, package_, HeaderPart_, header_part_, relate_to_):
+    def it_can_add_a_header_part(
+        self, package_: Mock, HeaderPart_: Mock, header_part_: Mock, relate_to_: Mock
+    ):
         HeaderPart_.new.return_value = header_part_
         relate_to_.return_value = "rId7"
-        document_part = DocumentPart(None, None, None, package_)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         header_part, rId = document_part.add_header_part()
 
@@ -44,19 +63,23 @@ def it_can_add_a_header_part(self, package_, HeaderPart_, header_part_, relate_t
         assert header_part is header_part_
         assert rId == "rId7"
 
-    def it_can_drop_a_specified_header_part(self, drop_rel_):
-        document_part = DocumentPart(None, None, None, None)
+    def it_can_drop_a_specified_header_part(self, drop_rel_: Mock, package_: Mock):
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         document_part.drop_header_part("rId42")
 
         drop_rel_.assert_called_once_with(document_part, "rId42")
 
     def it_provides_access_to_a_footer_part_by_rId(
-        self, related_parts_prop_, related_parts_, footer_part_
+        self, related_parts_prop_: Mock, related_parts_: Mock, footer_part_: Mock, package_: Mock
     ):
         related_parts_prop_.return_value = related_parts_
         related_parts_.__getitem__.return_value = footer_part_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         footer_part = document_part.footer_part("rId9")
 
@@ -64,50 +87,79 @@ def it_provides_access_to_a_footer_part_by_rId(
         assert footer_part is footer_part_
 
     def it_provides_access_to_a_header_part_by_rId(
-        self, related_parts_prop_, related_parts_, header_part_
+        self, related_parts_prop_: Mock, related_parts_: Mock, header_part_: Mock, package_: Mock
     ):
         related_parts_prop_.return_value = related_parts_
         related_parts_.__getitem__.return_value = header_part_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         header_part = document_part.header_part("rId11")
 
         related_parts_.__getitem__.assert_called_once_with("rId11")
         assert header_part is header_part_
 
-    def it_can_save_the_package_to_a_file(self, save_fixture):
-        document, file_ = save_fixture
-        document.save(file_)
-        document._package.save.assert_called_once_with(file_)
+    def it_can_save_the_package_to_a_file(self, package_: Mock):
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
-    def it_provides_access_to_the_document_settings(self, settings_fixture):
-        document_part, settings_ = settings_fixture
-        settings = document_part.settings
-        assert settings is settings_
+        document_part.save("foobar.docx")
 
-    def it_provides_access_to_the_document_styles(self, styles_fixture):
-        document_part, styles_ = styles_fixture
-        styles = document_part.styles
-        assert styles is styles_
+        package_.save.assert_called_once_with("foobar.docx")
+
+    def it_provides_access_to_the_document_settings(
+        self, _settings_part_prop_: Mock, settings_part_: Mock, settings_: Mock, package_: Mock
+    ):
+        settings_part_.settings = settings_
+        _settings_part_prop_.return_value = settings_part_
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
-    def it_provides_access_to_its_core_properties(self, core_props_fixture):
-        document_part, core_properties_ = core_props_fixture
-        core_properties = document_part.core_properties
-        assert core_properties is core_properties_
+        assert document_part.settings is settings_
+
+    def it_provides_access_to_the_document_styles(
+        self, _styles_part_prop_: Mock, styles_part_: Mock, styles_: Mock, package_: Mock
+    ):
+        styles_part_.styles = styles_
+        _styles_part_prop_.return_value = styles_part_
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
+
+        assert document_part.styles is styles_
+
+    def it_provides_access_to_its_core_properties(self, package_: Mock, core_properties_: Mock):
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
+        package_.core_properties = core_properties_
+
+        assert document_part.core_properties is core_properties_
 
     def it_provides_access_to_the_inline_shapes_in_the_document(
-        self, inline_shapes_fixture
+        self, InlineShapes_: Mock, package_: Mock
     ):
-        document, InlineShapes_, body_elm = inline_shapes_fixture
-        inline_shapes = document.inline_shapes
-        InlineShapes_.assert_called_once_with(body_elm, document)
+        document_elm = element("w:document/w:body")
+        body_elm = document_elm[0]
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, document_elm, package_
+        )
+
+        inline_shapes = document_part.inline_shapes
+
+        InlineShapes_.assert_called_once_with(body_elm, document_part)
         assert inline_shapes is InlineShapes_.return_value
 
     def it_provides_access_to_the_numbering_part(
-        self, part_related_by_, numbering_part_
+        self, part_related_by_: Mock, numbering_part_: Mock, package_: Mock
     ):
         part_related_by_.return_value = numbering_part_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         numbering_part = document_part.numbering_part
 
@@ -115,11 +167,18 @@ def it_provides_access_to_the_numbering_part(
         assert numbering_part is numbering_part_
 
     def and_it_creates_a_numbering_part_if_not_present(
-        self, part_related_by_, relate_to_, NumberingPart_, numbering_part_
+        self,
+        part_related_by_: Mock,
+        relate_to_: Mock,
+        NumberingPart_: Mock,
+        numbering_part_: Mock,
+        package_: Mock,
     ):
         part_related_by_.side_effect = KeyError
         NumberingPart_.new.return_value = numbering_part_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         numbering_part = document_part.numbering_part
 
@@ -127,20 +186,28 @@ def and_it_creates_a_numbering_part_if_not_present(
         relate_to_.assert_called_once_with(document_part, numbering_part_, RT.NUMBERING)
         assert numbering_part is numbering_part_
 
-    def it_can_get_a_style_by_id(self, styles_prop_, styles_, style_):
+    def it_can_get_a_style_by_id(
+        self, styles_prop_: Mock, styles_: Mock, style_: Mock, package_: Mock
+    ):
         styles_prop_.return_value = styles_
         styles_.get_by_id.return_value = style_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         style = document_part.get_style("BodyText", WD_STYLE_TYPE.PARAGRAPH)
 
         styles_.get_by_id.assert_called_once_with("BodyText", WD_STYLE_TYPE.PARAGRAPH)
         assert style is style_
 
-    def it_can_get_the_id_of_a_style(self, style_, styles_prop_, styles_):
+    def it_can_get_the_id_of_a_style(
+        self, style_: Mock, styles_prop_: Mock, styles_: Mock, package_: Mock
+    ):
         styles_prop_.return_value = styles_
         styles_.get_style_id.return_value = "BodyCharacter"
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         style_id = document_part.get_style_id(style_, WD_STYLE_TYPE.CHARACTER)
 
@@ -148,10 +215,12 @@ def it_can_get_the_id_of_a_style(self, style_, styles_prop_, styles_):
         assert style_id == "BodyCharacter"
 
     def it_provides_access_to_its_settings_part_to_help(
-        self, part_related_by_, settings_part_
+        self, part_related_by_: Mock, settings_part_: Mock, package_: Mock
     ):
         part_related_by_.return_value = settings_part_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         settings_part = document_part._settings_part
 
@@ -159,11 +228,18 @@ def it_provides_access_to_its_settings_part_to_help(
         assert settings_part is settings_part_
 
     def and_it_creates_a_default_settings_part_if_not_present(
-        self, package_, part_related_by_, SettingsPart_, settings_part_, relate_to_
+        self,
+        package_: Mock,
+        part_related_by_: Mock,
+        SettingsPart_: Mock,
+        settings_part_: Mock,
+        relate_to_: Mock,
     ):
         part_related_by_.side_effect = KeyError
         SettingsPart_.default.return_value = settings_part_
-        document_part = DocumentPart(None, None, None, package_)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         settings_part = document_part._settings_part
 
@@ -172,10 +248,12 @@ def and_it_creates_a_default_settings_part_if_not_present(
         assert settings_part is settings_part_
 
     def it_provides_access_to_its_styles_part_to_help(
-        self, part_related_by_, styles_part_
+        self, part_related_by_: Mock, styles_part_: Mock, package_: Mock
     ):
         part_related_by_.return_value = styles_part_
-        document_part = DocumentPart(None, None, None, None)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         styles_part = document_part._styles_part
 
@@ -183,11 +261,18 @@ def it_provides_access_to_its_styles_part_to_help(
         assert styles_part is styles_part_
 
     def and_it_creates_a_default_styles_part_if_not_present(
-        self, package_, part_related_by_, StylesPart_, styles_part_, relate_to_
+        self,
+        package_: Mock,
+        part_related_by_: Mock,
+        StylesPart_: Mock,
+        styles_part_: Mock,
+        relate_to_: Mock,
     ):
         part_related_by_.side_effect = KeyError
         StylesPart_.default.return_value = styles_part_
-        document_part = DocumentPart(None, None, None, package_)
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
 
         styles_part = document_part._styles_part
 
@@ -195,135 +280,100 @@ def and_it_creates_a_default_styles_part_if_not_present(
         relate_to_.assert_called_once_with(document_part, styles_part_, RT.STYLES)
         assert styles_part is styles_part_
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def core_props_fixture(self, package_, core_properties_):
-        document_part = DocumentPart(None, None, None, package_)
-        package_.core_properties = core_properties_
-        return document_part, core_properties_
-
-    @pytest.fixture
-    def inline_shapes_fixture(self, request, InlineShapes_):
-        document_elm = (a_document().with_nsdecls().with_child(a_body())).element
-        body_elm = document_elm[0]
-        document = DocumentPart(None, None, document_elm, None)
-        return document, InlineShapes_, body_elm
-
-    @pytest.fixture
-    def save_fixture(self, package_):
-        document_part = DocumentPart(None, None, None, package_)
-        file_ = "foobar.docx"
-        return document_part, file_
-
-    @pytest.fixture
-    def settings_fixture(self, _settings_part_prop_, settings_part_, settings_):
-        document_part = DocumentPart(None, None, None, None)
-        _settings_part_prop_.return_value = settings_part_
-        settings_part_.settings = settings_
-        return document_part, settings_
-
-    @pytest.fixture
-    def styles_fixture(self, _styles_part_prop_, styles_part_, styles_):
-        document_part = DocumentPart(None, None, None, None)
-        _styles_part_prop_.return_value = styles_part_
-        styles_part_.styles = styles_
-        return document_part, styles_
-
-    # fixture components ---------------------------------------------
+    # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
-    def core_properties_(self, request):
+    def core_properties_(self, request: FixtureRequest):
         return instance_mock(request, CoreProperties)
 
     @pytest.fixture
-    def drop_rel_(self, request):
+    def drop_rel_(self, request: FixtureRequest):
         return method_mock(request, DocumentPart, "drop_rel", autospec=True)
 
     @pytest.fixture
-    def FooterPart_(self, request):
+    def FooterPart_(self, request: FixtureRequest):
         return class_mock(request, "docx.parts.document.FooterPart")
 
     @pytest.fixture
-    def footer_part_(self, request):
+    def footer_part_(self, request: FixtureRequest):
         return instance_mock(request, FooterPart)
 
     @pytest.fixture
-    def HeaderPart_(self, request):
+    def HeaderPart_(self, request: FixtureRequest):
         return class_mock(request, "docx.parts.document.HeaderPart")
 
     @pytest.fixture
-    def header_part_(self, request):
+    def header_part_(self, request: FixtureRequest):
         return instance_mock(request, HeaderPart)
 
     @pytest.fixture
-    def InlineShapes_(self, request):
+    def InlineShapes_(self, request: FixtureRequest):
         return class_mock(request, "docx.parts.document.InlineShapes")
 
     @pytest.fixture
-    def NumberingPart_(self, request):
+    def NumberingPart_(self, request: FixtureRequest):
         return class_mock(request, "docx.parts.document.NumberingPart")
 
     @pytest.fixture
-    def numbering_part_(self, request):
+    def numbering_part_(self, request: FixtureRequest):
         return instance_mock(request, NumberingPart)
 
     @pytest.fixture
-    def package_(self, request):
+    def package_(self, request: FixtureRequest):
         return instance_mock(request, Package)
 
     @pytest.fixture
-    def part_related_by_(self, request):
+    def part_related_by_(self, request: FixtureRequest):
         return method_mock(request, DocumentPart, "part_related_by")
 
     @pytest.fixture
-    def relate_to_(self, request):
+    def relate_to_(self, request: FixtureRequest):
         return method_mock(request, DocumentPart, "relate_to")
 
     @pytest.fixture
-    def related_parts_(self, request):
+    def related_parts_(self, request: FixtureRequest):
         return instance_mock(request, dict)
 
     @pytest.fixture
-    def related_parts_prop_(self, request):
+    def related_parts_prop_(self, request: FixtureRequest):
         return property_mock(request, DocumentPart, "related_parts")
 
     @pytest.fixture
-    def SettingsPart_(self, request):
+    def SettingsPart_(self, request: FixtureRequest):
         return class_mock(request, "docx.parts.document.SettingsPart")
 
     @pytest.fixture
-    def settings_(self, request):
+    def settings_(self, request: FixtureRequest):
         return instance_mock(request, Settings)
 
     @pytest.fixture
-    def settings_part_(self, request):
+    def settings_part_(self, request: FixtureRequest):
         return instance_mock(request, SettingsPart)
 
     @pytest.fixture
-    def _settings_part_prop_(self, request):
+    def _settings_part_prop_(self, request: FixtureRequest):
         return property_mock(request, DocumentPart, "_settings_part")
 
     @pytest.fixture
-    def style_(self, request):
+    def style_(self, request: FixtureRequest):
         return instance_mock(request, BaseStyle)
 
     @pytest.fixture
-    def styles_(self, request):
+    def styles_(self, request: FixtureRequest):
         return instance_mock(request, Styles)
 
     @pytest.fixture
-    def StylesPart_(self, request):
+    def StylesPart_(self, request: FixtureRequest):
         return class_mock(request, "docx.parts.document.StylesPart")
 
     @pytest.fixture
-    def styles_part_(self, request):
+    def styles_part_(self, request: FixtureRequest):
         return instance_mock(request, StylesPart)
 
     @pytest.fixture
-    def styles_prop_(self, request):
+    def styles_prop_(self, request: FixtureRequest):
         return property_mock(request, DocumentPart, "styles")
 
     @pytest.fixture
-    def _styles_part_prop_(self, request):
+    def _styles_part_prop_(self, request: FixtureRequest):
         return property_mock(request, DocumentPart, "_styles_part")
diff --git a/tests/test_api.py b/tests/test_api.py
index b6e6818b5..6b5d3ae07 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -2,66 +2,55 @@
 
 import pytest
 
-import docx
-from docx.api import Document
+from docx.api import Document as DocumentFactoryFn
+from docx.document import Document as DocumentCls
 from docx.opc.constants import CONTENT_TYPE as CT
 
-from .unitutil.mock import class_mock, function_mock, instance_mock
+from .unitutil.mock import FixtureRequest, Mock, class_mock, function_mock, instance_mock
 
 
 class DescribeDocument:
-    def it_opens_a_docx_file(self, open_fixture):
-        docx, Package_, document_ = open_fixture
-        document = Document(docx)
-        Package_.open.assert_called_once_with(docx)
-        assert document is document_
-
-    def it_opens_the_default_docx_if_none_specified(self, default_fixture):
-        docx, Package_, document_ = default_fixture
-        document = Document()
-        Package_.open.assert_called_once_with(docx)
-        assert document is document_
-
-    def it_raises_on_not_a_Word_file(self, raise_fixture):
-        not_a_docx = raise_fixture
-        with pytest.raises(ValueError, match="file 'foobar.xlsx' is not a Word file,"):
-            Document(not_a_docx)
+    """Unit-test suite for `docx.api.Document` factory function."""
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def default_fixture(self, _default_docx_path_, Package_, document_):
-        docx = "barfoo.docx"
-        _default_docx_path_.return_value = docx
+    def it_opens_a_docx_file(self, Package_: Mock, document_: Mock):
         document_part = Package_.open.return_value.main_document_part
         document_part.document = document_
         document_part.content_type = CT.WML_DOCUMENT_MAIN
-        return docx, Package_, document_
 
-    @pytest.fixture
-    def open_fixture(self, Package_, document_):
-        docx = "foobar.docx"
+        document = DocumentFactoryFn("foobar.docx")
+
+        Package_.open.assert_called_once_with("foobar.docx")
+        assert document is document_
+
+    def it_opens_the_default_docx_if_none_specified(
+        self, _default_docx_path_: Mock, Package_: Mock, document_: Mock
+    ):
+        _default_docx_path_.return_value = "default-document.docx"
         document_part = Package_.open.return_value.main_document_part
         document_part.document = document_
         document_part.content_type = CT.WML_DOCUMENT_MAIN
-        return docx, Package_, document_
 
-    @pytest.fixture
-    def raise_fixture(self, Package_):
-        not_a_docx = "foobar.xlsx"
+        document = DocumentFactoryFn()
+
+        Package_.open.assert_called_once_with("default-document.docx")
+        assert document is document_
+
+    def it_raises_on_not_a_Word_file(self, Package_: Mock):
         Package_.open.return_value.main_document_part.content_type = "BOGUS"
-        return not_a_docx
 
-    # fixture components ---------------------------------------------
+        with pytest.raises(ValueError, match="file 'foobar.xlsx' is not a Word file,"):
+            DocumentFactoryFn("foobar.xlsx")
+
+    # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
-    def _default_docx_path_(self, request):
+    def _default_docx_path_(self, request: FixtureRequest):
         return function_mock(request, "docx.api._default_docx_path")
 
     @pytest.fixture
-    def document_(self, request):
-        return instance_mock(request, docx.document.Document)
+    def document_(self, request: FixtureRequest):
+        return instance_mock(request, DocumentCls)
 
     @pytest.fixture
-    def Package_(self, request):
+    def Package_(self, request: FixtureRequest):
         return class_mock(request, "docx.api.Package")
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
index 1549bd8ea..ab463663f 100644
--- a/tests/test_blkcntnr.py
+++ b/tests/test_blkcntnr.py
@@ -1,42 +1,61 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for the docx.blkcntnr (block item container) module."""
 
+from __future__ import annotations
+
+from typing import cast
+
 import pytest
 
-from docx import Document
+import docx
 from docx.blkcntnr import BlockItemContainer
+from docx.document import Document
+from docx.oxml.document import CT_Body
 from docx.shared import Inches
 from docx.table import Table
 from docx.text.paragraph import Paragraph
 
 from .unitutil.cxml import element, xml
 from .unitutil.file import snippet_seq, test_file
-from .unitutil.mock import call, instance_mock, method_mock
+from .unitutil.mock import FixtureRequest, Mock, call, instance_mock, method_mock
 
 
 class DescribeBlockItemContainer:
     """Unit-test suite for `docx.blkcntnr.BlockItemContainer`."""
 
-    def it_can_add_a_paragraph(self, add_paragraph_fixture, _add_paragraph_):
-        text, style, paragraph_, add_run_calls = add_paragraph_fixture
+    @pytest.mark.parametrize(
+        ("text", "style"), [("", None), ("Foo", None), ("", "Bar"), ("Foo", "Bar")]
+    )
+    def it_can_add_a_paragraph(
+        self,
+        text: str,
+        style: str | None,
+        blkcntnr: BlockItemContainer,
+        _add_paragraph_: Mock,
+        paragraph_: Mock,
+    ):
+        paragraph_.style = None
         _add_paragraph_.return_value = paragraph_
-        blkcntnr = BlockItemContainer(None, None)
 
         paragraph = blkcntnr.add_paragraph(text, style)
 
         _add_paragraph_.assert_called_once_with(blkcntnr)
-        assert paragraph.add_run.call_args_list == add_run_calls
+        assert paragraph_.add_run.call_args_list == ([call(text)] if text else [])
         assert paragraph.style == style
         assert paragraph is paragraph_
 
-    def it_can_add_a_table(self, add_table_fixture):
-        blkcntnr, rows, cols, width, expected_xml = add_table_fixture
+    def it_can_add_a_table(self, blkcntnr: BlockItemContainer):
+        rows, cols, width = 2, 2, Inches(2)
+
         table = blkcntnr.add_table(rows, cols, width)
+
         assert isinstance(table, Table)
-        assert table._element.xml == expected_xml
+        assert table._element.xml == snippet_seq("new-tbl")[0]
         assert table._parent is blkcntnr
 
     def it_can_iterate_its_inner_content(self):
-        document = Document(test_file("blk-inner-content.docx"))
+        document = docx.Document(test_file("blk-inner-content.docx"))
 
         inner_content = document.iter_inner_content()
 
@@ -55,101 +74,78 @@ def it_can_iterate_its_inner_content(self):
         with pytest.raises(StopIteration):
             next(inner_content)
 
-    def it_provides_access_to_the_paragraphs_it_contains(self, paragraphs_fixture):
-        # test len(), iterable, and indexed access
-        blkcntnr, expected_count = paragraphs_fixture
-        paragraphs = blkcntnr.paragraphs
-        assert len(paragraphs) == expected_count
-        count = 0
-        for idx, paragraph in enumerate(paragraphs):
-            assert isinstance(paragraph, Paragraph)
-            assert paragraphs[idx] is paragraph
-            count += 1
-        assert count == expected_count
-
-    def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
-        # test len(), iterable, and indexed access
-        blkcntnr, expected_count = tables_fixture
-        tables = blkcntnr.tables
-        assert len(tables) == expected_count
-        count = 0
-        for idx, table in enumerate(tables):
-            assert isinstance(table, Table)
-            assert tables[idx] is table
-            count += 1
-        assert count == expected_count
-
-    def it_adds_a_paragraph_to_help(self, _add_paragraph_fixture):
-        blkcntnr, expected_xml = _add_paragraph_fixture
-        new_paragraph = blkcntnr._add_paragraph()
-        assert isinstance(new_paragraph, Paragraph)
-        assert new_paragraph._parent == blkcntnr
-        assert blkcntnr._element.xml == expected_xml
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
-            ("", None),
-            ("Foo", None),
-            ("", "Bar"),
-            ("Foo", "Bar"),
-        ]
-    )
-    def add_paragraph_fixture(self, request, paragraph_):
-        text, style = request.param
-        paragraph_.style = None
-        add_run_calls = [call(text)] if text else []
-        return text, style, paragraph_, add_run_calls
-
-    @pytest.fixture
-    def _add_paragraph_fixture(self, request):
-        blkcntnr_cxml, after_cxml = "w:body", "w:body/w:p"
-        blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
-        expected_xml = xml(after_cxml)
-        return blkcntnr, expected_xml
-
-    @pytest.fixture
-    def add_table_fixture(self):
-        blkcntnr = BlockItemContainer(element("w:body"), None)
-        rows, cols, width = 2, 2, Inches(2)
-        expected_xml = snippet_seq("new-tbl")[0]
-        return blkcntnr, rows, cols, width, expected_xml
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("blkcntnr_cxml", "expected_count"),
+        [
             ("w:body", 0),
             ("w:body/w:p", 1),
             ("w:body/(w:p,w:p)", 2),
             ("w:body/(w:p,w:tbl)", 1),
             ("w:body/(w:p,w:tbl,w:p)", 2),
-        ]
+        ],
     )
-    def paragraphs_fixture(self, request):
-        blkcntnr_cxml, expected_count = request.param
-        blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
-        return blkcntnr, expected_count
+    def it_provides_access_to_the_paragraphs_it_contains(
+        self, blkcntnr_cxml: str, expected_count: int, document_: Mock
+    ):
+        blkcntnr = BlockItemContainer(cast(CT_Body, element(blkcntnr_cxml)), document_)
+
+        paragraphs = blkcntnr.paragraphs
 
-    @pytest.fixture(
-        params=[
+        # -- supports len() --
+        assert len(paragraphs) == expected_count
+        # -- is iterable --
+        assert all(isinstance(p, Paragraph) for p in paragraphs)
+        # -- is indexable --
+        assert all(p is paragraphs[idx] for idx, p in enumerate(paragraphs))
+
+    @pytest.mark.parametrize(
+        ("blkcntnr_cxml", "expected_count"),
+        [
             ("w:body", 0),
             ("w:body/w:tbl", 1),
             ("w:body/(w:tbl,w:tbl)", 2),
             ("w:body/(w:p,w:tbl)", 1),
             ("w:body/(w:tbl,w:tbl,w:p)", 2),
-        ]
+        ],
     )
-    def tables_fixture(self, request):
-        blkcntnr_cxml, expected_count = request.param
-        blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
-        return blkcntnr, expected_count
+    def it_provides_access_to_the_tables_it_contains(
+        self, blkcntnr_cxml: str, expected_count: int, document_: Mock
+    ):
+        blkcntnr = BlockItemContainer(cast(CT_Body, element(blkcntnr_cxml)), document_)
+
+        tables = blkcntnr.tables
+
+        # -- supports len() --
+        assert len(tables) == expected_count
+        # -- is iterable --
+        assert all(isinstance(t, Table) for t in tables)
+        # -- is indexable --
+        assert all(t is tables[idx] for idx, t in enumerate(tables))
 
-    # fixture components ---------------------------------------------
+    def it_adds_a_paragraph_to_help(self, document_: Mock):
+        blkcntnr = BlockItemContainer(cast(CT_Body, element("w:body")), document_)
+
+        new_paragraph = blkcntnr._add_paragraph()
+
+        assert isinstance(new_paragraph, Paragraph)
+        assert new_paragraph._parent == blkcntnr
+        assert blkcntnr._element.xml == xml("w:body/w:p")
+
+    # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
-    def _add_paragraph_(self, request):
+    def _add_paragraph_(self, request: FixtureRequest):
         return method_mock(request, BlockItemContainer, "_add_paragraph")
 
     @pytest.fixture
-    def paragraph_(self, request):
+    def blkcntnr(self, document_: Mock):
+        blkcntnr_elm = cast(CT_Body, element("w:body"))
+        return BlockItemContainer(blkcntnr_elm, document_)
+
+    @pytest.fixture
+    def document_(self, request: FixtureRequest):
+        return instance_mock(request, Document)
+
+    @pytest.fixture
+    def paragraph_(self, request: FixtureRequest):
         return instance_mock(request, Paragraph)
diff --git a/tests/test_document.py b/tests/test_document.py
index 6a2c5af88..739813321 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -13,7 +13,7 @@
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.opc.coreprops import CoreProperties
-from docx.oxml.document import CT_Document
+from docx.oxml.document import CT_Body, CT_Document
 from docx.parts.document import DocumentPart
 from docx.section import Section, Sections
 from docx.settings import Settings
@@ -25,33 +25,43 @@
 from docx.text.run import Run
 
 from .unitutil.cxml import element, xml
-from .unitutil.mock import Mock, class_mock, instance_mock, method_mock, property_mock
+from .unitutil.mock import (
+    FixtureRequest,
+    Mock,
+    class_mock,
+    instance_mock,
+    method_mock,
+    property_mock,
+)
 
 
 class DescribeDocument:
-    """Unit-test suite for `docx.Document`."""
+    """Unit-test suite for `docx.document.Document`."""
 
-    def it_can_add_a_heading(self, add_heading_fixture, add_paragraph_, paragraph_):
-        level, style = add_heading_fixture
+    @pytest.mark.parametrize(
+        ("level", "style"), [(0, "Title"), (1, "Heading 1"), (2, "Heading 2"), (9, "Heading 9")]
+    )
+    def it_can_add_a_heading(
+        self, level: int, style: str, document: Document, add_paragraph_: Mock, paragraph_: Mock
+    ):
         add_paragraph_.return_value = paragraph_
-        document = Document(None, None)
 
         paragraph = document.add_heading("Spam vs. Bacon", level)
 
         add_paragraph_.assert_called_once_with(document, "Spam vs. Bacon", style)
         assert paragraph is paragraph_
 
-    def it_raises_on_heading_level_out_of_range(self):
-        document = Document(None, None)
+    def it_raises_on_heading_level_out_of_range(self, document: Document):
         with pytest.raises(ValueError, match="level must be in range 0-9, got -1"):
             document.add_heading(level=-1)
         with pytest.raises(ValueError, match="level must be in range 0-9, got 10"):
             document.add_heading(level=10)
 
-    def it_can_add_a_page_break(self, add_paragraph_, paragraph_, run_):
+    def it_can_add_a_page_break(
+        self, document: Document, add_paragraph_: Mock, paragraph_: Mock, run_: Mock
+    ):
         add_paragraph_.return_value = paragraph_
         paragraph_.add_run.return_value = run_
-        document = Document(None, None)
 
         paragraph = document.add_page_break()
 
@@ -60,70 +70,137 @@ def it_can_add_a_page_break(self, add_paragraph_, paragraph_, run_):
         run_.add_break.assert_called_once_with(WD_BREAK.PAGE)
         assert paragraph is paragraph_
 
-    def it_can_add_a_paragraph(self, add_paragraph_fixture):
-        document, text, style, paragraph_ = add_paragraph_fixture
+    @pytest.mark.parametrize(
+        ("text", "style"), [("", None), ("", "Heading 1"), ("foo\rbar", "Body Text")]
+    )
+    def it_can_add_a_paragraph(
+        self,
+        text: str,
+        style: str | None,
+        document: Document,
+        body_: Mock,
+        body_prop_: Mock,
+        paragraph_: Mock,
+    ):
+        body_prop_.return_value = body_
+        body_.add_paragraph.return_value = paragraph_
+
         paragraph = document.add_paragraph(text, style)
-        document._body.add_paragraph.assert_called_once_with(text, style)
+
+        body_.add_paragraph.assert_called_once_with(text, style)
         assert paragraph is paragraph_
 
-    def it_can_add_a_picture(self, add_picture_fixture):
-        document, path, width, height, run_, picture_ = add_picture_fixture
+    def it_can_add_a_picture(
+        self, document: Document, add_paragraph_: Mock, run_: Mock, picture_: Mock
+    ):
+        path, width, height = "foobar.png", 100, 200
+        add_paragraph_.return_value.add_run.return_value = run_
+        run_.add_picture.return_value = picture_
+
         picture = document.add_picture(path, width, height)
+
         run_.add_picture.assert_called_once_with(path, width, height)
         assert picture is picture_
 
+    @pytest.mark.parametrize(
+        ("sentinel_cxml", "start_type", "new_sentinel_cxml"),
+        [
+            ("w:sectPr", WD_SECTION.EVEN_PAGE, "w:sectPr/w:type{w:val=evenPage}"),
+            (
+                "w:sectPr/w:type{w:val=evenPage}",
+                WD_SECTION.ODD_PAGE,
+                "w:sectPr/w:type{w:val=oddPage}",
+            ),
+            ("w:sectPr/w:type{w:val=oddPage}", WD_SECTION.NEW_PAGE, "w:sectPr"),
+        ],
+    )
     def it_can_add_a_section(
-        self, add_section_fixture, Section_, section_, document_part_
+        self,
+        sentinel_cxml: str,
+        start_type: WD_SECTION,
+        new_sentinel_cxml: str,
+        Section_: Mock,
+        section_: Mock,
+        document_part_: Mock,
     ):
-        document_elm, start_type, expected_xml = add_section_fixture
         Section_.return_value = section_
-        document = Document(document_elm, document_part_)
+        document = Document(
+            cast(CT_Document, element("w:document/w:body/(w:p,%s)" % sentinel_cxml)),
+            document_part_,
+        )
 
         section = document.add_section(start_type)
 
-        assert document.element.xml == expected_xml
+        assert document.element.xml == xml(
+            "w:document/w:body/(w:p,w:p/w:pPr/%s,%s)" % (sentinel_cxml, new_sentinel_cxml)
+        )
         sectPr = document.element.xpath("w:body/w:sectPr")[0]
         Section_.assert_called_once_with(sectPr, document_part_)
         assert section is section_
 
-    def it_can_add_a_table(self, add_table_fixture):
-        document, rows, cols, style, width, table_ = add_table_fixture
+    def it_can_add_a_table(
+        self,
+        document: Document,
+        _block_width_prop_: Mock,
+        body_prop_: Mock,
+        body_: Mock,
+        table_: Mock,
+    ):
+        rows, cols, style = 4, 2, "Light Shading Accent 1"
+        body_prop_.return_value = body_
+        body_.add_table.return_value = table_
+        _block_width_prop_.return_value = width = 42
+
         table = document.add_table(rows, cols, style)
-        document._body.add_table.assert_called_once_with(rows, cols, width)
+
+        body_.add_table.assert_called_once_with(rows, cols, width)
         assert table == table_
         assert table.style == style
 
-    def it_can_save_the_document_to_a_file(self, save_fixture):
-        document, file_ = save_fixture
-        document.save(file_)
-        document._part.save.assert_called_once_with(file_)
+    def it_can_save_the_document_to_a_file(self, document_part_: Mock):
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
+
+        document.save("foobar.docx")
+
+        document_part_.save.assert_called_once_with("foobar.docx")
+
+    def it_provides_access_to_its_core_properties(
+        self, document_part_: Mock, core_properties_: Mock
+    ):
+        document_part_.core_properties = core_properties_
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
 
-    def it_provides_access_to_its_core_properties(self, core_props_fixture):
-        document, core_properties_ = core_props_fixture
         core_properties = document.core_properties
+
         assert core_properties is core_properties_
 
-    def it_provides_access_to_its_inline_shapes(self, inline_shapes_fixture):
-        document, inline_shapes_ = inline_shapes_fixture
+    def it_provides_access_to_its_inline_shapes(self, document_part_: Mock, inline_shapes_: Mock):
+        document_part_.inline_shapes = inline_shapes_
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
+
         assert document.inline_shapes is inline_shapes_
 
     def it_can_iterate_the_inner_content_of_the_document(
         self, body_prop_: Mock, body_: Mock, document_part_: Mock
     ):
-        document_elm = cast(CT_Document, element("w:document"))
         body_prop_.return_value = body_
         body_.iter_inner_content.return_value = iter((1, 2, 3))
-        document = Document(document_elm, document_part_)
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
 
         assert list(document.iter_inner_content()) == [1, 2, 3]
 
-    def it_provides_access_to_its_paragraphs(self, paragraphs_fixture):
-        document, paragraphs_ = paragraphs_fixture
+    def it_provides_access_to_its_paragraphs(
+        self, document: Document, body_prop_: Mock, body_: Mock, paragraphs_: Mock
+    ):
+        body_prop_.return_value = body_
+        body_.paragraphs = paragraphs_
         paragraphs = document.paragraphs
         assert paragraphs is paragraphs_
 
-    def it_provides_access_to_its_sections(self, document_part_, Sections_, sections_):
-        document_elm = element("w:document")
+    def it_provides_access_to_its_sections(
+        self, document_part_: Mock, Sections_: Mock, sections_: Mock
+    ):
+        document_elm = cast(CT_Document, element("w:document"))
         Sections_.return_value = sections_
         document = Document(document_elm, document_part_)
 
@@ -132,267 +209,172 @@ def it_provides_access_to_its_sections(self, document_part_, Sections_, sections
         Sections_.assert_called_once_with(document_elm, document_part_)
         assert sections is sections_
 
-    def it_provides_access_to_its_settings(self, settings_fixture):
-        document, settings_ = settings_fixture
-        assert document.settings is settings_
-
-    def it_provides_access_to_its_styles(self, styles_fixture):
-        document, styles_ = styles_fixture
-        assert document.styles is styles_
+    def it_provides_access_to_its_settings(self, document_part_: Mock, settings_: Mock):
+        document_part_.settings = settings_
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
 
-    def it_provides_access_to_its_tables(self, tables_fixture):
-        document, tables_ = tables_fixture
-        tables = document.tables
-        assert tables is tables_
+        assert document.settings is settings_
 
-    def it_provides_access_to_the_document_part(self, part_fixture):
-        document, part_ = part_fixture
-        assert document.part is part_
+    def it_provides_access_to_its_styles(self, document_part_: Mock, styles_: Mock):
+        document_part_.styles = styles_
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
 
-    def it_provides_access_to_the_document_body(self, body_fixture):
-        document, body_elm, _Body_, body_ = body_fixture
-        body = document._body
-        _Body_.assert_called_once_with(body_elm, document)
-        assert body is body_
+        assert document.styles is styles_
 
-    def it_determines_block_width_to_help(self, block_width_fixture):
-        document, expected_value = block_width_fixture
-        width = document._block_width
-        assert isinstance(width, Length)
-        assert width == expected_value
+    def it_provides_access_to_its_tables(
+        self, document: Document, body_prop_: Mock, body_: Mock, tables_: Mock
+    ):
+        body_prop_.return_value = body_
+        body_.tables = tables_
 
-    # fixtures -------------------------------------------------------
+        assert document.tables is tables_
 
-    @pytest.fixture(
-        params=[
-            (0, "Title"),
-            (1, "Heading 1"),
-            (2, "Heading 2"),
-            (9, "Heading 9"),
-        ]
-    )
-    def add_heading_fixture(self, request):
-        level, style = request.param
-        return level, style
-
-    @pytest.fixture(
-        params=[
-            ("", None),
-            ("", "Heading 1"),
-            ("foo\rbar", "Body Text"),
-        ]
-    )
-    def add_paragraph_fixture(self, request, body_prop_, paragraph_):
-        text, style = request.param
-        document = Document(None, None)
-        body_prop_.return_value.add_paragraph.return_value = paragraph_
-        return document, text, style, paragraph_
+    def it_provides_access_to_the_document_part(self, document_part_: Mock):
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
+        assert document.part is document_part_
 
-    @pytest.fixture
-    def add_picture_fixture(self, request, add_paragraph_, run_, picture_):
-        document = Document(None, None)
-        path, width, height = "foobar.png", 100, 200
-        add_paragraph_.return_value.add_run.return_value = run_
-        run_.add_picture.return_value = picture_
-        return document, path, width, height, run_, picture_
+    def it_provides_access_to_the_document_body(
+        self, _Body_: Mock, body_: Mock, document_part_: Mock
+    ):
+        _Body_.return_value = body_
+        document_elm = cast(CT_Document, element("w:document/w:body"))
+        body_elm = document_elm[0]
+        document = Document(document_elm, document_part_)
 
-    @pytest.fixture(
-        params=[
-            ("w:sectPr", WD_SECTION.EVEN_PAGE, "w:sectPr/w:type{w:val=evenPage}"),
-            (
-                "w:sectPr/w:type{w:val=evenPage}",
-                WD_SECTION.ODD_PAGE,
-                "w:sectPr/w:type{w:val=oddPage}",
-            ),
-            ("w:sectPr/w:type{w:val=oddPage}", WD_SECTION.NEW_PAGE, "w:sectPr"),
-        ]
-    )
-    def add_section_fixture(self, request):
-        sentinel, start_type, new_sentinel = request.param
-        document_elm = element("w:document/w:body/(w:p,%s)" % sentinel)
-        expected_xml = xml(
-            "w:document/w:body/(w:p,w:p/w:pPr/%s,%s)" % (sentinel, new_sentinel)
-        )
-        return document_elm, start_type, expected_xml
+        body = document._body
 
-    @pytest.fixture
-    def add_table_fixture(self, _block_width_prop_, body_prop_, table_):
-        document = Document(None, None)
-        rows, cols, style = 4, 2, "Light Shading Accent 1"
-        body_prop_.return_value.add_table.return_value = table_
-        _block_width_prop_.return_value = width = 42
-        return document, rows, cols, style, width, table_
+        _Body_.assert_called_once_with(body_elm, document)
+        assert body is body_
 
-    @pytest.fixture
-    def block_width_fixture(self, sections_prop_, section_):
-        document = Document(None, None)
+    def it_determines_block_width_to_help(
+        self, document: Document, sections_prop_: Mock, section_: Mock
+    ):
         sections_prop_.return_value = [None, section_]
         section_.page_width = 6000
         section_.left_margin = 1500
         section_.right_margin = 1000
-        expected_value = 3500
-        return document, expected_value
 
-    @pytest.fixture
-    def body_fixture(self, _Body_, body_):
-        document_elm = element("w:document/w:body")
-        body_elm = document_elm[0]
-        document = Document(document_elm, None)
-        return document, body_elm, _Body_, body_
-
-    @pytest.fixture
-    def core_props_fixture(self, document_part_, core_properties_):
-        document = Document(None, document_part_)
-        document_part_.core_properties = core_properties_
-        return document, core_properties_
-
-    @pytest.fixture
-    def inline_shapes_fixture(self, document_part_, inline_shapes_):
-        document = Document(None, document_part_)
-        document_part_.inline_shapes = inline_shapes_
-        return document, inline_shapes_
-
-    @pytest.fixture
-    def paragraphs_fixture(self, body_prop_, paragraphs_):
-        document = Document(None, None)
-        body_prop_.return_value.paragraphs = paragraphs_
-        return document, paragraphs_
-
-    @pytest.fixture
-    def part_fixture(self, document_part_):
-        document = Document(None, document_part_)
-        return document, document_part_
-
-    @pytest.fixture
-    def save_fixture(self, document_part_):
-        document = Document(None, document_part_)
-        file_ = "foobar.docx"
-        return document, file_
-
-    @pytest.fixture
-    def settings_fixture(self, document_part_, settings_):
-        document = Document(None, document_part_)
-        document_part_.settings = settings_
-        return document, settings_
-
-    @pytest.fixture
-    def styles_fixture(self, document_part_, styles_):
-        document = Document(None, document_part_)
-        document_part_.styles = styles_
-        return document, styles_
+        width = document._block_width
 
-    @pytest.fixture
-    def tables_fixture(self, body_prop_, tables_):
-        document = Document(None, None)
-        body_prop_.return_value.tables = tables_
-        return document, tables_
+        assert isinstance(width, Length)
+        assert width == 3500
 
-    # fixture components ---------------------------------------------
+    # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
-    def add_paragraph_(self, request):
+    def add_paragraph_(self, request: FixtureRequest):
         return method_mock(request, Document, "add_paragraph")
 
     @pytest.fixture
-    def _Body_(self, request, body_):
-        return class_mock(request, "docx.document._Body", return_value=body_)
+    def _Body_(self, request: FixtureRequest):
+        return class_mock(request, "docx.document._Body")
 
     @pytest.fixture
-    def body_(self, request):
+    def body_(self, request: FixtureRequest):
         return instance_mock(request, _Body)
 
     @pytest.fixture
-    def _block_width_prop_(self, request):
+    def _block_width_prop_(self, request: FixtureRequest):
         return property_mock(request, Document, "_block_width")
 
     @pytest.fixture
-    def body_prop_(self, request, body_):
-        return property_mock(request, Document, "_body", return_value=body_)
+    def body_prop_(self, request: FixtureRequest):
+        return property_mock(request, Document, "_body")
 
     @pytest.fixture
-    def core_properties_(self, request):
+    def core_properties_(self, request: FixtureRequest):
         return instance_mock(request, CoreProperties)
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document(self, document_part_: Mock) -> Document:
+        document_elm = cast(CT_Document, element("w:document"))
+        return Document(document_elm, document_part_)
+
+    @pytest.fixture
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def inline_shapes_(self, request):
+    def inline_shapes_(self, request: FixtureRequest):
         return instance_mock(request, InlineShapes)
 
     @pytest.fixture
-    def paragraph_(self, request):
+    def paragraph_(self, request: FixtureRequest):
         return instance_mock(request, Paragraph)
 
     @pytest.fixture
-    def paragraphs_(self, request):
+    def paragraphs_(self, request: FixtureRequest):
         return instance_mock(request, list)
 
     @pytest.fixture
-    def picture_(self, request):
+    def picture_(self, request: FixtureRequest):
         return instance_mock(request, InlineShape)
 
     @pytest.fixture
-    def run_(self, request):
+    def run_(self, request: FixtureRequest):
         return instance_mock(request, Run)
 
     @pytest.fixture
-    def Section_(self, request):
+    def Section_(self, request: FixtureRequest):
         return class_mock(request, "docx.document.Section")
 
     @pytest.fixture
-    def section_(self, request):
+    def section_(self, request: FixtureRequest):
         return instance_mock(request, Section)
 
     @pytest.fixture
-    def Sections_(self, request):
+    def Sections_(self, request: FixtureRequest):
         return class_mock(request, "docx.document.Sections")
 
     @pytest.fixture
-    def sections_(self, request):
+    def sections_(self, request: FixtureRequest):
         return instance_mock(request, Sections)
 
     @pytest.fixture
-    def sections_prop_(self, request):
+    def sections_prop_(self, request: FixtureRequest):
         return property_mock(request, Document, "sections")
 
     @pytest.fixture
-    def settings_(self, request):
+    def settings_(self, request: FixtureRequest):
         return instance_mock(request, Settings)
 
     @pytest.fixture
-    def styles_(self, request):
+    def styles_(self, request: FixtureRequest):
         return instance_mock(request, Styles)
 
     @pytest.fixture
-    def table_(self, request):
-        return instance_mock(request, Table, style="UNASSIGNED")
+    def table_(self, request: FixtureRequest):
+        return instance_mock(request, Table)
 
     @pytest.fixture
-    def tables_(self, request):
+    def tables_(self, request: FixtureRequest):
         return instance_mock(request, list)
 
 
 class Describe_Body:
-    def it_can_clear_itself_of_all_content_it_holds(self, clear_fixture):
-        body, expected_xml = clear_fixture
-        _body = body.clear_content()
-        assert body._body.xml == expected_xml
-        assert _body is body
+    """Unit-test suite for `docx.document._Body`."""
 
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("cxml", "expected_cxml"),
+        [
             ("w:body", "w:body"),
             ("w:body/w:p", "w:body"),
             ("w:body/w:sectPr", "w:body/w:sectPr"),
             ("w:body/(w:p, w:sectPr)", "w:body/w:sectPr"),
-        ]
+        ],
     )
-    def clear_fixture(self, request):
-        before_cxml, after_cxml = request.param
-        body = _Body(element(before_cxml), None)
-        expected_xml = xml(after_cxml)
-        return body, expected_xml
+    def it_can_clear_itself_of_all_content_it_holds(
+        self, cxml: str, expected_cxml: str, document_: Mock
+    ):
+        body = _Body(cast(CT_Body, element(cxml)), document_)
+
+        _body = body.clear_content()
+
+        assert body._body.xml == xml(expected_cxml)
+        assert _body is body
+
+    # -- fixtures --------------------------------------------------------------------------------
+
+    @pytest.fixture
+    def document_(self, request: FixtureRequest):
+        return instance_mock(request, Document)
diff --git a/tests/test_package.py b/tests/test_package.py
index eda5f0132..ac9839828 100644
--- a/tests/test_package.py
+++ b/tests/test_package.py
@@ -1,5 +1,9 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for docx.package module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.image.image import Image
@@ -8,12 +12,21 @@
 from docx.parts.image import ImagePart
 
 from .unitutil.file import docx_path
-from .unitutil.mock import class_mock, instance_mock, method_mock, property_mock
+from .unitutil.mock import (
+    FixtureRequest,
+    Mock,
+    class_mock,
+    instance_mock,
+    method_mock,
+    property_mock,
+)
 
 
 class DescribePackage:
+    """Unit-test suite for `docx.package.Package`."""
+
     def it_can_get_or_add_an_image_part_containing_a_specified_image(
-        self, image_parts_prop_, image_parts_, image_part_
+        self, image_parts_prop_: Mock, image_parts_: Mock, image_part_: Mock
     ):
         image_parts_prop_.return_value = image_parts_
         image_parts_.get_or_add_image_part.return_value = image_part_
@@ -26,29 +39,36 @@ def it_can_get_or_add_an_image_part_containing_a_specified_image(
 
     def it_gathers_package_image_parts_after_unmarshalling(self):
         package = Package.open(docx_path("having-images"))
+
         image_parts = package.image_parts
+
         assert len(image_parts) == 3
-        for image_part in image_parts:
-            assert isinstance(image_part, ImagePart)
+        assert all(isinstance(p, ImagePart) for p in image_parts)
 
     # fixture components ---------------------------------------------
 
     @pytest.fixture
-    def image_part_(self, request):
+    def image_part_(self, request: FixtureRequest):
         return instance_mock(request, ImagePart)
 
     @pytest.fixture
-    def image_parts_(self, request):
+    def image_parts_(self, request: FixtureRequest):
         return instance_mock(request, ImageParts)
 
     @pytest.fixture
-    def image_parts_prop_(self, request):
+    def image_parts_prop_(self, request: FixtureRequest):
         return property_mock(request, Package, "image_parts")
 
 
 class DescribeImageParts:
+    """Unit-test suite for `docx.package.Package`."""
+
     def it_can_get_a_matching_image_part(
-        self, Image_, image_, _get_by_sha1_, image_part_
+        self,
+        Image_: Mock,
+        image_: Mock,
+        _get_by_sha1_: Mock,
+        image_part_: Mock,
     ):
         Image_.from_file.return_value = image_
         image_.sha1 = "f005ba11"
@@ -62,7 +82,12 @@ def it_can_get_a_matching_image_part(
         assert image_part is image_part_
 
     def but_it_adds_a_new_image_part_when_match_fails(
-        self, Image_, image_, _get_by_sha1_, _add_image_part_, image_part_
+        self,
+        Image_: Mock,
+        image_: Mock,
+        _get_by_sha1_: Mock,
+        _add_image_part_: Mock,
+        image_part_: Mock,
     ):
         Image_.from_file.return_value = image_
         image_.sha1 = "fa1afe1"
@@ -77,73 +102,74 @@ def but_it_adds_a_new_image_part_when_match_fails(
         _add_image_part_.assert_called_once_with(image_parts, image_)
         assert image_part is image_part_
 
-    def it_knows_the_next_available_image_partname(self, next_partname_fixture):
-        image_parts, ext, expected_partname = next_partname_fixture
-        assert image_parts._next_image_partname(ext) == expected_partname
+    @pytest.mark.parametrize(
+        ("existing_partname_numbers", "expected_partname_number"),
+        [
+            ((2, 3), 1),
+            ((1, 3), 2),
+            ((1, 2), 3),
+        ],
+    )
+    def it_knows_the_next_available_image_partname(
+        self,
+        request: FixtureRequest,
+        existing_partname_numbers: tuple[int, int],
+        expected_partname_number: int,
+    ):
+        image_parts = ImageParts()
+        for n in existing_partname_numbers:
+            image_parts.append(
+                instance_mock(request, ImagePart, partname=PackURI(f"/word/media/image{n}.png"))
+            )
+
+        next_partname = image_parts._next_image_partname("png")
 
-    def it_can_really_add_a_new_image_part(
-        self, _next_image_partname_, partname_, image_, ImagePart_, image_part_
+        assert next_partname == PackURI("/word/media/image%d.png" % expected_partname_number)
+
+    def it_can_add_a_new_image_part(
+        self,
+        _next_image_partname_: Mock,
+        image_: Mock,
+        ImagePart_: Mock,
+        image_part_: Mock,
     ):
-        _next_image_partname_.return_value = partname_
+        partname = PackURI("/word/media/image7.png")
+        _next_image_partname_.return_value = partname
         ImagePart_.from_image.return_value = image_part_
         image_parts = ImageParts()
 
         image_part = image_parts._add_image_part(image_)
 
-        ImagePart_.from_image.assert_called_once_with(image_, partname_)
+        ImagePart_.from_image.assert_called_once_with(image_, partname)
         assert image_part in image_parts
         assert image_part is image_part_
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture(params=[((2, 3), 1), ((1, 3), 2), ((1, 2), 3)])
-    def next_partname_fixture(self, request):
-        def image_part_with_partname_(n):
-            partname = image_partname(n)
-            return instance_mock(request, ImagePart, partname=partname)
-
-        def image_partname(n):
-            return PackURI("/word/media/image%d.png" % n)
-
-        existing_partname_numbers, expected_partname_number = request.param
-        image_parts = ImageParts()
-        for n in existing_partname_numbers:
-            image_part_ = image_part_with_partname_(n)
-            image_parts.append(image_part_)
-        ext = "png"
-        expected_image_partname = image_partname(expected_partname_number)
-        return image_parts, ext, expected_image_partname
-
-    # fixture components ---------------------------------------------
-
     @pytest.fixture
-    def _add_image_part_(self, request):
+    def _add_image_part_(self, request: FixtureRequest):
         return method_mock(request, ImageParts, "_add_image_part")
 
     @pytest.fixture
-    def _get_by_sha1_(self, request):
+    def _get_by_sha1_(self, request: FixtureRequest):
         return method_mock(request, ImageParts, "_get_by_sha1")
 
     @pytest.fixture
-    def Image_(self, request):
+    def Image_(self, request: FixtureRequest):
         return class_mock(request, "docx.package.Image")
 
     @pytest.fixture
-    def image_(self, request):
+    def image_(self, request: FixtureRequest):
         return instance_mock(request, Image)
 
     @pytest.fixture
-    def ImagePart_(self, request):
+    def ImagePart_(self, request: FixtureRequest):
         return class_mock(request, "docx.package.ImagePart")
 
     @pytest.fixture
-    def image_part_(self, request):
+    def image_part_(self, request: FixtureRequest):
         return instance_mock(request, ImagePart)
 
     @pytest.fixture
-    def _next_image_partname_(self, request):
+    def _next_image_partname_(self, request: FixtureRequest):
         return method_mock(request, ImageParts, "_next_image_partname")
-
-    @pytest.fixture
-    def partname_(self, request):
-        return instance_mock(request, PackURI)
diff --git a/tests/test_section.py b/tests/test_section.py
index 333e755b7..54d665768 100644
--- a/tests/test_section.py
+++ b/tests/test_section.py
@@ -65,9 +65,7 @@ def it_can_access_its_Section_instances_by_index(
     ):
         document_elm = cast(
             CT_Document,
-            element(
-                "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
-            ),
+            element("w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"),
         )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
@@ -87,9 +85,7 @@ def it_can_access_its_Section_instances_by_slice(
     ):
         document_elm = cast(
             CT_Document,
-            element(
-                "w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"
-            ),
+            element("w:document/w:body/(w:p/w:pPr/w:sectPr,w:p/w:pPr/w:sectPr,w:sectPr)"),
         )
         sectPrs = document_elm.xpath("//w:sectPr")
         Section_.return_value = section_
@@ -103,7 +99,7 @@ def it_can_access_its_Section_instances_by_slice(
         ]
         assert section_lst == [section_, section_]
 
-    # fixture components ---------------------------------------------
+    # -- fixtures---------------------------------------------------------------------------------
 
     @pytest.fixture
     def document_part_(self, request: FixtureRequest):
@@ -170,9 +166,7 @@ def it_provides_access_to_its_even_page_footer(
 
         footer = section.even_page_footer
 
-        _Footer_.assert_called_once_with(
-            sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE
-        )
+        _Footer_.assert_called_once_with(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
         assert footer is footer_
 
     def it_provides_access_to_its_even_page_header(
@@ -184,9 +178,7 @@ def it_provides_access_to_its_even_page_header(
 
         header = section.even_page_header
 
-        _Header_.assert_called_once_with(
-            sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE
-        )
+        _Header_.assert_called_once_with(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
         assert header is header_
 
     def it_provides_access_to_its_first_page_footer(
@@ -198,9 +190,7 @@ def it_provides_access_to_its_first_page_footer(
 
         footer = section.first_page_footer
 
-        _Footer_.assert_called_once_with(
-            sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE
-        )
+        _Footer_.assert_called_once_with(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
         assert footer is footer_
 
     def it_provides_access_to_its_first_page_header(
@@ -212,9 +202,7 @@ def it_provides_access_to_its_first_page_header(
 
         header = section.first_page_header
 
-        _Header_.assert_called_once_with(
-            sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE
-        )
+        _Header_.assert_called_once_with(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
         assert header is header_
 
     def it_provides_access_to_its_default_footer(
@@ -226,9 +214,7 @@ def it_provides_access_to_its_default_footer(
 
         footer = section.footer
 
-        _Footer_.assert_called_once_with(
-            sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY
-        )
+        _Footer_.assert_called_once_with(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
         assert footer is footer_
 
     def it_provides_access_to_its_default_header(
@@ -240,9 +226,7 @@ def it_provides_access_to_its_default_header(
 
         header = section.header
 
-        _Header_.assert_called_once_with(
-            sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY
-        )
+        _Header_.assert_called_once_with(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
         assert header is header_
 
     def it_can_iterate_its_inner_content(self):
@@ -562,20 +546,16 @@ def header_(self, request: FixtureRequest):
 class Describe_BaseHeaderFooter:
     """Unit-test suite for `docx.section._BaseHeaderFooter`."""
 
-    @pytest.mark.parametrize(
-        ("has_definition", "expected_value"), [(False, True), (True, False)]
-    )
+    @pytest.mark.parametrize(("has_definition", "expected_value"), [(False, True), (True, False)])
     def it_knows_when_its_linked_to_the_previous_header_or_footer(
-        self, has_definition: bool, expected_value: bool, _has_definition_prop_: Mock
+        self,
+        has_definition: bool,
+        expected_value: bool,
+        header: _BaseHeaderFooter,
+        _has_definition_prop_: Mock,
     ):
         _has_definition_prop_.return_value = has_definition
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
-
-        is_linked = header.is_linked_to_previous
-
-        assert is_linked is expected_value
+        assert header.is_linked_to_previous is expected_value
 
     @pytest.mark.parametrize(
         ("has_definition", "value", "drop_calls", "add_calls"),
@@ -592,14 +572,12 @@ def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
         value: bool,
         drop_calls: int,
         add_calls: int,
+        header: _BaseHeaderFooter,
         _has_definition_prop_: Mock,
         _drop_definition_: Mock,
         _add_definition_: Mock,
     ):
         _has_definition_prop_.return_value = has_definition
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
 
         header.is_linked_to_previous = value
 
@@ -607,13 +585,10 @@ def it_can_change_whether_it_is_linked_to_previous_header_or_footer(
         assert _add_definition_.call_args_list == [call(header)] * add_calls
 
     def it_provides_access_to_the_header_or_footer_part_for_BlockItemContainer(
-        self, _get_or_add_definition_: Mock, header_part_: Mock
+        self, header: _BaseHeaderFooter, _get_or_add_definition_: Mock, header_part_: Mock
     ):
         # ---this override fulfills part of the BlockItemContainer subclass interface---
         _get_or_add_definition_.return_value = header_part_
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
 
         header_part = header.part
 
@@ -621,14 +596,11 @@ def it_provides_access_to_the_header_or_footer_part_for_BlockItemContainer(
         assert header_part is header_part_
 
     def it_provides_access_to_the_hdr_or_ftr_element_to_help(
-        self, _get_or_add_definition_: Mock, header_part_: Mock
+        self, header: _BaseHeaderFooter, _get_or_add_definition_: Mock, header_part_: Mock
     ):
         hdr = element("w:hdr")
         _get_or_add_definition_.return_value = header_part_
         header_part_.element = hdr
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
 
         hdr_elm = header._element
 
@@ -636,13 +608,14 @@ def it_provides_access_to_the_hdr_or_ftr_element_to_help(
         assert hdr_elm is hdr
 
     def it_gets_the_definition_when_it_has_one(
-        self, _has_definition_prop_: Mock, _definition_prop_: Mock, header_part_: Mock
+        self,
+        header: _BaseHeaderFooter,
+        _has_definition_prop_: Mock,
+        _definition_prop_: Mock,
+        header_part_: Mock,
     ):
         _has_definition_prop_.return_value = True
         _definition_prop_.return_value = header_part_
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
 
         header_part = header._get_or_add_definition()
 
@@ -650,6 +623,7 @@ def it_gets_the_definition_when_it_has_one(
 
     def but_it_gets_the_prior_definition_when_it_is_linked(
         self,
+        header: _BaseHeaderFooter,
         _has_definition_prop_: Mock,
         _prior_headerfooter_prop_: Mock,
         prior_headerfooter_: Mock,
@@ -658,9 +632,6 @@ def but_it_gets_the_prior_definition_when_it_is_linked(
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = prior_headerfooter_
         prior_headerfooter_._get_or_add_definition.return_value = header_part_
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
 
         header_part = header._get_or_add_definition()
 
@@ -669,6 +640,7 @@ def but_it_gets_the_prior_definition_when_it_is_linked(
 
     def and_it_adds_a_definition_when_it_is_linked_and_the_first_section(
         self,
+        header: _BaseHeaderFooter,
         _has_definition_prop_: Mock,
         _prior_headerfooter_prop_: Mock,
         _add_definition_: Mock,
@@ -677,9 +649,6 @@ def and_it_adds_a_definition_when_it_is_linked_and_the_first_section(
         _has_definition_prop_.return_value = False
         _prior_headerfooter_prop_.return_value = None
         _add_definition_.return_value = header_part_
-        header = _BaseHeaderFooter(
-            None, None, None  # pyright: ignore[reportGeneralTypeIssues]
-        )
 
         header_part = header._get_or_add_definition()
 
@@ -696,6 +665,10 @@ def _add_definition_(self, request: FixtureRequest):
     def _definition_prop_(self, request: FixtureRequest):
         return property_mock(request, _BaseHeaderFooter, "_definition")
 
+    @pytest.fixture
+    def document_part_(self, request: FixtureRequest):
+        return instance_mock(request, DocumentPart)
+
     @pytest.fixture
     def _drop_definition_(self, request: FixtureRequest):
         return method_mock(request, _BaseHeaderFooter, "_drop_definition")
@@ -708,6 +681,11 @@ def _get_or_add_definition_(self, request: FixtureRequest):
     def _has_definition_prop_(self, request: FixtureRequest):
         return property_mock(request, _BaseHeaderFooter, "_has_definition")
 
+    @pytest.fixture
+    def header(self, document_part_: Mock) -> _BaseHeaderFooter:
+        sectPr = cast(CT_SectPr, element("w:sectPr"))
+        return _BaseHeaderFooter(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
+
     @pytest.fixture
     def header_part_(self, request: FixtureRequest):
         return instance_mock(request, HeaderPart)
@@ -724,25 +702,21 @@ def _prior_headerfooter_prop_(self, request: FixtureRequest):
 class Describe_Footer:
     """Unit-test suite for `docx.section._Footer`."""
 
-    def it_can_add_a_footer_part_to_help(
-        self, document_part_: Mock, footer_part_: Mock
-    ):
-        sectPr = element("w:sectPr{r:a=b}")
+    def it_can_add_a_footer_part_to_help(self, document_part_: Mock, footer_part_: Mock):
+        sectPr = cast(CT_SectPr, element("w:sectPr{r:a=b}"))
         document_part_.add_footer_part.return_value = footer_part_, "rId3"
         footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
         footer_part = footer._add_definition()
 
         document_part_.add_footer_part.assert_called_once_with()
-        assert sectPr.xml == xml(
-            "w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId3}"
-        )
+        assert sectPr.xml == xml("w:sectPr{r:a=b}/w:footerReference{w:type=default,r:id=rId3}")
         assert footer_part is footer_part_
 
     def it_provides_access_to_its_footer_part_to_help(
         self, document_part_: Mock, footer_part_: Mock
     ):
-        sectPr = element("w:sectPr/w:footerReference{w:type=even,r:id=rId3}")
+        sectPr = cast(CT_SectPr, element("w:sectPr/w:footerReference{w:type=even,r:id=rId3}"))
         document_part_.footer_part.return_value = footer_part_
         footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
 
@@ -752,7 +726,9 @@ def it_provides_access_to_its_footer_part_to_help(
         assert footer_part is footer_part_
 
     def it_can_drop_the_related_footer_part_to_help(self, document_part_: Mock):
-        sectPr = element("w:sectPr{r:a=b}/w:footerReference{w:type=first,r:id=rId42}")
+        sectPr = cast(
+            CT_SectPr, element("w:sectPr{r:a=b}/w:footerReference{w:type=first,r:id=rId42}")
+        )
         footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
 
         footer._drop_definition()
@@ -778,28 +754,26 @@ def it_provides_access_to_the_prior_Footer_to_help(
         self, request: FixtureRequest, document_part_: Mock, footer_: Mock
     ):
         doc_elm = element("w:document/(w:sectPr,w:sectPr)")
-        prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
+        prior_sectPr, sectPr = cast(CT_SectPr, doc_elm[0]), cast(CT_SectPr, doc_elm[1])
         footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
         # ---mock must occur after construction of "real" footer---
         _Footer_ = class_mock(request, "docx.section._Footer", return_value=footer_)
 
         prior_footer = footer._prior_headerfooter
 
-        _Footer_.assert_called_once_with(
-            prior_sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE
-        )
+        _Footer_.assert_called_once_with(prior_sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
         assert prior_footer is footer_
 
-    def but_it_returns_None_when_its_the_first_footer(self):
+    def but_it_returns_None_when_its_the_first_footer(self, document_part_: Mock):
         doc_elm = cast(CT_Document, element("w:document/w:sectPr"))
-        sectPr = doc_elm[0]
-        footer = _Footer(sectPr, None, None)
+        sectPr = cast(CT_SectPr, doc_elm[0])
+        footer = _Footer(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
         prior_footer = footer._prior_headerfooter
 
         assert prior_footer is None
 
-    # -- fixtures ----------------------------------------------------
+    # -- fixtures---------------------------------------------------------------------------------
 
     @pytest.fixture
     def document_part_(self, request: FixtureRequest):
@@ -815,25 +789,23 @@ def footer_part_(self, request: FixtureRequest):
 
 
 class Describe_Header:
-    def it_can_add_a_header_part_to_help(
-        self, document_part_: Mock, header_part_: Mock
-    ):
-        sectPr = element("w:sectPr{r:a=b}")
+    """Unit-test suite for `docx.section._Header`."""
+
+    def it_can_add_a_header_part_to_help(self, document_part_: Mock, header_part_: Mock):
+        sectPr = cast(CT_SectPr, element("w:sectPr{r:a=b}"))
         document_part_.add_header_part.return_value = header_part_, "rId3"
         header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.FIRST_PAGE)
 
         header_part = header._add_definition()
 
         document_part_.add_header_part.assert_called_once_with()
-        assert sectPr.xml == xml(
-            "w:sectPr{r:a=b}/w:headerReference{w:type=first,r:id=rId3}"
-        )
+        assert sectPr.xml == xml("w:sectPr{r:a=b}/w:headerReference{w:type=first,r:id=rId3}")
         assert header_part is header_part_
 
     def it_provides_access_to_its_header_part_to_help(
         self, document_part_: Mock, header_part_: Mock
     ):
-        sectPr = element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}")
+        sectPr = cast(CT_SectPr, element("w:sectPr/w:headerReference{w:type=default,r:id=rId8}"))
         document_part_.header_part.return_value = header_part_
         header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
@@ -843,7 +815,9 @@ def it_provides_access_to_its_header_part_to_help(
         assert header_part is header_part_
 
     def it_can_drop_the_related_header_part_to_help(self, document_part_: Mock):
-        sectPr = element("w:sectPr{r:a=b}/w:headerReference{w:type=even,r:id=rId42}")
+        sectPr = cast(
+            CT_SectPr, element("w:sectPr{r:a=b}/w:headerReference{w:type=even,r:id=rId42}")
+        )
         header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.EVEN_PAGE)
 
         header._drop_definition()
@@ -866,31 +840,29 @@ def it_knows_when_it_has_a_header_part_to_help(
         assert has_definition is expected_value
 
     def it_provides_access_to_the_prior_Header_to_help(
-        self, request, document_part_: Mock, header_: Mock
+        self, request: FixtureRequest, document_part_: Mock, header_: Mock
     ):
         doc_elm = element("w:document/(w:sectPr,w:sectPr)")
-        prior_sectPr, sectPr = doc_elm[0], doc_elm[1]
+        prior_sectPr, sectPr = cast(CT_SectPr, doc_elm[0]), cast(CT_SectPr, doc_elm[1])
         header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
         # ---mock must occur after construction of "real" header---
         _Header_ = class_mock(request, "docx.section._Header", return_value=header_)
 
         prior_header = header._prior_headerfooter
 
-        _Header_.assert_called_once_with(
-            prior_sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY
-        )
+        _Header_.assert_called_once_with(prior_sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
         assert prior_header is header_
 
-    def but_it_returns_None_when_its_the_first_header(self):
+    def but_it_returns_None_when_its_the_first_header(self, document_part_: Mock):
         doc_elm = element("w:document/w:sectPr")
-        sectPr = doc_elm[0]
-        header = _Header(sectPr, None, None)
+        sectPr = cast(CT_SectPr, doc_elm[0])
+        header = _Header(sectPr, document_part_, WD_HEADER_FOOTER.PRIMARY)
 
         prior_header = header._prior_headerfooter
 
         assert prior_header is None
 
-    # -- fixtures-----------------------------------------------------
+    # -- fixtures---------------------------------------------------------------------------------
 
     @pytest.fixture
     def document_part_(self, request: FixtureRequest):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 9f430822d..ff07eda26 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,5 +1,9 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for the docx.settings module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.settings import Settings
@@ -8,56 +12,37 @@
 
 
 class DescribeSettings:
-    def it_knows_when_the_document_has_distinct_odd_and_even_headers(
-        self, odd_and_even_get_fixture
-    ):
-        settings_elm, expected_value = odd_and_even_get_fixture
-        settings = Settings(settings_elm)
-
-        odd_and_even_pages_header_footer = settings.odd_and_even_pages_header_footer
-
-        assert odd_and_even_pages_header_footer is expected_value
-
-    def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
-        self, odd_and_even_set_fixture
-    ):
-        settings_elm, value, expected_xml = odd_and_even_set_fixture
-        settings = Settings(settings_elm)
+    """Unit-test suite for the `docx.settings.Settings` objects."""
 
-        settings.odd_and_even_pages_header_footer = value
-
-        assert settings_elm.xml == expected_xml
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("cxml", "expected_value"),
+        [
             ("w:settings", False),
             ("w:settings/w:evenAndOddHeaders", True),
             ("w:settings/w:evenAndOddHeaders{w:val=0}", False),
             ("w:settings/w:evenAndOddHeaders{w:val=1}", True),
             ("w:settings/w:evenAndOddHeaders{w:val=true}", True),
-        ]
+        ],
     )
-    def odd_and_even_get_fixture(self, request):
-        settings_cxml, expected_value = request.param
-        settings_elm = element(settings_cxml)
-        return settings_elm, expected_value
+    def it_knows_when_the_document_has_distinct_odd_and_even_headers(
+        self, cxml: str, expected_value: bool
+    ):
+        assert Settings(element(cxml)).odd_and_even_pages_header_footer is expected_value
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("cxml", "new_value", "expected_cxml"),
+        [
             ("w:settings", True, "w:settings/w:evenAndOddHeaders"),
             ("w:settings/w:evenAndOddHeaders", False, "w:settings"),
-            (
-                "w:settings/w:evenAndOddHeaders{w:val=1}",
-                True,
-                "w:settings/w:evenAndOddHeaders",
-            ),
+            ("w:settings/w:evenAndOddHeaders{w:val=1}", True, "w:settings/w:evenAndOddHeaders"),
             ("w:settings/w:evenAndOddHeaders{w:val=off}", False, "w:settings"),
-        ]
+        ],
     )
-    def odd_and_even_set_fixture(self, request):
-        settings_cxml, value, expected_cxml = request.param
-        settings_elm = element(settings_cxml)
-        expected_xml = xml(expected_cxml)
-        return settings_elm, value, expected_xml
+    def it_can_change_whether_the_document_has_distinct_odd_and_even_headers(
+        self, cxml: str, new_value: bool, expected_cxml: str
+    ):
+        settings = Settings(element(cxml))
+
+        settings.odd_and_even_pages_header_footer = new_value
+
+        assert settings._settings.xml == xml(expected_cxml)
diff --git a/tests/test_shape.py b/tests/test_shape.py
index da307e48f..68998b90e 100644
--- a/tests/test_shape.py
+++ b/tests/test_shape.py
@@ -1,194 +1,129 @@
+# pyright: reportPrivateUsage=false
+
 """Test suite for the docx.shape module."""
 
+from __future__ import annotations
+
+from typing import cast
+
 import pytest
 
+from docx.document import Document
 from docx.enum.shape import WD_INLINE_SHAPE
+from docx.oxml.document import CT_Body
 from docx.oxml.ns import nsmap
+from docx.oxml.shape import CT_Inline
 from docx.shape import InlineShape, InlineShapes
-from docx.shared import Length
-
-from .oxml.unitdata.dml import (
-    a_blip,
-    a_blipFill,
-    a_graphic,
-    a_graphicData,
-    a_pic,
-    an_inline,
-)
+from docx.shared import Emu, Length
+
 from .unitutil.cxml import element, xml
-from .unitutil.mock import loose_mock
+from .unitutil.mock import FixtureRequest, Mock, instance_mock
 
 
 class DescribeInlineShapes:
-    def it_knows_how_many_inline_shapes_it_contains(self, inline_shapes_fixture):
-        inline_shapes, expected_count = inline_shapes_fixture
-        assert len(inline_shapes) == expected_count
-
-    def it_can_iterate_over_its_InlineShape_instances(self, inline_shapes_fixture):
-        inline_shapes, inline_shape_count = inline_shapes_fixture
-        actual_count = 0
-        for inline_shape in inline_shapes:
-            assert isinstance(inline_shape, InlineShape)
-            actual_count += 1
-        assert actual_count == inline_shape_count
-
-    def it_provides_indexed_access_to_inline_shapes(self, inline_shapes_fixture):
-        inline_shapes, inline_shape_count = inline_shapes_fixture
-        for idx in range(-inline_shape_count, inline_shape_count):
-            inline_shape = inline_shapes[idx]
-            assert isinstance(inline_shape, InlineShape)
-
-    def it_raises_on_indexed_access_out_of_range(self, inline_shapes_fixture):
-        inline_shapes, inline_shape_count = inline_shapes_fixture
-        too_low = -1 - inline_shape_count
-        with pytest.raises(IndexError, match=r"inline shape index \[-3\] out of rang"):
-            inline_shapes[too_low]
-        too_high = inline_shape_count
+    """Unit-test suite for `docx.shape.InlineShapes` objects."""
+
+    def it_knows_how_many_inline_shapes_it_contains(self, body: CT_Body, document_: Mock):
+        inline_shapes = InlineShapes(body, document_)
+        assert len(inline_shapes) == 2
+
+    def it_can_iterate_over_its_InlineShape_instances(self, body: CT_Body, document_: Mock):
+        inline_shapes = InlineShapes(body, document_)
+        assert all(isinstance(s, InlineShape) for s in inline_shapes)
+        assert len(list(inline_shapes)) == 2
+
+    def it_provides_indexed_access_to_inline_shapes(self, body: CT_Body, document_: Mock):
+        inline_shapes = InlineShapes(body, document_)
+        for idx in range(-2, 2):
+            assert isinstance(inline_shapes[idx], InlineShape)
+
+    def it_raises_on_indexed_access_out_of_range(self, body: CT_Body, document_: Mock):
+        inline_shapes = InlineShapes(body, document_)
+
+        with pytest.raises(IndexError, match=r"inline shape index \[-3\] out of range"):
+            inline_shapes[-3]
         with pytest.raises(IndexError, match=r"inline shape index \[2\] out of range"):
-            inline_shapes[too_high]
+            inline_shapes[2]
 
-    def it_knows_the_part_it_belongs_to(self, inline_shapes_with_parent_):
-        inline_shapes, parent_ = inline_shapes_with_parent_
-        part = inline_shapes.part
-        assert part is parent_.part
+    def it_knows_the_part_it_belongs_to(self, body: CT_Body, document_: Mock):
+        inline_shapes = InlineShapes(body, document_)
+        assert inline_shapes.part is document_.part
 
-    # fixtures -------------------------------------------------------
+    # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
-    def inline_shapes_fixture(self):
-        body = element("w:body/w:p/(w:r/w:drawing/wp:inline, w:r/w:drawing/wp:inline)")
-        inline_shapes = InlineShapes(body, None)
-        expected_count = 2
-        return inline_shapes, expected_count
-
-    # fixture components ---------------------------------------------
+    def body(self) -> CT_Body:
+        return cast(
+            CT_Body, element("w:body/w:p/(w:r/w:drawing/wp:inline, w:r/w:drawing/wp:inline)")
+        )
 
     @pytest.fixture
-    def inline_shapes_with_parent_(self, request):
-        parent_ = loose_mock(request, name="parent_")
-        inline_shapes = InlineShapes(None, parent_)
-        return inline_shapes, parent_
+    def document_(self, request: FixtureRequest):
+        return instance_mock(request, Document)
 
 
 class DescribeInlineShape:
-    def it_knows_what_type_of_shape_it_is(self, shape_type_fixture):
-        inline_shape, inline_shape_type = shape_type_fixture
-        assert inline_shape.type == inline_shape_type
-
-    def it_knows_its_display_dimensions(self, dimensions_get_fixture):
-        inline_shape, cx, cy = dimensions_get_fixture
-        width = inline_shape.width
-        height = inline_shape.height
-        assert isinstance(width, Length)
-        assert width == cx
-        assert isinstance(height, Length)
-        assert height == cy
+    """Unit-test suite for `docx.shape.InlineShape` objects."""
+
+    @pytest.mark.parametrize(
+        ("uri", "content_cxml", "expected_value"),
+        [
+            # -- embedded picture --
+            (nsmap["pic"], "/pic:pic/pic:blipFill/a:blip{r:embed=rId1}", WD_INLINE_SHAPE.PICTURE),
+            # -- linked picture --
+            (
+                nsmap["pic"],
+                "/pic:pic/pic:blipFill/a:blip{r:link=rId2}",
+                WD_INLINE_SHAPE.LINKED_PICTURE,
+            ),
+            # -- linked and embedded picture (not expected) --
+            (
+                nsmap["pic"],
+                "/pic:pic/pic:blipFill/a:blip{r:embed=rId1,r:link=rId2}",
+                WD_INLINE_SHAPE.LINKED_PICTURE,
+            ),
+            # -- chart --
+            (nsmap["c"], "", WD_INLINE_SHAPE.CHART),
+            # -- SmartArt --
+            (nsmap["dgm"], "", WD_INLINE_SHAPE.SMART_ART),
+            # -- something else we don't know about --
+            ("foobar", "", WD_INLINE_SHAPE.NOT_IMPLEMENTED),
+        ],
+    )
+    def it_knows_what_type_of_shape_it_is(
+        self, uri: str, content_cxml: str, expected_value: WD_INLINE_SHAPE
+    ):
+        cxml = "wp:inline/a:graphic/a:graphicData{uri=%s}%s" % (uri, content_cxml)
+        inline = cast(CT_Inline, element(cxml))
+        inline_shape = InlineShape(inline)
+        assert inline_shape.type == expected_value
 
-    def it_can_change_its_display_dimensions(self, dimensions_set_fixture):
-        inline_shape, cx, cy, expected_xml = dimensions_set_fixture
-        inline_shape.width = cx
-        inline_shape.height = cy
-        assert inline_shape._inline.xml == expected_xml
+    def it_knows_its_display_dimensions(self):
+        inline = cast(CT_Inline, element("wp:inline/wp:extent{cx=333, cy=666}"))
+        inline_shape = InlineShape(inline)
 
-    # fixtures -------------------------------------------------------
+        width, height = inline_shape.width, inline_shape.height
 
-    @pytest.fixture
-    def dimensions_get_fixture(self):
-        inline_cxml, expected_cx, expected_cy = (
-            "wp:inline/wp:extent{cx=333, cy=666}",
-            333,
-            666,
+        assert isinstance(width, Length)
+        assert width == 333
+        assert isinstance(height, Length)
+        assert height == 666
+
+    def it_can_change_its_display_dimensions(self):
+        inline_shape = InlineShape(
+            cast(
+                CT_Inline,
+                element(
+                    "wp:inline/(wp:extent{cx=333,cy=666},a:graphic/a:graphicData/pic:pic/"
+                    "pic:spPr/a:xfrm/a:ext{cx=333,cy=666})"
+                ),
+            )
         )
-        inline_shape = InlineShape(element(inline_cxml))
-        return inline_shape, expected_cx, expected_cy
 
-    @pytest.fixture
-    def dimensions_set_fixture(self):
-        inline_cxml, new_cx, new_cy, expected_cxml = (
-            "wp:inline/(wp:extent{cx=333,cy=666},a:graphic/a:graphicData/"
-            "pic:pic/pic:spPr/a:xfrm/a:ext{cx=333,cy=666})",
-            444,
-            888,
-            "wp:inline/(wp:extent{cx=444,cy=888},a:graphic/a:graphicData/"
-            "pic:pic/pic:spPr/a:xfrm/a:ext{cx=444,cy=888})",
+        inline_shape.width = Emu(444)
+        inline_shape.height = Emu(888)
+
+        assert inline_shape._inline.xml == xml(
+            "wp:inline/(wp:extent{cx=444,cy=888},a:graphic/a:graphicData/pic:pic/pic:spPr/"
+            "a:xfrm/a:ext{cx=444,cy=888})"
         )
-        inline_shape = InlineShape(element(inline_cxml))
-        expected_xml = xml(expected_cxml)
-        return inline_shape, new_cx, new_cy, expected_xml
-
-    @pytest.fixture(
-        params=[
-            "embed pic",
-            "link pic",
-            "link+embed pic",
-            "chart",
-            "smart art",
-            "not implemented",
-        ]
-    )
-    def shape_type_fixture(self, request):
-        if request.param == "embed pic":
-            inline = self._inline_with_picture(embed=True)
-            shape_type = WD_INLINE_SHAPE.PICTURE
-
-        elif request.param == "link pic":
-            inline = self._inline_with_picture(link=True)
-            shape_type = WD_INLINE_SHAPE.LINKED_PICTURE
-
-        elif request.param == "link+embed pic":
-            inline = self._inline_with_picture(embed=True, link=True)
-            shape_type = WD_INLINE_SHAPE.LINKED_PICTURE
-
-        elif request.param == "chart":
-            inline = self._inline_with_uri(nsmap["c"])
-            shape_type = WD_INLINE_SHAPE.CHART
-
-        elif request.param == "smart art":
-            inline = self._inline_with_uri(nsmap["dgm"])
-            shape_type = WD_INLINE_SHAPE.SMART_ART
-
-        elif request.param == "not implemented":
-            inline = self._inline_with_uri("foobar")
-            shape_type = WD_INLINE_SHAPE.NOT_IMPLEMENTED
-
-        return InlineShape(inline), shape_type
-
-    # fixture components ---------------------------------------------
-
-    def _inline_with_picture(self, embed=False, link=False):
-        picture_ns = nsmap["pic"]
-
-        blip_bldr = a_blip()
-        if embed:
-            blip_bldr.with_embed("rId1")
-        if link:
-            blip_bldr.with_link("rId2")
-
-        inline = (
-            an_inline()
-            .with_nsdecls("wp", "r")
-            .with_child(
-                a_graphic()
-                .with_nsdecls()
-                .with_child(
-                    a_graphicData()
-                    .with_uri(picture_ns)
-                    .with_child(
-                        a_pic()
-                        .with_nsdecls()
-                        .with_child(a_blipFill().with_child(blip_bldr))
-                    )
-                )
-            )
-        ).element
-        return inline
-
-    def _inline_with_uri(self, uri):
-        inline = (
-            an_inline()
-            .with_nsdecls("wp")
-            .with_child(
-                a_graphic().with_nsdecls().with_child(a_graphicData().with_uri(uri))
-            )
-        ).element
-        return inline
diff --git a/tests/test_shared.py b/tests/test_shared.py
index 3fbe54b07..fb6c273cb 100644
--- a/tests/test_shared.py
+++ b/tests/test_shared.py
@@ -1,17 +1,25 @@
 """Test suite for the docx.shared module."""
 
+from __future__ import annotations
+
 import pytest
 
 from docx.opc.part import XmlPart
 from docx.shared import Cm, ElementProxy, Emu, Inches, Length, Mm, Pt, RGBColor, Twips
 
 from .unitutil.cxml import element
-from .unitutil.mock import instance_mock
+from .unitutil.mock import FixtureRequest, Mock, instance_mock
 
 
 class DescribeElementProxy:
-    def it_knows_when_its_equal_to_another_proxy_object(self, eq_fixture):
-        proxy, proxy_2, proxy_3, not_a_proxy = eq_fixture
+    """Unit-test suite for `docx.shared.ElementProxy` objects."""
+
+    def it_knows_when_its_equal_to_another_proxy_object(self):
+        p, q = element("w:p"), element("w:p")
+        proxy = ElementProxy(p)
+        proxy_2 = ElementProxy(p)
+        proxy_3 = ElementProxy(q)
+        not_a_proxy = "Foobar"
 
         assert (proxy == proxy_2) is True
         assert (proxy == proxy_3) is False
@@ -21,66 +29,33 @@ def it_knows_when_its_equal_to_another_proxy_object(self, eq_fixture):
         assert (proxy != proxy_3) is True
         assert (proxy != not_a_proxy) is True
 
-    def it_knows_its_element(self, element_fixture):
-        proxy, element = element_fixture
-        assert proxy.element is element
-
-    def it_knows_its_part(self, part_fixture):
-        proxy, part_ = part_fixture
-        assert proxy.part is part_
-
-    # fixture --------------------------------------------------------
-
-    @pytest.fixture
-    def element_fixture(self):
+    def it_knows_its_element(self):
         p = element("w:p")
         proxy = ElementProxy(p)
-        return proxy, p
-
-    @pytest.fixture
-    def eq_fixture(self):
-        p, q = element("w:p"), element("w:p")
-        proxy = ElementProxy(p)
-        proxy_2 = ElementProxy(p)
-        proxy_3 = ElementProxy(q)
-        not_a_proxy = "Foobar"
-        return proxy, proxy_2, proxy_3, not_a_proxy
+        assert proxy.element is p
 
-    @pytest.fixture
-    def part_fixture(self, other_proxy_, part_):
+    def it_knows_its_part(self, other_proxy_: Mock, part_: Mock):
         other_proxy_.part = part_
-        proxy = ElementProxy(None, other_proxy_)
-        return proxy, part_
+        proxy = ElementProxy(element("w:p"), other_proxy_)
+        assert proxy.part is part_
 
-    # fixture components ---------------------------------------------
+    # -- fixture ---------------------------------------------------------------------------------
 
     @pytest.fixture
-    def other_proxy_(self, request):
+    def other_proxy_(self, request: FixtureRequest):
         return instance_mock(request, ElementProxy)
 
     @pytest.fixture
-    def part_(self, request):
+    def part_(self, request: FixtureRequest):
         return instance_mock(request, XmlPart)
 
 
 class DescribeLength:
-    def it_can_construct_from_convenient_units(self, construct_fixture):
-        UnitCls, units_val, emu = construct_fixture
-        length = UnitCls(units_val)
-        assert isinstance(length, Length)
-        assert length == emu
-
-    def it_can_self_convert_to_convenient_units(self, units_fixture):
-        emu, units_prop_name, expected_length_in_units, type_ = units_fixture
-        length = Length(emu)
-        length_in_units = getattr(length, units_prop_name)
-        assert length_in_units == expected_length_in_units
-        assert isinstance(length_in_units, type_)
-
-    # fixtures -------------------------------------------------------
+    """Unit-test suite for `docx.shared.Length` objects."""
 
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("UnitCls", "units_val", "emu"),
+        [
             (Length, 914400, 914400),
             (Inches, 1.1, 1005840),
             (Cm, 2.53, 910799),
@@ -88,32 +63,47 @@ def it_can_self_convert_to_convenient_units(self, units_fixture):
             (Mm, 13.8, 496800),
             (Pt, 24.5, 311150),
             (Twips, 360, 228600),
-        ]
+        ],
     )
-    def construct_fixture(self, request):
-        UnitCls, units_val, emu = request.param
-        return UnitCls, units_val, emu
-
-    @pytest.fixture(
-        params=[
-            (914400, "inches", 1.0, float),
-            (914400, "cm", 2.54, float),
-            (914400, "emu", 914400, int),
-            (914400, "mm", 25.4, float),
-            (914400, "pt", 72.0, float),
-            (914400, "twips", 1440, int),
-        ]
+    def it_can_construct_from_convenient_units(self, UnitCls: type, units_val: float, emu: int):
+        length = UnitCls(units_val)
+        assert isinstance(length, Length)
+        assert length == emu
+
+    @pytest.mark.parametrize(
+        ("prop_name", "expected_value", "expected_type"),
+        [
+            ("inches", 1.0, float),
+            ("cm", 2.54, float),
+            ("emu", 914400, int),
+            ("mm", 25.4, float),
+            ("pt", 72.0, float),
+            ("twips", 1440, int),
+        ],
     )
-    def units_fixture(self, request):
-        emu, units_prop_name, expected_length_in_units, type_ = request.param
-        return emu, units_prop_name, expected_length_in_units, type_
+    def it_can_self_convert_to_convenient_units(
+        self, prop_name: str, expected_value: float, expected_type: type
+    ):
+        # -- use an inch for the initial value --
+        length = Length(914400)
+        length_in_units = getattr(length, prop_name)
+        assert length_in_units == expected_value
+        assert isinstance(length_in_units, expected_type)
 
 
 class DescribeRGBColor:
+    """Unit-test suite for `docx.shared.RGBColor` objects."""
+
     def it_is_natively_constructed_using_three_ints_0_to_255(self):
-        RGBColor(0x12, 0x34, 0x56)
-        with pytest.raises(ValueError, match=r"RGBColor\(\) takes three integer valu"):
-            RGBColor("12", "34", "56")
+        rgb_color = RGBColor(0x12, 0x34, 0x56)
+
+        assert isinstance(rgb_color, RGBColor)
+        # -- it is comparable to a tuple[int, int, int] --
+        assert rgb_color == (18, 52, 86)
+
+    def it_raises_with_helpful_error_message_on_wrong_types(self):
+        with pytest.raises(TypeError, match=r"RGBColor\(\) takes three integer valu"):
+            RGBColor("12", "34", "56")  # pyright: ignore
         with pytest.raises(ValueError, match=r"\(\) takes three integer values 0-255"):
             RGBColor(-1, 34, 56)
         with pytest.raises(ValueError, match=r"RGBColor\(\) takes three integer valu"):
@@ -124,7 +114,7 @@ def it_can_construct_from_a_hex_string_rgb_value(self):
         assert rgb == RGBColor(0x12, 0x34, 0x56)
 
     def it_can_provide_a_hex_string_rgb_value(self):
-        assert str(RGBColor(0x12, 0x34, 0x56)) == "123456"
+        assert str(RGBColor(0xF3, 0x8A, 0x56)) == "F38A56"
 
     def it_has_a_custom_repr(self):
         rgb_color = RGBColor(0x42, 0xF0, 0xBA)
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index 772c5ad82..a54120fdd 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -15,23 +15,67 @@
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
 from docx.text.font import Font
+from docx.text.paragraph import Paragraph
 from docx.text.run import Run
 
 from ..unitutil.cxml import element, xml
-from ..unitutil.mock import class_mock, instance_mock, property_mock
+from ..unitutil.mock import FixtureRequest, Mock, class_mock, instance_mock, property_mock
 
 
 class DescribeRun:
     """Unit-test suite for `docx.text.run.Run`."""
 
-    def it_knows_its_bool_prop_states(self, bool_prop_get_fixture):
-        run, prop_name, expected_state = bool_prop_get_fixture
-        assert getattr(run, prop_name) == expected_state
+    @pytest.mark.parametrize(
+        ("r_cxml", "bool_prop_name", "expected_value"),
+        [
+            ("w:r/w:rPr", "bold", None),
+            ("w:r/w:rPr/w:b", "bold", True),
+            ("w:r/w:rPr/w:b{w:val=on}", "bold", True),
+            ("w:r/w:rPr/w:b{w:val=off}", "bold", False),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", True),
+            ("w:r/w:rPr/w:i{w:val=0}", "italic", False),
+        ],
+    )
+    def it_knows_its_bool_prop_states(
+        self, r_cxml: str, bool_prop_name: str, expected_value: bool | None, paragraph_: Mock
+    ):
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
+        assert getattr(run, bool_prop_name) == expected_value
 
-    def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
-        run, prop_name, value, expected_xml = bool_prop_set_fixture
-        setattr(run, prop_name, value)
-        assert run._r.xml == expected_xml
+    @pytest.mark.parametrize(
+        ("initial_r_cxml", "bool_prop_name", "value", "expected_cxml"),
+        [
+            # -- nothing to True, False, and None ---------------------------
+            ("w:r", "bold", True, "w:r/w:rPr/w:b"),
+            ("w:r", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r", "italic", None, "w:r/w:rPr"),
+            # -- default to True, False, and None ---------------------------
+            ("w:r/w:rPr/w:b", "bold", True, "w:r/w:rPr/w:b"),
+            ("w:r/w:rPr/w:b", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r/w:rPr/w:i", "italic", None, "w:r/w:rPr"),
+            # -- True to True, False, and None ------------------------------
+            ("w:r/w:rPr/w:b{w:val=on}", "bold", True, "w:r/w:rPr/w:b"),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
+            ("w:r/w:rPr/w:b{w:val=1}", "bold", None, "w:r/w:rPr"),
+            # -- False to True, False, and None -----------------------------
+            ("w:r/w:rPr/w:i{w:val=false}", "italic", True, "w:r/w:rPr/w:i"),
+            ("w:r/w:rPr/w:i{w:val=0}", "italic", False, "w:r/w:rPr/w:i{w:val=0}"),
+            ("w:r/w:rPr/w:i{w:val=off}", "italic", None, "w:r/w:rPr"),
+        ],
+    )
+    def it_can_change_its_bool_prop_settings(
+        self,
+        initial_r_cxml: str,
+        bool_prop_name: str,
+        value: bool | None,
+        expected_cxml: str,
+        paragraph_: Mock,
+    ):
+        run = Run(cast(CT_R, element(initial_r_cxml)), paragraph_)
+
+        setattr(run, bool_prop_name, value)
+
+        assert run._r.xml == xml(expected_cxml)
 
     @pytest.mark.parametrize(
         ("r_cxml", "expected_value"),
@@ -43,11 +87,9 @@ def it_can_change_its_bool_prop_settings(self, bool_prop_set_fixture):
         ],
     )
     def it_knows_whether_it_contains_a_page_break(
-        self, r_cxml: str, expected_value: bool
+        self, r_cxml: str, expected_value: bool, paragraph_: Mock
     ):
-        r = cast(CT_R, element(r_cxml))
-        run = Run(r, None)  # pyright: ignore[reportGeneralTypeIssues]
-
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
         assert run.contains_page_break == expected_value
 
     @pytest.mark.parametrize(
@@ -80,48 +122,138 @@ def it_can_iterate_its_inner_content_items(
         actual = [type(item).__name__ for item in inner_content]
         assert actual == expected, f"expected: {expected}, got: {actual}"
 
-    def it_knows_its_character_style(self, style_get_fixture):
-        run, style_id_, style_ = style_get_fixture
+    def it_knows_its_character_style(
+        self, part_prop_: Mock, document_part_: Mock, paragraph_: Mock
+    ):
+        style_ = document_part_.get_style.return_value
+        part_prop_.return_value = document_part_
+        style_id = "Barfoo"
+        run = Run(cast(CT_R, element(f"w:r/w:rPr/w:rStyle{{w:val={style_id}}}")), paragraph_)
+
         style = run.style
-        run.part.get_style.assert_called_once_with(style_id_, WD_STYLE_TYPE.CHARACTER)
+
+        document_part_.get_style.assert_called_once_with(style_id, WD_STYLE_TYPE.CHARACTER)
         assert style is style_
 
-    def it_can_change_its_character_style(self, style_set_fixture):
-        run, value, expected_xml = style_set_fixture
+    @pytest.mark.parametrize(
+        ("r_cxml", "value", "style_id", "expected_cxml"),
+        [
+            ("w:r", "Foo Font", "FooFont", "w:r/w:rPr/w:rStyle{w:val=FooFont}"),
+            ("w:r/w:rPr", "Foo Font", "FooFont", "w:r/w:rPr/w:rStyle{w:val=FooFont}"),
+            (
+                "w:r/w:rPr/w:rStyle{w:val=FooFont}",
+                "Bar Font",
+                "BarFont",
+                "w:r/w:rPr/w:rStyle{w:val=BarFont}",
+            ),
+            ("w:r/w:rPr/w:rStyle{w:val=FooFont}", None, None, "w:r/w:rPr"),
+            ("w:r", None, None, "w:r/w:rPr"),
+        ],
+    )
+    def it_can_change_its_character_style(
+        self,
+        r_cxml: str,
+        value: str | None,
+        style_id: str | None,
+        expected_cxml: str,
+        part_prop_: Mock,
+        paragraph_: Mock,
+    ):
+        part_ = part_prop_.return_value
+        part_.get_style_id.return_value = style_id
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
+
         run.style = value
-        run.part.get_style_id.assert_called_once_with(value, WD_STYLE_TYPE.CHARACTER)
-        assert run._r.xml == expected_xml
 
-    def it_knows_its_underline_type(self, underline_get_fixture):
-        run, expected_value = underline_get_fixture
+        part_.get_style_id.assert_called_once_with(value, WD_STYLE_TYPE.CHARACTER)
+        assert run._r.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_value"),
+        [
+            ("w:r", None),
+            ("w:r/w:rPr/w:u", None),
+            ("w:r/w:rPr/w:u{w:val=single}", True),
+            ("w:r/w:rPr/w:u{w:val=none}", False),
+            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
+            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
+        ],
+    )
+    def it_knows_its_underline_type(
+        self, r_cxml: str, expected_value: bool | WD_UNDERLINE | None, paragraph_: Mock
+    ):
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
         assert run.underline is expected_value
 
-    def it_can_change_its_underline_type(self, underline_set_fixture):
-        run, underline, expected_xml = underline_set_fixture
-        run.underline = underline
-        assert run._r.xml == expected_xml
+    @pytest.mark.parametrize(
+        ("initial_r_cxml", "new_underline", "expected_cxml"),
+        [
+            ("w:r", True, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r", False, "w:r/w:rPr/w:u{w:val=none}"),
+            ("w:r", None, "w:r/w:rPr"),
+            ("w:r", WD_UNDERLINE.SINGLE, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r", WD_UNDERLINE.THICK, "w:r/w:rPr/w:u{w:val=thick}"),
+            ("w:r/w:rPr/w:u{w:val=single}", True, "w:r/w:rPr/w:u{w:val=single}"),
+            ("w:r/w:rPr/w:u{w:val=single}", False, "w:r/w:rPr/w:u{w:val=none}"),
+            ("w:r/w:rPr/w:u{w:val=single}", None, "w:r/w:rPr"),
+            (
+                "w:r/w:rPr/w:u{w:val=single}",
+                WD_UNDERLINE.SINGLE,
+                "w:r/w:rPr/w:u{w:val=single}",
+            ),
+            (
+                "w:r/w:rPr/w:u{w:val=single}",
+                WD_UNDERLINE.DOTTED,
+                "w:r/w:rPr/w:u{w:val=dotted}",
+            ),
+        ],
+    )
+    def it_can_change_its_underline_type(
+        self,
+        initial_r_cxml: str,
+        new_underline: bool | WD_UNDERLINE | None,
+        expected_cxml: str,
+        paragraph_: Mock,
+    ):
+        run = Run(cast(CT_R, element(initial_r_cxml)), paragraph_)
+
+        run.underline = new_underline
+
+        assert run._r.xml == xml(expected_cxml)
 
     @pytest.mark.parametrize("invalid_value", ["foobar", 42, "single"])
-    def it_raises_on_assign_invalid_underline_value(self, invalid_value: Any):
-        r = cast(CT_R, element("w:r/w:rPr"))
-        run = Run(r, None)
+    def it_raises_on_assign_invalid_underline_value(self, invalid_value: Any, paragraph_: Mock):
+        run = Run(cast(CT_R, element("w:r/w:rPr")), paragraph_)
         with pytest.raises(ValueError, match=" is not a valid WD_UNDERLINE"):
             run.underline = invalid_value
 
-    def it_provides_access_to_its_font(self, font_fixture):
-        run, Font_, font_ = font_fixture
+    def it_provides_access_to_its_font(self, Font_: Mock, font_: Mock, paragraph_: Mock):
+        Font_.return_value = font_
+        run = Run(cast(CT_R, element("w:r")), paragraph_)
+
         font = run.font
+
         Font_.assert_called_once_with(run._element)
         assert font is font_
 
-    def it_can_add_text(self, add_text_fixture, Text_):
-        r, text_str, expected_xml = add_text_fixture
-        run = Run(r, None)
+    @pytest.mark.parametrize(
+        ("r_cxml", "new_text", "expected_cxml"),
+        [
+            ("w:r", "foo", 'w:r/w:t"foo"'),
+            ('w:r/w:t"foo"', "bar", 'w:r/(w:t"foo", w:t"bar")'),
+            ("w:r", "fo ", 'w:r/w:t{xml:space=preserve}"fo "'),
+            ("w:r", "f o", 'w:r/w:t"f o"'),
+        ],
+    )
+    def it_can_add_text(
+        self, r_cxml: str, new_text: str, expected_cxml: str, Text_: Mock, paragraph_: Mock
+    ):
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
 
-        _text = run.add_text(text_str)
+        text = run.add_text(new_text)
 
-        assert run._r.xml == expected_xml
-        assert _text is Text_.return_value
+        assert run._r.xml == xml(expected_cxml)
+        assert text is Text_.return_value
 
     @pytest.mark.parametrize(
         ("break_type", "expected_cxml"),
@@ -134,28 +266,42 @@ def it_can_add_text(self, add_text_fixture, Text_):
             (WD_BREAK.LINE_CLEAR_ALL, "w:r/w:br{w:clear=all}"),
         ],
     )
-    def it_can_add_a_break(self, break_type: WD_BREAK, expected_cxml: str):
-        r = cast(CT_R, element("w:r"))
-        run = Run(r, None)  # pyright:ignore[reportGeneralTypeIssues]
-        expected_xml = xml(expected_cxml)
+    def it_can_add_a_break(self, break_type: WD_BREAK, expected_cxml: str, paragraph_: Mock):
+        run = Run(cast(CT_R, element("w:r")), paragraph_)
 
         run.add_break(break_type)
 
-        assert run._r.xml == expected_xml
+        assert run._r.xml == xml(expected_cxml)
+
+    @pytest.mark.parametrize(
+        ("r_cxml", "expected_cxml"), [('w:r/w:t"foo"', 'w:r/(w:t"foo", w:tab)')]
+    )
+    def it_can_add_a_tab(self, r_cxml: str, expected_cxml: str, paragraph_: Mock):
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
 
-    def it_can_add_a_tab(self, add_tab_fixture):
-        run, expected_xml = add_tab_fixture
         run.add_tab()
-        assert run._r.xml == expected_xml
 
-    def it_can_add_a_picture(self, add_picture_fixture):
-        run, image, width, height, inline = add_picture_fixture[:5]
-        expected_xml, InlineShape_, picture_ = add_picture_fixture[5:]
+        assert run._r.xml == xml(expected_cxml)
+
+    def it_can_add_a_picture(
+        self,
+        part_prop_: Mock,
+        document_part_: Mock,
+        InlineShape_: Mock,
+        picture_: Mock,
+        paragraph_: Mock,
+    ):
+        part_prop_.return_value = document_part_
+        run = Run(cast(CT_R, element("w:r/wp:x")), paragraph_)
+        image = "foobar.png"
+        width, height, inline = 1111, 2222, element("wp:inline{id=42}")
+        document_part_.new_pic_inline.return_value = inline
+        InlineShape_.return_value = picture_
 
         picture = run.add_picture(image, width, height)
 
-        run.part.new_pic_inline.assert_called_once_with(image, width, height)
-        assert run._r.xml == expected_xml
+        document_part_.new_pic_inline.assert_called_once_with(image, width, height)
+        assert run._r.xml == xml("w:r/(wp:x,w:drawing/wp:inline{id=42})")
         InlineShape_.assert_called_once_with(inline)
         assert picture is picture_
 
@@ -174,15 +320,13 @@ def it_can_add_a_picture(self, add_picture_fixture):
         ],
     )
     def it_can_remove_its_content_but_keep_formatting(
-        self, initial_r_cxml: str, expected_cxml: str
+        self, initial_r_cxml: str, expected_cxml: str, paragraph_: Mock
     ):
-        r = cast(CT_R, element(initial_r_cxml))
-        run = Run(r, None)  # pyright: ignore[reportGeneralTypeIssues]
-        expected_xml = xml(expected_cxml)
+        run = Run(cast(CT_R, element(initial_r_cxml)), paragraph_)
 
         cleared_run = run.clear()
 
-        assert run._r.xml == expected_xml
+        assert run._r.xml == xml(expected_cxml)
         assert cleared_run is run
 
     @pytest.mark.parametrize(
@@ -194,212 +338,58 @@ def it_can_remove_its_content_but_keep_formatting(
             ('w:r/(w:br{w:type=page}, w:t"abc", w:t"def", w:tab)', "abcdef\t"),
         ],
     )
-    def it_knows_the_text_it_contains(self, r_cxml: str, expected_text: str):
-        r = cast(CT_R, element(r_cxml))
-        run = Run(r, None)  # pyright: ignore[reportGeneralTypeIssues]
+    def it_knows_the_text_it_contains(self, r_cxml: str, expected_text: str, paragraph_: Mock):
+        run = Run(cast(CT_R, element(r_cxml)), paragraph_)
         assert run.text == expected_text
 
-    def it_can_replace_the_text_it_contains(self, text_set_fixture):
-        run, text, expected_xml = text_set_fixture
-        run.text = text
-        assert run._r.xml == expected_xml
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def add_picture_fixture(self, part_prop_, document_part_, InlineShape_, picture_):
-        run = Run(element("w:r/wp:x"), None)
-        image = "foobar.png"
-        width, height, inline = 1111, 2222, element("wp:inline{id=42}")
-        expected_xml = xml("w:r/(wp:x,w:drawing/wp:inline{id=42})")
-        document_part_.new_pic_inline.return_value = inline
-        InlineShape_.return_value = picture_
-        return (run, image, width, height, inline, expected_xml, InlineShape_, picture_)
-
-    @pytest.fixture(
-        params=[
-            ('w:r/w:t"foo"', 'w:r/(w:t"foo", w:tab)'),
-        ]
-    )
-    def add_tab_fixture(self, request):
-        r_cxml, expected_cxml = request.param
-        run = Run(element(r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:r", "foo", 'w:r/w:t"foo"'),
-            ('w:r/w:t"foo"', "bar", 'w:r/(w:t"foo", w:t"bar")'),
-            ("w:r", "fo ", 'w:r/w:t{xml:space=preserve}"fo "'),
-            ("w:r", "f o", 'w:r/w:t"f o"'),
-        ]
-    )
-    def add_text_fixture(self, request):
-        r_cxml, text, expected_cxml = request.param
-        r = element(r_cxml)
-        expected_xml = xml(expected_cxml)
-        return r, text, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:r/w:rPr", "bold", None),
-            ("w:r/w:rPr/w:b", "bold", True),
-            ("w:r/w:rPr/w:b{w:val=on}", "bold", True),
-            ("w:r/w:rPr/w:b{w:val=off}", "bold", False),
-            ("w:r/w:rPr/w:b{w:val=1}", "bold", True),
-            ("w:r/w:rPr/w:i{w:val=0}", "italic", False),
-        ]
-    )
-    def bool_prop_get_fixture(self, request):
-        r_cxml, bool_prop_name, expected_value = request.param
-        run = Run(element(r_cxml), None)
-        return run, bool_prop_name, expected_value
-
-    @pytest.fixture(
-        params=[
-            # nothing to True, False, and None ---------------------------
-            ("w:r", "bold", True, "w:r/w:rPr/w:b"),
-            ("w:r", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
-            ("w:r", "italic", None, "w:r/w:rPr"),
-            # default to True, False, and None ---------------------------
-            ("w:r/w:rPr/w:b", "bold", True, "w:r/w:rPr/w:b"),
-            ("w:r/w:rPr/w:b", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
-            ("w:r/w:rPr/w:i", "italic", None, "w:r/w:rPr"),
-            # True to True, False, and None ------------------------------
-            ("w:r/w:rPr/w:b{w:val=on}", "bold", True, "w:r/w:rPr/w:b"),
-            ("w:r/w:rPr/w:b{w:val=1}", "bold", False, "w:r/w:rPr/w:b{w:val=0}"),
-            ("w:r/w:rPr/w:b{w:val=1}", "bold", None, "w:r/w:rPr"),
-            # False to True, False, and None -----------------------------
-            ("w:r/w:rPr/w:i{w:val=false}", "italic", True, "w:r/w:rPr/w:i"),
-            ("w:r/w:rPr/w:i{w:val=0}", "italic", False, "w:r/w:rPr/w:i{w:val=0}"),
-            ("w:r/w:rPr/w:i{w:val=off}", "italic", None, "w:r/w:rPr"),
-        ]
-    )
-    def bool_prop_set_fixture(self, request):
-        initial_r_cxml, bool_prop_name, value, expected_cxml = request.param
-        run = Run(element(initial_r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, bool_prop_name, value, expected_xml
-
-    @pytest.fixture
-    def font_fixture(self, Font_, font_):
-        run = Run(element("w:r"), None)
-        return run, Font_, font_
-
-    @pytest.fixture
-    def style_get_fixture(self, part_prop_):
-        style_id = "Barfoo"
-        r_cxml = "w:r/w:rPr/w:rStyle{w:val=%s}" % style_id
-        run = Run(element(r_cxml), None)
-        style_ = part_prop_.return_value.get_style.return_value
-        return run, style_id, style_
-
-    @pytest.fixture(
-        params=[
-            ("w:r", "Foo Font", "FooFont", "w:r/w:rPr/w:rStyle{w:val=FooFont}"),
-            ("w:r/w:rPr", "Foo Font", "FooFont", "w:r/w:rPr/w:rStyle{w:val=FooFont}"),
-            (
-                "w:r/w:rPr/w:rStyle{w:val=FooFont}",
-                "Bar Font",
-                "BarFont",
-                "w:r/w:rPr/w:rStyle{w:val=BarFont}",
-            ),
-            ("w:r/w:rPr/w:rStyle{w:val=FooFont}", None, None, "w:r/w:rPr"),
-            ("w:r", None, None, "w:r/w:rPr"),
-        ]
-    )
-    def style_set_fixture(self, request, part_prop_):
-        r_cxml, value, style_id, expected_cxml = request.param
-        run = Run(element(r_cxml), None)
-        part_prop_.return_value.get_style_id.return_value = style_id
-        expected_xml = xml(expected_cxml)
-        return run, value, expected_xml
-
-    @pytest.fixture(
-        params=[
+    @pytest.mark.parametrize(
+        ("new_text", "expected_cxml"),
+        [
             ("abc  def", 'w:r/w:t"abc  def"'),
             ("abc\tdef", 'w:r/(w:t"abc", w:tab, w:t"def")'),
             ("abc\ndef", 'w:r/(w:t"abc", w:br,  w:t"def")'),
             ("abc\rdef", 'w:r/(w:t"abc", w:br,  w:t"def")'),
-        ]
-    )
-    def text_set_fixture(self, request):
-        new_text, expected_cxml = request.param
-        initial_r_cxml = 'w:r/w:t"should get deleted"'
-        run = Run(element(initial_r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, new_text, expected_xml
-
-    @pytest.fixture(
-        params=[
-            ("w:r", None),
-            ("w:r/w:rPr/w:u", None),
-            ("w:r/w:rPr/w:u{w:val=single}", True),
-            ("w:r/w:rPr/w:u{w:val=none}", False),
-            ("w:r/w:rPr/w:u{w:val=double}", WD_UNDERLINE.DOUBLE),
-            ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
-        ]
+        ],
     )
-    def underline_get_fixture(self, request):
-        r_cxml, expected_underline = request.param
-        run = Run(element(r_cxml), None)
-        return run, expected_underline
+    def it_can_replace_the_text_it_contains(
+        self, new_text: str, expected_cxml: str, paragraph_: Mock
+    ):
+        run = Run(cast(CT_R, element('w:r/w:t"should get deleted"')), paragraph_)
 
-    @pytest.fixture(
-        params=[
-            ("w:r", True, "w:r/w:rPr/w:u{w:val=single}"),
-            ("w:r", False, "w:r/w:rPr/w:u{w:val=none}"),
-            ("w:r", None, "w:r/w:rPr"),
-            ("w:r", WD_UNDERLINE.SINGLE, "w:r/w:rPr/w:u{w:val=single}"),
-            ("w:r", WD_UNDERLINE.THICK, "w:r/w:rPr/w:u{w:val=thick}"),
-            ("w:r/w:rPr/w:u{w:val=single}", True, "w:r/w:rPr/w:u{w:val=single}"),
-            ("w:r/w:rPr/w:u{w:val=single}", False, "w:r/w:rPr/w:u{w:val=none}"),
-            ("w:r/w:rPr/w:u{w:val=single}", None, "w:r/w:rPr"),
-            (
-                "w:r/w:rPr/w:u{w:val=single}",
-                WD_UNDERLINE.SINGLE,
-                "w:r/w:rPr/w:u{w:val=single}",
-            ),
-            (
-                "w:r/w:rPr/w:u{w:val=single}",
-                WD_UNDERLINE.DOTTED,
-                "w:r/w:rPr/w:u{w:val=dotted}",
-            ),
-        ]
-    )
-    def underline_set_fixture(self, request):
-        initial_r_cxml, new_underline, expected_cxml = request.param
-        run = Run(element(initial_r_cxml), None)
-        expected_xml = xml(expected_cxml)
-        return run, new_underline, expected_xml
+        run.text = new_text
 
-    # fixture components ---------------------------------------------
+        assert run._r.xml == xml(expected_cxml)
+
+    # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
-    def document_part_(self, request):
+    def document_part_(self, request: FixtureRequest):
         return instance_mock(request, DocumentPart)
 
     @pytest.fixture
-    def Font_(self, request, font_):
-        return class_mock(request, "docx.text.run.Font", return_value=font_)
+    def Font_(self, request: FixtureRequest):
+        return class_mock(request, "docx.text.run.Font")
 
     @pytest.fixture
-    def font_(self, request):
+    def font_(self, request: FixtureRequest):
         return instance_mock(request, Font)
 
     @pytest.fixture
-    def InlineShape_(self, request):
+    def InlineShape_(self, request: FixtureRequest):
         return class_mock(request, "docx.text.run.InlineShape")
 
     @pytest.fixture
-    def part_prop_(self, request, document_part_):
-        return property_mock(request, Run, "part", return_value=document_part_)
+    def paragraph_(self, request: FixtureRequest):
+        return instance_mock(request, Paragraph)
+
+    @pytest.fixture
+    def part_prop_(self, request: FixtureRequest):
+        return property_mock(request, Run, "part")
 
     @pytest.fixture
-    def picture_(self, request):
+    def picture_(self, request: FixtureRequest):
         return instance_mock(request, InlineShape)
 
     @pytest.fixture
-    def Text_(self, request):
+    def Text_(self, request: FixtureRequest):
         return class_mock(request, "docx.text.run._Text")

From 592fa8f332819a7a8175dd023d3e04597ebba524 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 6 Jun 2025 10:58:26 -0700
Subject: [PATCH 340/367] modn: improve ruff compliance

Run `ruff format` on code base.
---
 docs/conf.py                      |   4 +-
 features/steps/block.py           |   4 +-
 features/steps/document.py        |   8 +-
 features/steps/hyperlink.py       |  32 +-
 features/steps/pagebreak.py       |  72 ++---
 features/steps/paragraph.py       |  16 +-
 features/steps/parfmt.py          |   4 +-
 features/steps/section.py         |  16 +-
 features/steps/settings.py        |   8 +-
 features/steps/shape.py           |   7 +-
 features/steps/text.py            |  18 +-
 src/docx/blkcntnr.py              |   2 +-
 src/docx/image/__init__.py        |   2 +-
 src/docx/image/constants.py       | 128 ++++----
 src/docx/image/image.py           |   4 +-
 src/docx/image/jpeg.py            |  20 +-
 src/docx/opc/constants.py         | 472 ++++++++----------------------
 src/docx/opc/packuri.py           |   3 +-
 src/docx/opc/pkgreader.py         |   8 +-
 src/docx/opc/rel.py               |   6 +-
 src/docx/oxml/simpletypes.py      |   2 +-
 src/docx/oxml/table.py            |  10 +-
 src/docx/oxml/text/font.py        |   8 +-
 src/docx/oxml/text/pagebreak.py   |  12 +-
 src/docx/oxml/xmlchemy.py         |   6 +-
 src/docx/parts/settings.py        |   3 +-
 src/docx/parts/styles.py          |   4 +-
 src/docx/styles/styles.py         |  17 +-
 src/docx/text/font.py             |   6 +-
 src/docx/text/tabstops.py         |   4 +-
 src/docx/types.py                 |   6 +-
 tests/image/test_bmp.py           |   4 +-
 tests/image/test_gif.py           |   2 +-
 tests/image/test_helpers.py       |   4 +-
 tests/image/test_image.py         |   8 +-
 tests/image/test_jpeg.py          |  20 +-
 tests/image/test_png.py           |  24 +-
 tests/image/test_tiff.py          |  30 +-
 tests/opc/test_pkgreader.py       |  32 +-
 tests/opc/test_rel.py             |  20 +-
 tests/oxml/parts/test_document.py |   5 +-
 tests/oxml/test__init__.py        |   9 +-
 tests/oxml/test_styles.py         |   3 +-
 tests/oxml/test_table.py          |  11 +-
 tests/oxml/test_xmlchemy.py       |  66 ++---
 tests/oxml/text/test_hyperlink.py |   4 +-
 tests/parts/test_hdrftr.py        |   8 +-
 tests/parts/test_image.py         |   8 +-
 tests/parts/test_numbering.py     |   4 +-
 tests/parts/test_settings.py      |   8 +-
 tests/parts/test_story.py         |   4 +-
 tests/styles/test_style.py        |  14 +-
 tests/styles/test_styles.py       |  23 +-
 tests/test_enum.py                |   4 +-
 tests/text/test_font.py           |  24 +-
 tests/text/test_pagebreak.py      |   8 +-
 tests/text/test_paragraph.py      |  18 +-
 tests/unitutil/file.py            |   4 +-
 tests/unitutil/mock.py            |   8 +-
 59 files changed, 383 insertions(+), 906 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 06b428064..e37e9be7e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -270,9 +270,7 @@
 
 # Custom sidebar templates, maps document names to template names.
 # html_sidebars = {}
-html_sidebars = {
-    "**": ["localtoc.html", "relations.html", "sidebarlinks.html", "searchbox.html"]
-}
+html_sidebars = {"**": ["localtoc.html", "relations.html", "sidebarlinks.html", "searchbox.html"]}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
diff --git a/features/steps/block.py b/features/steps/block.py
index c365c9510..e3d5c6154 100644
--- a/features/steps/block.py
+++ b/features/steps/block.py
@@ -13,9 +13,7 @@
 
 @given("a _Cell object with paragraphs and tables")
 def given_a_cell_with_paragraphs_and_tables(context: Context):
-    context.cell = (
-        Document(test_docx("blk-paras-and-tables")).tables[1].rows[0].cells[0]
-    )
+    context.cell = Document(test_docx("blk-paras-and-tables")).tables[1].rows[0].cells[0]
 
 
 @given("a Document object with paragraphs and tables")
diff --git a/features/steps/document.py b/features/steps/document.py
index 49165efc3..1c12ac106 100644
--- a/features/steps/document.py
+++ b/features/steps/document.py
@@ -126,17 +126,13 @@ def when_add_picture_specifying_width_and_height(context):
 @when("I add a picture specifying a height of 1.5 inches")
 def when_add_picture_specifying_height(context):
     document = context.document
-    context.picture = document.add_picture(
-        test_file("monty-truth.png"), height=Inches(1.5)
-    )
+    context.picture = document.add_picture(test_file("monty-truth.png"), height=Inches(1.5))
 
 
 @when("I add a picture specifying a width of 1.5 inches")
 def when_add_picture_specifying_width(context):
     document = context.document
-    context.picture = document.add_picture(
-        test_file("monty-truth.png"), width=Inches(1.5)
-    )
+    context.picture = document.add_picture(test_file("monty-truth.png"), width=Inches(1.5))
 
 
 @when("I add a picture specifying only the image file")
diff --git a/features/steps/hyperlink.py b/features/steps/hyperlink.py
index 2bba31ed8..14fa9f7be 100644
--- a/features/steps/hyperlink.py
+++ b/features/steps/hyperlink.py
@@ -27,9 +27,7 @@ def given_a_hyperlink_having_a_uri_fragment(context: Context):
 
 
 @given("a hyperlink having address {address} and fragment {fragment}")
-def given_a_hyperlink_having_address_and_fragment(
-    context: Context, address: str, fragment: str
-):
+def given_a_hyperlink_having_address_and_fragment(context: Context, address: str, fragment: str):
     paragraph_idxs: Dict[Tuple[str, str], int] = {
         ("''", "linkedBookmark"): 1,
         ("https://foo.com", "''"): 2,
@@ -73,60 +71,46 @@ def given_a_hyperlink_having_one_or_more_runs(context: Context, one_or_more: str
 def then_hyperlink_address_is_the_URL_of_the_hyperlink(context: Context):
     actual_value = context.hyperlink.address
     expected_value = "http://yahoo.com/"
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("hyperlink.contains_page_break is {value}")
 def then_hyperlink_contains_page_break_is_value(context: Context, value: str):
     actual_value = context.hyperlink.contains_page_break
     expected_value = {"True": True, "False": False}[value]
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("hyperlink.fragment is the URI fragment of the hyperlink")
 def then_hyperlink_fragment_is_the_URI_fragment_of_the_hyperlink(context: Context):
     actual_value = context.hyperlink.fragment
     expected_value = "linkedBookmark"
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("hyperlink.runs contains only Run instances")
 def then_hyperlink_runs_contains_only_Run_instances(context: Context):
     actual_value = [type(item).__name__ for item in context.hyperlink.runs]
     expected_value = ["Run" for _ in context.hyperlink.runs]
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("hyperlink.runs has length {value}")
 def then_hyperlink_runs_has_length(context: Context, value: str):
     actual_value = len(context.hyperlink.runs)
     expected_value = int(value)
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("hyperlink.text is the visible text of the hyperlink")
 def then_hyperlink_text_is_the_visible_text_of_the_hyperlink(context: Context):
     actual_value = context.hyperlink.text
     expected_value = "awesome hyperlink"
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("hyperlink.url is {value}")
 def then_hyperlink_url_is_value(context: Context, value: str):
     actual_value = context.hyperlink.url
     expected_value = "" if value == "''" else value
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
diff --git a/features/steps/pagebreak.py b/features/steps/pagebreak.py
index 7d443da46..870428127 100644
--- a/features/steps/pagebreak.py
+++ b/features/steps/pagebreak.py
@@ -38,33 +38,23 @@ def then_rendered_page_break_preceding_paragraph_fragment_includes_the_hyperlink
 
     actual_value = type(para_frag).__name__
     expected_value = "Paragraph"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.text
     expected_value = "Page break in>><<this hyperlink"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.alignment
     expected_value = WD_PARAGRAPH_ALIGNMENT.RIGHT  # pyright: ignore
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.hyperlinks[0].runs[0].style.name
     expected_value = "Hyperlink"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.hyperlinks[0].address
     expected_value = "http://google.com/"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
 
 @then("rendered_page_break.preceding_paragraph_fragment is the content before break")
@@ -75,27 +65,19 @@ def then_rendered_page_break_preceding_paragraph_fragment_is_the_content_before_
 
     actual_value = type(para_frag).__name__
     expected_value = "Paragraph"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.text
     expected_value = "Page break here>>"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.alignment
     expected_value = WD_PARAGRAPH_ALIGNMENT.CENTER  # pyright: ignore
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.runs[0].style.name
     expected_value = "Default Paragraph Font"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
 
 @then("rendered_page_break.following_paragraph_fragment excludes the hyperlink")
@@ -107,37 +89,27 @@ def then_rendered_page_break_following_paragraph_fragment_excludes_the_hyperlink
     # -- paragraph fragment is a Paragraph object --
     actual_value = type(para_frag).__name__
     expected_value = "Paragraph"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     # -- paragraph text is only the fragment after the page-break --
     actual_value = para_frag.text
     expected_value = " and another one here>><<with text following"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     # -- paragraph properties are preserved --
     actual_value = para_frag.alignment
     expected_value = WD_PARAGRAPH_ALIGNMENT.RIGHT  # pyright: ignore
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     # -- paragraph has no hyperlinks --
     actual_value = para_frag.hyperlinks
     expected_value = []
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     # -- following paragraph fragment retains any remaining page-breaks --
     actual_value = [type(rpb).__name__ for rpb in para_frag.rendered_page_breaks]
     expected_value = ["RenderedPageBreak"]
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
 
 @then("rendered_page_break.following_paragraph_fragment is the content after break")
@@ -148,24 +120,16 @@ def then_rendered_page_break_following_paragraph_fragment_is_the_content_after_b
 
     actual_value = type(para_frag).__name__
     expected_value = "Paragraph"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.text
     expected_value = "<<followed by more text."
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.alignment
     expected_value = WD_PARAGRAPH_ALIGNMENT.CENTER  # pyright: ignore
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
 
     actual_value = para_frag.runs[0].style.name
     expected_value = "Default Paragraph Font"
-    assert (
-        actual_value == expected_value
-    ), f"expected: '{expected_value}', got: '{actual_value}'"
+    assert actual_value == expected_value, f"expected: '{expected_value}', got: '{actual_value}'"
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
index 4f8e2395a..7db053637 100644
--- a/features/steps/paragraph.py
+++ b/features/steps/paragraph.py
@@ -120,16 +120,12 @@ def when_I_set_the_paragraph_text(context: Context):
 def then_paragraph_contains_page_break_is_value(context: Context, value: str):
     actual_value = context.paragraph.contains_page_break
     expected_value = {"True": True, "False": False}[value]
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("paragraph.hyperlinks contains only Hyperlink instances")
 def then_paragraph_hyperlinks_contains_only_Hyperlink_instances(context: Context):
-    assert all(
-        type(item).__name__ == "Hyperlink" for item in context.paragraph.hyperlinks
-    )
+    assert all(type(item).__name__ == "Hyperlink" for item in context.paragraph.hyperlinks)
 
 
 @then("paragraph.hyperlinks has length {value}")
@@ -163,9 +159,7 @@ def then_paragraph_paragraph_format_is_its_parfmt_object(context: Context):
 def then_paragraph_rendered_page_breaks_has_length(context: Context, value: str):
     actual_value = len(context.paragraph.rendered_page_breaks)
     expected_value = int(value)
-    assert (
-        actual_value == expected_value
-    ), f"got: {actual_value}, expected: {expected_value}"
+    assert actual_value == expected_value, f"got: {actual_value}, expected: {expected_value}"
 
 
 @then("paragraph.rendered_page_breaks contains only RenderedPageBreak instances")
@@ -216,9 +210,7 @@ def then_document_contains_text_I_added(context: Context):
 
 
 @then("the paragraph alignment property value is {align_value}")
-def then_the_paragraph_alignment_prop_value_is_value(
-    context: Context, align_value: str
-):
+def then_the_paragraph_alignment_prop_value_is_value(context: Context, align_value: str):
     expected_value: Any = {
         "None": None,
         "WD_ALIGN_PARAGRAPH.LEFT": WD_PARAGRAPH_ALIGNMENT.LEFT,  # pyright: ignore
diff --git a/features/steps/parfmt.py b/features/steps/parfmt.py
index ca39c8575..96eb1c0c8 100644
--- a/features/steps/parfmt.py
+++ b/features/steps/parfmt.py
@@ -160,9 +160,7 @@ def then_paragraph_format_alignment_is_value(context, value):
 
 @then("paragraph_format.line_spacing is {value}")
 def then_paragraph_format_line_spacing_is_value(context, value):
-    expected_value = (
-        None if value == "None" else float(value) if "." in value else int(value)
-    )
+    expected_value = None if value == "None" else float(value) if "." in value else int(value)
     paragraph_format = context.paragraph_format
 
     if expected_value is None or isinstance(expected_value, int):
diff --git a/features/steps/section.py b/features/steps/section.py
index 6291d756e..8de856f65 100644
--- a/features/steps/section.py
+++ b/features/steps/section.py
@@ -73,9 +73,7 @@ def given_a_section_having_known_orientation(context: Context, orientation: str)
 
 
 @when("I assign {bool_val} to section.different_first_page_header_footer")
-def when_I_assign_value_to_section_different_first_page_hdrftr(
-    context: Context, bool_val: str
-):
+def when_I_assign_value_to_section_different_first_page_hdrftr(context: Context, bool_val: str):
     context.section.different_first_page_header_footer = eval(bool_val)
 
 
@@ -158,9 +156,7 @@ def then_len_sections_is_3(context: Context):
 def then_section_different_first_page_header_footer_is(context: Context, bool_val: str):
     actual = context.section.different_first_page_header_footer
     expected = eval(bool_val)
-    assert actual == expected, (
-        "section.different_first_page_header_footer is %s" % actual
-    )
+    assert actual == expected, "section.different_first_page_header_footer is %s" % actual
 
 
 @then("section.even_page_footer is a _Footer object")
@@ -213,9 +209,7 @@ def step_impl(context: Context):
 
 
 @then("section.{propname}.is_linked_to_previous is True")
-def then_section_hdrftr_prop_is_linked_to_previous_is_True(
-    context: Context, propname: str
-):
+def then_section_hdrftr_prop_is_linked_to_previous_is_True(context: Context, propname: str):
     actual = getattr(context.section, propname).is_linked_to_previous
     expected = True
     assert actual == expected, "section.%s.is_linked_to_previous is %s" % (
@@ -241,9 +235,7 @@ def then_the_reported_margin_is_inches(context: Context, margin_side: str, inche
 
 
 @then("the reported page orientation is {orientation}")
-def then_the_reported_page_orientation_is_orientation(
-    context: Context, orientation: str
-):
+def then_the_reported_page_orientation_is_orientation(context: Context, orientation: str):
     expected_value = {
         "WD_ORIENT.LANDSCAPE": WD_ORIENT.LANDSCAPE,
         "WD_ORIENT.PORTRAIT": WD_ORIENT.PORTRAIT,
diff --git a/features/steps/settings.py b/features/steps/settings.py
index 286ec6c2d..1b03661eb 100644
--- a/features/steps/settings.py
+++ b/features/steps/settings.py
@@ -22,9 +22,7 @@ def given_a_document_having_no_settings_part(context):
 
 @given("a Settings object {with_or_without} odd and even page headers as settings")
 def given_a_Settings_object_with_or_without_odd_and_even_hdrs(context, with_or_without):
-    testfile_name = {"with": "doc-odd-even-hdrs", "without": "sct-section-props"}[
-        with_or_without
-    ]
+    testfile_name = {"with": "doc-odd-even-hdrs", "without": "sct-section-props"}[with_or_without]
     context.settings = Document(test_docx(testfile_name)).settings
 
 
@@ -49,6 +47,4 @@ def then_document_settings_is_a_Settings_object(context):
 def then_settings_odd_and_even_pages_header_footer_is(context, bool_val):
     actual = context.settings.odd_and_even_pages_header_footer
     expected = eval(bool_val)
-    assert actual == expected, (
-        "settings.odd_and_even_pages_header_footer is %s" % actual
-    )
+    assert actual == expected, "settings.odd_and_even_pages_header_footer is %s" % actual
diff --git a/features/steps/shape.py b/features/steps/shape.py
index d0acb7fd5..fbadd64bd 100644
--- a/features/steps/shape.py
+++ b/features/steps/shape.py
@@ -111,9 +111,10 @@ def then_the_document_contains_the_inline_picture(context):
     image_part = document.part.related_parts[rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
     expected_sha1 = "79769f1e202add2e963158b532e36c2c0f76a70c"
-    assert (
-        image_sha1 == expected_sha1
-    ), "image SHA1 doesn't match, expected %s, got %s" % (expected_sha1, image_sha1)
+    assert image_sha1 == expected_sha1, "image SHA1 doesn't match, expected %s, got %s" % (
+        expected_sha1,
+        image_sha1,
+    )
 
 
 @then("the length of the inline shape collection is 5")
diff --git a/features/steps/text.py b/features/steps/text.py
index f969f066f..9fafc61fc 100644
--- a/features/steps/text.py
+++ b/features/steps/text.py
@@ -60,9 +60,7 @@ def given_a_run_having_mixed_text_content(context):
           <w:t>pqr</w:t>
           <w:ptab/>
           <w:t>stu</w:t>
-        </w:r>""" % nsdecls(
-        "w"
-    )
+        </w:r>""" % nsdecls("w")
     r = parse_xml(r_xml)
     context.run = Run(r, None)
 
@@ -235,9 +233,7 @@ def then_run_font_is_the_Font_object_for_the_run(context):
 def then_run_iter_inner_content_generates_text_and_page_breaks(context: Context):
     actual_value = [type(item).__name__ for item in context.run.iter_inner_content()]
     expected_value = ["str", "RenderedPageBreak", "str", "RenderedPageBreak", "str"]
-    assert (
-        actual_value == expected_value
-    ), f"expected: {expected_value}, got: {actual_value}"
+    assert actual_value == expected_value, f"expected: {expected_value}, got: {actual_value}"
 
 
 @then("run.style is styles['{style_name}']")
@@ -267,15 +263,15 @@ def then_the_picture_appears_at_the_end_of_the_run(context):
     run = context.run
     r = run._r
     blip_rId = r.xpath(
-        "./w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/"
-        "a:blip/@r:embed"
+        "./w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip/@r:embed"
     )[0]
     image_part = run.part.related_parts[blip_rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
     expected_sha1 = "79769f1e202add2e963158b532e36c2c0f76a70c"
-    assert (
-        image_sha1 == expected_sha1
-    ), "image SHA1 doesn't match, expected %s, got %s" % (expected_sha1, image_sha1)
+    assert image_sha1 == expected_sha1, "image SHA1 doesn't match, expected %s, got %s" % (
+        expected_sha1,
+        image_sha1,
+    )
 
 
 @then("the run appears in {boolean_prop_name} unconditionally")
diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index a9969f6f6..951e03427 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -67,7 +67,7 @@ def add_table(self, rows: int, cols: int, width: Length) -> Table:
         from docx.table import Table
 
         tbl = CT_Tbl.new_tbl(rows, cols, width)
-        self._element._insert_tbl(tbl)  #  # pyright: ignore[reportPrivateUsage]
+        self._element._insert_tbl(tbl)  # pyright: ignore[reportPrivateUsage]
         return Table(tbl, self)
 
     def iter_inner_content(self) -> Iterator[Paragraph | Table]:
diff --git a/src/docx/image/__init__.py b/src/docx/image/__init__.py
index d28033ef1..9d5e4b05b 100644
--- a/src/docx/image/__init__.py
+++ b/src/docx/image/__init__.py
@@ -12,7 +12,7 @@
 
 SIGNATURES = (
     # class, offset, signature_bytes
-    (Png, 0, b"\x89PNG\x0D\x0A\x1A\x0A"),
+    (Png, 0, b"\x89PNG\x0d\x0a\x1a\x0a"),
     (Jfif, 6, b"JFIF"),
     (Exif, 6, b"Exif"),
     (Gif, 0, b"GIF87a"),
diff --git a/src/docx/image/constants.py b/src/docx/image/constants.py
index 729a828b2..03fae5855 100644
--- a/src/docx/image/constants.py
+++ b/src/docx/image/constants.py
@@ -5,58 +5,58 @@ class JPEG_MARKER_CODE:
     """JPEG marker codes."""
 
     TEM = b"\x01"
-    DHT = b"\xC4"
-    DAC = b"\xCC"
-    JPG = b"\xC8"
-
-    SOF0 = b"\xC0"
-    SOF1 = b"\xC1"
-    SOF2 = b"\xC2"
-    SOF3 = b"\xC3"
-    SOF5 = b"\xC5"
-    SOF6 = b"\xC6"
-    SOF7 = b"\xC7"
-    SOF9 = b"\xC9"
-    SOFA = b"\xCA"
-    SOFB = b"\xCB"
-    SOFD = b"\xCD"
-    SOFE = b"\xCE"
-    SOFF = b"\xCF"
-
-    RST0 = b"\xD0"
-    RST1 = b"\xD1"
-    RST2 = b"\xD2"
-    RST3 = b"\xD3"
-    RST4 = b"\xD4"
-    RST5 = b"\xD5"
-    RST6 = b"\xD6"
-    RST7 = b"\xD7"
-
-    SOI = b"\xD8"
-    EOI = b"\xD9"
-    SOS = b"\xDA"
-    DQT = b"\xDB"  # Define Quantization Table(s)
-    DNL = b"\xDC"
-    DRI = b"\xDD"
-    DHP = b"\xDE"
-    EXP = b"\xDF"
-
-    APP0 = b"\xE0"
-    APP1 = b"\xE1"
-    APP2 = b"\xE2"
-    APP3 = b"\xE3"
-    APP4 = b"\xE4"
-    APP5 = b"\xE5"
-    APP6 = b"\xE6"
-    APP7 = b"\xE7"
-    APP8 = b"\xE8"
-    APP9 = b"\xE9"
-    APPA = b"\xEA"
-    APPB = b"\xEB"
-    APPC = b"\xEC"
-    APPD = b"\xED"
-    APPE = b"\xEE"
-    APPF = b"\xEF"
+    DHT = b"\xc4"
+    DAC = b"\xcc"
+    JPG = b"\xc8"
+
+    SOF0 = b"\xc0"
+    SOF1 = b"\xc1"
+    SOF2 = b"\xc2"
+    SOF3 = b"\xc3"
+    SOF5 = b"\xc5"
+    SOF6 = b"\xc6"
+    SOF7 = b"\xc7"
+    SOF9 = b"\xc9"
+    SOFA = b"\xca"
+    SOFB = b"\xcb"
+    SOFD = b"\xcd"
+    SOFE = b"\xce"
+    SOFF = b"\xcf"
+
+    RST0 = b"\xd0"
+    RST1 = b"\xd1"
+    RST2 = b"\xd2"
+    RST3 = b"\xd3"
+    RST4 = b"\xd4"
+    RST5 = b"\xd5"
+    RST6 = b"\xd6"
+    RST7 = b"\xd7"
+
+    SOI = b"\xd8"
+    EOI = b"\xd9"
+    SOS = b"\xda"
+    DQT = b"\xdb"  # Define Quantization Table(s)
+    DNL = b"\xdc"
+    DRI = b"\xdd"
+    DHP = b"\xde"
+    EXP = b"\xdf"
+
+    APP0 = b"\xe0"
+    APP1 = b"\xe1"
+    APP2 = b"\xe2"
+    APP3 = b"\xe3"
+    APP4 = b"\xe4"
+    APP5 = b"\xe5"
+    APP6 = b"\xe6"
+    APP7 = b"\xe7"
+    APP8 = b"\xe8"
+    APP9 = b"\xe9"
+    APPA = b"\xea"
+    APPB = b"\xeb"
+    APPC = b"\xec"
+    APPD = b"\xed"
+    APPE = b"\xee"
+    APPF = b"\xef"
 
     STANDALONE_MARKERS = (TEM, SOI, EOI, RST0, RST1, RST2, RST3, RST4, RST5, RST6, RST7)
 
@@ -78,18 +78,18 @@ class JPEG_MARKER_CODE:
 
     marker_names = {
         b"\x00": "UNKNOWN",
-        b"\xC0": "SOF0",
-        b"\xC2": "SOF2",
-        b"\xC4": "DHT",
-        b"\xDA": "SOS",  # start of scan
-        b"\xD8": "SOI",  # start of image
-        b"\xD9": "EOI",  # end of image
-        b"\xDB": "DQT",
-        b"\xE0": "APP0",
-        b"\xE1": "APP1",
-        b"\xE2": "APP2",
-        b"\xED": "APP13",
-        b"\xEE": "APP14",
+        b"\xc0": "SOF0",
+        b"\xc2": "SOF2",
+        b"\xc4": "DHT",
+        b"\xda": "SOS",  # start of scan
+        b"\xd8": "SOI",  # start of image
+        b"\xd9": "EOI",  # end of image
+        b"\xdb": "DQT",
+        b"\xe0": "APP0",
+        b"\xe1": "APP1",
+        b"\xe2": "APP2",
+        b"\xed": "APP13",
+        b"\xee": "APP14",
     }
 
     @classmethod
diff --git a/src/docx/image/image.py b/src/docx/image/image.py
index 0022b5b45..e5e7f8a13 100644
--- a/src/docx/image/image.py
+++ b/src/docx/image/image.py
@@ -194,7 +194,7 @@ def __init__(self, px_width: int, px_height: int, horz_dpi: int, vert_dpi: int):
     @property
     def content_type(self) -> str:
         """Abstract property definition, must be implemented by all subclasses."""
-        msg = "content_type property must be implemented by all subclasses of " "BaseImageHeader"
+        msg = "content_type property must be implemented by all subclasses of BaseImageHeader"
         raise NotImplementedError(msg)
 
     @property
@@ -204,7 +204,7 @@ def default_ext(self) -> str:
         An abstract property definition, must be implemented by all subclasses.
         """
         raise NotImplementedError(
-            "default_ext property must be implemented by all subclasses of " "BaseImageHeader"
+            "default_ext property must be implemented by all subclasses of BaseImageHeader"
         )
 
     @property
diff --git a/src/docx/image/jpeg.py b/src/docx/image/jpeg.py
index b0114a998..74da51871 100644
--- a/src/docx/image/jpeg.py
+++ b/src/docx/image/jpeg.py
@@ -188,20 +188,20 @@ def next(self, start):
 
     def _next_non_ff_byte(self, start):
         """Return an offset, byte 2-tuple for the next byte in `stream` that is not
-        '\xFF', starting with the byte at offset `start`.
+        '\xff', starting with the byte at offset `start`.
 
-        If the byte at offset `start` is not '\xFF', `start` and the returned `offset`
+        If the byte at offset `start` is not '\xff', `start` and the returned `offset`
         will be the same.
         """
         self._stream.seek(start)
         byte_ = self._read_byte()
-        while byte_ == b"\xFF":
+        while byte_ == b"\xff":
             byte_ = self._read_byte()
         offset_of_non_ff_byte = self._stream.tell() - 1
         return offset_of_non_ff_byte, byte_
 
     def _offset_of_next_ff_byte(self, start):
-        """Return the offset of the next '\xFF' byte in `stream` starting with the byte
+        """Return the offset of the next '\xff' byte in `stream` starting with the byte
         at offset `start`.
 
         Returns `start` if the byte at that offset is a hex 255; it does not necessarily
@@ -209,7 +209,7 @@ def _offset_of_next_ff_byte(self, start):
         """
         self._stream.seek(start)
         byte_ = self._read_byte()
-        while byte_ != b"\xFF":
+        while byte_ != b"\xff":
             byte_ = self._read_byte()
         offset_of_ff_byte = self._stream.tell() - 1
         return offset_of_ff_byte
@@ -263,7 +263,7 @@ def from_stream(cls, stream, marker_code, offset):
 
     @property
     def marker_code(self):
-        """The single-byte code that identifies the type of this marker, e.g. ``'\xE0'``
+        """The single-byte code that identifies the type of this marker, e.g. ``'\xe0'``
         for start of image (SOI)."""
         return self._marker_code
 
@@ -284,9 +284,7 @@ def segment_length(self):
 class _App0Marker(_Marker):
     """Represents a JFIF APP0 marker segment."""
 
-    def __init__(
-        self, marker_code, offset, length, density_units, x_density, y_density
-    ):
+    def __init__(self, marker_code, offset, length, density_units, x_density, y_density):
         super(_App0Marker, self).__init__(marker_code, offset, length)
         self._density_units = density_units
         self._x_density = x_density
@@ -332,9 +330,7 @@ def from_stream(cls, stream, marker_code, offset):
         density_units = stream.read_byte(offset, 9)
         x_density = stream.read_short(offset, 10)
         y_density = stream.read_short(offset, 12)
-        return cls(
-            marker_code, offset, segment_length, density_units, x_density, y_density
-        )
+        return cls(marker_code, offset, segment_length, density_units, x_density, y_density)
 
 
 class _App1Marker(_Marker):
diff --git a/src/docx/opc/constants.py b/src/docx/opc/constants.py
index 89d3c16cc..a3d0e0812 100644
--- a/src/docx/opc/constants.py
+++ b/src/docx/opc/constants.py
@@ -9,27 +9,15 @@ class CONTENT_TYPE:
 
     BMP = "image/bmp"
     DML_CHART = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"
-    DML_CHARTSHAPES = (
-        "application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml"
-    )
-    DML_DIAGRAM_COLORS = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml"
-    )
-    DML_DIAGRAM_DATA = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml"
-    )
-    DML_DIAGRAM_LAYOUT = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml"
-    )
-    DML_DIAGRAM_STYLE = (
-        "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml"
-    )
+    DML_CHARTSHAPES = "application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml"
+    DML_DIAGRAM_COLORS = "application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml"
+    DML_DIAGRAM_DATA = "application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml"
+    DML_DIAGRAM_LAYOUT = "application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml"
+    DML_DIAGRAM_STYLE = "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml"
     GIF = "image/gif"
     JPEG = "image/jpeg"
     MS_PHOTO = "image/vnd.ms-photo"
-    OFC_CUSTOM_PROPERTIES = (
-        "application/vnd.openxmlformats-officedocument.custom-properties+xml"
-    )
+    OFC_CUSTOM_PROPERTIES = "application/vnd.openxmlformats-officedocument.custom-properties+xml"
     OFC_CUSTOM_XML_PROPERTIES = (
         "application/vnd.openxmlformats-officedocument.customXmlProperties+xml"
     )
@@ -40,209 +28,126 @@ class CONTENT_TYPE:
     OFC_OLE_OBJECT = "application/vnd.openxmlformats-officedocument.oleObject"
     OFC_PACKAGE = "application/vnd.openxmlformats-officedocument.package"
     OFC_THEME = "application/vnd.openxmlformats-officedocument.theme+xml"
-    OFC_THEME_OVERRIDE = (
-        "application/vnd.openxmlformats-officedocument.themeOverride+xml"
-    )
+    OFC_THEME_OVERRIDE = "application/vnd.openxmlformats-officedocument.themeOverride+xml"
     OFC_VML_DRAWING = "application/vnd.openxmlformats-officedocument.vmlDrawing"
     OPC_CORE_PROPERTIES = "application/vnd.openxmlformats-package.core-properties+xml"
     OPC_DIGITAL_SIGNATURE_CERTIFICATE = (
         "application/vnd.openxmlformats-package.digital-signature-certificate"
     )
-    OPC_DIGITAL_SIGNATURE_ORIGIN = (
-        "application/vnd.openxmlformats-package.digital-signature-origin"
-    )
+    OPC_DIGITAL_SIGNATURE_ORIGIN = "application/vnd.openxmlformats-package.digital-signature-origin"
     OPC_DIGITAL_SIGNATURE_XMLSIGNATURE = (
         "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"
     )
     OPC_RELATIONSHIPS = "application/vnd.openxmlformats-package.relationships+xml"
-    PML_COMMENTS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.comments+xml"
-    )
+    PML_COMMENTS = "application/vnd.openxmlformats-officedocument.presentationml.comments+xml"
     PML_COMMENT_AUTHORS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.commen"
-        "tAuthors+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml"
     )
     PML_HANDOUT_MASTER = (
-        "application/vnd.openxmlformats-officedocument.presentationml.handou"
-        "tMaster+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.handoutMaster+xml"
     )
     PML_NOTES_MASTER = (
-        "application/vnd.openxmlformats-officedocument.presentationml.notesM"
-        "aster+xml"
-    )
-    PML_NOTES_SLIDE = (
-        "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml"
     )
+    PML_NOTES_SLIDE = "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml"
     PML_PRESENTATION_MAIN = (
-        "application/vnd.openxmlformats-officedocument.presentationml.presen"
-        "tation.main+xml"
-    )
-    PML_PRES_PROPS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.presProps+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml"
     )
+    PML_PRES_PROPS = "application/vnd.openxmlformats-officedocument.presentationml.presProps+xml"
     PML_PRINTER_SETTINGS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.printe"
-        "rSettings"
+        "application/vnd.openxmlformats-officedocument.presentationml.printerSettings"
     )
     PML_SLIDE = "application/vnd.openxmlformats-officedocument.presentationml.slide+xml"
     PML_SLIDESHOW_MAIN = (
-        "application/vnd.openxmlformats-officedocument.presentationml.slides"
-        "how.main+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml"
     )
     PML_SLIDE_LAYOUT = (
-        "application/vnd.openxmlformats-officedocument.presentationml.slideL"
-        "ayout+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml"
     )
     PML_SLIDE_MASTER = (
-        "application/vnd.openxmlformats-officedocument.presentationml.slideM"
-        "aster+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml"
     )
     PML_SLIDE_UPDATE_INFO = (
-        "application/vnd.openxmlformats-officedocument.presentationml.slideU"
-        "pdateInfo+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.slideUpdateInfo+xml"
     )
     PML_TABLE_STYLES = (
-        "application/vnd.openxmlformats-officedocument.presentationml.tableS"
-        "tyles+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml"
     )
     PML_TAGS = "application/vnd.openxmlformats-officedocument.presentationml.tags+xml"
     PML_TEMPLATE_MAIN = (
-        "application/vnd.openxmlformats-officedocument.presentationml.templa"
-        "te.main+xml"
-    )
-    PML_VIEW_PROPS = (
-        "application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml"
+        "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml"
     )
+    PML_VIEW_PROPS = "application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml"
     PNG = "image/png"
-    SML_CALC_CHAIN = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml"
-    )
-    SML_CHARTSHEET = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml"
-    )
-    SML_COMMENTS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"
-    )
-    SML_CONNECTIONS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml"
-    )
+    SML_CALC_CHAIN = "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml"
+    SML_CHARTSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml"
+    SML_COMMENTS = "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"
+    SML_CONNECTIONS = "application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml"
     SML_CUSTOM_PROPERTY = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.customProperty"
     )
-    SML_DIALOGSHEET = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml"
-    )
+    SML_DIALOGSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml"
     SML_EXTERNAL_LINK = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.externa"
-        "lLink+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml"
     )
     SML_PIVOT_CACHE_DEFINITION = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCa"
-        "cheDefinition+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"
     )
     SML_PIVOT_CACHE_RECORDS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCa"
-        "cheRecords+xml"
-    )
-    SML_PIVOT_TABLE = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml"
     )
+    SML_PIVOT_TABLE = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
     SML_PRINTER_SETTINGS = (
         "application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings"
     )
-    SML_QUERY_TABLE = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml"
-    )
+    SML_QUERY_TABLE = "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml"
     SML_REVISION_HEADERS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisio"
-        "nHeaders+xml"
-    )
-    SML_REVISION_LOG = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml"
     )
+    SML_REVISION_LOG = "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml"
     SML_SHARED_STRINGS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedS"
-        "trings+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"
     )
     SML_SHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-    SML_SHEET_MAIN = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
-    )
+    SML_SHEET_MAIN = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
     SML_SHEET_METADATA = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMe"
-        "tadata+xml"
-    )
-    SML_STYLES = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml"
     )
+    SML_STYLES = "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"
     SML_TABLE = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"
     SML_TABLE_SINGLE_CELLS = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.tableSi"
-        "ngleCells+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.tableSingleCells+xml"
     )
     SML_TEMPLATE_MAIN = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.templat"
-        "e.main+xml"
-    )
-    SML_USER_NAMES = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml"
     )
+    SML_USER_NAMES = "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml"
     SML_VOLATILE_DEPENDENCIES = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.volatil"
-        "eDependencies+xml"
-    )
-    SML_WORKSHEET = (
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.volatileDependencies+xml"
     )
+    SML_WORKSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
     TIFF = "image/tiff"
-    WML_COMMENTS = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"
-    )
-    WML_DOCUMENT = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-    )
+    WML_COMMENTS = "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"
+    WML_DOCUMENT = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
     WML_DOCUMENT_GLOSSARY = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.docu"
-        "ment.glossary+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml"
     )
     WML_DOCUMENT_MAIN = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.docu"
-        "ment.main+xml"
-    )
-    WML_ENDNOTES = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"
-    )
-    WML_FONT_TABLE = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.font"
-        "Table+xml"
-    )
-    WML_FOOTER = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"
-    )
-    WML_FOOTNOTES = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.foot"
-        "notes+xml"
-    )
-    WML_HEADER = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"
-    )
-    WML_NUMBERING = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.numb"
-        "ering+xml"
-    )
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"
+    )
+    WML_ENDNOTES = "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"
+    WML_FONT_TABLE = "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"
+    WML_FOOTER = "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml"
+    WML_FOOTNOTES = "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"
+    WML_HEADER = "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml"
+    WML_NUMBERING = "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"
     WML_PRINTER_SETTINGS = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.prin"
-        "terSettings"
-    )
-    WML_SETTINGS = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"
-    )
-    WML_STYLES = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.printerSettings"
     )
+    WML_SETTINGS = "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"
+    WML_STYLES = "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"
     WML_WEB_SETTINGS = (
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.webS"
-        "ettings+xml"
+        "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"
     )
     XML = "application/xml"
     X_EMF = "image/x-emf"
@@ -257,9 +162,7 @@ class NAMESPACE:
     DML_WORDPROCESSING_DRAWING = (
         "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
     )
-    OFC_RELATIONSHIPS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-    )
+    OFC_RELATIONSHIPS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
     OPC_RELATIONSHIPS = "http://schemas.openxmlformats.org/package/2006/relationships"
     OPC_CONTENT_TYPES = "http://schemas.openxmlformats.org/package/2006/content-types"
     WML_MAIN = "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
@@ -274,259 +177,130 @@ class RELATIONSHIP_TARGET_MODE:
 
 class RELATIONSHIP_TYPE:
     AUDIO = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/audio"
-    A_F_CHUNK = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk"
-    )
-    CALC_CHAIN = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/calcChain"
-    )
+    A_F_CHUNK = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/aFChunk"
+    CALC_CHAIN = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain"
     CERTIFICATE = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/digita"
-        "l-signature/certificate"
+        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/certificate"
     )
     CHART = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
-    CHARTSHEET = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/chartsheet"
-    )
+    CHARTSHEET = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartsheet"
     CHART_USER_SHAPES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/chartUserShapes"
-    )
-    COMMENTS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/comments"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes"
     )
+    COMMENTS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"
     COMMENT_AUTHORS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/commentAuthors"
-    )
-    CONNECTIONS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/connections"
-    )
-    CONTROL = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors"
     )
+    CONNECTIONS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections"
+    CONTROL = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control"
     CORE_PROPERTIES = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/metada"
-        "ta/core-properties"
+        "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"
     )
     CUSTOM_PROPERTIES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/custom-properties"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties"
     )
     CUSTOM_PROPERTY = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/customProperty"
-    )
-    CUSTOM_XML = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/customXml"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customProperty"
     )
+    CUSTOM_XML = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"
     CUSTOM_XML_PROPS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/customXmlProps"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps"
     )
     DIAGRAM_COLORS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/diagramColors"
-    )
-    DIAGRAM_DATA = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/diagramData"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramColors"
     )
+    DIAGRAM_DATA = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramData"
     DIAGRAM_LAYOUT = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/diagramLayout"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramLayout"
     )
     DIAGRAM_QUICK_STYLE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/diagramQuickStyle"
-    )
-    DIALOGSHEET = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/dialogsheet"
-    )
-    DRAWING = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
-    )
-    ENDNOTES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/endnotes"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramQuickStyle"
     )
+    DIALOGSHEET = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/dialogsheet"
+    DRAWING = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
+    ENDNOTES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"
     EXTENDED_PROPERTIES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/extended-properties"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"
     )
     EXTERNAL_LINK = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/externalLink"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink"
     )
     FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font"
-    FONT_TABLE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/fontTable"
-    )
-    FOOTER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
-    )
-    FOOTNOTES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/footnotes"
-    )
+    FONT_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"
+    FOOTER = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
+    FOOTNOTES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"
     GLOSSARY_DOCUMENT = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/glossaryDocument"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument"
     )
     HANDOUT_MASTER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/handoutMaster"
-    )
-    HEADER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"
-    )
-    HYPERLINK = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/hyperlink"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/handoutMaster"
     )
+    HEADER = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header"
+    HYPERLINK = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
     IMAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
-    NOTES_MASTER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/notesMaster"
-    )
-    NOTES_SLIDE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/notesSlide"
-    )
-    NUMBERING = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/numbering"
-    )
+    NOTES_MASTER = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster"
+    NOTES_SLIDE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide"
+    NUMBERING = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"
     OFFICE_DOCUMENT = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/officeDocument"
-    )
-    OLE_OBJECT = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/oleObject"
-    )
-    ORIGIN = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/digita"
-        "l-signature/origin"
-    )
-    PACKAGE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
     )
+    OLE_OBJECT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"
+    ORIGIN = "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
+    PACKAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"
     PIVOT_CACHE_DEFINITION = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/pivotCacheDefinition"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"
     )
     PIVOT_CACHE_RECORDS = (
         "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
         "/spreadsheetml/pivotCacheRecords"
     )
-    PIVOT_TABLE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/pivotTable"
-    )
-    PRES_PROPS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/presProps"
-    )
+    PIVOT_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable"
+    PRES_PROPS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/presProps"
     PRINTER_SETTINGS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/printerSettings"
-    )
-    QUERY_TABLE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/queryTable"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings"
     )
+    QUERY_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable"
     REVISION_HEADERS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/revisionHeaders"
-    )
-    REVISION_LOG = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/revisionLog"
-    )
-    SETTINGS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/settings"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders"
     )
+    REVISION_LOG = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionLog"
+    SETTINGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"
     SHARED_STRINGS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/sharedStrings"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"
     )
     SHEET_METADATA = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/sheetMetadata"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata"
     )
     SIGNATURE = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/digita"
-        "l-signature/signature"
+        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/signature"
     )
     SLIDE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide"
-    SLIDE_LAYOUT = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/slideLayout"
-    )
-    SLIDE_MASTER = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/slideMaster"
-    )
+    SLIDE_LAYOUT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout"
+    SLIDE_MASTER = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster"
     SLIDE_UPDATE_INFO = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/slideUpdateInfo"
-    )
-    STYLES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideUpdateInfo"
     )
+    STYLES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
     TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
     TABLE_SINGLE_CELLS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/tableSingleCells"
-    )
-    TABLE_STYLES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/tableStyles"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableSingleCells"
     )
+    TABLE_STYLES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tableStyles"
     TAGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags"
     THEME = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"
     THEME_OVERRIDE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/themeOverride"
-    )
-    THUMBNAIL = (
-        "http://schemas.openxmlformats.org/package/2006/relationships/metada"
-        "ta/thumbnail"
-    )
-    USERNAMES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/usernames"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/themeOverride"
     )
+    THUMBNAIL = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail"
+    USERNAMES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/usernames"
     VIDEO = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video"
-    VIEW_PROPS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/viewProps"
-    )
-    VML_DRAWING = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/vmlDrawing"
-    )
+    VIEW_PROPS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/viewProps"
+    VML_DRAWING = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing"
     VOLATILE_DEPENDENCIES = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/volatileDependencies"
-    )
-    WEB_SETTINGS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/webSettings"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/volatileDependencies"
     )
+    WEB_SETTINGS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"
     WORKSHEET_SOURCE = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-        "/worksheetSource"
-    )
-    XML_MAPS = (
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/xmlMaps"
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheetSource"
     )
+    XML_MAPS = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/xmlMaps"
diff --git a/src/docx/opc/packuri.py b/src/docx/opc/packuri.py
index fdbb67ed8..89437b164 100644
--- a/src/docx/opc/packuri.py
+++ b/src/docx/opc/packuri.py
@@ -10,8 +10,7 @@
 
 
 class PackURI(str):
-    """Provides access to pack URI components such as the baseURI and the filename
-    slice.
+    """Provides access to pack URI components such as the baseURI and the filename slice.
 
     Behaves as |str| otherwise.
     """
diff --git a/src/docx/opc/pkgreader.py b/src/docx/opc/pkgreader.py
index f00e7b5f0..15207e517 100644
--- a/src/docx/opc/pkgreader.py
+++ b/src/docx/opc/pkgreader.py
@@ -22,9 +22,7 @@ def from_file(pkg_file):
         phys_reader = PhysPkgReader(pkg_file)
         content_types = _ContentTypeMap.from_xml(phys_reader.content_types_xml)
         pkg_srels = PackageReader._srels_for(phys_reader, PACKAGE_URI)
-        sparts = PackageReader._load_serialized_parts(
-            phys_reader, pkg_srels, content_types
-        )
+        sparts = PackageReader._load_serialized_parts(phys_reader, pkg_srels, content_types)
         phys_reader.close()
         return PackageReader(content_types, pkg_srels, sparts)
 
@@ -80,9 +78,7 @@ def _walk_phys_parts(phys_reader, srels, visited_partnames=None):
             part_srels = PackageReader._srels_for(phys_reader, partname)
             blob = phys_reader.blob_for(partname)
             yield (partname, blob, reltype, part_srels)
-            next_walker = PackageReader._walk_phys_parts(
-                phys_reader, part_srels, visited_partnames
-            )
+            next_walker = PackageReader._walk_phys_parts(phys_reader, part_srels, visited_partnames)
             for partname, blob, reltype, srels in next_walker:
                 yield (partname, blob, reltype, srels)
 
diff --git a/src/docx/opc/rel.py b/src/docx/opc/rel.py
index 47e8860d8..153b308d0 100644
--- a/src/docx/opc/rel.py
+++ b/src/docx/opc/rel.py
@@ -79,9 +79,7 @@ def matches(rel: _Relationship, reltype: str, target: Part | str, is_external: b
             if rel.is_external != is_external:
                 return False
             rel_target = rel.target_ref if rel.is_external else rel.target_part
-            if rel_target != target:
-                return False
-            return True
+            return rel_target == target
 
         for rel in self.values():
             if matches(rel, reltype, target, is_external):
@@ -142,7 +140,7 @@ def rId(self) -> str:
     def target_part(self) -> Part:
         if self._is_external:
             raise ValueError(
-                "target_part property on _Relationship is undef" "ined when target mode is External"
+                "target_part property on _Relationship is undefined when target mode is External"
             )
         return cast("Part", self._target)
 
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index dd10ab910..69d4b65d4 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -125,7 +125,7 @@ def convert_to_xml(cls, value: bool) -> str:
     def validate(cls, value: Any) -> None:
         if value not in (True, False):
             raise TypeError(
-                "only True or False (and possibly None) may be assigned, got" " '%s'" % value
+                "only True or False (and possibly None) may be assigned, got '%s'" % value
             )
 
 
diff --git a/src/docx/oxml/table.py b/src/docx/oxml/table.py
index e38d58562..9457da207 100644
--- a/src/docx/oxml/table.py
+++ b/src/docx/oxml/table.py
@@ -519,7 +519,7 @@ def merge(self, other_tc: CT_Tc) -> CT_Tc:
     @classmethod
     def new(cls) -> CT_Tc:
         """A new `w:tc` element, containing an empty paragraph as the required EG_BlockLevelElt."""
-        return cast(CT_Tc, parse_xml("<w:tc %s>\n" "  <w:p/>\n" "</w:tc>" % nsdecls("w")))
+        return cast(CT_Tc, parse_xml("<w:tc %s><w:p/></w:tc>" % nsdecls("w")))
 
     @property
     def right(self) -> int:
@@ -583,7 +583,9 @@ def vMerge_val(top_tc: CT_Tc):
             return (
                 ST_Merge.CONTINUE
                 if top_tc is not self
-                else None if height == 1 else ST_Merge.RESTART
+                else None
+                if height == 1
+                else ST_Merge.RESTART
             )
 
         top_tc = self if top_tc is None else top_tc
@@ -609,9 +611,7 @@ def _is_empty(self) -> bool:
         # -- cell must include at least one block item but can be a `w:tbl`, `w:sdt`,
         # -- `w:customXml` or a `w:p`
         only_item = block_items[0]
-        if isinstance(only_item, CT_P) and len(only_item.r_lst) == 0:
-            return True
-        return False
+        return isinstance(only_item, CT_P) and len(only_item.r_lst) == 0
 
     def _move_content_to(self, other_tc: CT_Tc):
         """Append the content of this cell to `other_tc`.
diff --git a/src/docx/oxml/text/font.py b/src/docx/oxml/text/font.py
index c5dc9bd2e..32eb567ba 100644
--- a/src/docx/oxml/text/font.py
+++ b/src/docx/oxml/text/font.py
@@ -236,9 +236,7 @@ def subscript(self) -> bool | None:
         vertAlign = self.vertAlign
         if vertAlign is None:
             return None
-        if vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT:
-            return True
-        return False
+        return vertAlign.val == ST_VerticalAlignRun.SUBSCRIPT
 
     @subscript.setter
     def subscript(self, value: bool | None) -> None:
@@ -260,9 +258,7 @@ def superscript(self) -> bool | None:
         vertAlign = self.vertAlign
         if vertAlign is None:
             return None
-        if vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT:
-            return True
-        return False
+        return vertAlign.val == ST_VerticalAlignRun.SUPERSCRIPT
 
     @superscript.setter
     def superscript(self, value: bool | None):
diff --git a/src/docx/oxml/text/pagebreak.py b/src/docx/oxml/text/pagebreak.py
index 943f9b6c2..45a6f51a7 100644
--- a/src/docx/oxml/text/pagebreak.py
+++ b/src/docx/oxml/text/pagebreak.py
@@ -46,9 +46,7 @@ def following_fragment_p(self) -> CT_P:
 
         # -- splitting approach is different when break is inside a hyperlink --
         return (
-            self._following_frag_in_hlink
-            if self._is_in_hyperlink
-            else self._following_frag_in_run
+            self._following_frag_in_hlink if self._is_in_hyperlink else self._following_frag_in_run
         )
 
     @property
@@ -116,9 +114,7 @@ def preceding_fragment_p(self) -> CT_P:
 
         # -- splitting approach is different when break is inside a hyperlink --
         return (
-            self._preceding_frag_in_hlink
-            if self._is_in_hyperlink
-            else self._preceding_frag_in_run
+            self._preceding_frag_in_hlink if self._is_in_hyperlink else self._preceding_frag_in_run
         )
 
     def _enclosing_hyperlink(self, lrpb: CT_LastRenderedPageBreak) -> CT_Hyperlink:
@@ -139,9 +135,7 @@ def _first_lrpb_in_p(self, p: CT_P) -> CT_LastRenderedPageBreak:
 
         Raises `ValueError` if there are no rendered page-breaks in `p`.
         """
-        lrpbs = p.xpath(
-            "./w:r/w:lastRenderedPageBreak | ./w:hyperlink/w:r/w:lastRenderedPageBreak"
-        )
+        lrpbs = p.xpath("./w:r/w:lastRenderedPageBreak | ./w:hyperlink/w:r/w:lastRenderedPageBreak")
         if not lrpbs:
             raise ValueError("no rendered page-breaks in paragraph element")
         return lrpbs[0]
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index bc33e1f58..df75ee18c 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -75,9 +75,7 @@ def _eq_elm_strs(self, line: str, line_2: str):
             return False
         if close != close_2:
             return False
-        if text != text_2:
-            return False
-        return True
+        return text == text_2
 
     @classmethod
     def _parse_line(cls, line: str) -> tuple[str, str, str, str]:
@@ -464,7 +462,7 @@ def get_or_change_to_child(obj: BaseOxmlElement):
             return child
 
         get_or_change_to_child.__doc__ = (
-            "Return the ``<%s>`` child, replacing any other group element if" " found."
+            "Return the ``<%s>`` child, replacing any other group element if found."
         ) % self._nsptagname
         self._add_to_class(self._get_or_change_to_method_name, get_or_change_to_child)
 
diff --git a/src/docx/parts/settings.py b/src/docx/parts/settings.py
index 116facca2..7fe371f09 100644
--- a/src/docx/parts/settings.py
+++ b/src/docx/parts/settings.py
@@ -27,8 +27,7 @@ def __init__(
 
     @classmethod
     def default(cls, package: Package):
-        """Return a newly created settings part, containing a default `w:settings`
-        element tree."""
+        """Return a newly created settings part, containing a default `w:settings` element tree."""
         partname = PackURI("/word/settings.xml")
         content_type = CT.WML_SETTINGS
         element = cast("CT_Settings", parse_xml(cls._default_settings_xml()))
diff --git a/src/docx/parts/styles.py b/src/docx/parts/styles.py
index dffa762ef..6e065beee 100644
--- a/src/docx/parts/styles.py
+++ b/src/docx/parts/styles.py
@@ -36,9 +36,7 @@ def styles(self):
     @classmethod
     def _default_styles_xml(cls):
         """Return a bytestream containing XML for a default styles part."""
-        path = os.path.join(
-            os.path.split(__file__)[0], "..", "templates", "default-styles.xml"
-        )
+        path = os.path.join(os.path.split(__file__)[0], "..", "templates", "default-styles.xml")
         with open(path, "rb") as f:
             xml_bytes = f.read()
         return xml_bytes
diff --git a/src/docx/styles/styles.py b/src/docx/styles/styles.py
index 98a56e520..b05b3ebb1 100644
--- a/src/docx/styles/styles.py
+++ b/src/docx/styles/styles.py
@@ -40,10 +40,7 @@ def __getitem__(self, key: str):
 
         style_elm = self._element.get_by_id(key)
         if style_elm is not None:
-            msg = (
-                "style lookup by style_id is deprecated. Use style name as "
-                "key instead."
-            )
+            msg = "style lookup by style_id is deprecated. Use style name as key instead."
             warn(msg, UserWarning, stacklevel=2)
             return StyleFactory(style_elm)
 
@@ -118,9 +115,7 @@ def _get_by_id(self, style_id: str | None, style_type: WD_STYLE_TYPE):
             return self.default(style_type)
         return StyleFactory(style)
 
-    def _get_style_id_from_name(
-        self, style_name: str, style_type: WD_STYLE_TYPE
-    ) -> str | None:
+    def _get_style_id_from_name(self, style_name: str, style_type: WD_STYLE_TYPE) -> str | None:
         """Return the id of the style of `style_type` corresponding to `style_name`.
 
         Returns |None| if that style is the default style for `style_type`. Raises
@@ -129,17 +124,13 @@ def _get_style_id_from_name(
         """
         return self._get_style_id_from_style(self[style_name], style_type)
 
-    def _get_style_id_from_style(
-        self, style: BaseStyle, style_type: WD_STYLE_TYPE
-    ) -> str | None:
+    def _get_style_id_from_style(self, style: BaseStyle, style_type: WD_STYLE_TYPE) -> str | None:
         """Id of `style`, or |None| if it is the default style of `style_type`.
 
         Raises |ValueError| if style is not of `style_type`.
         """
         if style.type != style_type:
-            raise ValueError(
-                "assigned style is type %s, need type %s" % (style.type, style_type)
-            )
+            raise ValueError("assigned style is type %s, need type %s" % (style.type, style_type))
         if style == self.default(style_type):
             return None
         return style.style_id
diff --git a/src/docx/text/font.py b/src/docx/text/font.py
index acd60795b..0439f4547 100644
--- a/src/docx/text/font.py
+++ b/src/docx/text/font.py
@@ -398,11 +398,7 @@ def underline(self, value: bool | WD_UNDERLINE | None) -> None:
         # -- False == 0, which happen to match the mapping for WD_UNDERLINE.SINGLE
         # -- and .NONE respectively.
         val = (
-            WD_UNDERLINE.SINGLE
-            if value is True
-            else WD_UNDERLINE.NONE
-            if value is False
-            else value
+            WD_UNDERLINE.SINGLE if value is True else WD_UNDERLINE.NONE if value is False else value
         )
         rPr.u_val = val
 
diff --git a/src/docx/text/tabstops.py b/src/docx/text/tabstops.py
index 824085d2b..0f8c22c9c 100644
--- a/src/docx/text/tabstops.py
+++ b/src/docx/text/tabstops.py
@@ -50,9 +50,7 @@ def __len__(self):
             return 0
         return len(tabs.tab_lst)
 
-    def add_tab_stop(
-        self, position, alignment=WD_TAB_ALIGNMENT.LEFT, leader=WD_TAB_LEADER.SPACES
-    ):
+    def add_tab_stop(self, position, alignment=WD_TAB_ALIGNMENT.LEFT, leader=WD_TAB_LEADER.SPACES):
         """Add a new tab stop at `position`, a |Length| object specifying the location
         of the tab stop relative to the paragraph edge.
 
diff --git a/src/docx/types.py b/src/docx/types.py
index 00bc100a1..06d1a571a 100644
--- a/src/docx/types.py
+++ b/src/docx/types.py
@@ -19,8 +19,7 @@ class ProvidesStoryPart(Protocol):
     """
 
     @property
-    def part(self) -> StoryPart:
-        ...
+    def part(self) -> StoryPart: ...
 
 
 class ProvidesXmlPart(Protocol):
@@ -32,5 +31,4 @@ class ProvidesXmlPart(Protocol):
     """
 
     @property
-    def part(self) -> XmlPart:
-        ...
+    def part(self) -> XmlPart: ...
diff --git a/tests/image/test_bmp.py b/tests/image/test_bmp.py
index 15b322b66..27c0e8f5c 100644
--- a/tests/image/test_bmp.py
+++ b/tests/image/test_bmp.py
@@ -14,8 +14,8 @@ class DescribeBmp:
     def it_can_construct_from_a_bmp_stream(self, Bmp__init__):
         cx, cy, horz_dpi, vert_dpi = 26, 43, 200, 96
         bytes_ = (
-            b"fillerfillerfiller\x1A\x00\x00\x00\x2B\x00\x00\x00"
-            b"fillerfiller\xB8\x1E\x00\x00\x00\x00\x00\x00"
+            b"fillerfillerfiller\x1a\x00\x00\x00\x2b\x00\x00\x00"
+            b"fillerfiller\xb8\x1e\x00\x00\x00\x00\x00\x00"
         )
         stream = io.BytesIO(bytes_)
 
diff --git a/tests/image/test_gif.py b/tests/image/test_gif.py
index a533da04d..4aa6581ba 100644
--- a/tests/image/test_gif.py
+++ b/tests/image/test_gif.py
@@ -13,7 +13,7 @@
 class DescribeGif:
     def it_can_construct_from_a_gif_stream(self, Gif__init__):
         cx, cy = 42, 24
-        bytes_ = b"filler\x2A\x00\x18\x00"
+        bytes_ = b"filler\x2a\x00\x18\x00"
         stream = io.BytesIO(bytes_)
 
         gif = Gif.from_stream(stream)
diff --git a/tests/image/test_helpers.py b/tests/image/test_helpers.py
index 9192564dc..03421ff5f 100644
--- a/tests/image/test_helpers.py
+++ b/tests/image/test_helpers.py
@@ -28,8 +28,8 @@ def it_can_read_a_long(self, read_long_fixture):
 
     @pytest.fixture(
         params=[
-            (BIG_ENDIAN, b"\xBE\x00\x00\x00\x2A\xEF", 1, 42),
-            (LITTLE_ENDIAN, b"\xBE\xEF\x2A\x00\x00\x00", 2, 42),
+            (BIG_ENDIAN, b"\xbe\x00\x00\x00\x2a\xef", 1, 42),
+            (LITTLE_ENDIAN, b"\xbe\xef\x2a\x00\x00\x00", 2, 42),
         ]
     )
     def read_long_fixture(self, request):
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
index bd5ed0903..c13e87305 100644
--- a/tests/image/test_image.py
+++ b/tests/image/test_image.py
@@ -27,9 +27,7 @@
 
 
 class DescribeImage:
-    def it_can_construct_from_an_image_blob(
-        self, blob_, BytesIO_, _from_stream_, stream_, image_
-    ):
+    def it_can_construct_from_an_image_blob(self, blob_, BytesIO_, _from_stream_, stream_, image_):
         image = Image.from_blob(blob_)
 
         BytesIO_.assert_called_once_with(blob_)
@@ -231,9 +229,7 @@ def filename_(self, request):
 
     @pytest.fixture
     def _from_stream_(self, request, image_):
-        return method_mock(
-            request, Image, "_from_stream", autospec=False, return_value=image_
-        )
+        return method_mock(request, Image, "_from_stream", autospec=False, return_value=image_)
 
     @pytest.fixture
     def height_prop_(self, request):
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
index a558e1d4e..129a07d80 100644
--- a/tests/image/test_jpeg.py
+++ b/tests/image/test_jpeg.py
@@ -247,7 +247,7 @@ def it_can_construct_from_a_stream_and_offset(self, from_stream_fixture):
     )
     def from_stream_fixture(self, request, _Marker__init_):
         marker_code, offset, length = request.param
-        bytes_ = b"\xFF\xD8\xFF\xE0\x00\x10"
+        bytes_ = b"\xff\xd8\xff\xe0\x00\x10"
         stream_reader = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         return stream_reader, marker_code, offset, _Marker__init_, length
 
@@ -258,7 +258,7 @@ def _Marker__init_(self, request):
 
 class Describe_App0Marker:
     def it_can_construct_from_a_stream_and_offset(self, _App0Marker__init_):
-        bytes_ = b"\x00\x10JFIF\x00\x01\x01\x01\x00\x2A\x00\x18"
+        bytes_ = b"\x00\x10JFIF\x00\x01\x01\x01\x00\x2a\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.APP0, 0, 16
         density_units, x_density, y_density = 1, 42, 24
         stream = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
@@ -318,9 +318,7 @@ def it_can_construct_from_non_Exif_APP1_segment(self, _App1Marker__init_):
 
         app1_marker = _App1Marker.from_stream(stream, marker_code, offset)
 
-        _App1Marker__init_.assert_called_once_with(
-            ANY, marker_code, offset, length, 72, 72
-        )
+        _App1Marker__init_.assert_called_once_with(ANY, marker_code, offset, length, 72, 72)
         assert isinstance(app1_marker, _App1Marker)
 
     def it_gets_a_tiff_from_its_Exif_segment_to_help_construct(self, get_tiff_fixture):
@@ -348,9 +346,7 @@ def _App1Marker__init_(self, request):
     def get_tiff_fixture(self, request, substream_, Tiff_, tiff_):
         bytes_ = b"xfillerxMM\x00*\x00\x00\x00\x42"
         stream_reader = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
-        BytesIO_ = class_mock(
-            request, "docx.image.jpeg.io.BytesIO", return_value=substream_
-        )
+        BytesIO_ = class_mock(request, "docx.image.jpeg.io.BytesIO", return_value=substream_)
         offset, segment_length, segment_bytes = 0, 16, bytes_[8:]
         return (
             stream_reader,
@@ -390,7 +386,7 @@ def _tiff_from_exif_segment_(self, request, tiff_):
 
 class Describe_SofMarker:
     def it_can_construct_from_a_stream_and_offset(self, request, _SofMarker__init_):
-        bytes_ = b"\x00\x11\x00\x00\x2A\x00\x18"
+        bytes_ = b"\x00\x11\x00\x00\x2a\x00\x18"
         marker_code, offset, length = JPEG_MARKER_CODE.SOF0, 0, 17
         px_width, px_height = 24, 42
         stream = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
@@ -509,7 +505,7 @@ def _MarkerFinder__init_(self, request):
     )
     def next_fixture(self, request):
         start, marker_code, segment_offset = request.param
-        bytes_ = b"\xFF\xD8\xFF\xE0\x00\x01\xFF\x00\xFF\xFF\xFF\xD9"
+        bytes_ = b"\xff\xd8\xff\xe0\x00\x01\xff\x00\xff\xff\xff\xd9"
         stream_reader = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         marker_finder = _MarkerFinder(stream_reader)
         expected_code_and_offset = (marker_code, segment_offset)
@@ -626,9 +622,7 @@ def stream_(self, request):
 
     @pytest.fixture
     def StreamReader_(self, request, stream_reader_):
-        return class_mock(
-            request, "docx.image.jpeg.StreamReader", return_value=stream_reader_
-        )
+        return class_mock(request, "docx.image.jpeg.StreamReader", return_value=stream_reader_)
 
     @pytest.fixture
     def stream_reader_(self, request):
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
index 61e7fdbed..5379b403b 100644
--- a/tests/image/test_png.py
+++ b/tests/image/test_png.py
@@ -30,9 +30,7 @@
 
 
 class DescribePng:
-    def it_can_construct_from_a_png_stream(
-        self, stream_, _PngParser_, png_parser_, Png__init__
-    ):
+    def it_can_construct_from_a_png_stream(self, stream_, _PngParser_, png_parser_, Png__init__):
         px_width, px_height, horz_dpi, vert_dpi = 42, 24, 36, 63
         png_parser_.px_width = px_width
         png_parser_.px_height = px_height
@@ -42,9 +40,7 @@ def it_can_construct_from_a_png_stream(
         png = Png.from_stream(stream_)
 
         _PngParser_.parse.assert_called_once_with(stream_)
-        Png__init__.assert_called_once_with(
-            ANY, px_width, px_height, horz_dpi, vert_dpi
-        )
+        Png__init__.assert_called_once_with(ANY, px_width, px_height, horz_dpi, vert_dpi)
         assert isinstance(png, Png)
 
     def it_knows_its_content_type(self):
@@ -157,9 +153,7 @@ def stream_(self, request):
 
 
 class Describe_Chunks:
-    def it_can_construct_from_a_stream(
-        self, stream_, _ChunkParser_, chunk_parser_, _Chunks__init_
-    ):
+    def it_can_construct_from_a_stream(self, stream_, _ChunkParser_, chunk_parser_, _Chunks__init_):
         chunk_lst = [1, 2]
         chunk_parser_.iter_chunks.return_value = iter(chunk_lst)
 
@@ -277,9 +271,7 @@ def chunk_2_(self, request):
 
     @pytest.fixture
     def _ChunkFactory_(self, request, chunk_lst_):
-        return function_mock(
-            request, "docx.image.png._ChunkFactory", side_effect=chunk_lst_
-        )
+        return function_mock(request, "docx.image.png._ChunkFactory", side_effect=chunk_lst_)
 
     @pytest.fixture
     def chunk_lst_(self, chunk_, chunk_2_):
@@ -315,9 +307,7 @@ def iter_offsets_fixture(self):
 
     @pytest.fixture
     def StreamReader_(self, request, stream_rdr_):
-        return class_mock(
-            request, "docx.image.png.StreamReader", return_value=stream_rdr_
-        )
+        return class_mock(request, "docx.image.png.StreamReader", return_value=stream_rdr_)
 
     @pytest.fixture
     def stream_(self, request):
@@ -409,7 +399,7 @@ def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
 
     @pytest.fixture
     def from_offset_fixture(self):
-        bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x18"
+        bytes_ = b"\x00\x00\x00\x2a\x00\x00\x00\x18"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset, px_width, px_height = 0, 42, 24
         return stream_rdr, offset, px_width, px_height
@@ -430,7 +420,7 @@ def it_can_construct_from_a_stream_and_offset(self, from_offset_fixture):
 
     @pytest.fixture
     def from_offset_fixture(self):
-        bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x18\x01"
+        bytes_ = b"\x00\x00\x00\x2a\x00\x00\x00\x18\x01"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset, horz_px_per_unit, vert_px_per_unit, units_specifier = (0, 42, 24, 1)
         return (stream_rdr, offset, horz_px_per_unit, vert_px_per_unit, units_specifier)
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
index b7f37afe5..35344eede 100644
--- a/tests/image/test_tiff.py
+++ b/tests/image/test_tiff.py
@@ -32,9 +32,7 @@
 
 
 class DescribeTiff:
-    def it_can_construct_from_a_tiff_stream(
-        self, stream_, _TiffParser_, tiff_parser_, Tiff__init_
-    ):
+    def it_can_construct_from_a_tiff_stream(self, stream_, _TiffParser_, tiff_parser_, Tiff__init_):
         px_width, px_height = 111, 222
         horz_dpi, vert_dpi = 333, 444
         tiff_parser_.px_width = px_width
@@ -45,9 +43,7 @@ def it_can_construct_from_a_tiff_stream(
         tiff = Tiff.from_stream(stream_)
 
         _TiffParser_.parse.assert_called_once_with(stream_)
-        Tiff__init_.assert_called_once_with(
-            ANY, px_width, px_height, horz_dpi, vert_dpi
-        )
+        Tiff__init_.assert_called_once_with(ANY, px_width, px_height, horz_dpi, vert_dpi)
         assert isinstance(tiff, Tiff)
 
     def it_knows_its_content_type(self):
@@ -186,9 +182,7 @@ def stream_(self, request):
 
     @pytest.fixture
     def StreamReader_(self, request, stream_rdr_):
-        return class_mock(
-            request, "docx.image.tiff.StreamReader", return_value=stream_rdr_
-        )
+        return class_mock(request, "docx.image.tiff.StreamReader", return_value=stream_rdr_)
 
     @pytest.fixture
     def stream_rdr_(self, request, ifd0_offset_):
@@ -244,9 +238,7 @@ def _IfdEntries__init_(self, request):
 
     @pytest.fixture
     def _IfdParser_(self, request, ifd_parser_):
-        return class_mock(
-            request, "docx.image.tiff._IfdParser", return_value=ifd_parser_
-        )
+        return class_mock(request, "docx.image.tiff._IfdParser", return_value=ifd_parser_)
 
     @pytest.fixture
     def ifd_parser_(self, request):
@@ -386,9 +378,7 @@ def offset_(self, request):
 
 
 class Describe_IfdEntry:
-    def it_can_construct_from_a_stream_and_offset(
-        self, _parse_value_, _IfdEntry__init_, value_
-    ):
+    def it_can_construct_from_a_stream_and_offset(self, _parse_value_, _IfdEntry__init_, value_):
         bytes_ = b"\x00\x01\x66\x66\x00\x00\x00\x02\x00\x00\x00\x03"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         offset, tag_code, value_count, value_offset = 0, 1, 2, 3
@@ -396,9 +386,7 @@ def it_can_construct_from_a_stream_and_offset(
 
         ifd_entry = _IfdEntry.from_stream(stream_rdr, offset)
 
-        _parse_value_.assert_called_once_with(
-            stream_rdr, offset, value_count, value_offset
-        )
+        _parse_value_.assert_called_once_with(stream_rdr, offset, value_count, value_offset)
         _IfdEntry__init_.assert_called_once_with(ANY, tag_code, value_)
         assert isinstance(ifd_entry, _IfdEntry)
 
@@ -432,7 +420,7 @@ def it_can_parse_an_ascii_string_IFD_entry(self):
 
 class Describe_ShortIfdEntry:
     def it_can_parse_a_short_int_IFD_entry(self):
-        bytes_ = b"foobaroo\x00\x2A"
+        bytes_ = b"foobaroo\x00\x2a"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _ShortIfdEntry._parse_value(stream_rdr, 0, 1, None)
         assert val == 42
@@ -440,7 +428,7 @@ def it_can_parse_a_short_int_IFD_entry(self):
 
 class Describe_LongIfdEntry:
     def it_can_parse_a_long_int_IFD_entry(self):
-        bytes_ = b"foobaroo\x00\x00\x00\x2A"
+        bytes_ = b"foobaroo\x00\x00\x00\x2a"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _LongIfdEntry._parse_value(stream_rdr, 0, 1, None)
         assert val == 42
@@ -448,7 +436,7 @@ def it_can_parse_a_long_int_IFD_entry(self):
 
 class Describe_RationalIfdEntry:
     def it_can_parse_a_rational_IFD_entry(self):
-        bytes_ = b"\x00\x00\x00\x2A\x00\x00\x00\x54"
+        bytes_ = b"\x00\x00\x00\x2a\x00\x00\x00\x54"
         stream_rdr = StreamReader(io.BytesIO(bytes_), BIG_ENDIAN)
         val = _RationalIfdEntry._parse_value(stream_rdr, None, 1, 0)
         assert val == 0.5
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
index 8e14f0e01..0aed52c8d 100644
--- a/tests/opc/test_pkgreader.py
+++ b/tests/opc/test_pkgreader.py
@@ -44,9 +44,7 @@ def it_can_construct_from_pkg_file(
         PhysPkgReader_.assert_called_once_with(pkg_file)
         from_xml.assert_called_once_with(phys_reader.content_types_xml)
         _srels_for.assert_called_once_with(phys_reader, "/")
-        _load_serialized_parts.assert_called_once_with(
-            phys_reader, pkg_srels, content_types
-        )
+        _load_serialized_parts.assert_called_once_with(phys_reader, pkg_srels, content_types)
         phys_reader.close.assert_called_once_with()
         _init_.assert_called_once_with(ANY, content_types, pkg_srels, sparts)
         assert isinstance(pkg_reader, PackageReader)
@@ -94,17 +92,11 @@ def it_can_load_serialized_parts(self, _SerializedPart_, _walk_phys_parts):
             Mock(name="spart_2"),
         )
         # exercise ---------------------
-        retval = PackageReader._load_serialized_parts(
-            phys_reader, pkg_srels, content_types
-        )
+        retval = PackageReader._load_serialized_parts(phys_reader, pkg_srels, content_types)
         # verify -----------------------
         expected_calls = [
-            call(
-                "/part/name1.xml", "app/vnd.type_1", "<Part_1/>", "reltype1", "srels_1"
-            ),
-            call(
-                "/part/name2.xml", "app/vnd.type_2", "<Part_2/>", "reltype2", "srels_2"
-            ),
+            call("/part/name1.xml", "app/vnd.type_1", "<Part_1/>", "reltype1", "srels_1"),
+            call("/part/name2.xml", "app/vnd.type_2", "<Part_2/>", "reltype2", "srels_2"),
         ]
         assert _SerializedPart_.call_args_list == expected_calls
         assert retval == expected_sparts
@@ -208,9 +200,7 @@ def _init_(self, request):
         return initializer_mock(request, PackageReader)
 
     @pytest.fixture
-    def iter_sparts_fixture(
-        self, sparts_, partnames_, content_types_, reltypes_, blobs_
-    ):
+    def iter_sparts_fixture(self, sparts_, partnames_, content_types_, reltypes_, blobs_):
         pkg_reader = PackageReader(None, None, sparts_)
         expected_iter_spart_items = [
             (partnames_[0], content_types_[0], reltypes_[0], blobs_[0]),
@@ -220,9 +210,7 @@ def iter_sparts_fixture(
 
     @pytest.fixture
     def _load_serialized_parts(self, request):
-        return method_mock(
-            request, PackageReader, "_load_serialized_parts", autospec=False
-        )
+        return method_mock(request, PackageReader, "_load_serialized_parts", autospec=False)
 
     @pytest.fixture
     def partnames_(self, request):
@@ -283,15 +271,11 @@ def it_can_construct_from_ct_item_xml(self, from_xml_fixture):
         assert ct_map._defaults == expected_defaults
         assert ct_map._overrides == expected_overrides
 
-    def it_matches_an_override_on_case_insensitive_partname(
-        self, match_override_fixture
-    ):
+    def it_matches_an_override_on_case_insensitive_partname(self, match_override_fixture):
         ct_map, partname, content_type = match_override_fixture
         assert ct_map[partname] == content_type
 
-    def it_falls_back_to_case_insensitive_extension_default_match(
-        self, match_default_fixture
-    ):
+    def it_falls_back_to_case_insensitive_extension_default_match(self, match_default_fixture):
         ct_map, partname, content_type = match_default_fixture
         assert ct_map[partname] == content_type
 
diff --git a/tests/opc/test_rel.py b/tests/opc/test_rel.py
index 7b7a98dfe..f56fecd22 100644
--- a/tests/opc/test_rel.py
+++ b/tests/opc/test_rel.py
@@ -77,18 +77,14 @@ def it_can_find_a_relationship_by_rId(self):
         rels["foobar"] = rel
         assert rels["foobar"] == rel
 
-    def it_can_find_or_add_a_relationship(
-        self, rels_with_matching_rel_, rels_with_missing_rel_
-    ):
+    def it_can_find_or_add_a_relationship(self, rels_with_matching_rel_, rels_with_missing_rel_):
         rels, reltype, part, matching_rel = rels_with_matching_rel_
         assert rels.get_or_add(reltype, part) == matching_rel
 
         rels, reltype, part, new_rel = rels_with_missing_rel_
         assert rels.get_or_add(reltype, part) == new_rel
 
-    def it_can_find_or_add_an_external_relationship(
-        self, add_matching_ext_rel_fixture_
-    ):
+    def it_can_find_or_add_an_external_relationship(self, add_matching_ext_rel_fixture_):
         rels, reltype, url, rId = add_matching_ext_rel_fixture_
         _rId = rels.get_or_add_ext_rel(reltype, url)
         assert _rId == rId
@@ -235,20 +231,14 @@ def rels_with_missing_rel_(self, request, rels, _Relationship_):
     @pytest.fixture
     def rels_with_rId_gap(self, request):
         rels = Relationships(None)
-        rel_with_rId1 = instance_mock(
-            request, _Relationship, name="rel_with_rId1", rId="rId1"
-        )
-        rel_with_rId3 = instance_mock(
-            request, _Relationship, name="rel_with_rId3", rId="rId3"
-        )
+        rel_with_rId1 = instance_mock(request, _Relationship, name="rel_with_rId1", rId="rId1")
+        rel_with_rId3 = instance_mock(request, _Relationship, name="rel_with_rId3", rId="rId3")
         rels["rId1"] = rel_with_rId1
         rels["rId3"] = rel_with_rId3
         return rels, "rId2"
 
     @pytest.fixture
-    def rels_with_target_known_by_reltype(
-        self, rels, _rel_with_target_known_by_reltype
-    ):
+    def rels_with_target_known_by_reltype(self, rels, _rel_with_target_known_by_reltype):
         rel, reltype, target_part = _rel_with_target_known_by_reltype
         rels[1] = rel
         return rels, reltype, target_part
diff --git a/tests/oxml/parts/test_document.py b/tests/oxml/parts/test_document.py
index 90b587674..149a65790 100644
--- a/tests/oxml/parts/test_document.py
+++ b/tests/oxml/parts/test_document.py
@@ -38,9 +38,6 @@ def clear_fixture(self, request):
     def section_break_fixture(self):
         body = element("w:body/w:sectPr/w:type{w:val=foobar}")
         expected_xml = xml(
-            "w:body/("
-            "  w:p/w:pPr/w:sectPr/w:type{w:val=foobar},"
-            "  w:sectPr/w:type{w:val=foobar}"
-            ")"
+            "w:body/(w:p/w:pPr/w:sectPr/w:type{w:val=foobar},w:sectPr/w:type{w:val=foobar})"
         )
         return body, expected_xml
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
index 5f392df38..9f19094b4 100644
--- a/tests/oxml/test__init__.py
+++ b/tests/oxml/test__init__.py
@@ -12,15 +12,12 @@ class DescribeOxmlElement:
     def it_returns_an_lxml_element_with_matching_tag_name(self):
         element = OxmlElement("a:foo")
         assert isinstance(element, etree._Element)
-        assert element.tag == (
-            "{http://schemas.openxmlformats.org/drawingml/2006/main}foo"
-        )
+        assert element.tag == ("{http://schemas.openxmlformats.org/drawingml/2006/main}foo")
 
     def it_adds_supplied_attributes(self):
         element = OxmlElement("a:foo", {"a": "b", "c": "d"})
         assert etree.tostring(element) == (
-            '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/200'
-            '6/main" a="b" c="d"/>'
+            '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" a="b" c="d"/>'
         ).encode("utf-8")
 
     def it_adds_additional_namespace_declarations_when_supplied(self):
@@ -43,7 +40,7 @@ def it_strips_whitespace_between_elements(self, whitespace_fixture):
 
     @pytest.fixture
     def whitespace_fixture(self):
-        pretty_xml_text = "<foø>\n" "  <bår>text</bår>\n" "</foø>\n"
+        pretty_xml_text = "<foø>\n  <bår>text</bår>\n</foø>\n"
         stripped_xml_text = "<foø><bår>text</bår></foø>"
         return pretty_xml_text, stripped_xml_text
 
diff --git a/tests/oxml/test_styles.py b/tests/oxml/test_styles.py
index 7677a8a9e..8814dd6aa 100644
--- a/tests/oxml/test_styles.py
+++ b/tests/oxml/test_styles.py
@@ -31,8 +31,7 @@ def it_can_add_a_style_of_type(self, add_fixture):
                 "heading 1",
                 WD_STYLE_TYPE.PARAGRAPH,
                 True,
-                "w:styles/w:style{w:type=paragraph,w:styleId=Heading1}/w:name{w:val"
-                "=heading 1}",
+                "w:styles/w:style{w:type=paragraph,w:styleId=Heading1}/w:name{w:val=heading 1}",
             ),
         ]
     )
diff --git a/tests/oxml/test_table.py b/tests/oxml/test_table.py
index 46b2f4ed1..2c9e05344 100644
--- a/tests/oxml/test_table.py
+++ b/tests/oxml/test_table.py
@@ -19,7 +19,6 @@
 
 
 class DescribeCT_Row:
-
     @pytest.mark.parametrize(
         ("tr_cxml", "expected_cxml"),
         [
@@ -231,7 +230,7 @@ def it_knows_its_inner_content_block_item_elements(self):
                 'w:tr/(w:tc/w:p/w:r/w:t"a",w:tc/w:p/w:r/w:t"b")',
                 0,
                 2,
-                'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p/w:r/w:t"a",' 'w:p/w:r/w:t"b"))',
+                'w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p/w:r/w:t"a",w:p/w:r/w:t"b"))',
             ),
             (
                 "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p),w:tc/w:p)",
@@ -266,7 +265,7 @@ def it_can_swallow_the_next_tc_help_merge(
                 "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
                 0,
                 2,
-                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=2880,w:type=dxa}," "w:gridSpan{w:val=2}),w:p))",
+                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=2880,w:type=dxa},w:gridSpan{w:val=2}),w:p))",
             ),
             # neither have a width
             (
@@ -277,17 +276,17 @@ def it_can_swallow_the_next_tc_help_merge(
             ),
             # only second one has a width
             (
-                "w:tr/(w:tc/w:p," "w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
+                "w:tr/(w:tc/w:p,w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p))",
                 0,
                 2,
                 "w:tr/(w:tc/(w:tcPr/w:gridSpan{w:val=2},w:p))",
             ),
             # only first one has a width
             (
-                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p)," "w:tc/w:p)",
+                "w:tr/(w:tc/(w:tcPr/w:tcW{w:w=1440,w:type=dxa},w:p),w:tc/w:p)",
                 0,
                 2,
-                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=1440,w:type=dxa}," "w:gridSpan{w:val=2}),w:p))",
+                "w:tr/(w:tc/(w:tcPr/(w:tcW{w:w=1440,w:type=dxa},w:gridSpan{w:val=2}),w:p))",
             ),
         ],
     )
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
index fca309851..76b53c957 100644
--- a/tests/oxml/test_xmlchemy.py
+++ b/tests/oxml/test_xmlchemy.py
@@ -131,7 +131,7 @@ def it_returns_unicode_text(self, type_fixture):
 
     @pytest.fixture
     def pretty_fixture(self, element):
-        expected_xml_text = "<foø>\n" "  <bår>text</bår>\n" "</foø>\n"
+        expected_xml_text = "<foø>\n  <bår>text</bår>\n</foø>\n"
         return element, expected_xml_text
 
     @pytest.fixture
@@ -176,8 +176,7 @@ def it_knows_if_two_xml_lines_are_equivalent(self, xml_line_case):
             ('<a:f b="c"/>', "<a:f", ' b="c"', "/>", None),
             ("<a:f>t</a:f>", "<a:f", "", ">", "t</a:f>"),
             (
-                '<dcterms:created xsi:type="dcterms:W3CDTF">2013-12-23T23:15:00Z</d'
-                "cterms:created>",
+                '<dcterms:created xsi:type="dcterms:W3CDTF">2013-12-23T23:15:00Z</dcterms:created>',
                 "<dcterms:created",
                 ' xsi:type="dcterms:W3CDTF"',
                 ">",
@@ -250,22 +249,16 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent, choice, expected_xml = insert_fixture
         parent._insert_choice(choice)
         assert parent.xml == expected_xml
-        assert parent._insert_choice.__doc__.startswith(
-            "Return the passed ``<w:choice>`` "
-        )
+        assert parent._insert_choice.__doc__.startswith("Return the passed ``<w:choice>`` ")
 
     def it_adds_an_add_method_for_the_child_element(self, add_fixture):
         parent, expected_xml = add_fixture
         choice = parent._add_choice()
         assert parent.xml == expected_xml
         assert isinstance(choice, CT_Choice)
-        assert parent._add_choice.__doc__.startswith(
-            "Add a new ``<w:choice>`` child element "
-        )
+        assert parent._add_choice.__doc__.startswith("Add a new ``<w:choice>`` child element ")
 
-    def it_adds_a_get_or_change_to_method_for_the_child_element(
-        self, get_or_change_to_fixture
-    ):
+    def it_adds_a_get_or_change_to_method_for_the_child_element(self, get_or_change_to_fixture):
         parent, expected_xml = get_or_change_to_fixture
         choice = parent.get_or_change_to_choice()
         assert isinstance(choice, CT_Choice)
@@ -302,10 +295,7 @@ def getter_fixture(self, request):
     @pytest.fixture
     def insert_fixture(self):
         parent = (
-            a_parent()
-            .with_nsdecls()
-            .with_child(an_oomChild())
-            .with_child(an_oooChild())
+            a_parent().with_nsdecls().with_child(an_oomChild()).with_child(an_oooChild())
         ).element
         choice = a_choice().with_nsdecls().element
         expected_xml = (
@@ -362,27 +352,21 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent, oomChild, expected_xml = insert_fixture
         parent._insert_oomChild(oomChild)
         assert parent.xml == expected_xml
-        assert parent._insert_oomChild.__doc__.startswith(
-            "Return the passed ``<w:oomChild>`` "
-        )
+        assert parent._insert_oomChild.__doc__.startswith("Return the passed ``<w:oomChild>`` ")
 
     def it_adds_a_private_add_method_for_the_child_element(self, add_fixture):
         parent, expected_xml = add_fixture
         oomChild = parent._add_oomChild()
         assert parent.xml == expected_xml
         assert isinstance(oomChild, CT_OomChild)
-        assert parent._add_oomChild.__doc__.startswith(
-            "Add a new ``<w:oomChild>`` child element "
-        )
+        assert parent._add_oomChild.__doc__.startswith("Add a new ``<w:oomChild>`` child element ")
 
     def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
         parent, expected_xml = add_fixture
         oomChild = parent.add_oomChild()
         assert parent.xml == expected_xml
         assert isinstance(oomChild, CT_OomChild)
-        assert parent._add_oomChild.__doc__.startswith(
-            "Add a new ``<w:oomChild>`` child element "
-        )
+        assert parent._add_oomChild.__doc__.startswith("Add a new ``<w:oomChild>`` child element ")
 
     # fixtures -------------------------------------------------------
 
@@ -444,9 +428,7 @@ def it_adds_a_setter_property_for_the_attr(self, setter_fixture):
         assert parent.xml == expected_xml
 
     def it_adds_a_docstring_for_the_property(self):
-        assert CT_Parent.optAttr.__doc__.startswith(
-            "ST_IntegerType type-converted value of "
-        )
+        assert CT_Parent.optAttr.__doc__.startswith("ST_IntegerType type-converted value of ")
 
     # fixtures -------------------------------------------------------
 
@@ -477,9 +459,7 @@ def it_adds_a_setter_property_for_the_attr(self, setter_fixture):
         assert parent.xml == expected_xml
 
     def it_adds_a_docstring_for_the_property(self):
-        assert CT_Parent.reqAttr.__doc__.startswith(
-            "ST_IntegerType type-converted value of "
-        )
+        assert CT_Parent.reqAttr.__doc__.startswith("ST_IntegerType type-converted value of ")
 
     def it_raises_on_get_when_attribute_not_present(self):
         parent = a_parent().with_nsdecls().element
@@ -532,27 +512,21 @@ def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent, zomChild, expected_xml = insert_fixture
         parent._insert_zomChild(zomChild)
         assert parent.xml == expected_xml
-        assert parent._insert_zomChild.__doc__.startswith(
-            "Return the passed ``<w:zomChild>`` "
-        )
+        assert parent._insert_zomChild.__doc__.startswith("Return the passed ``<w:zomChild>`` ")
 
     def it_adds_an_add_method_for_the_child_element(self, add_fixture):
         parent, expected_xml = add_fixture
         zomChild = parent._add_zomChild()
         assert parent.xml == expected_xml
         assert isinstance(zomChild, CT_ZomChild)
-        assert parent._add_zomChild.__doc__.startswith(
-            "Add a new ``<w:zomChild>`` child element "
-        )
+        assert parent._add_zomChild.__doc__.startswith("Add a new ``<w:zomChild>`` child element ")
 
     def it_adds_a_public_add_method_for_the_child_element(self, add_fixture):
         parent, expected_xml = add_fixture
         zomChild = parent.add_zomChild()
         assert parent.xml == expected_xml
         assert isinstance(zomChild, CT_ZomChild)
-        assert parent._add_zomChild.__doc__.startswith(
-            "Add a new ``<w:zomChild>`` child element "
-        )
+        assert parent._add_zomChild.__doc__.startswith("Add a new ``<w:zomChild>`` child element ")
 
     def it_removes_the_property_root_name_used_for_declaration(self):
         assert not hasattr(CT_Parent, "zomChild")
@@ -614,17 +588,13 @@ def it_adds_an_add_method_for_the_child_element(self, add_fixture):
         zooChild = parent._add_zooChild()
         assert parent.xml == expected_xml
         assert isinstance(zooChild, CT_ZooChild)
-        assert parent._add_zooChild.__doc__.startswith(
-            "Add a new ``<w:zooChild>`` child element "
-        )
+        assert parent._add_zooChild.__doc__.startswith("Add a new ``<w:zooChild>`` child element ")
 
     def it_adds_an_insert_method_for_the_child_element(self, insert_fixture):
         parent, zooChild, expected_xml = insert_fixture
         parent._insert_zooChild(zooChild)
         assert parent.xml == expected_xml
-        assert parent._insert_zooChild.__doc__.startswith(
-            "Return the passed ``<w:zooChild>`` "
-        )
+        assert parent._insert_zooChild.__doc__.startswith("Return the passed ``<w:zooChild>`` ")
 
     def it_adds_a_get_or_add_method_for_the_child_element(self, get_or_add_fixture):
         parent, expected_xml = get_or_add_fixture
@@ -743,9 +713,7 @@ class CT_Parent(BaseOxmlElement):
         (Choice("w:choice"), Choice("w:choice2")),
         successors=("w:oomChild", "w:oooChild"),
     )
-    oomChild = OneOrMore(
-        "w:oomChild", successors=("w:oooChild", "w:zomChild", "w:zooChild")
-    )
+    oomChild = OneOrMore("w:oomChild", successors=("w:oooChild", "w:zomChild", "w:zooChild"))
     oooChild = OneAndOnlyOne("w:oooChild")
     zomChild = ZeroOrMore("w:zomChild", successors=("w:zooChild",))
     zooChild = ZeroOrOne("w:zooChild", successors=())
diff --git a/tests/oxml/text/test_hyperlink.py b/tests/oxml/text/test_hyperlink.py
index f55ab9c22..f5cec4761 100644
--- a/tests/oxml/text/test_hyperlink.py
+++ b/tests/oxml/text/test_hyperlink.py
@@ -30,9 +30,7 @@ def it_has_a_relationship_that_contains_the_hyperlink_address(self):
             ("w:hyperlink{r:id=rId6,w:history=1}", True),
         ],
     )
-    def it_knows_whether_it_has_been_clicked_on_aka_visited(
-        self, cxml: str, expected_value: bool
-    ):
+    def it_knows_whether_it_has_been_clicked_on_aka_visited(self, cxml: str, expected_value: bool):
         hyperlink = cast(CT_Hyperlink, element(cxml))
         assert hyperlink.history is expected_value
 
diff --git a/tests/parts/test_hdrftr.py b/tests/parts/test_hdrftr.py
index ee0cc7134..bb98acead 100644
--- a/tests/parts/test_hdrftr.py
+++ b/tests/parts/test_hdrftr.py
@@ -27,9 +27,7 @@ def it_is_used_by_loader_to_construct_footer_part(
         FooterPart_load_.assert_called_once_with(partname, content_type, blob, package_)
         assert part is footer_part_
 
-    def it_can_create_a_new_footer_part(
-        self, package_, _default_footer_xml_, parse_xml_, _init_
-    ):
+    def it_can_create_a_new_footer_part(self, package_, _default_footer_xml_, parse_xml_, _init_):
         ftr = element("w:ftr")
         package_.next_partname.return_value = "/word/footer24.xml"
         _default_footer_xml_.return_value = "<w:ftr>"
@@ -95,9 +93,7 @@ def it_is_used_by_loader_to_construct_header_part(
         HeaderPart_load_.assert_called_once_with(partname, content_type, blob, package_)
         assert part is header_part_
 
-    def it_can_create_a_new_header_part(
-        self, package_, _default_header_xml_, parse_xml_, _init_
-    ):
+    def it_can_create_a_new_header_part(self, package_, _default_header_xml_, parse_xml_, _init_):
         hdr = element("w:hdr")
         package_.next_partname.return_value = "/word/header42.xml"
         _default_header_xml_.return_value = "<w:hdr>"
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
index acf0b0727..395f57726 100644
--- a/tests/parts/test_image.py
+++ b/tests/parts/test_image.py
@@ -24,17 +24,13 @@ def it_is_used_by_PartFactory_to_construct_image_part(
 
         part = PartFactory(partname_, content_type, reltype, blob_, package_)
 
-        image_part_load_.assert_called_once_with(
-            partname_, content_type, blob_, package_
-        )
+        image_part_load_.assert_called_once_with(partname_, content_type, blob_, package_)
         assert part is image_part_
 
     def it_can_construct_from_an_Image_instance(self, image_, partname_, _init_):
         image_part = ImagePart.from_image(image_, partname_)
 
-        _init_.assert_called_once_with(
-            ANY, partname_, image_.content_type, image_.blob, image_
-        )
+        _init_.assert_called_once_with(ANY, partname_, image_.content_type, image_.blob, image_)
         assert isinstance(image_part, ImagePart)
 
     def it_knows_its_default_dimensions_in_EMU(self, dimensions_fixture):
diff --git a/tests/parts/test_numbering.py b/tests/parts/test_numbering.py
index 7655206ec..1ed0f2a05 100644
--- a/tests/parts/test_numbering.py
+++ b/tests/parts/test_numbering.py
@@ -24,9 +24,7 @@ def it_provides_access_to_the_numbering_definitions(self, num_defs_fixture):
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def num_defs_fixture(
-        self, _NumberingDefinitions_, numbering_elm_, numbering_definitions_
-    ):
+    def num_defs_fixture(self, _NumberingDefinitions_, numbering_elm_, numbering_definitions_):
         numbering_part = NumberingPart(None, None, numbering_elm_, None)
         return (
             numbering_part,
diff --git a/tests/parts/test_settings.py b/tests/parts/test_settings.py
index 581cc6173..73b8a5e9a 100644
--- a/tests/parts/test_settings.py
+++ b/tests/parts/test_settings.py
@@ -14,9 +14,7 @@
 
 
 class DescribeSettingsPart:
-    def it_is_used_by_loader_to_construct_settings_part(
-        self, load_, package_, settings_part_
-    ):
+    def it_is_used_by_loader_to_construct_settings_part(self, load_, package_, settings_part_):
         partname, blob = "partname", "blob"
         content_type = CT.WML_SETTINGS
         load_.return_value = settings_part_
@@ -61,9 +59,7 @@ def package_(self, request):
 
     @pytest.fixture
     def Settings_(self, request, settings_):
-        return class_mock(
-            request, "docx.parts.settings.Settings", return_value=settings_
-        )
+        return class_mock(request, "docx.parts.settings.Settings", return_value=settings_)
 
     @pytest.fixture
     def settings_(self, request):
diff --git a/tests/parts/test_story.py b/tests/parts/test_story.py
index b65abe8b7..9a1dc7fab 100644
--- a/tests/parts/test_story.py
+++ b/tests/parts/test_story.py
@@ -30,9 +30,7 @@ def it_can_get_or_add_an_image(self, package_, image_part_, image_, relate_to_):
         assert rId == "rId42"
         assert image is image_
 
-    def it_can_get_a_style_by_id_and_type(
-        self, _document_part_prop_, document_part_, style_
-    ):
+    def it_can_get_a_style_by_id_and_type(self, _document_part_prop_, document_part_, style_):
         style_id = "BodyText"
         style_type = WD_STYLE_TYPE.PARAGRAPH
         _document_part_prop_.return_value = document_part_
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
index b24e02733..6201f9927 100644
--- a/tests/styles/test_style.py
+++ b/tests/styles/test_style.py
@@ -75,9 +75,7 @@ def character_style_(self, request):
 
     @pytest.fixture
     def _TableStyle_(self, request, table_style_):
-        return class_mock(
-            request, "docx.styles.style._TableStyle", return_value=table_style_
-        )
+        return class_mock(request, "docx.styles.style._TableStyle", return_value=table_style_)
 
     @pytest.fixture
     def table_style_(self, request):
@@ -529,17 +527,11 @@ def next_get_fixture(self, request):
     def next_set_fixture(self, request):
         style_name, next_style_name, style_cxml = request.param
         styles = element(
-            "w:styles/("
-            "w:style{w:type=paragraph,w:styleId=H},"
-            "w:style{w:type=paragraph,w:styleId=B})"
+            "w:styles/(w:style{w:type=paragraph,w:styleId=H},w:style{w:type=paragraph,w:styleId=B})"
         )
         style_elms = {"H": styles[0], "B": styles[1]}
         style = ParagraphStyle(style_elms[style_name])
-        next_style = (
-            None
-            if next_style_name is None
-            else ParagraphStyle(style_elms[next_style_name])
-        )
+        next_style = ParagraphStyle(style_elms[next_style_name]) if next_style_name else None
         expected_xml = xml(style_cxml)
         return style, next_style, expected_xml
 
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
index ea9346bdc..7493388d0 100644
--- a/tests/styles/test_styles.py
+++ b/tests/styles/test_styles.py
@@ -52,9 +52,7 @@ def it_can_add_a_new_style(self, add_fixture):
 
         style = styles.add_style(name, style_type, builtin)
 
-        styles._element.add_style_of_type.assert_called_once_with(
-            name_, style_type, builtin
-        )
+        styles._element.add_style_of_type.assert_called_once_with(name_, style_type, builtin)
         StyleFactory_.assert_called_once_with(style_elm_)
         assert style is style_
 
@@ -110,9 +108,7 @@ def and_it_can_get_a_style_id_from_a_style_name(self, _get_style_id_from_name_):
 
         style_id = styles.get_style_id("Style Name", style_type)
 
-        _get_style_id_from_name_.assert_called_once_with(
-            styles, "Style Name", style_type
-        )
+        _get_style_id_from_name_.assert_called_once_with(styles, "Style Name", style_type)
         assert style_id == "StyleId"
 
     def but_it_returns_None_for_a_style_or_name_of_None(self):
@@ -132,9 +128,7 @@ def it_gets_a_style_by_id_to_help(self, _get_by_id_fixture):
         assert StyleFactory_.call_args_list == StyleFactory_calls
         assert style is style_
 
-    def it_gets_a_style_id_from_a_name_to_help(
-        self, _getitem_, _get_style_id_from_style_, style_
-    ):
+    def it_gets_a_style_id_from_a_name_to_help(self, _getitem_, _get_style_id_from_style_, style_):
         style_name, style_type, style_id_ = "Foo Bar", 1, "FooBar"
         _getitem_.return_value = style_
         _get_style_id_from_style_.return_value = style_id_
@@ -173,9 +167,7 @@ def it_provides_access_to_the_latent_styles(self, latent_styles_fixture):
             ("Heading 1", "heading 1", WD_STYLE_TYPE.PARAGRAPH, True),
         ]
     )
-    def add_fixture(
-        self, request, styles_elm_, _getitem_, style_elm_, StyleFactory_, style_
-    ):
+    def add_fixture(self, request, styles_elm_, _getitem_, style_elm_, StyleFactory_, style_):
         name, name_, style_type, builtin = request.param
         styles = Styles(styles_elm_)
         _getitem_.return_value = None
@@ -207,8 +199,7 @@ def add_raises_fixture(self, _getitem_):
                 WD_STYLE_TYPE.PARAGRAPH,
             ),
             (
-                "w:styles/(w:style{w:type=table,w:default=1},w:style{w:type=table,w"
-                ":default=1})",
+                "w:styles/(w:style{w:type=table,w:default=1},w:style{w:type=table,w:default=1})",
                 True,
                 WD_STYLE_TYPE.TABLE,
             ),
@@ -387,9 +378,7 @@ def _get_style_id_from_style_(self, request):
 
     @pytest.fixture
     def LatentStyles_(self, request, latent_styles_):
-        return class_mock(
-            request, "docx.styles.styles.LatentStyles", return_value=latent_styles_
-        )
+        return class_mock(request, "docx.styles.styles.LatentStyles", return_value=latent_styles_)
 
     @pytest.fixture
     def latent_styles_(self, request):
diff --git a/tests/test_enum.py b/tests/test_enum.py
index 1b8a14f5b..79607a7e0 100644
--- a/tests/test_enum.py
+++ b/tests/test_enum.py
@@ -60,9 +60,7 @@ def and_it_can_find_the_member_from_None_when_a_member_maps_that(self):
         assert SomeXmlAttr.from_xml(None) == SomeXmlAttr.BAZ
 
     def but_it_raises_when_there_is_no_such_mapped_XML_value(self):
-        with pytest.raises(
-            ValueError, match="SomeXmlAttr has no XML mapping for 'baz'"
-        ):
+        with pytest.raises(ValueError, match="SomeXmlAttr has no XML mapping for 'baz'"):
             SomeXmlAttr.from_xml("baz")
 
 
diff --git a/tests/text/test_font.py b/tests/text/test_font.py
index 6a9da0223..471c5451b 100644
--- a/tests/text/test_font.py
+++ b/tests/text/test_font.py
@@ -62,9 +62,7 @@ def it_knows_its_typeface_name(self, r_cxml: str, expected_value: str | None):
             ),
         ],
     )
-    def it_can_change_its_typeface_name(
-        self, r_cxml: str, value: str, expected_r_cxml: str
-    ):
+    def it_can_change_its_typeface_name(self, r_cxml: str, value: str, expected_r_cxml: str):
         r = cast(CT_R, element(r_cxml))
         font = Font(r)
         expected_xml = xml(expected_r_cxml)
@@ -95,9 +93,7 @@ def it_knows_its_size(self, r_cxml: str, expected_value: Length | None):
             ("w:r/w:rPr/w:sz{w:val=36}", None, "w:r/w:rPr"),
         ],
     )
-    def it_can_change_its_size(
-        self, r_cxml: str, value: Length | None, expected_r_cxml: str
-    ):
+    def it_can_change_its_size(self, r_cxml: str, value: Length | None, expected_r_cxml: str):
         r = cast(CT_R, element(r_cxml))
         font = Font(r)
         expected_xml = xml(expected_r_cxml)
@@ -224,9 +220,7 @@ def it_can_change_its_bool_prop_settings(
             ("w:r/w:rPr/w:vertAlign{w:val=superscript}", False),
         ],
     )
-    def it_knows_whether_it_is_subscript(
-        self, r_cxml: str, expected_value: bool | None
-    ):
+    def it_knows_whether_it_is_subscript(self, r_cxml: str, expected_value: bool | None):
         r = cast(CT_R, element(r_cxml))
         font = Font(r)
         assert font.subscript == expected_value
@@ -283,9 +277,7 @@ def it_can_change_whether_it_is_subscript(
             ("w:r/w:rPr/w:vertAlign{w:val=superscript}", True),
         ],
     )
-    def it_knows_whether_it_is_superscript(
-        self, r_cxml: str, expected_value: bool | None
-    ):
+    def it_knows_whether_it_is_superscript(self, r_cxml: str, expected_value: bool | None):
         r = cast(CT_R, element(r_cxml))
         font = Font(r)
         assert font.superscript == expected_value
@@ -343,9 +335,7 @@ def it_can_change_whether_it_is_superscript(
             ("w:r/w:rPr/w:u{w:val=wave}", WD_UNDERLINE.WAVY),
         ],
     )
-    def it_knows_its_underline_type(
-        self, r_cxml: str, expected_value: WD_UNDERLINE | bool | None
-    ):
+    def it_knows_its_underline_type(self, r_cxml: str, expected_value: WD_UNDERLINE | bool | None):
         r = cast(CT_R, element(r_cxml))
         font = Font(r)
         assert font.underline is expected_value
@@ -393,9 +383,7 @@ def it_can_change_its_underline_type(
             ("w:r/w:rPr/w:highlight{w:val=blue}", WD_COLOR.BLUE),
         ],
     )
-    def it_knows_its_highlight_color(
-        self, r_cxml: str, expected_value: WD_COLOR | None
-    ):
+    def it_knows_its_highlight_color(self, r_cxml: str, expected_value: WD_COLOR | None):
         r = cast(CT_R, element(r_cxml))
         font = Font(r)
         assert font.highlight_color is expected_value
diff --git a/tests/text/test_pagebreak.py b/tests/text/test_pagebreak.py
index c7494dca2..bc7848797 100644
--- a/tests/text/test_pagebreak.py
+++ b/tests/text/test_pagebreak.py
@@ -107,13 +107,7 @@ def it_produces_None_for_following_fragment_when_page_break_is_trailing(
     def it_can_split_off_the_following_paragraph_content_when_in_a_run(
         self, fake_parent: t.ProvidesStoryPart
     ):
-        p_cxml = (
-            "w:p/("
-            "  w:pPr/w:ind"
-            '  ,w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar")'
-            '  ,w:r/w:t"foo"'
-            ")"
-        )
+        p_cxml = 'w:p/(w:pPr/w:ind,w:r/(w:t"foo",w:lastRenderedPageBreak,w:t"bar"),w:r/w:t"foo")'
         p = cast(CT_P, element(p_cxml))
         lrpb = p.lastRenderedPageBreaks[0]
         page_break = RenderedPageBreak(lrpb, fake_parent)
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
index c1451c3c1..0329b1dd3 100644
--- a/tests/text/test_paragraph.py
+++ b/tests/text/test_paragraph.py
@@ -85,9 +85,7 @@ def it_can_iterate_its_inner_content_items(
     def it_knows_its_paragraph_style(self, style_get_fixture):
         paragraph, style_id_, style_ = style_get_fixture
         style = paragraph.style
-        paragraph.part.get_style.assert_called_once_with(
-            style_id_, WD_STYLE_TYPE.PARAGRAPH
-        )
+        paragraph.part.get_style.assert_called_once_with(style_id_, WD_STYLE_TYPE.PARAGRAPH)
         assert style is style_
 
     def it_can_change_its_paragraph_style(self, style_set_fixture):
@@ -95,9 +93,7 @@ def it_can_change_its_paragraph_style(self, style_set_fixture):
 
         paragraph.style = value
 
-        paragraph.part.get_style_id.assert_called_once_with(
-            value, WD_STYLE_TYPE.PARAGRAPH
-        )
+        paragraph.part.get_style_id.assert_called_once_with(value, WD_STYLE_TYPE.PARAGRAPH)
         assert paragraph._p.xml == expected_xml
 
     @pytest.mark.parametrize(
@@ -108,8 +104,7 @@ def it_can_change_its_paragraph_style(self, style_set_fixture):
             ("w:p/w:r/w:lastRenderedPageBreak", 1),
             ("w:p/w:hyperlink/w:r/w:lastRenderedPageBreak", 1),
             (
-                "w:p/(w:r/w:lastRenderedPageBreak,"
-                "w:hyperlink/w:r/w:lastRenderedPageBreak)",
+                "w:p/(w:r/w:lastRenderedPageBreak,w:hyperlink/w:r/w:lastRenderedPageBreak)",
                 2,
             ),
             (
@@ -144,8 +139,7 @@ def it_provides_access_to_the_rendered_page_breaks_it_contains(
             ('w:p/w:r/(w:t"foo", w:br,  w:t"bar")', "foo\nbar"),
             ('w:p/w:r/(w:t"foo", w:cr,  w:t"bar")', "foo\nbar"),
             (
-                'w:p/(w:r/w:t"click ",w:hyperlink{r:id=rId6}/w:r/w:t"here",'
-                'w:r/w:t" for more")',
+                'w:p/(w:r/w:t"click ",w:hyperlink{r:id=rId6}/w:r/w:t"here",w:r/w:t" for more")',
                 "click here for more",
             ),
         ],
@@ -385,9 +379,7 @@ def part_prop_(self, request, document_part_):
     @pytest.fixture
     def Run_(self, request, runs_):
         run_, run_2_ = runs_
-        return class_mock(
-            request, "docx.text.paragraph.Run", side_effect=[run_, run_2_]
-        )
+        return class_mock(request, "docx.text.paragraph.Run", side_effect=[run_, run_2_])
 
     @pytest.fixture
     def r_(self, request):
diff --git a/tests/unitutil/file.py b/tests/unitutil/file.py
index 795052c8e..226585bc7 100644
--- a/tests/unitutil/file.py
+++ b/tests/unitutil/file.py
@@ -43,9 +43,7 @@ def snippet_text(snippet_file_name: str):
     Return the unicode text read from the test snippet file having
     `snippet_file_name`.
     """
-    snippet_file_path = os.path.join(
-        test_file_dir, "snippets", "%s.txt" % snippet_file_name
-    )
+    snippet_file_path = os.path.join(test_file_dir, "snippets", "%s.txt" % snippet_file_name)
     with open(snippet_file_path, "rb") as f:
         snippet_bytes = f.read()
     return snippet_bytes.decode("utf-8")
diff --git a/tests/unitutil/mock.py b/tests/unitutil/mock.py
index d0e41ce93..de05cc206 100644
--- a/tests/unitutil/mock.py
+++ b/tests/unitutil/mock.py
@@ -75,16 +75,12 @@ def function_mock(
     return _patch.start()
 
 
-def initializer_mock(
-    request: FixtureRequest, cls: type, autospec: bool = True, **kwargs: Any
-):
+def initializer_mock(request: FixtureRequest, cls: type, autospec: bool = True, **kwargs: Any):
     """Return mock for __init__() method on `cls`.
 
     The patch is reversed after pytest uses it.
     """
-    _patch = patch.object(
-        cls, "__init__", autospec=autospec, return_value=None, **kwargs
-    )
+    _patch = patch.object(cls, "__init__", autospec=autospec, return_value=None, **kwargs)
     request.addfinalizer(_patch.stop)
     return _patch.start()
 

From d9da49bdfd87908e86dbae3516050419181cf63c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Fri, 6 Jun 2025 11:21:05 -0700
Subject: [PATCH 341/367] fix: remove redundant w:pic "insertion"

The removed `._insert_pic(pic)` call is redundant because the `pic`
element is already inserted by the prior `CT_Inline.new()` call. The
reason the second `._insert_pic()` call did not add a second `pic`
element is that the `pic` element is the same instance in both cases. So
that `pic` element is "moved" from where it was, back to the same place.
---
 src/docx/oxml/shape.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/docx/oxml/shape.py b/src/docx/oxml/shape.py
index 00e7593a9..c6df8e7b8 100644
--- a/src/docx/oxml/shape.py
+++ b/src/docx/oxml/shape.py
@@ -100,7 +100,6 @@ def new_pic_inline(
         pic_id = 0  # Word doesn't seem to use this, but does not omit it
         pic = CT_Picture.new(pic_id, filename, rId, cx, cy)
         inline = cls.new(cx, cy, shape_id, pic)
-        inline.graphic.graphicData._insert_pic(pic)
         return inline
 
     @classmethod

From 5cb32d7787a79ad255ad6f11ad735d2513dd08c1 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:26:57 -0700
Subject: [PATCH 342/367] xfail: acceptance test for Document.comments

---
 features/doc-comments.feature                 |  40 ++++++++++
 features/steps/comments.py                    |  69 ++++++++++++++++++
 .../steps/test_files/comments-rich-para.docx  | Bin 0 -> 19974 bytes
 src/docx/comments.py                          |  24 ++++++
 4 files changed, 133 insertions(+)
 create mode 100644 features/doc-comments.feature
 create mode 100644 features/steps/comments.py
 create mode 100644 features/steps/test_files/comments-rich-para.docx
 create mode 100644 src/docx/comments.py

diff --git a/features/doc-comments.feature b/features/doc-comments.feature
new file mode 100644
index 000000000..c49edaa77
--- /dev/null
+++ b/features/doc-comments.feature
@@ -0,0 +1,40 @@
+Feature: Document.comments
+  In order to operate on comments added to a document
+  As a developer using python-docx
+  I need access to the comments collection for the document
+  And I need methods allowing access to the comments in the collection
+
+
+  @wip
+  Scenario Outline: Access document comments
+    Given a document having <a-or-no> comments part
+     Then document.comments is a Comments object
+
+    Examples: having a comments part or not
+      | a-or-no |
+      | a       |
+      | no      |
+
+
+  @wip
+  Scenario Outline: Comments.__len__()
+    Given a Comments object with <count> comments
+     Then len(comments) == <count>
+
+    Examples: len(comments) values
+      | count |
+      | 0    |
+      | 4    |
+
+
+  @wip
+  Scenario: Comments.__iter__()
+    Given a Comments object with 4 comments
+     Then iterating comments yields 4 Comment objects
+
+
+  @wip
+  Scenario: Comments.get()
+    Given a Comments object with 4 comments
+     When I call comments.get(2)
+     Then the result is a Comment object with id 2
diff --git a/features/steps/comments.py b/features/steps/comments.py
new file mode 100644
index 000000000..81993aeda
--- /dev/null
+++ b/features/steps/comments.py
@@ -0,0 +1,69 @@
+"""Step implementations for document comments-related features."""
+
+from behave import given, then, when
+from behave.runner import Context
+
+from docx import Document
+from docx.comments import Comment, Comments
+
+from helpers import test_docx
+
+# given ====================================================
+
+
+@given("a Comments object with {count} comments")
+def given_a_comments_object_with_count_comments(context: Context, count: str):
+    testfile_name = {"0": "doc-default", "4": "comments-rich-para"}[count]
+    context.comments = Document(test_docx(testfile_name)).comments
+
+
+@given("a document having a comments part")
+def given_a_document_having_a_comments_part(context: Context):
+    context.document = Document(test_docx("comments-rich-para"))
+
+
+@given("a document having no comments part")
+def given_a_document_having_no_comments_part(context: Context):
+    context.document = Document(test_docx("doc-default"))
+
+
+# when =====================================================
+
+
+@when("I call comments.get(2)")
+def when_I_call_comments_get_2(context: Context):
+    context.comment = context.comments.get(2)
+
+
+# then =====================================================
+
+
+@then("document.comments is a Comments object")
+def then_document_comments_is_a_Comments_object(context: Context):
+    document = context.document
+    assert type(document.comments) is Comments
+
+
+@then("iterating comments yields {count} Comment objects")
+def then_iterating_comments_yields_count_comments(context: Context, count: str):
+    comment_iter = iter(context.comments)
+
+    comment = next(comment_iter)
+    assert type(comment) is Comment, f"expected a Comment object, got {type(comment)}"
+
+    remaining = list(comment_iter)
+    assert len(remaining) == int(count) - 1, "iterating comments did not yield the expected count"
+
+
+@then("len(comments) == {count}")
+def then_len_comments_eq_count(context: Context, count: str):
+    actual = len(context.comments)
+    expected = int(count)
+    assert actual == expected, f"expected len(comments) of {expected}, got {actual}"
+
+
+@then("the result is a Comment object with id 2")
+def then_the_result_is_a_comment_object_with_id_2(context: Context):
+    comment = context.comment
+    assert type(comment) is Comment, f"expected a Comment object, got {type(comment)}"
+    assert comment.comment_id == 2, f"expected comment_id `2`, got '{comment.comment_id}'"
diff --git a/features/steps/test_files/comments-rich-para.docx b/features/steps/test_files/comments-rich-para.docx
new file mode 100644
index 0000000000000000000000000000000000000000..e63db413e871466da97e906aef754bc06b2f9601
GIT binary patch
literal 19974
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

literal 0
HcmV?d00001

diff --git a/src/docx/comments.py b/src/docx/comments.py
new file mode 100644
index 000000000..9165e884d
--- /dev/null
+++ b/src/docx/comments.py
@@ -0,0 +1,24 @@
+"""Collection providing access to comments added to this document."""
+
+from __future__ import annotations
+
+from docx.blkcntnr import BlockItemContainer
+
+
+class Comments:
+    """Collection containing the comments added to this document."""
+
+
+class Comment(BlockItemContainer):
+    """Proxy for a single comment in the document.
+
+    Provides methods to access comment metadata such as author, initials, and date.
+
+    A comment is also a block-item container, similar to a table cell, so it can contain both
+    paragraphs and tables and its paragraphs can contain rich text, hyperlinks and images,
+    although the common case is that a comment contains a single paragraph of plain text like a
+    sentence or phrase.
+
+    Note that certain content like tables may not be displayed in the Word comment sidebar due to
+    space limitations. Such "over-sized" content can still be viewed in the review pane.
+    """

From 451747a944fe93dfdfec1363ff11516789eb5524 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:31:23 -0700
Subject: [PATCH 343/367] comments: add Document.comments

Provides access to the comments collection from the document object.
---
 docs/conf.py               |  2 ++
 src/docx/document.py       |  6 ++++++
 src/docx/parts/document.py |  6 ++++++
 tests/test_document.py     | 11 +++++++++++
 4 files changed, 25 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index e37e9be7e..60e28fa4c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -83,6 +83,8 @@
 
 .. |CharacterStyle| replace:: :class:`.CharacterStyle`
 
+.. |Comments| replace:: :class:`.Comments`
+
 .. |Cm| replace:: :class:`.Cm`
 
 .. |ColorFormat| replace:: :class:`.ColorFormat`
diff --git a/src/docx/document.py b/src/docx/document.py
index 2cf0a1c38..5de03bf9d 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -15,6 +15,7 @@
 
 if TYPE_CHECKING:
     import docx.types as t
+    from docx.comments import Comments
     from docx.oxml.document import CT_Body, CT_Document
     from docx.parts.document import DocumentPart
     from docx.settings import Settings
@@ -106,6 +107,11 @@ def add_table(self, rows: int, cols: int, style: str | _TableStyle | None = None
         table.style = style
         return table
 
+    @property
+    def comments(self) -> Comments:
+        """A |Comments| object providing access to comments added to the document."""
+        return self._part.comments
+
     @property
     def core_properties(self):
         """A |CoreProperties| object providing Dublin Core properties of document."""
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index dea0845f7..78841f47a 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -15,6 +15,7 @@
 from docx.shared import lazyproperty
 
 if TYPE_CHECKING:
+    from docx.comments import Comments
     from docx.enum.style import WD_STYLE_TYPE
     from docx.opc.coreprops import CoreProperties
     from docx.settings import Settings
@@ -42,6 +43,11 @@ def add_header_part(self):
         rId = self.relate_to(header_part, RT.HEADER)
         return header_part, rId
 
+    @property
+    def comments(self) -> Comments:
+        """|Comments| object providing access to the comments added to this document."""
+        raise NotImplementedError
+
     @property
     def core_properties(self) -> CoreProperties:
         """A |CoreProperties| object providing read/write access to the core properties
diff --git a/tests/test_document.py b/tests/test_document.py
index 739813321..0b36017a5 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -9,6 +9,7 @@
 
 import pytest
 
+from docx.comments import Comments
 from docx.document import Document, _Body
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
@@ -164,6 +165,12 @@ def it_can_save_the_document_to_a_file(self, document_part_: Mock):
 
         document_part_.save.assert_called_once_with("foobar.docx")
 
+    def it_provides_access_to_the_comments(self, document_part_: Mock, comments_: Mock):
+        document_part_.comments = comments_
+        document = Document(cast(CT_Document, element("w:document")), document_part_)
+
+        assert document.comments is comments_
+
     def it_provides_access_to_its_core_properties(
         self, document_part_: Mock, core_properties_: Mock
     ):
@@ -281,6 +288,10 @@ def _block_width_prop_(self, request: FixtureRequest):
     def body_prop_(self, request: FixtureRequest):
         return property_mock(request, Document, "_body")
 
+    @pytest.fixture
+    def comments_(self, request: FixtureRequest):
+        return instance_mock(request, Comments)
+
     @pytest.fixture
     def core_properties_(self, request: FixtureRequest):
         return instance_mock(request, CoreProperties)

From 8f184cc41811995916fa0d0c02d9dab761092a67 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:32:47 -0700
Subject: [PATCH 344/367] comments: add DocumentPart.comments

Provide a way to get a `Comments` object from the `DocumentPart`.
---
 src/docx/parts/comments.py   | 15 +++++++++++++++
 src/docx/parts/document.py   | 11 ++++++++++-
 tests/parts/test_document.py | 29 +++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 src/docx/parts/comments.py

diff --git a/src/docx/parts/comments.py b/src/docx/parts/comments.py
new file mode 100644
index 000000000..6258ceed2
--- /dev/null
+++ b/src/docx/parts/comments.py
@@ -0,0 +1,15 @@
+"""Contains comments added to the document."""
+
+from __future__ import annotations
+
+from docx.comments import Comments
+from docx.parts.story import StoryPart
+
+
+class CommentsPart(StoryPart):
+    """Container part for comments added to the document."""
+
+    @property
+    def comments(self) -> Comments:
+        """A |Comments| proxy object for the `w:comments` root element of this part."""
+        raise NotImplementedError
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index 78841f47a..e804647f6 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -6,6 +6,7 @@
 
 from docx.document import Document
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
+from docx.parts.comments import CommentsPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
 from docx.parts.settings import SettingsPart
@@ -46,7 +47,7 @@ def add_header_part(self):
     @property
     def comments(self) -> Comments:
         """|Comments| object providing access to the comments added to this document."""
-        raise NotImplementedError
+        return self._comments_part.comments
 
     @property
     def core_properties(self) -> CoreProperties:
@@ -124,6 +125,14 @@ def styles(self):
         document."""
         return self._styles_part.styles
 
+    @property
+    def _comments_part(self) -> CommentsPart:
+        """A |CommentsPart| object providing access to the comments added to this document.
+
+        Creates a default comments part if one is not present.
+        """
+        raise NotImplementedError
+
     @property
     def _settings_part(self) -> SettingsPart:
         """A |SettingsPart| object providing access to the document-level settings for
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index cfe9e870c..c8b7793f9 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -4,12 +4,14 @@
 
 import pytest
 
+from docx.comments import Comments
 from docx.enum.style import WD_STYLE_TYPE
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.coreprops import CoreProperties
 from docx.opc.packuri import PackURI
 from docx.package import Package
+from docx.parts.comments import CommentsPart
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.numbering import NumberingPart
@@ -109,6 +111,17 @@ def it_can_save_the_package_to_a_file(self, package_: Mock):
 
         package_.save.assert_called_once_with("foobar.docx")
 
+    def it_provides_access_to_the_comments_added_to_the_document(
+        self, _comments_part_prop_: Mock, comments_part_: Mock, comments_: Mock, package_: Mock
+    ):
+        comments_part_.comments = comments_
+        _comments_part_prop_.return_value = comments_part_
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
+
+        assert document_part.comments is comments_
+
     def it_provides_access_to_the_document_settings(
         self, _settings_part_prop_: Mock, settings_part_: Mock, settings_: Mock, package_: Mock
     ):
@@ -282,6 +295,22 @@ def and_it_creates_a_default_styles_part_if_not_present(
 
     # -- fixtures --------------------------------------------------------------------------------
 
+    @pytest.fixture
+    def comments_(self, request: FixtureRequest) -> Mock:
+        return instance_mock(request, Comments)
+
+    @pytest.fixture
+    def CommentsPart_(self, request: FixtureRequest) -> Mock:
+        return class_mock(request, "docx.parts.document.CommentsPart")
+
+    @pytest.fixture
+    def comments_part_(self, request: FixtureRequest) -> Mock:
+        return instance_mock(request, CommentsPart)
+
+    @pytest.fixture
+    def _comments_part_prop_(self, request: FixtureRequest) -> Mock:
+        return property_mock(request, DocumentPart, "_comments_part")
+
     @pytest.fixture
     def core_properties_(self, request: FixtureRequest):
         return instance_mock(request, CoreProperties)

From ae0e82d979a972d758918072c7088fa49fa5eec3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:34:02 -0700
Subject: [PATCH 345/367] comments: add DocumentPart._comments_part

Also involves adding `CommentsPart.default`. Because the comments part
is optional, we need a mechanism to add a default (empty) comments part
when one is not present. This is what `CommentsPart.default()` is for.
---
 src/docx/oxml/comments.py               | 15 +++++++++++
 src/docx/parts/comments.py              | 26 +++++++++++++++++++
 src/docx/parts/document.py              |  8 +++++-
 src/docx/templates/default-comments.xml |  5 ++++
 tests/parts/test_comments.py            | 25 +++++++++++++++++++
 tests/parts/test_document.py            | 33 +++++++++++++++++++++++++
 6 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 src/docx/oxml/comments.py
 create mode 100644 src/docx/templates/default-comments.xml
 create mode 100644 tests/parts/test_comments.py

diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
new file mode 100644
index 000000000..65624b738
--- /dev/null
+++ b/src/docx/oxml/comments.py
@@ -0,0 +1,15 @@
+"""Custom element classes related to document comments."""
+
+from __future__ import annotations
+
+from docx.oxml.xmlchemy import BaseOxmlElement
+
+
+class CT_Comments(BaseOxmlElement):
+    """`w:comments` element, the root element for the comments part.
+
+    Simply contains a collection of `w:comment` elements, each representing a single comment. Each
+    contained comment is identified by a unique `w:id` attribute, used to reference the comment
+    from the document text. The offset of the comment in this collection is arbitrary; it is
+    essentially a _set_ implemented as a list.
+    """
diff --git a/src/docx/parts/comments.py b/src/docx/parts/comments.py
index 6258ceed2..e43f24a8e 100644
--- a/src/docx/parts/comments.py
+++ b/src/docx/parts/comments.py
@@ -2,7 +2,17 @@
 
 from __future__ import annotations
 
+import os
+from typing import cast
+
+from typing_extensions import Self
+
 from docx.comments import Comments
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.packuri import PackURI
+from docx.oxml.comments import CT_Comments
+from docx.oxml.parser import parse_xml
+from docx.package import Package
 from docx.parts.story import StoryPart
 
 
@@ -13,3 +23,19 @@ class CommentsPart(StoryPart):
     def comments(self) -> Comments:
         """A |Comments| proxy object for the `w:comments` root element of this part."""
         raise NotImplementedError
+
+    @classmethod
+    def default(cls, package: Package) -> Self:
+        """A newly created comments part, containing a default empty `w:comments` element."""
+        partname = PackURI("/word/comments.xml")
+        content_type = CT.WML_COMMENTS
+        element = cast("CT_Comments", parse_xml(cls._default_comments_xml()))
+        return cls(partname, content_type, element, package)
+
+    @classmethod
+    def _default_comments_xml(cls) -> bytes:
+        """A byte-string containing XML for a default comments part."""
+        path = os.path.join(os.path.split(__file__)[0], "..", "templates", "default-comments.xml")
+        with open(path, "rb") as f:
+            xml_bytes = f.read()
+        return xml_bytes
diff --git a/src/docx/parts/document.py b/src/docx/parts/document.py
index e804647f6..4960264b1 100644
--- a/src/docx/parts/document.py
+++ b/src/docx/parts/document.py
@@ -131,7 +131,13 @@ def _comments_part(self) -> CommentsPart:
 
         Creates a default comments part if one is not present.
         """
-        raise NotImplementedError
+        try:
+            return cast(CommentsPart, self.part_related_by(RT.COMMENTS))
+        except KeyError:
+            assert self.package is not None
+            comments_part = CommentsPart.default(self.package)
+            self.relate_to(comments_part, RT.COMMENTS)
+            return comments_part
 
     @property
     def _settings_part(self) -> SettingsPart:
diff --git a/src/docx/templates/default-comments.xml b/src/docx/templates/default-comments.xml
new file mode 100644
index 000000000..2afdda20b
--- /dev/null
+++ b/src/docx/templates/default-comments.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<w:comments
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+  mc:Ignorable="w14 w15 w16se w16cid wp14"/>
diff --git a/tests/parts/test_comments.py b/tests/parts/test_comments.py
new file mode 100644
index 000000000..5e6ef988c
--- /dev/null
+++ b/tests/parts/test_comments.py
@@ -0,0 +1,25 @@
+"""Unit test suite for the docx.parts.hdrftr module."""
+
+from __future__ import annotations
+
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.package import Package
+from docx.parts.comments import CommentsPart
+
+
+class DescribeCommentsPart:
+    """Unit test suite for `docx.parts.comments.CommentsPart` objects."""
+
+    def it_constructs_a_default_comments_part_to_help(self):
+        package = Package()
+
+        comments_part = CommentsPart.default(package)
+
+        assert isinstance(comments_part, CommentsPart)
+        assert comments_part.partname == "/word/comments.xml"
+        assert comments_part.content_type == CT.WML_COMMENTS
+        assert comments_part.package is package
+        assert comments_part.element.tag == (
+            "{http://schemas.openxmlformats.org/wordprocessingml/2006/main}comments"
+        )
+        assert len(comments_part.element) == 0
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
index c8b7793f9..c27990baf 100644
--- a/tests/parts/test_document.py
+++ b/tests/parts/test_document.py
@@ -227,6 +227,39 @@ def it_can_get_the_id_of_a_style(
         styles_.get_style_id.assert_called_once_with(style_, WD_STYLE_TYPE.CHARACTER)
         assert style_id == "BodyCharacter"
 
+    def it_provides_access_to_its_comments_part_to_help(
+        self, package_: Mock, part_related_by_: Mock, comments_part_: Mock
+    ):
+        part_related_by_.return_value = comments_part_
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
+
+        comments_part = document_part._comments_part
+
+        part_related_by_.assert_called_once_with(document_part, RT.COMMENTS)
+        assert comments_part is comments_part_
+
+    def and_it_creates_a_default_comments_part_if_not_present(
+        self,
+        package_: Mock,
+        part_related_by_: Mock,
+        CommentsPart_: Mock,
+        comments_part_: Mock,
+        relate_to_: Mock,
+    ):
+        part_related_by_.side_effect = KeyError
+        CommentsPart_.default.return_value = comments_part_
+        document_part = DocumentPart(
+            PackURI("/word/document.xml"), CT.WML_DOCUMENT, element("w:document"), package_
+        )
+
+        comments_part = document_part._comments_part
+
+        CommentsPart_.default.assert_called_once_with(package_)
+        relate_to_.assert_called_once_with(document_part, comments_part_, RT.COMMENTS)
+        assert comments_part is comments_part_
+
     def it_provides_access_to_its_settings_part_to_help(
         self, part_related_by_: Mock, settings_part_: Mock, package_: Mock
     ):

From 9c8a2e91fa743bf8f19226eb3353c9fa1a6973b3 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:36:02 -0700
Subject: [PATCH 346/367] comments: add CommentsPart.comments

---
 src/docx/comments.py         | 10 ++++++++++
 src/docx/parts/comments.py   |  8 +++++++-
 tests/parts/test_comments.py | 38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/docx/comments.py b/src/docx/comments.py
index 9165e884d..587837baa 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -2,12 +2,22 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from docx.blkcntnr import BlockItemContainer
 
+if TYPE_CHECKING:
+    from docx.oxml.comments import CT_Comments
+    from docx.parts.comments import CommentsPart
+
 
 class Comments:
     """Collection containing the comments added to this document."""
 
+    def __init__(self, comments_elm: CT_Comments, comments_part: CommentsPart):
+        self._comments_elm = comments_elm
+        self._comments_part = comments_part
+
 
 class Comment(BlockItemContainer):
     """Proxy for a single comment in the document.
diff --git a/src/docx/parts/comments.py b/src/docx/parts/comments.py
index e43f24a8e..111bfb878 100644
--- a/src/docx/parts/comments.py
+++ b/src/docx/parts/comments.py
@@ -19,10 +19,16 @@
 class CommentsPart(StoryPart):
     """Container part for comments added to the document."""
 
+    def __init__(
+        self, partname: PackURI, content_type: str, element: CT_Comments, package: Package
+    ):
+        super().__init__(partname, content_type, element, package)
+        self._comments = element
+
     @property
     def comments(self) -> Comments:
         """A |Comments| proxy object for the `w:comments` root element of this part."""
-        raise NotImplementedError
+        return Comments(self._comments, self)
 
     @classmethod
     def default(cls, package: Package) -> Self:
diff --git a/tests/parts/test_comments.py b/tests/parts/test_comments.py
index 5e6ef988c..4cab7783b 100644
--- a/tests/parts/test_comments.py
+++ b/tests/parts/test_comments.py
@@ -2,14 +2,38 @@
 
 from __future__ import annotations
 
+from typing import cast
+
+import pytest
+
+from docx.comments import Comments
 from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.packuri import PackURI
+from docx.oxml.comments import CT_Comments
 from docx.package import Package
 from docx.parts.comments import CommentsPart
 
+from ..unitutil.cxml import element
+from ..unitutil.mock import FixtureRequest, Mock, class_mock, instance_mock
+
 
 class DescribeCommentsPart:
     """Unit test suite for `docx.parts.comments.CommentsPart` objects."""
 
+    def it_provides_access_to_its_comments_collection(
+        self, Comments_: Mock, comments_: Mock, package_: Mock
+    ):
+        Comments_.return_value = comments_
+        comments_elm = cast(CT_Comments, element("w:comments"))
+        comments_part = CommentsPart(
+            PackURI("/word/comments.xml"), CT.WML_COMMENTS, comments_elm, package_
+        )
+
+        comments = comments_part.comments
+
+        Comments_.assert_called_once_with(comments_part.element, comments_part)
+        assert comments is comments_
+
     def it_constructs_a_default_comments_part_to_help(self):
         package = Package()
 
@@ -23,3 +47,17 @@ def it_constructs_a_default_comments_part_to_help(self):
             "{http://schemas.openxmlformats.org/wordprocessingml/2006/main}comments"
         )
         assert len(comments_part.element) == 0
+
+    # -- fixtures --------------------------------------------------------------------------------
+
+    @pytest.fixture
+    def Comments_(self, request: FixtureRequest) -> Mock:
+        return class_mock(request, "docx.parts.comments.Comments")
+
+    @pytest.fixture
+    def comments_(self, request: FixtureRequest) -> Mock:
+        return instance_mock(request, Comments)
+
+    @pytest.fixture
+    def package_(self, request: FixtureRequest) -> Mock:
+        return instance_mock(request, Package)

From 595deccd0d4700cc993332f0cde61a98ca9a443b Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:36:50 -0700
Subject: [PATCH 347/367] comments: package-loader loads CommentsPart

CommentsPart is loaded as XML-part on document deserialization.
---
 features/doc-comments.feature |  1 -
 src/docx/__init__.py          |  3 +++
 src/docx/parts/comments.py    |  6 +++++-
 tests/parts/test_comments.py  | 26 +++++++++++++++++++++++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/features/doc-comments.feature b/features/doc-comments.feature
index c49edaa77..d23a763a5 100644
--- a/features/doc-comments.feature
+++ b/features/doc-comments.feature
@@ -5,7 +5,6 @@ Feature: Document.comments
   And I need methods allowing access to the comments in the collection
 
 
-  @wip
   Scenario Outline: Access document comments
     Given a document having <a-or-no> comments part
      Then document.comments is a Comments object
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index 205221027..987e8a267 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -25,6 +25,7 @@
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.part import PartFactory
 from docx.opc.parts.coreprops import CorePropertiesPart
+from docx.parts.comments import CommentsPart
 from docx.parts.document import DocumentPart
 from docx.parts.hdrftr import FooterPart, HeaderPart
 from docx.parts.image import ImagePart
@@ -41,6 +42,7 @@ def part_class_selector(content_type: str, reltype: str) -> Type[Part] | None:
 
 PartFactory.part_class_selector = part_class_selector
 PartFactory.part_type_for[CT.OPC_CORE_PROPERTIES] = CorePropertiesPart
+PartFactory.part_type_for[CT.WML_COMMENTS] = CommentsPart
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
 PartFactory.part_type_for[CT.WML_FOOTER] = FooterPart
 PartFactory.part_type_for[CT.WML_HEADER] = HeaderPart
@@ -51,6 +53,7 @@ def part_class_selector(content_type: str, reltype: str) -> Type[Part] | None:
 del (
     CT,
     CorePropertiesPart,
+    CommentsPart,
     DocumentPart,
     FooterPart,
     HeaderPart,
diff --git a/src/docx/parts/comments.py b/src/docx/parts/comments.py
index 111bfb878..0e4cc7438 100644
--- a/src/docx/parts/comments.py
+++ b/src/docx/parts/comments.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 from typing_extensions import Self
 
@@ -15,6 +15,10 @@
 from docx.package import Package
 from docx.parts.story import StoryPart
 
+if TYPE_CHECKING:
+    from docx.oxml.comments import CT_Comments
+    from docx.package import Package
+
 
 class CommentsPart(StoryPart):
     """Container part for comments added to the document."""
diff --git a/tests/parts/test_comments.py b/tests/parts/test_comments.py
index 4cab7783b..049c9e737 100644
--- a/tests/parts/test_comments.py
+++ b/tests/parts/test_comments.py
@@ -8,18 +8,34 @@
 
 from docx.comments import Comments
 from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.packuri import PackURI
+from docx.opc.part import PartFactory
 from docx.oxml.comments import CT_Comments
 from docx.package import Package
 from docx.parts.comments import CommentsPart
 
 from ..unitutil.cxml import element
-from ..unitutil.mock import FixtureRequest, Mock, class_mock, instance_mock
+from ..unitutil.mock import FixtureRequest, Mock, class_mock, instance_mock, method_mock
 
 
 class DescribeCommentsPart:
     """Unit test suite for `docx.parts.comments.CommentsPart` objects."""
 
+    def it_is_used_by_the_part_loader_to_construct_a_comments_part(
+        self, package_: Mock, CommentsPart_load_: Mock, comments_part_: Mock
+    ):
+        partname = PackURI("/word/comments.xml")
+        content_type = CT.WML_COMMENTS
+        reltype = RT.COMMENTS
+        blob = b"<w:comments/>"
+        CommentsPart_load_.return_value = comments_part_
+
+        part = PartFactory(partname, content_type, reltype, blob, package_)
+
+        CommentsPart_load_.assert_called_once_with(partname, content_type, blob, package_)
+        assert part is comments_part_
+
     def it_provides_access_to_its_comments_collection(
         self, Comments_: Mock, comments_: Mock, package_: Mock
     ):
@@ -58,6 +74,14 @@ def Comments_(self, request: FixtureRequest) -> Mock:
     def comments_(self, request: FixtureRequest) -> Mock:
         return instance_mock(request, Comments)
 
+    @pytest.fixture
+    def comments_part_(self, request: FixtureRequest) -> Mock:
+        return instance_mock(request, CommentsPart)
+
+    @pytest.fixture
+    def CommentsPart_load_(self, request: FixtureRequest) -> Mock:
+        return method_mock(request, CommentsPart, "load", autospec=False)
+
     @pytest.fixture
     def package_(self, request: FixtureRequest) -> Mock:
         return instance_mock(request, Package)

From 6c0024c52e477707685ba5c373abb2336b9fef36 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:41:05 -0700
Subject: [PATCH 348/367] comments: add Comments.__len__()

---
 features/doc-comments.feature |  1 -
 src/docx/comments.py          |  4 +++
 src/docx/oxml/__init__.py     | 27 ++++++++++++-------
 src/docx/oxml/comments.py     | 16 +++++++++++-
 tests/test_comments.py        | 49 +++++++++++++++++++++++++++++++++++
 5 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 tests/test_comments.py

diff --git a/features/doc-comments.feature b/features/doc-comments.feature
index d23a763a5..6aaffee68 100644
--- a/features/doc-comments.feature
+++ b/features/doc-comments.feature
@@ -15,7 +15,6 @@ Feature: Document.comments
       | no      |
 
 
-  @wip
   Scenario Outline: Comments.__len__()
     Given a Comments object with <count> comments
      Then len(comments) == <count>
diff --git a/src/docx/comments.py b/src/docx/comments.py
index 587837baa..736cbb7ab 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -18,6 +18,10 @@ def __init__(self, comments_elm: CT_Comments, comments_part: CommentsPart):
         self._comments_elm = comments_elm
         self._comments_part = comments_part
 
+    def __len__(self) -> int:
+        """The number of comments in this collection."""
+        return len(self._comments_elm.comment_lst)
+
 
 class Comment(BlockItemContainer):
     """Proxy for a single comment in the document.
diff --git a/src/docx/oxml/__init__.py b/src/docx/oxml/__init__.py
index 3fbc114ae..37f608cef 100644
--- a/src/docx/oxml/__init__.py
+++ b/src/docx/oxml/__init__.py
@@ -1,3 +1,5 @@
+# ruff: noqa: E402, I001
+
 """Initializes oxml sub-package.
 
 This including registering custom element classes corresponding to Open XML elements.
@@ -84,16 +86,21 @@
 # ---------------------------------------------------------------------------
 # other custom element class mappings
 
-from .coreprops import CT_CoreProperties  # noqa
+from .comments import CT_Comments, CT_Comment
+
+register_element_cls("w:comments", CT_Comments)
+register_element_cls("w:comment", CT_Comment)
+
+from .coreprops import CT_CoreProperties
 
 register_element_cls("cp:coreProperties", CT_CoreProperties)
 
-from .document import CT_Body, CT_Document  # noqa
+from .document import CT_Body, CT_Document
 
 register_element_cls("w:body", CT_Body)
 register_element_cls("w:document", CT_Document)
 
-from .numbering import CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr  # noqa
+from .numbering import CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
 
 register_element_cls("w:abstractNumId", CT_DecimalNumber)
 register_element_cls("w:ilvl", CT_DecimalNumber)
@@ -104,7 +111,7 @@
 register_element_cls("w:numbering", CT_Numbering)
 register_element_cls("w:startOverride", CT_DecimalNumber)
 
-from .section import (  # noqa
+from .section import (
     CT_HdrFtr,
     CT_HdrFtrRef,
     CT_PageMar,
@@ -122,11 +129,11 @@
 register_element_cls("w:sectPr", CT_SectPr)
 register_element_cls("w:type", CT_SectType)
 
-from .settings import CT_Settings  # noqa
+from .settings import CT_Settings
 
 register_element_cls("w:settings", CT_Settings)
 
-from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles  # noqa
+from .styles import CT_LatentStyles, CT_LsdException, CT_Style, CT_Styles
 
 register_element_cls("w:basedOn", CT_String)
 register_element_cls("w:latentStyles", CT_LatentStyles)
@@ -141,7 +148,7 @@
 register_element_cls("w:uiPriority", CT_DecimalNumber)
 register_element_cls("w:unhideWhenUsed", CT_OnOff)
 
-from .table import (  # noqa
+from .table import (
     CT_Height,
     CT_Row,
     CT_Tbl,
@@ -178,7 +185,7 @@
 register_element_cls("w:vAlign", CT_VerticalJc)
 register_element_cls("w:vMerge", CT_VMerge)
 
-from .text.font import (  # noqa
+from .text.font import (
     CT_Color,
     CT_Fonts,
     CT_Highlight,
@@ -217,11 +224,11 @@
 register_element_cls("w:vertAlign", CT_VerticalAlignRun)
 register_element_cls("w:webHidden", CT_OnOff)
 
-from .text.paragraph import CT_P  # noqa
+from .text.paragraph import CT_P
 
 register_element_cls("w:p", CT_P)
 
-from .text.parfmt import (  # noqa
+from .text.parfmt import (
     CT_Ind,
     CT_Jc,
     CT_PPr,
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index 65624b738..1e818ebfb 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from docx.oxml.xmlchemy import BaseOxmlElement
+from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore
 
 
 class CT_Comments(BaseOxmlElement):
@@ -13,3 +13,17 @@ class CT_Comments(BaseOxmlElement):
     from the document text. The offset of the comment in this collection is arbitrary; it is
     essentially a _set_ implemented as a list.
     """
+
+    # -- type-declarations to fill in the gaps for metaclass-added methods --
+    comment_lst: list[CT_Comment]
+
+    comment = ZeroOrMore("w:comment")
+
+
+class CT_Comment(BaseOxmlElement):
+    """`w:comment` element, representing a single comment.
+
+    A comment is a so-called "story" and can contain paragraphs and tables much like a table-cell.
+    While probably most often used for a single sentence or phrase, a comment can contain rich
+    content, including multiple rich-text paragraphs, hyperlinks, images, and tables.
+    """
diff --git a/tests/test_comments.py b/tests/test_comments.py
new file mode 100644
index 000000000..2bde587c6
--- /dev/null
+++ b/tests/test_comments.py
@@ -0,0 +1,49 @@
+"""Unit test suite for the docx.comments module."""
+
+from __future__ import annotations
+
+from typing import cast
+
+import pytest
+
+from docx.comments import Comments
+from docx.opc.constants import CONTENT_TYPE as CT
+from docx.opc.packuri import PackURI
+from docx.oxml.comments import CT_Comments
+from docx.package import Package
+from docx.parts.comments import CommentsPart
+
+from .unitutil.cxml import element
+from .unitutil.mock import FixtureRequest, Mock, instance_mock
+
+
+class DescribeComments:
+    """Unit-test suite for `docx.comments.Comments`."""
+
+    @pytest.mark.parametrize(
+        ("cxml", "count"),
+        [
+            ("w:comments", 0),
+            ("w:comments/w:comment", 1),
+            ("w:comments/(w:comment,w:comment,w:comment)", 3),
+        ],
+    )
+    def it_knows_how_many_comments_it_contains(self, cxml: str, count: int, package_: Mock):
+        comments_elm = cast(CT_Comments, element(cxml))
+        comments = Comments(
+            comments_elm,
+            CommentsPart(
+                PackURI("/word/comments.xml"),
+                CT.WML_COMMENTS,
+                comments_elm,
+                package_,
+            ),
+        )
+
+        assert len(comments) == count
+
+    # -- fixtures --------------------------------------------------------------------------------
+
+    @pytest.fixture
+    def package_(self, request: FixtureRequest):
+        return instance_mock(request, Package)

From 88ff3cab593bd68440e0d552631f2f80c476447d Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:43:23 -0700
Subject: [PATCH 349/367] comments: add Comments.__iter__()

---
 features/doc-comments.feature |  1 -
 src/docx/blkcntnr.py          |  3 ++-
 src/docx/comments.py          | 15 +++++++++++++--
 tests/test_comments.py        | 23 ++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/features/doc-comments.feature b/features/doc-comments.feature
index 6aaffee68..fbe2fd278 100644
--- a/features/doc-comments.feature
+++ b/features/doc-comments.feature
@@ -25,7 +25,6 @@ Feature: Document.comments
       | 4    |
 
 
-  @wip
   Scenario: Comments.__iter__()
     Given a Comments object with 4 comments
      Then iterating comments yields 4 Comment objects
diff --git a/src/docx/blkcntnr.py b/src/docx/blkcntnr.py
index 951e03427..82c7ef727 100644
--- a/src/docx/blkcntnr.py
+++ b/src/docx/blkcntnr.py
@@ -19,6 +19,7 @@
 
 if TYPE_CHECKING:
     import docx.types as t
+    from docx.oxml.comments import CT_Comment
     from docx.oxml.document import CT_Body
     from docx.oxml.section import CT_HdrFtr
     from docx.oxml.table import CT_Tc
@@ -26,7 +27,7 @@
     from docx.styles.style import ParagraphStyle
     from docx.table import Table
 
-BlockItemElement: TypeAlias = "CT_Body | CT_HdrFtr | CT_Tc"
+BlockItemElement: TypeAlias = "CT_Body | CT_Comment | CT_HdrFtr | CT_Tc"
 
 
 class BlockItemContainer(StoryChild):
diff --git a/src/docx/comments.py b/src/docx/comments.py
index 736cbb7ab..6ccdec83b 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Iterator
 
 from docx.blkcntnr import BlockItemContainer
 
 if TYPE_CHECKING:
-    from docx.oxml.comments import CT_Comments
+    from docx.oxml.comments import CT_Comment, CT_Comments
     from docx.parts.comments import CommentsPart
 
 
@@ -18,6 +18,13 @@ def __init__(self, comments_elm: CT_Comments, comments_part: CommentsPart):
         self._comments_elm = comments_elm
         self._comments_part = comments_part
 
+    def __iter__(self) -> Iterator[Comment]:
+        """Iterator over the comments in this collection."""
+        return (
+            Comment(comment_elm, self._comments_part)
+            for comment_elm in self._comments_elm.comment_lst
+        )
+
     def __len__(self) -> int:
         """The number of comments in this collection."""
         return len(self._comments_elm.comment_lst)
@@ -36,3 +43,7 @@ class Comment(BlockItemContainer):
     Note that certain content like tables may not be displayed in the Word comment sidebar due to
     space limitations. Such "over-sized" content can still be viewed in the review pane.
     """
+
+    def __init__(self, comment_elm: CT_Comment, comments_part: CommentsPart):
+        super().__init__(comment_elm, comments_part)
+        self._comment_elm = comment_elm
diff --git a/tests/test_comments.py b/tests/test_comments.py
index 2bde587c6..b38e429f9 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -6,7 +6,7 @@
 
 import pytest
 
-from docx.comments import Comments
+from docx.comments import Comment, Comments
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
 from docx.oxml.comments import CT_Comments
@@ -42,6 +42,27 @@ def it_knows_how_many_comments_it_contains(self, cxml: str, count: int, package_
 
         assert len(comments) == count
 
+    def it_is_iterable_over_the_comments_it_contains(self, package_: Mock):
+        comments_elm = cast(CT_Comments, element("w:comments/(w:comment,w:comment)"))
+        comments = Comments(
+            comments_elm,
+            CommentsPart(
+                PackURI("/word/comments.xml"),
+                CT.WML_COMMENTS,
+                comments_elm,
+                package_,
+            ),
+        )
+
+        comment_iter = iter(comments)
+
+        comment1 = next(comment_iter)
+        assert type(comment1) is Comment, "expected a `Comment` object"
+        comment2 = next(comment_iter)
+        assert type(comment2) is Comment, "expected a `Comment` object"
+        with pytest.raises(StopIteration):
+            next(comment_iter)
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From e2aec420ba2d43991e4fa8acb04f200c65229ad0 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:47:47 -0700
Subject: [PATCH 350/367] comments: add Comments.get()

To get a comment by id, None when not found.
---
 src/docx/comments.py      |  5 +++++
 src/docx/oxml/comments.py |  5 +++++
 tests/test_comments.py    | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/src/docx/comments.py b/src/docx/comments.py
index 6ccdec83b..4a3da9dae 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -29,6 +29,11 @@ def __len__(self) -> int:
         """The number of comments in this collection."""
         return len(self._comments_elm.comment_lst)
 
+    def get(self, comment_id: int) -> Comment | None:
+        """Return the comment identified by `comment_id`, or |None| if not found."""
+        comment_elm = self._comments_elm.get_comment_by_id(comment_id)
+        return Comment(comment_elm, self._comments_part) if comment_elm is not None else None
+
 
 class Comment(BlockItemContainer):
     """Proxy for a single comment in the document.
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index 1e818ebfb..c5d84bc31 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -19,6 +19,11 @@ class CT_Comments(BaseOxmlElement):
 
     comment = ZeroOrMore("w:comment")
 
+    def get_comment_by_id(self, comment_id: int) -> CT_Comment | None:
+        """Return the `w:comment` element identified by `comment_id`, or |None| if not found."""
+        comment_elms = self.xpath(f"(./w:comment[@w:id='{comment_id}'])[1]")
+        return comment_elms[0] if comment_elms else None
+
 
 class CT_Comment(BaseOxmlElement):
     """`w:comment` element, representing a single comment.
diff --git a/tests/test_comments.py b/tests/test_comments.py
index b38e429f9..a32f7acbf 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -1,3 +1,5 @@
+# pyright: reportPrivateUsage=false
+
 """Unit test suite for the docx.comments module."""
 
 from __future__ import annotations
@@ -63,6 +65,26 @@ def it_is_iterable_over_the_comments_it_contains(self, package_: Mock):
         with pytest.raises(StopIteration):
             next(comment_iter)
 
+    def it_can_get_a_comment_by_id(self, package_: Mock):
+        comments_elm = cast(
+            CT_Comments,
+            element("w:comments/(w:comment{w:id=1},w:comment{w:id=2},w:comment{w:id=3})"),
+        )
+        comments = Comments(
+            comments_elm,
+            CommentsPart(
+                PackURI("/word/comments.xml"),
+                CT.WML_COMMENTS,
+                comments_elm,
+                package_,
+            ),
+        )
+
+        comment = comments.get(2)
+
+        assert type(comment) is Comment, "expected a `Comment` object"
+        assert comment._comment_elm is comments_elm.comment_lst[1]
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From 0eeaa2f0760b61374fef5f2912f63f7ded4bcaeb Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:49:31 -0700
Subject: [PATCH 351/367] comments: add Comment.comment_id

---
 features/doc-comments.feature |  1 -
 src/docx/comments.py          |  5 +++++
 src/docx/oxml/comments.py     |  5 ++++-
 tests/test_comments.py        | 18 +++++++++++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/features/doc-comments.feature b/features/doc-comments.feature
index fbe2fd278..944146e5e 100644
--- a/features/doc-comments.feature
+++ b/features/doc-comments.feature
@@ -30,7 +30,6 @@ Feature: Document.comments
      Then iterating comments yields 4 Comment objects
 
 
-  @wip
   Scenario: Comments.get()
     Given a Comments object with 4 comments
      When I call comments.get(2)
diff --git a/src/docx/comments.py b/src/docx/comments.py
index 4a3da9dae..d3f58343f 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -52,3 +52,8 @@ class Comment(BlockItemContainer):
     def __init__(self, comment_elm: CT_Comment, comments_part: CommentsPart):
         super().__init__(comment_elm, comments_part)
         self._comment_elm = comment_elm
+
+    @property
+    def comment_id(self) -> int:
+        """The unique identifier of this comment."""
+        return self._comment_elm.id
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index c5d84bc31..a24e1dba2 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrMore
+from docx.oxml.simpletypes import ST_DecimalNumber
+from docx.oxml.xmlchemy import BaseOxmlElement, RequiredAttribute, ZeroOrMore
 
 
 class CT_Comments(BaseOxmlElement):
@@ -32,3 +33,5 @@ class CT_Comment(BaseOxmlElement):
     While probably most often used for a single sentence or phrase, a comment can contain rich
     content, including multiple rich-text paragraphs, hyperlinks, images, and tables.
     """
+
+    id: int = RequiredAttribute("w:id", ST_DecimalNumber)  # pyright: ignore[reportAssignmentType]
diff --git a/tests/test_comments.py b/tests/test_comments.py
index a32f7acbf..8f9fd473f 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -11,7 +11,7 @@
 from docx.comments import Comment, Comments
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
-from docx.oxml.comments import CT_Comments
+from docx.oxml.comments import CT_Comment, CT_Comments
 from docx.package import Package
 from docx.parts.comments import CommentsPart
 
@@ -90,3 +90,19 @@ def it_can_get_a_comment_by_id(self, package_: Mock):
     @pytest.fixture
     def package_(self, request: FixtureRequest):
         return instance_mock(request, Package)
+
+
+class DescribeComment:
+    """Unit-test suite for `docx.comments.Comment`."""
+
+    def it_knows_its_comment_id(self, comments_part_: Mock):
+        comment_elm = cast(CT_Comment, element("w:comment{w:id=42}"))
+        comment = Comment(comment_elm, comments_part_)
+
+        assert comment.comment_id == 42
+
+    # -- fixtures --------------------------------------------------------------------------------
+
+    @pytest.fixture
+    def comments_part_(self, request: FixtureRequest):
+        return instance_mock(request, CommentsPart)

From 7cf36d648fb18b13979ea7df631724d0dda1bc2c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 22:57:11 -0700
Subject: [PATCH 352/367] xfail: acceptance test for Comment properties

---
 features/cmt-props.feature | 40 +++++++++++++++++++++++++
 features/steps/comments.py | 61 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 features/cmt-props.feature

diff --git a/features/cmt-props.feature b/features/cmt-props.feature
new file mode 100644
index 000000000..6eead5aa7
--- /dev/null
+++ b/features/cmt-props.feature
@@ -0,0 +1,40 @@
+Feature: Get comment properties
+  In order to characterize comments by their metadata
+  As a developer using python-docx
+  I need methods to access comment metadata properties
+
+
+  Scenario: Comment.id
+    Given a Comment object
+     Then comment.comment_id is the comment identifier
+
+
+  @wip
+  Scenario: Comment.author
+    Given a Comment object
+     Then comment.author is the author of the comment
+
+
+  @wip
+  Scenario: Comment.initials
+    Given a Comment object
+     Then comment.initials is the initials of the comment author
+
+
+  @wip
+  Scenario: Comment.timestamp
+    Given a Comment object
+     Then comment.timestamp is the date and time the comment was authored
+
+
+  @wip
+  Scenario: Comment.paragraphs[0].text
+    Given a Comment object
+     When I assign para_text = comment.paragraphs[0].text
+     Then para_text is the text of the first paragraph in the comment
+
+
+  @wip
+  Scenario: Retrieve embedded image from a comment
+    Given a Comment object containing an embedded image
+     Then I can extract the image from the comment
diff --git a/features/steps/comments.py b/features/steps/comments.py
index 81993aeda..14c7d3359 100644
--- a/features/steps/comments.py
+++ b/features/steps/comments.py
@@ -1,16 +1,29 @@
 """Step implementations for document comments-related features."""
 
+import datetime as dt
+
 from behave import given, then, when
 from behave.runner import Context
 
 from docx import Document
 from docx.comments import Comment, Comments
+from docx.drawing import Drawing
 
 from helpers import test_docx
 
 # given ====================================================
 
 
+@given("a Comment object")
+def given_a_comment_object(context: Context):
+    context.comment = Document(test_docx("comments-rich-para")).comments.get(0)
+
+
+@given("a Comment object containing an embedded image")
+def given_a_comment_object_containing_an_embedded_image(context: Context):
+    context.comment = Document(test_docx("comments-rich-para")).comments.get(1)
+
+
 @given("a Comments object with {count} comments")
 def given_a_comments_object_with_count_comments(context: Context, count: str):
     testfile_name = {"0": "doc-default", "4": "comments-rich-para"}[count]
@@ -30,6 +43,11 @@ def given_a_document_having_no_comments_part(context: Context):
 # when =====================================================
 
 
+@when("I assign para_text = comment.paragraphs[0].text")
+def when_I_assign_para_text(context: Context):
+    context.para_text = context.comment.paragraphs[0].text
+
+
 @when("I call comments.get(2)")
 def when_I_call_comments_get_2(context: Context):
     context.comment = context.comments.get(2)
@@ -38,12 +56,48 @@ def when_I_call_comments_get_2(context: Context):
 # then =====================================================
 
 
+@then("comment.author is the author of the comment")
+def then_comment_author_is_the_author_of_the_comment(context: Context):
+    actual = context.comment.author
+    assert actual == "Steve Canny", f"expected author 'Steve Canny', got '{actual}'"
+
+
+@then("comment.comment_id is the comment identifier")
+def then_comment_comment_id_is_the_comment_identifier(context: Context):
+    assert context.comment.comment_id == 0
+
+
+@then("comment.initials is the initials of the comment author")
+def then_comment_initials_is_the_initials_of_the_comment_author(context: Context):
+    initials = context.comment.initials
+    assert initials == "SJC", f"expected initials 'SJC', got '{initials}'"
+
+
+@then("comment.timestamp is the date and time the comment was authored")
+def then_comment_timestamp_is_the_date_and_time_the_comment_was_authored(context: Context):
+    assert context.comment.timestamp == dt.datetime(2025, 6, 7, 11, 20, 0, tzinfo=dt.timezone.utc)
+
+
 @then("document.comments is a Comments object")
 def then_document_comments_is_a_Comments_object(context: Context):
     document = context.document
     assert type(document.comments) is Comments
 
 
+@then("I can extract the image from the comment")
+def then_I_can_extract_the_image_from_the_comment(context: Context):
+    paragraph = context.comment.paragraphs[0]
+    run = paragraph.runs[2]
+    drawing = next(d for d in run.iter_inner_content() if isinstance(d, Drawing))
+    assert drawing.has_picture
+
+    image = drawing.image
+
+    assert image.content_type == "image/jpeg", f"got {image.content_type}"
+    assert image.filename == "image.jpg", f"got {image.filename}"
+    assert image.sha1 == "1be010ea47803b00e140b852765cdf84f491da47", f"got {image.sha1}"
+
+
 @then("iterating comments yields {count} Comment objects")
 def then_iterating_comments_yields_count_comments(context: Context, count: str):
     comment_iter = iter(context.comments)
@@ -62,6 +116,13 @@ def then_len_comments_eq_count(context: Context, count: str):
     assert actual == expected, f"expected len(comments) of {expected}, got {actual}"
 
 
+@then("para_text is the text of the first paragraph in the comment")
+def then_para_text_is_the_text_of_the_first_paragraph_in_the_comment(context: Context):
+    actual = context.para_text
+    expected = "Text with hyperlink https://google.com embedded."
+    assert actual == expected, f"expected para_text '{expected}', got '{actual}'"
+
+
 @then("the result is a Comment object with id 2")
 def then_the_result_is_a_comment_object_with_id_2(context: Context):
     comment = context.comment

From 8af46fe57a84299da4ffc3e1528eecc35accca92 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:05:07 -0700
Subject: [PATCH 353/367] comments: add Comment.author

---
 features/cmt-props.feature | 1 -
 src/docx/comments.py       | 5 +++++
 src/docx/oxml/comments.py  | 3 ++-
 tests/test_comments.py     | 6 ++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/features/cmt-props.feature b/features/cmt-props.feature
index 6eead5aa7..95fe17746 100644
--- a/features/cmt-props.feature
+++ b/features/cmt-props.feature
@@ -9,7 +9,6 @@ Feature: Get comment properties
      Then comment.comment_id is the comment identifier
 
 
-  @wip
   Scenario: Comment.author
     Given a Comment object
      Then comment.author is the author of the comment
diff --git a/src/docx/comments.py b/src/docx/comments.py
index d3f58343f..a107f7b0b 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -53,6 +53,11 @@ def __init__(self, comment_elm: CT_Comment, comments_part: CommentsPart):
         super().__init__(comment_elm, comments_part)
         self._comment_elm = comment_elm
 
+    @property
+    def author(self) -> str:
+        """The recorded author of this comment."""
+        return self._comment_elm.author
+
     @property
     def comment_id(self) -> int:
         """The unique identifier of this comment."""
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index a24e1dba2..1aa71add5 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from docx.oxml.simpletypes import ST_DecimalNumber
+from docx.oxml.simpletypes import ST_DecimalNumber, ST_String
 from docx.oxml.xmlchemy import BaseOxmlElement, RequiredAttribute, ZeroOrMore
 
 
@@ -35,3 +35,4 @@ class CT_Comment(BaseOxmlElement):
     """
 
     id: int = RequiredAttribute("w:id", ST_DecimalNumber)  # pyright: ignore[reportAssignmentType]
+    author: str = RequiredAttribute("w:author", ST_String)  # pyright: ignore[reportAssignmentType]
diff --git a/tests/test_comments.py b/tests/test_comments.py
index 8f9fd473f..7b0e3588c 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -101,6 +101,12 @@ def it_knows_its_comment_id(self, comments_part_: Mock):
 
         assert comment.comment_id == 42
 
+    def it_knows_its_author(self, comments_part_: Mock):
+        comment_elm = cast(CT_Comment, element("w:comment{w:id=42,w:author=Steve Canny}"))
+        comment = Comment(comment_elm, comments_part_)
+
+        assert comment.author == "Steve Canny"
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From cab50c5e65da92e31f64401f535efa0d9d0d8e84 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:06:01 -0700
Subject: [PATCH 354/367] comments: add Comment.initials

---
 features/cmt-props.feature | 1 -
 src/docx/comments.py       | 9 +++++++++
 src/docx/oxml/comments.py  | 5 ++++-
 tests/test_comments.py     | 6 ++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/features/cmt-props.feature b/features/cmt-props.feature
index 95fe17746..f1a7fbc4c 100644
--- a/features/cmt-props.feature
+++ b/features/cmt-props.feature
@@ -14,7 +14,6 @@ Feature: Get comment properties
      Then comment.author is the author of the comment
 
 
-  @wip
   Scenario: Comment.initials
     Given a Comment object
      Then comment.initials is the initials of the comment author
diff --git a/src/docx/comments.py b/src/docx/comments.py
index a107f7b0b..cc1a86161 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -62,3 +62,12 @@ def author(self) -> str:
     def comment_id(self) -> int:
         """The unique identifier of this comment."""
         return self._comment_elm.id
+
+    @property
+    def initials(self) -> str | None:
+        """Read/write. The recorded initials of the comment author.
+
+        This attribute is optional in the XML, returns |None| if not set. Assigning |None| removes
+        any existing initials from the XML.
+        """
+        return self._comment_elm.initials
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index 1aa71add5..b841cdfe9 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from docx.oxml.simpletypes import ST_DecimalNumber, ST_String
-from docx.oxml.xmlchemy import BaseOxmlElement, RequiredAttribute, ZeroOrMore
+from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrMore
 
 
 class CT_Comments(BaseOxmlElement):
@@ -36,3 +36,6 @@ class CT_Comment(BaseOxmlElement):
 
     id: int = RequiredAttribute("w:id", ST_DecimalNumber)  # pyright: ignore[reportAssignmentType]
     author: str = RequiredAttribute("w:author", ST_String)  # pyright: ignore[reportAssignmentType]
+    initials: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:initials", ST_String
+    )
diff --git a/tests/test_comments.py b/tests/test_comments.py
index 7b0e3588c..9e4f64d68 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -107,6 +107,12 @@ def it_knows_its_author(self, comments_part_: Mock):
 
         assert comment.author == "Steve Canny"
 
+    def it_knows_the_initials_of_its_author(self, comments_part_: Mock):
+        comment_elm = cast(CT_Comment, element("w:comment{w:id=42,w:initials=SJC}"))
+        comment = Comment(comment_elm, comments_part_)
+
+        assert comment.initials == "SJC"
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From cfb87e7708f561f09e6d4f3e7289c659c226eafb Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:06:54 -0700
Subject: [PATCH 355/367] comments: add Comment.timestamp

---
 features/cmt-props.feature   |  1 -
 src/docx/comments.py         |  9 ++++++
 src/docx/oxml/comments.py    |  7 ++++-
 src/docx/oxml/simpletypes.py | 53 ++++++++++++++++++++++++++++++++++++
 tests/test_comments.py       | 10 +++++++
 5 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/features/cmt-props.feature b/features/cmt-props.feature
index f1a7fbc4c..ab5450dfa 100644
--- a/features/cmt-props.feature
+++ b/features/cmt-props.feature
@@ -19,7 +19,6 @@ Feature: Get comment properties
      Then comment.initials is the initials of the comment author
 
 
-  @wip
   Scenario: Comment.timestamp
     Given a Comment object
      Then comment.timestamp is the date and time the comment was authored
diff --git a/src/docx/comments.py b/src/docx/comments.py
index cc1a86161..e5d25fd79 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import datetime as dt
 from typing import TYPE_CHECKING, Iterator
 
 from docx.blkcntnr import BlockItemContainer
@@ -71,3 +72,11 @@ def initials(self) -> str | None:
         any existing initials from the XML.
         """
         return self._comment_elm.initials
+
+    @property
+    def timestamp(self) -> dt.datetime | None:
+        """The date and time this comment was authored.
+
+        This attribute is optional in the XML, returns |None| if not set.
+        """
+        return self._comment_elm.date
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index b841cdfe9..612a51f8a 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
-from docx.oxml.simpletypes import ST_DecimalNumber, ST_String
+import datetime as dt
+
+from docx.oxml.simpletypes import ST_DateTime, ST_DecimalNumber, ST_String
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrMore
 
 
@@ -39,3 +41,6 @@ class CT_Comment(BaseOxmlElement):
     initials: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:initials", ST_String
     )
+    date: dt.datetime | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
+        "w:date", ST_DateTime
+    )
diff --git a/src/docx/oxml/simpletypes.py b/src/docx/oxml/simpletypes.py
index 69d4b65d4..a0fc87d3f 100644
--- a/src/docx/oxml/simpletypes.py
+++ b/src/docx/oxml/simpletypes.py
@@ -9,6 +9,7 @@
 
 from __future__ import annotations
 
+import datetime as dt
 from typing import TYPE_CHECKING, Any, Tuple
 
 from docx.exceptions import InvalidXmlError
@@ -213,6 +214,58 @@ def validate(cls, value: Any) -> None:
         cls.validate_int_in_range(value, -27273042329600, 27273042316900)
 
 
+class ST_DateTime(BaseSimpleType):
+    @classmethod
+    def convert_from_xml(cls, str_value: str) -> dt.datetime:
+        """Convert an xsd:dateTime string to a datetime object."""
+
+        def parse_xsd_datetime(dt_str: str) -> dt.datetime:
+            # -- handle trailing 'Z' (Zulu/UTC), common in Word files --
+            if dt_str.endswith("Z"):
+                try:
+                    # -- optional fractional seconds case --
+                    return dt.datetime.strptime(dt_str, "%Y-%m-%dT%H:%M:%S.%fZ").replace(
+                        tzinfo=dt.timezone.utc
+                    )
+                except ValueError:
+                    return dt.datetime.strptime(dt_str, "%Y-%m-%dT%H:%M:%SZ").replace(
+                        tzinfo=dt.timezone.utc
+                    )
+
+            # -- handles explicit offsets like +00:00, -05:00, or naive datetimes --
+            try:
+                return dt.datetime.fromisoformat(dt_str)
+            except ValueError:
+                # -- fall-back to parsing as naive datetime (with or without fractional seconds) --
+                try:
+                    return dt.datetime.strptime(dt_str, "%Y-%m-%dT%H:%M:%S.%f")
+                except ValueError:
+                    return dt.datetime.strptime(dt_str, "%Y-%m-%dT%H:%M:%S")
+
+        try:
+            # -- parse anything reasonable, but never raise, just use default epoch time --
+            return parse_xsd_datetime(str_value)
+        except Exception:
+            return dt.datetime(1970, 1, 1, tzinfo=dt.timezone.utc)
+
+    @classmethod
+    def convert_to_xml(cls, value: dt.datetime) -> str:
+        # -- convert naive datetime to timezon-aware assuming local timezone --
+        if value.tzinfo is None:
+            value = value.astimezone()
+
+        # -- convert to UTC if not already --
+        value = value.astimezone(dt.timezone.utc)
+
+        # -- format with 'Z' suffix for UTC --
+        return value.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    @classmethod
+    def validate(cls, value: Any) -> None:
+        if not isinstance(value, dt.datetime):
+            raise TypeError("only a datetime.datetime object may be assigned, got '%s'" % value)
+
+
 class ST_DecimalNumber(XsdInt):
     pass
 
diff --git a/tests/test_comments.py b/tests/test_comments.py
index 9e4f64d68..ea9e97c96 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+import datetime as dt
 from typing import cast
 
 import pytest
@@ -113,6 +114,15 @@ def it_knows_the_initials_of_its_author(self, comments_part_: Mock):
 
         assert comment.initials == "SJC"
 
+    def it_knows_the_date_and_time_it_was_authored(self, comments_part_: Mock):
+        comment_elm = cast(
+            CT_Comment,
+            element("w:comment{w:id=42,w:date=2023-10-01T12:34:56Z}"),
+        )
+        comment = Comment(comment_elm, comments_part_)
+
+        assert comment.timestamp == dt.datetime(2023, 10, 1, 12, 34, 56, tzinfo=dt.timezone.utc)
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From 19175adf57d91f314e95fa72972c6065f72b4dff Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:09:32 -0700
Subject: [PATCH 356/367] comments: add Comment.paragraphs

Actual implementation is primarily inherited from `BlockItemContainer`,
but support for those operations must be present in `CT_Comment` and
it's worth testing explicitly.
---
 features/cmt-props.feature |  1 -
 src/docx/oxml/comments.py  | 23 +++++++++++++++++++++++
 tests/test_comments.py     | 12 ++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/features/cmt-props.feature b/features/cmt-props.feature
index ab5450dfa..f5c636196 100644
--- a/features/cmt-props.feature
+++ b/features/cmt-props.feature
@@ -24,7 +24,6 @@ Feature: Get comment properties
      Then comment.timestamp is the date and time the comment was authored
 
 
-  @wip
   Scenario: Comment.paragraphs[0].text
     Given a Comment object
      When I assign para_text = comment.paragraphs[0].text
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index 612a51f8a..0ebd7e200 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -3,10 +3,15 @@
 from __future__ import annotations
 
 import datetime as dt
+from typing import TYPE_CHECKING, Callable
 
 from docx.oxml.simpletypes import ST_DateTime, ST_DecimalNumber, ST_String
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrMore
 
+if TYPE_CHECKING:
+    from docx.oxml.table import CT_Tbl
+    from docx.oxml.text.paragraph import CT_P
+
 
 class CT_Comments(BaseOxmlElement):
     """`w:comments` element, the root element for the comments part.
@@ -36,6 +41,7 @@ class CT_Comment(BaseOxmlElement):
     content, including multiple rich-text paragraphs, hyperlinks, images, and tables.
     """
 
+    # -- attributes on `w:comment` --
     id: int = RequiredAttribute("w:id", ST_DecimalNumber)  # pyright: ignore[reportAssignmentType]
     author: str = RequiredAttribute("w:author", ST_String)  # pyright: ignore[reportAssignmentType]
     initials: str | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
@@ -44,3 +50,20 @@ class CT_Comment(BaseOxmlElement):
     date: dt.datetime | None = OptionalAttribute(  # pyright: ignore[reportAssignmentType]
         "w:date", ST_DateTime
     )
+
+    # -- children --
+
+    p = ZeroOrMore("w:p", successors=())
+    tbl = ZeroOrMore("w:tbl", successors=())
+
+    # -- type-declarations for methods added by metaclass --
+
+    add_p: Callable[[], CT_P]
+    p_lst: list[CT_P]
+    tbl_lst: list[CT_Tbl]
+    _insert_tbl: Callable[[CT_Tbl], CT_Tbl]
+
+    @property
+    def inner_content_elements(self) -> list[CT_P | CT_Tbl]:
+        """Generate all `w:p` and `w:tbl` elements in this comment."""
+        return self.xpath("./w:p | ./w:tbl")
diff --git a/tests/test_comments.py b/tests/test_comments.py
index ea9e97c96..2a0615a79 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -123,6 +123,18 @@ def it_knows_the_date_and_time_it_was_authored(self, comments_part_: Mock):
 
         assert comment.timestamp == dt.datetime(2023, 10, 1, 12, 34, 56, tzinfo=dt.timezone.utc)
 
+    def it_provides_access_to_the_paragraphs_it_contains(self, comments_part_: Mock):
+        comment_elm = cast(
+            CT_Comment,
+            element('w:comment{w:id=42}/(w:p/w:r/w:t"First para",w:p/w:r/w:t"Second para")'),
+        )
+        comment = Comment(comment_elm, comments_part_)
+
+        paragraphs = comment.paragraphs
+
+        assert len(paragraphs) == 2
+        assert [para.text for para in paragraphs] == ["First para", "Second para"]
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From 432dd15eb343476024167a3ffec39e2b86d5585c Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:11:42 -0700
Subject: [PATCH 357/367] drawing: add image extraction from Drawing

---
 features/cmt-props.feature   |  1 -
 src/docx/drawing/__init__.py | 39 +++++++++++++++++++
 tests/test_comments.py       |  4 +-
 tests/test_drawing.py        | 74 ++++++++++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_drawing.py

diff --git a/features/cmt-props.feature b/features/cmt-props.feature
index f5c636196..e4e620828 100644
--- a/features/cmt-props.feature
+++ b/features/cmt-props.feature
@@ -30,7 +30,6 @@ Feature: Get comment properties
      Then para_text is the text of the first paragraph in the comment
 
 
-  @wip
   Scenario: Retrieve embedded image from a comment
     Given a Comment object containing an embedded image
      Then I can extract the image from the comment
diff --git a/src/docx/drawing/__init__.py b/src/docx/drawing/__init__.py
index f40205747..00d1f51bb 100644
--- a/src/docx/drawing/__init__.py
+++ b/src/docx/drawing/__init__.py
@@ -9,6 +9,7 @@
 
 if TYPE_CHECKING:
     import docx.types as t
+    from docx.image.image import Image
 
 
 class Drawing(Parented):
@@ -18,3 +19,41 @@ def __init__(self, drawing: CT_Drawing, parent: t.ProvidesStoryPart):
         super().__init__(parent)
         self._parent = parent
         self._drawing = self._element = drawing
+
+    @property
+    def has_picture(self) -> bool:
+        """True when `drawing` contains an embedded picture.
+
+        A drawing can contain a picture, but it can also contain a chart, SmartArt, or a
+        drawing canvas. Methods related to a picture, like `.image`, will raise when the drawing
+        does not contain a picture. Use this value to determine whether image methods will succeed.
+
+        This value is `False` when a linked picture is present. This should be relatively rare and
+        the image would only be retrievable from the filesystem.
+
+        Note this does not distinguish between inline and floating images. The presence of either
+        one will cause this value to be `True`.
+        """
+        xpath_expr = (
+            # -- an inline picture --
+            "./wp:inline/a:graphic/a:graphicData/pic:pic"
+            # -- a floating picture --
+            " | ./wp:anchor/a:graphic/a:graphicData/pic:pic"
+        )
+        # -- xpath() will return a list, empty if there are no matches --
+        return bool(self._drawing.xpath(xpath_expr))
+
+    @property
+    def image(self) -> Image:
+        """An `Image` proxy object for the image in this (picture) drawing.
+
+        Raises `ValueError` when this drawing does contains something other than a picture. Use
+        `.has_picture` to qualify drawing objects before using this property.
+        """
+        picture_rIds = self._drawing.xpath(".//pic:blipFill/a:blip/@r:embed")
+        if not picture_rIds:
+            raise ValueError("drawing does not contain a picture")
+        rId = picture_rIds[0]
+        doc_part = self.part
+        image_part = doc_part.related_parts[rId]
+        return image_part.image
diff --git a/tests/test_comments.py b/tests/test_comments.py
index 2a0615a79..a4be3dbb4 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -1,6 +1,6 @@
 # pyright: reportPrivateUsage=false
 
-"""Unit test suite for the docx.comments module."""
+"""Unit test suite for the `docx.comments` module."""
 
 from __future__ import annotations
 
@@ -21,7 +21,7 @@
 
 
 class DescribeComments:
-    """Unit-test suite for `docx.comments.Comments`."""
+    """Unit-test suite for `docx.comments.Comments` objects."""
 
     @pytest.mark.parametrize(
         ("cxml", "count"),
diff --git a/tests/test_drawing.py b/tests/test_drawing.py
new file mode 100644
index 000000000..c8fedb1a4
--- /dev/null
+++ b/tests/test_drawing.py
@@ -0,0 +1,74 @@
+# pyright: reportPrivateUsage=false
+
+"""Unit test suite for the `docx.drawing` module."""
+
+from __future__ import annotations
+
+from typing import cast
+
+import pytest
+
+from docx.drawing import Drawing
+from docx.image.image import Image
+from docx.oxml.drawing import CT_Drawing
+from docx.parts.document import DocumentPart
+from docx.parts.image import ImagePart
+
+from .unitutil.cxml import element
+from .unitutil.mock import FixtureRequest, Mock, instance_mock
+
+
+class DescribeDrawing:
+    """Unit-test suite for `docx.drawing.Drawing` objects."""
+
+    @pytest.mark.parametrize(
+        ("cxml", "expected_value"),
+        [
+            ("w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic", True),
+            ("w:drawing/wp:anchor/a:graphic/a:graphicData/pic:pic", True),
+            ("w:drawing/wp:inline/a:graphic/a:graphicData/a:grpSp", False),
+            ("w:drawing/wp:anchor/a:graphic/a:graphicData/a:chart", False),
+        ],
+    )
+    def it_knows_when_it_contains_a_Picture(
+        self, cxml: str, expected_value: bool, document_part_: Mock
+    ):
+        drawing = Drawing(cast(CT_Drawing, element(cxml)), document_part_)
+        assert drawing.has_picture == expected_value
+
+    def it_provides_access_to_the_image_in_a_Picture_drawing(
+        self, document_part_: Mock, image_part_: Mock, image_: Mock
+    ):
+        image_part_.image = image_
+        document_part_.part.related_parts = {"rId1": image_part_}
+        cxml = (
+            "w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip{r:embed=rId1}"
+        )
+        drawing = Drawing(cast(CT_Drawing, element(cxml)), document_part_)
+
+        image = drawing.image
+
+        assert image is image_
+
+    def but_it_raises_when_the_drawing_does_not_contain_a_Picture(self, document_part_: Mock):
+        drawing = Drawing(
+            cast(CT_Drawing, element("w:drawing/wp:inline/a:graphic/a:graphicData/a:grpSp")),
+            document_part_,
+        )
+
+        with pytest.raises(ValueError, match="drawing does not contain a picture"):
+            drawing.image
+
+    # -- fixtures --------------------------------------------------------------------------------
+
+    @pytest.fixture
+    def document_part_(self, request: FixtureRequest):
+        return instance_mock(request, DocumentPart)
+
+    @pytest.fixture
+    def image_(self, request: FixtureRequest):
+        return instance_mock(request, Image)
+
+    @pytest.fixture
+    def image_part_(self, request: FixtureRequest):
+        return instance_mock(request, ImagePart)

From d360409273a9fdfd2d6a26a7f35b8f3bfc781f04 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:20:17 -0700
Subject: [PATCH 358/367] xfail: acceptance test for Comment mutations

---
 features/cmt-mutations.feature                |  66 +++++++++
 features/steps/comments.py                    | 131 ++++++++++++++++++
 .../steps/test_files/comments-rich-para.docx  | Bin 19974 -> 20023 bytes
 3 files changed, 197 insertions(+)
 create mode 100644 features/cmt-mutations.feature

diff --git a/features/cmt-mutations.feature b/features/cmt-mutations.feature
new file mode 100644
index 000000000..634e7c1bc
--- /dev/null
+++ b/features/cmt-mutations.feature
@@ -0,0 +1,66 @@
+Feature: Comment mutations
+  In order to add and modify the content of a comment
+  As a developer using python-docx
+  I need mutation methods on Comment objects
+
+
+  @wip
+  Scenario: Comments.add_comment()
+    Given a Comments object with 0 comments
+     When I assign comment = comments.add_comment()
+     Then comment.comment_id == 0
+      And len(comment.paragraphs) == 1
+      And comment.paragraphs[0].style.name == "CommentText"
+      And len(comments) == 1
+      And comments.get(0) == comment
+
+
+  @wip
+  Scenario: Comments.add_comment() specifying author and initials
+    Given a Comments object with 0 comments
+     When I assign comment = comments.add_comment(author="John Doe", initials="JD")
+     Then comment.author == "John Doe"
+      And comment.initials == "JD"
+
+
+  @wip
+  Scenario: Comment.add_paragraph() specifying text and style
+    Given a default Comment object
+     When I assign paragraph = comment.add_paragraph(text, style)
+     Then len(comment.paragraphs) == 2
+      And paragraph.text == text
+      And paragraph.style == style
+      And comment.paragraphs[-1] == paragraph
+
+
+  @wip
+  Scenario: Comment.add_paragraph() not specifying text or style
+    Given a default Comment object
+     When I assign paragraph = comment.add_paragraph()
+     Then len(comment.paragraphs) == 2
+      And paragraph.text == ""
+      And paragraph.style == "CommentText"
+      And comment.paragraphs[-1] == paragraph
+
+
+  @wip
+  Scenario: Add image to comment
+    Given a default Comment object
+     When I assign paragraph = comment.add_paragraph()
+      And I assign run = paragraph.add_run()
+      And I call run.add_picture()
+     Then run.iter_inner_content() yields a single Picture drawing
+
+
+  @wip
+  Scenario: update Comment.author
+    Given a Comment object
+     When I assign "Jane Smith" to comment.author
+     Then comment.author == "Jane Smith"
+
+
+  @wip
+  Scenario: update Comment.initials
+    Given a Comment object
+     When I assign "JS" to comment.initials
+     Then comment.initials == "JS"
diff --git a/features/steps/comments.py b/features/steps/comments.py
index 14c7d3359..2bca6d5a6 100644
--- a/features/steps/comments.py
+++ b/features/steps/comments.py
@@ -30,6 +30,11 @@ def given_a_comments_object_with_count_comments(context: Context, count: str):
     context.comments = Document(test_docx(testfile_name)).comments
 
 
+@given("a default Comment object")
+def given_a_default_comment_object(context: Context):
+    context.comment = Document(test_docx("comments-rich-para")).comments.add_comment()
+
+
 @given("a document having a comments part")
 def given_a_document_having_a_comments_part(context: Context):
     context.document = Document(test_docx("comments-rich-para"))
@@ -43,11 +48,48 @@ def given_a_document_having_no_comments_part(context: Context):
 # when =====================================================
 
 
+@when('I assign "{author}" to comment.author')
+def when_I_assign_author_to_comment_author(context: Context, author: str):
+    context.comment.author = author
+
+
+@when("I assign comment = comments.add_comment()")
+def when_I_assign_comment_eq_add_comment(context: Context):
+    context.comment = context.comments.add_comment()
+
+
+@when('I assign comment = comments.add_comment(author="John Doe", initials="JD")')
+def when_I_assign_comment_eq_comments_add_comment_with_author_and_initials(context: Context):
+    context.comment = context.comments.add_comment(author="John Doe", initials="JD")
+
+
+@when('I assign "{initials}" to comment.initials')
+def when_I_assign_initials(context: Context, initials: str):
+    context.comment.initials = initials
+
+
 @when("I assign para_text = comment.paragraphs[0].text")
 def when_I_assign_para_text(context: Context):
     context.para_text = context.comment.paragraphs[0].text
 
 
+@when("I assign paragraph = comment.add_paragraph()")
+def when_I_assign_default_add_paragraph(context: Context):
+    context.paragraph = context.comment.add_paragraph()
+
+
+@when("I assign paragraph = comment.add_paragraph(text, style)")
+def when_I_assign_add_paragraph_with_text_and_style(context: Context):
+    context.para_text = text = "Comment text"
+    context.para_style = style = "Normal"
+    context.paragraph = context.comment.add_paragraph(text, style)
+
+
+@when("I assign run = paragraph.add_run()")
+def when_I_assign_paragraph_add_run(context: Context):
+    context.run = context.paragraph.add_run()
+
+
 @when("I call comments.get(2)")
 def when_I_call_comments_get_2(context: Context):
     context.comment = context.comments.get(2)
@@ -62,6 +104,17 @@ def then_comment_author_is_the_author_of_the_comment(context: Context):
     assert actual == "Steve Canny", f"expected author 'Steve Canny', got '{actual}'"
 
 
+@then('comment.author == "{author}"')
+def then_comment_author_eq_author(context: Context, author: str):
+    actual = context.comment.author
+    assert actual == author, f"expected author '{author}', got '{actual}'"
+
+
+@then("comment.comment_id == 0")
+def then_comment_id_is_0(context: Context):
+    assert context.comment.comment_id == 0
+
+
 @then("comment.comment_id is the comment identifier")
 def then_comment_comment_id_is_the_comment_identifier(context: Context):
     assert context.comment.comment_id == 0
@@ -73,11 +126,42 @@ def then_comment_initials_is_the_initials_of_the_comment_author(context: Context
     assert initials == "SJC", f"expected initials 'SJC', got '{initials}'"
 
 
+@then('comment.initials == "{initials}"')
+def then_comment_initials_eq_initials(context: Context, initials: str):
+    actual = context.comment.initials
+    assert actual == initials, f"expected initials '{initials}', got '{actual}'"
+
+
+@then("comment.paragraphs[{idx}] == paragraph")
+def then_comment_paragraphs_idx_eq_paragraph(context: Context, idx: str):
+    actual = context.comment.paragraphs[int(idx)]._p
+    expected = context.paragraph._p
+    assert actual == expected, "paragraphs do not compare equal"
+
+
+@then('comment.paragraphs[{idx}].style.name == "{style}"')
+def then_comment_paragraphs_idx_style_name_eq_style(context: Context, idx: str, style: str):
+    actual = context.comment.paragraphs[int(idx)]._p.style
+    expected = style
+    assert actual == expected, f"expected style name '{expected}', got '{actual}'"
+
+
 @then("comment.timestamp is the date and time the comment was authored")
 def then_comment_timestamp_is_the_date_and_time_the_comment_was_authored(context: Context):
     assert context.comment.timestamp == dt.datetime(2025, 6, 7, 11, 20, 0, tzinfo=dt.timezone.utc)
 
 
+@then("comments.get({id}) == comment")
+def then_comments_get_comment_id_eq_comment(context: Context, id: str):
+    comment_id = int(id)
+    comment = context.comments.get(comment_id)
+
+    assert type(comment) is Comment, f"expected a Comment object, got {type(comment)}"
+    assert comment.comment_id == comment_id, (
+        f"expected comment_id '{comment_id}', got '{comment.comment_id}'"
+    )
+
+
 @then("document.comments is a Comments object")
 def then_document_comments_is_a_Comments_object(context: Context):
     document = context.document
@@ -109,6 +193,13 @@ def then_iterating_comments_yields_count_comments(context: Context, count: str):
     assert len(remaining) == int(count) - 1, "iterating comments did not yield the expected count"
 
 
+@then("len(comment.paragraphs) == {count}")
+def then_len_comment_paragraphs_eq_count(context: Context, count: str):
+    actual = len(context.comment.paragraphs)
+    expected = int(count)
+    assert actual == expected, f"expected len(comment.paragraphs) of {expected}, got {actual}"
+
+
 @then("len(comments) == {count}")
 def then_len_comments_eq_count(context: Context, count: str):
     actual = len(context.comments)
@@ -123,6 +214,46 @@ def then_para_text_is_the_text_of_the_first_paragraph_in_the_comment(context: Co
     assert actual == expected, f"expected para_text '{expected}', got '{actual}'"
 
 
+@then("paragraph.style == style")
+def then_paragraph_style_eq_known_style(context: Context):
+    actual = context.paragraph.style.name
+    expected = context.para_style
+    assert actual == expected, f"expected paragraph.style '{expected}', got '{actual}'"
+
+
+@then('paragraph.style == "{style}"')
+def then_paragraph_style_eq_style(context: Context, style: str):
+    actual = context.paragraph._p.style
+    expected = style
+    assert actual == expected, f"expected paragraph.style '{expected}', got '{actual}'"
+
+
+@then("paragraph.text == text")
+def then_paragraph_text_eq_known_text(context: Context):
+    actual = context.paragraph.text
+    expected = context.para_text
+    assert actual == expected, f"expected paragraph.text '{expected}', got '{actual}'"
+
+
+@then('paragraph.text == ""')
+def then_paragraph_text_eq_text(context: Context):
+    actual = context.paragraph.text
+    expected = ""
+    assert actual == expected, f"expected paragraph.text '{expected}', got '{actual}'"
+
+
+@then("run.iter_inner_content() yields a single Picture drawing")
+def then_run_iter_inner_content_yields_a_single_picture_drawing(context: Context):
+    inner_content = list(context.run.iter_inner_content())
+
+    assert len(inner_content) == 1, (
+        f"expected a single inner content element, got {len(inner_content)}"
+    )
+    inner_content_item = inner_content[0]
+    assert isinstance(inner_content_item, Drawing)
+    assert inner_content_item.has_picture
+
+
 @then("the result is a Comment object with id 2")
 def then_the_result_is_a_comment_object_with_id_2(context: Context):
     comment = context.comment
diff --git a/features/steps/test_files/comments-rich-para.docx b/features/steps/test_files/comments-rich-para.docx
index e63db413e871466da97e906aef754bc06b2f9601..245c17224c22d0a6d72958be917d9ef1a899bad6 100644
GIT binary patch
delta 5354
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
Va<B?~T8SRZ2n_^kmH%_|{{YKjKa&6e

delta 5285
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


From 8ac9fc4f6b50b9b7f208974e853f1995d63a834a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:24:17 -0700
Subject: [PATCH 359/367] comments: add Comments.add_comment()

Only with `text` parameter so far. Author and initials parameters to
follow.
---
 features/cmt-mutations.feature |  5 ---
 src/docx/comments.py           | 60 ++++++++++++++++++++++++++
 src/docx/oxml/comments.py      | 57 ++++++++++++++++++++++++-
 tests/oxml/test_comments.py    | 31 ++++++++++++++
 tests/test_comments.py         | 78 ++++++++++++++++++++++++++++++++++
 5 files changed, 225 insertions(+), 6 deletions(-)
 create mode 100644 tests/oxml/test_comments.py

diff --git a/features/cmt-mutations.feature b/features/cmt-mutations.feature
index 634e7c1bc..6fda8810b 100644
--- a/features/cmt-mutations.feature
+++ b/features/cmt-mutations.feature
@@ -4,7 +4,6 @@ Feature: Comment mutations
   I need mutation methods on Comment objects
 
 
-  @wip
   Scenario: Comments.add_comment()
     Given a Comments object with 0 comments
      When I assign comment = comments.add_comment()
@@ -15,7 +14,6 @@ Feature: Comment mutations
       And comments.get(0) == comment
 
 
-  @wip
   Scenario: Comments.add_comment() specifying author and initials
     Given a Comments object with 0 comments
      When I assign comment = comments.add_comment(author="John Doe", initials="JD")
@@ -23,7 +21,6 @@ Feature: Comment mutations
       And comment.initials == "JD"
 
 
-  @wip
   Scenario: Comment.add_paragraph() specifying text and style
     Given a default Comment object
      When I assign paragraph = comment.add_paragraph(text, style)
@@ -33,7 +30,6 @@ Feature: Comment mutations
       And comment.paragraphs[-1] == paragraph
 
 
-  @wip
   Scenario: Comment.add_paragraph() not specifying text or style
     Given a default Comment object
      When I assign paragraph = comment.add_paragraph()
@@ -43,7 +39,6 @@ Feature: Comment mutations
       And comment.paragraphs[-1] == paragraph
 
 
-  @wip
   Scenario: Add image to comment
     Given a default Comment object
      When I assign paragraph = comment.add_paragraph()
diff --git a/src/docx/comments.py b/src/docx/comments.py
index e5d25fd79..7fd39d54a 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -10,6 +10,8 @@
 if TYPE_CHECKING:
     from docx.oxml.comments import CT_Comment, CT_Comments
     from docx.parts.comments import CommentsPart
+    from docx.styles.style import ParagraphStyle
+    from docx.text.paragraph import Paragraph
 
 
 class Comments:
@@ -30,6 +32,48 @@ def __len__(self) -> int:
         """The number of comments in this collection."""
         return len(self._comments_elm.comment_lst)
 
+    def add_comment(self, text: str = "", author: str = "", initials: str | None = "") -> Comment:
+        """Add a new comment to the document and return it.
+
+        The comment is added to the end of the comments collection and is assigned a unique
+        comment-id.
+
+        If `text` is provided, it is added to the comment. This option provides for the common
+        case where a comment contains a modest passage of plain text. Multiple paragraphs can be
+        added using the `text` argument by separating their text with newlines (`"\\\\n"`).
+        Between newlines, text is interpreted as it is in `Document.add_paragraph(text=...)`.
+
+        The default is to place a single empty paragraph in the comment, which is the same
+        behavior as the Word UI when you add a comment. New runs can be added to the first
+        paragraph in the empty comment with `comments.paragraphs[0].add_run()` to adding more
+        complex text with emphasis or images. Additional paragraphs can be added using
+        `.add_paragraph()`.
+
+        `author` is a required attribute, set to the empty string by default.
+
+        `initials` is an optional attribute, set to the empty string by default. Passing |None|
+        for the `initials` parameter causes that attribute to be omitted from the XML.
+        """
+        comment_elm = self._comments_elm.add_comment()
+        comment_elm.author = author
+        comment_elm.initials = initials
+        comment_elm.date = dt.datetime.now(dt.timezone.utc)
+        comment = Comment(comment_elm, self._comments_part)
+
+        if text == "":
+            return comment
+
+        para_text_iter = iter(text.split("\n"))
+
+        first_para_text = next(para_text_iter)
+        first_para = comment.paragraphs[0]
+        first_para.add_run(first_para_text)
+
+        for s in para_text_iter:
+            comment.add_paragraph(text=s)
+
+        return comment
+
     def get(self, comment_id: int) -> Comment | None:
         """Return the comment identified by `comment_id`, or |None| if not found."""
         comment_elm = self._comments_elm.get_comment_by_id(comment_id)
@@ -54,6 +98,22 @@ def __init__(self, comment_elm: CT_Comment, comments_part: CommentsPart):
         super().__init__(comment_elm, comments_part)
         self._comment_elm = comment_elm
 
+    def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = None) -> Paragraph:
+        """Return paragraph newly added to the end of the content in this container.
+
+        The paragraph has `text` in a single run if present, and is given paragraph style `style`.
+        When `style` is |None| or ommitted, the "CommentText" paragraph style is applied, which is
+        the default style for comments.
+        """
+        paragraph = super().add_paragraph(text, style)
+
+        # -- have to assign style directly to element because `paragraph.style` raises when
+        # -- a style is not present in the styles part
+        if style is None:
+            paragraph._p.style = "CommentText"  # pyright: ignore[reportPrivateUsage]
+
+        return paragraph
+
     @property
     def author(self) -> str:
         """The recorded author of this comment."""
diff --git a/src/docx/oxml/comments.py b/src/docx/oxml/comments.py
index 0ebd7e200..ad9821759 100644
--- a/src/docx/oxml/comments.py
+++ b/src/docx/oxml/comments.py
@@ -3,8 +3,10 @@
 from __future__ import annotations
 
 import datetime as dt
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING, Callable, cast
 
+from docx.oxml.ns import nsdecls
+from docx.oxml.parser import parse_xml
 from docx.oxml.simpletypes import ST_DateTime, ST_DecimalNumber, ST_String
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute, ZeroOrMore
 
@@ -27,11 +29,64 @@ class CT_Comments(BaseOxmlElement):
 
     comment = ZeroOrMore("w:comment")
 
+    def add_comment(self) -> CT_Comment:
+        """Return newly added `w:comment` child of this `w:comments`.
+
+        The returned `w:comment` element is the minimum valid value, having a `w:id` value unique
+        within the existing comments and the required `w:author` attribute present but set to the
+        empty string. It's content is limited to a single run containing the necessary annotation
+        reference but no text. Content is added by adding runs to this first paragraph and by
+        adding additional paragraphs as needed.
+        """
+        next_id = self._next_available_comment_id()
+        comment = cast(
+            CT_Comment,
+            parse_xml(
+                f'<w:comment {nsdecls("w")} w:id="{next_id}" w:author="">'
+                f"  <w:p>"
+                f"    <w:pPr>"
+                f'      <w:pStyle w:val="CommentText"/>'
+                f"    </w:pPr>"
+                f"    <w:r>"
+                f"      <w:rPr>"
+                f'        <w:rStyle w:val="CommentReference"/>'
+                f"      </w:rPr>"
+                f"      <w:annotationRef/>"
+                f"    </w:r>"
+                f"  </w:p>"
+                f"</w:comment>"
+            ),
+        )
+        self.append(comment)
+        return comment
+
     def get_comment_by_id(self, comment_id: int) -> CT_Comment | None:
         """Return the `w:comment` element identified by `comment_id`, or |None| if not found."""
         comment_elms = self.xpath(f"(./w:comment[@w:id='{comment_id}'])[1]")
         return comment_elms[0] if comment_elms else None
 
+    def _next_available_comment_id(self) -> int:
+        """The next available comment id.
+
+        According to the schema, this can be any positive integer, as big as you like, and the
+        default mechanism is to use `max() + 1`. However, if that yields a value larger than will
+        fit in a 32-bit signed integer, we take a more deliberate approach to use the first
+        ununsed integer starting from 0.
+        """
+        used_ids = [int(x) for x in self.xpath("./w:comment/@w:id")]
+
+        next_id = max(used_ids, default=-1) + 1
+
+        if next_id <= 2**31 - 1:
+            return next_id
+
+        # -- fall-back to enumerating all used ids to find the first unused one --
+        for expected, actual in enumerate(sorted(used_ids)):
+            if expected != actual:
+                return expected
+
+        return len(used_ids)
+
 
 class CT_Comment(BaseOxmlElement):
     """`w:comment` element, representing a single comment.
diff --git a/tests/oxml/test_comments.py b/tests/oxml/test_comments.py
new file mode 100644
index 000000000..8fc116144
--- /dev/null
+++ b/tests/oxml/test_comments.py
@@ -0,0 +1,31 @@
+# pyright: reportPrivateUsage=false
+
+"""Unit-test suite for `docx.oxml.comments` module."""
+
+from __future__ import annotations
+
+from typing import cast
+
+import pytest
+
+from docx.oxml.comments import CT_Comments
+
+from ..unitutil.cxml import element
+
+
+class DescribeCT_Comments:
+    """Unit-test suite for `docx.oxml.comments.CT_Comments`."""
+
+    @pytest.mark.parametrize(
+        ("cxml", "expected_value"),
+        [
+            ("w:comments", 0),
+            ("w:comments/(w:comment{w:id=1})", 2),
+            ("w:comments/(w:comment{w:id=4},w:comment{w:id=2147483646})", 2147483647),
+            ("w:comments/(w:comment{w:id=1},w:comment{w:id=2147483647})", 0),
+            ("w:comments/(w:comment{w:id=1},w:comment{w:id=2},w:comment{w:id=3})", 4),
+        ],
+    )
+    def it_finds_the_next_available_comment_id_to_help(self, cxml: str, expected_value: int):
+        comments_elm = cast(CT_Comments, element(cxml))
+        assert comments_elm._next_available_comment_id() == expected_value
diff --git a/tests/test_comments.py b/tests/test_comments.py
index a4be3dbb4..8f5be2d1e 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -13,6 +13,7 @@
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.packuri import PackURI
 from docx.oxml.comments import CT_Comment, CT_Comments
+from docx.oxml.ns import qn
 from docx.package import Package
 from docx.parts.comments import CommentsPart
 
@@ -86,8 +87,85 @@ def it_can_get_a_comment_by_id(self, package_: Mock):
         assert type(comment) is Comment, "expected a `Comment` object"
         assert comment._comment_elm is comments_elm.comment_lst[1]
 
+    def but_it_returns_None_when_no_comment_with_that_id_exists(self, package_: Mock):
+        comments_elm = cast(
+            CT_Comments,
+            element("w:comments/(w:comment{w:id=1},w:comment{w:id=2},w:comment{w:id=3})"),
+        )
+        comments = Comments(
+            comments_elm,
+            CommentsPart(
+                PackURI("/word/comments.xml"),
+                CT.WML_COMMENTS,
+                comments_elm,
+                package_,
+            ),
+        )
+
+        comment = comments.get(4)
+
+        assert comment is None, "expected None when no comment with that id exists"
+
+    def it_can_add_a_new_comment(self, package_: Mock):
+        comments_elm = cast(CT_Comments, element("w:comments"))
+        comments_part = CommentsPart(
+            PackURI("/word/comments.xml"),
+            CT.WML_COMMENTS,
+            comments_elm,
+            package_,
+        )
+        now_before = dt.datetime.now(dt.timezone.utc).replace(microsecond=0)
+        comments = Comments(comments_elm, comments_part)
+
+        comment = comments.add_comment()
+
+        now_after = dt.datetime.now(dt.timezone.utc).replace(microsecond=0)
+        # -- a comment is unconditionally added, and returned for any further adjustment --
+        assert isinstance(comment, Comment)
+        # -- it is "linked" to the comments part so it can add images and hyperlinks, etc. --
+        assert comment.part is comments_part
+        # -- comment numbering starts at 0, and is incremented for each new comment --
+        assert comment.comment_id == 0
+        # -- author is a required attribut, but is the empty string by default --
+        assert comment.author == ""
+        # -- initials is an optional attribute, but defaults to the empty string, same as Word --
+        assert comment.initials == ""
+        # -- timestamp is also optional, but defaults to now-UTC --
+        assert comment.timestamp is not None
+        assert now_before <= comment.timestamp <= now_after
+        # -- by default, a new comment contains a single empty paragraph --
+        assert [p.text for p in comment.paragraphs] == [""]
+        # -- that paragraph has the "CommentText" style, same as Word applies --
+        comment_elm = comment._comment_elm
+        assert len(comment_elm.p_lst) == 1
+        p = comment_elm.p_lst[0]
+        assert p.style == "CommentText"
+        # -- and that paragraph contains a single run with the necessary annotation reference --
+        assert len(p.r_lst) == 1
+        r = comment_elm.p_lst[0].r_lst[0]
+        assert r.style == "CommentReference"
+        assert r[-1].tag == qn("w:annotationRef")
+
+    def and_it_can_add_text_to_the_comment_when_adding_it(self, comments: Comments, package_: Mock):
+        comment = comments.add_comment(text="para 1\n\npara 2")
+
+        assert len(comment.paragraphs) == 3
+        assert [p.text for p in comment.paragraphs] == ["para 1", "", "para 2"]
+        assert all(p._p.style == "CommentText" for p in comment.paragraphs)
+
     # -- fixtures --------------------------------------------------------------------------------
 
+    @pytest.fixture
+    def comments(self, package_: Mock) -> Comments:
+        comments_elm = cast(CT_Comments, element("w:comments"))
+        comments_part = CommentsPart(
+            PackURI("/word/comments.xml"),
+            CT.WML_COMMENTS,
+            comments_elm,
+            package_,
+        )
+        return Comments(comments_elm, comments_part)
+
     @pytest.fixture
     def package_(self, request: FixtureRequest):
         return instance_mock(request, Package)

From 761f4ccd7751afeeaa5fff5c6f47325c3e0970fa Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 23:26:14 -0700
Subject: [PATCH 360/367] comments: add Comment.author, .initials setters

- allow setting on construction
- allow update with property setters
---
 features/cmt-mutations.feature |  2 --
 src/docx/comments.py           | 13 ++++++++++++-
 src/docx/shared.py             |  2 +-
 tests/test_comments.py         | 35 ++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/features/cmt-mutations.feature b/features/cmt-mutations.feature
index 6fda8810b..1ef9ad2db 100644
--- a/features/cmt-mutations.feature
+++ b/features/cmt-mutations.feature
@@ -47,14 +47,12 @@ Feature: Comment mutations
      Then run.iter_inner_content() yields a single Picture drawing
 
 
-  @wip
   Scenario: update Comment.author
     Given a Comment object
      When I assign "Jane Smith" to comment.author
      Then comment.author == "Jane Smith"
 
 
-  @wip
   Scenario: update Comment.initials
     Given a Comment object
      When I assign "JS" to comment.initials
diff --git a/src/docx/comments.py b/src/docx/comments.py
index 7fd39d54a..f0b359ee7 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -116,9 +116,16 @@ def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = Non
 
     @property
     def author(self) -> str:
-        """The recorded author of this comment."""
+        """Read/write. The recorded author of this comment.
+
+        This field is required but can be set to the empty string.
+        """
         return self._comment_elm.author
 
+    @author.setter
+    def author(self, value: str):
+        self._comment_elm.author = value
+
     @property
     def comment_id(self) -> int:
         """The unique identifier of this comment."""
@@ -133,6 +140,10 @@ def initials(self) -> str | None:
         """
         return self._comment_elm.initials
 
+    @initials.setter
+    def initials(self, value: str | None):
+        self._comment_elm.initials = value
+
     @property
     def timestamp(self) -> dt.datetime | None:
         """The date and time this comment was authored.
diff --git a/src/docx/shared.py b/src/docx/shared.py
index 1d561227b..6c12dc91e 100644
--- a/src/docx/shared.py
+++ b/src/docx/shared.py
@@ -328,7 +328,7 @@ def __init__(self, parent: t.ProvidesXmlPart):
         self._parent = parent
 
     @property
-    def part(self):
+    def part(self) -> XmlPart:
         """The package part containing this object."""
         return self._parent.part
 
diff --git a/tests/test_comments.py b/tests/test_comments.py
index 8f5be2d1e..bdc38af9a 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -153,6 +153,14 @@ def and_it_can_add_text_to_the_comment_when_adding_it(self, comments: Comments,
         assert [p.text for p in comment.paragraphs] == ["para 1", "", "para 2"]
         assert all(p._p.style == "CommentText" for p in comment.paragraphs)
 
+    def and_it_sets_the_author_and_their_initials_when_adding_a_comment_when_provided(
+        self, comments: Comments, package_: Mock
+    ):
+        comment = comments.add_comment(author="Steve Canny", initials="SJC")
+
+        assert comment.author == "Steve Canny"
+        assert comment.initials == "SJC"
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture
@@ -213,6 +221,33 @@ def it_provides_access_to_the_paragraphs_it_contains(self, comments_part_: Mock)
         assert len(paragraphs) == 2
         assert [para.text for para in paragraphs] == ["First para", "Second para"]
 
+    def it_can_update_the_comment_author(self, comments_part_: Mock):
+        comment_elm = cast(CT_Comment, element("w:comment{w:id=42,w:author=Old Author}"))
+        comment = Comment(comment_elm, comments_part_)
+
+        comment.author = "New Author"
+
+        assert comment.author == "New Author"
+
+    @pytest.mark.parametrize(
+        "initials",
+        [
+            # -- valid initials --
+            "XYZ",
+            # -- empty string is valid
+            "",
+            # -- None is valid, removes existing initials
+            None,
+        ],
+    )
+    def it_can_update_the_comment_initials(self, initials: str | None, comments_part_: Mock):
+        comment_elm = cast(CT_Comment, element("w:comment{w:id=42,w:initials=ABC}"))
+        comment = Comment(comment_elm, comments_part_)
+
+        comment.initials = initials
+
+        assert comment.initials == initials
+
     # -- fixtures --------------------------------------------------------------------------------
 
     @pytest.fixture

From 66da52204db395466cc7ea033af0f5bffd228953 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 20:46:35 -0700
Subject: [PATCH 361/367] xfail: acceptance test for Document.add_comment()

---
 features/doc-add-comment.feature | 14 ++++++++++++++
 features/steps/comments.py       | 31 +++++++++++++++++++++++++++----
 features/steps/settings.py       | 17 +++++++++++------
 3 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 features/doc-add-comment.feature

diff --git a/features/doc-add-comment.feature b/features/doc-add-comment.feature
new file mode 100644
index 000000000..73560044a
--- /dev/null
+++ b/features/doc-add-comment.feature
@@ -0,0 +1,14 @@
+Feature: Add a comment to a document
+  In order add a comment to a document
+  As a developer using python-docx
+  I need a way to add a comment specifying both its content and its reference
+
+
+  @wip
+  Scenario: Document.add_comment(runs, text, author, initials)
+    Given a document having a comments part
+     When I assign comment = document.add_comment(runs, "A comment", "John Doe", "JD")
+     Then comment is a Comment object
+      And comment.text == "A comment"
+      And comment.author == "John Doe"
+      And comment.initials == "JD"
diff --git a/features/steps/comments.py b/features/steps/comments.py
index 2bca6d5a6..39680f257 100644
--- a/features/steps/comments.py
+++ b/features/steps/comments.py
@@ -63,6 +63,17 @@ def when_I_assign_comment_eq_comments_add_comment_with_author_and_initials(conte
     context.comment = context.comments.add_comment(author="John Doe", initials="JD")
 
 
+@when('I assign comment = document.add_comment(runs, "A comment", "John Doe", "JD")')
+def when_I_assign_comment_eq_document_add_comment(context: Context):
+    runs = list(context.document.paragraphs[0].runs)
+    context.comment = context.document.add_comment(
+        runs=runs,
+        text="A comment",
+        author="John Doe",
+        initials="JD",
+    )
+
+
 @when('I assign "{initials}" to comment.initials')
 def when_I_assign_initials(context: Context, initials: str):
     context.comment.initials = initials
@@ -98,10 +109,9 @@ def when_I_call_comments_get_2(context: Context):
 # then =====================================================
 
 
-@then("comment.author is the author of the comment")
-def then_comment_author_is_the_author_of_the_comment(context: Context):
-    actual = context.comment.author
-    assert actual == "Steve Canny", f"expected author 'Steve Canny', got '{actual}'"
+@then("comment is a Comment object")
+def then_comment_is_a_Comment_object(context: Context):
+    assert type(context.comment) is Comment
 
 
 @then('comment.author == "{author}"')
@@ -110,6 +120,12 @@ def then_comment_author_eq_author(context: Context, author: str):
     assert actual == author, f"expected author '{author}', got '{actual}'"
 
 
+@then("comment.author is the author of the comment")
+def then_comment_author_is_the_author_of_the_comment(context: Context):
+    actual = context.comment.author
+    assert actual == "Steve Canny", f"expected author 'Steve Canny', got '{actual}'"
+
+
 @then("comment.comment_id == 0")
 def then_comment_id_is_0(context: Context):
     assert context.comment.comment_id == 0
@@ -146,6 +162,13 @@ def then_comment_paragraphs_idx_style_name_eq_style(context: Context, idx: str,
     assert actual == expected, f"expected style name '{expected}', got '{actual}'"
 
 
+@then('comment.text == "{text}"')
+def then_comment_text_eq_text(context: Context, text: str):
+    actual = context.comment.text
+    expected = text
+    assert actual == expected, f"expected text '{expected}', got '{actual}'"
+
+
 @then("comment.timestamp is the date and time the comment was authored")
 def then_comment_timestamp_is_the_date_and_time_the_comment_was_authored(context: Context):
     assert context.comment.timestamp == dt.datetime(2025, 6, 7, 11, 20, 0, tzinfo=dt.timezone.utc)
diff --git a/features/steps/settings.py b/features/steps/settings.py
index 1b03661eb..882f5ded3 100644
--- a/features/steps/settings.py
+++ b/features/steps/settings.py
@@ -1,6 +1,7 @@
 """Step implementations for document settings-related features."""
 
 from behave import given, then, when
+from behave.runner import Context
 
 from docx import Document
 from docx.settings import Settings
@@ -11,17 +12,19 @@
 
 
 @given("a document having a settings part")
-def given_a_document_having_a_settings_part(context):
+def given_a_document_having_a_settings_part(context: Context):
     context.document = Document(test_docx("doc-word-default-blank"))
 
 
 @given("a document having no settings part")
-def given_a_document_having_no_settings_part(context):
+def given_a_document_having_no_settings_part(context: Context):
     context.document = Document(test_docx("set-no-settings-part"))
 
 
 @given("a Settings object {with_or_without} odd and even page headers as settings")
-def given_a_Settings_object_with_or_without_odd_and_even_hdrs(context, with_or_without):
+def given_a_Settings_object_with_or_without_odd_and_even_hdrs(
+    context: Context, with_or_without: str
+):
     testfile_name = {"with": "doc-odd-even-hdrs", "without": "sct-section-props"}[with_or_without]
     context.settings = Document(test_docx(testfile_name)).settings
 
@@ -30,7 +33,9 @@ def given_a_Settings_object_with_or_without_odd_and_even_hdrs(context, with_or_w
 
 
 @when("I assign {bool_val} to settings.odd_and_even_pages_header_footer")
-def when_I_assign_value_to_settings_odd_and_even_pages_header_footer(context, bool_val):
+def when_I_assign_value_to_settings_odd_and_even_pages_header_footer(
+    context: Context, bool_val: str
+):
     context.settings.odd_and_even_pages_header_footer = eval(bool_val)
 
 
@@ -38,13 +43,13 @@ def when_I_assign_value_to_settings_odd_and_even_pages_header_footer(context, bo
 
 
 @then("document.settings is a Settings object")
-def then_document_settings_is_a_Settings_object(context):
+def then_document_settings_is_a_Settings_object(context: Context):
     document = context.document
     assert type(document.settings) is Settings
 
 
 @then("settings.odd_and_even_pages_header_footer is {bool_val}")
-def then_settings_odd_and_even_pages_header_footer_is(context, bool_val):
+def then_settings_odd_and_even_pages_header_footer_is(context: Context, bool_val: str):
     actual = context.settings.odd_and_even_pages_header_footer
     expected = eval(bool_val)
     assert actual == expected, "settings.odd_and_even_pages_header_footer is %s" % actual

From af3b973dd2c938f6851537978fe76f4f5e91dcc9 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 16:31:54 -0700
Subject: [PATCH 362/367] comments: add Document.add_comment()

---
 src/docx/document.py      | 50 +++++++++++++++++++++++++++++++++++++--
 src/docx/oxml/shared.py   |  3 +--
 src/docx/oxml/xmlchemy.py |  3 +--
 src/docx/text/run.py      |  7 ++++++
 tests/test_document.py    | 34 +++++++++++++++++++++++++-
 5 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/src/docx/document.py b/src/docx/document.py
index 5de03bf9d..1168c4ae8 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -5,17 +5,18 @@
 
 from __future__ import annotations
 
-from typing import IO, TYPE_CHECKING, Iterator, List
+from typing import IO, TYPE_CHECKING, Iterator, List, Sequence
 
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
 from docx.section import Section, Sections
 from docx.shared import ElementProxy, Emu, Inches, Length
+from docx.text.run import Run
 
 if TYPE_CHECKING:
     import docx.types as t
-    from docx.comments import Comments
+    from docx.comments import Comment, Comments
     from docx.oxml.document import CT_Body, CT_Document
     from docx.parts.document import DocumentPart
     from docx.settings import Settings
@@ -37,6 +38,51 @@ def __init__(self, element: CT_Document, part: DocumentPart):
         self._part = part
         self.__body = None
 
+    def add_comment(
+        self, runs: Run | Sequence[Run], text: str, author: str = "", initials: str | None = ""
+    ) -> Comment:
+        """Add a comment to the document, anchored to the specified runs.
+
+        `runs` can be a single `Run` object or a non-empty sequence of `Run` objects. Only the
+        first and last run of a sequence are used, it's just more convenient to pass a whole
+        sequence when that's what you have handy, like `paragraph.runs` for example. When `runs`
+        contains a single `Run` object, that run serves as both the first and last run.
+
+        A comment can be anchored only on an even run boundary, meaning the text the comment
+        "references" must be a non-zero integer number of consecutive runs. The runs need not be
+        _contiguous_ per se, like the first can be in one paragraph and the last in the next
+        paragraph, but all runs between the first and the last will be included in the reference.
+
+        The comment reference range is delimited by placing a `w:commentRangeStart` element before
+        the first run and a `w:commentRangeEnd` element after the last run. This is why only the
+        first and last run are required and why a single run can serve as both first and last.
+        Word works out which text to highlight in the UI based on these range markers.
+
+        `text` allows the contents of a simple comment to be provided in the call, providing for
+        the common case where a comment is a single phrase or sentence without special formatting
+        such as bold or italics. More complex comments can be added using the returned `Comment`
+        object in much the same way as a `Document` or (table) `Cell` object, using methods like
+        `.add_paragraph()`, .add_run()`, etc.
+
+        The `author` and `initials` parameters allow that metadata to be set for the comment.
+        `author` is a required attribute on a comment and is the empty string by default.
+        `initials` is optional on a comment and may be omitted by passing |None|, but Word adds an
+        `initials` attribute by default and we follow that convention by using the empty string
+        when no `initials` argument is provided.
+        """
+        # -- normalize `runs` to a sequence of runs --
+        runs = [runs] if isinstance(runs, Run) else runs
+        first_run = runs[0]
+        last_run = runs[-1]
+
+        # -- Note that comments can only appear in the document part --
+        comment = self.comments.add_comment(text=text, author=author, initials=initials)
+
+        # -- let the first run orchestrate placement of the comment range start and end --
+        first_run.mark_comment_range(last_run, comment.comment_id)
+
+        return comment
+
     def add_heading(self, text: str = "", level: int = 1):
         """Return a heading paragraph newly added to the end of the document.
 
diff --git a/src/docx/oxml/shared.py b/src/docx/oxml/shared.py
index 8c2ebc9a9..8cfcd2be1 100644
--- a/src/docx/oxml/shared.py
+++ b/src/docx/oxml/shared.py
@@ -46,8 +46,7 @@ class CT_String(BaseOxmlElement):
 
     @classmethod
     def new(cls, nsptagname: str, val: str):
-        """Return a new ``CT_String`` element with tagname `nsptagname` and ``val``
-        attribute set to `val`."""
+        """A new `CT_String`` element with tagname `nsptagname` and `val` attribute set to `val`."""
         elm = cast(CT_String, OxmlElement(nsptagname))
         elm.val = val
         return elm
diff --git a/src/docx/oxml/xmlchemy.py b/src/docx/oxml/xmlchemy.py
index df75ee18c..e2c54b392 100644
--- a/src/docx/oxml/xmlchemy.py
+++ b/src/docx/oxml/xmlchemy.py
@@ -423,8 +423,7 @@ def _new_method_name(self):
 
 
 class Choice(_BaseChildElement):
-    """Defines a child element belonging to a group, only one of which may appear as a
-    child."""
+    """Defines a child element belonging to a group, only one of which may appear as a child."""
 
     @property
     def nsptagname(self):
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index d35988370..d49876eaf 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -173,6 +173,13 @@ def iter_inner_content(self) -> Iterator[str | Drawing | RenderedPageBreak]:
             elif isinstance(item, CT_Drawing):  # pyright: ignore[reportUnnecessaryIsInstance]
                 yield Drawing(item, self)
 
+    def mark_comment_range(self, last_run: Run, comment_id: int) -> None:
+        """Mark the range of runs from this run to `last_run` (inclusive) as belonging to a comment.
+
+        `comment_id` identfies the comment that references this range.
+        """
+        raise NotImplementedError
+
     @property
     def style(self) -> CharacterStyle:
         """Read/write.
diff --git a/tests/test_document.py b/tests/test_document.py
index 0b36017a5..53efacf8d 100644
--- a/tests/test_document.py
+++ b/tests/test_document.py
@@ -9,7 +9,7 @@
 
 import pytest
 
-from docx.comments import Comments
+from docx.comments import Comment, Comments
 from docx.document import Document, _Body
 from docx.enum.section import WD_SECTION
 from docx.enum.text import WD_BREAK
@@ -39,6 +39,26 @@
 class DescribeDocument:
     """Unit-test suite for `docx.document.Document`."""
 
+    def it_can_add_a_comment(
+        self,
+        document_part_: Mock,
+        comments_prop_: Mock,
+        comments_: Mock,
+        comment_: Mock,
+        run_mark_comment_range_: Mock,
+    ):
+        comment_.comment_id = 42
+        comments_.add_comment.return_value = comment_
+        comments_prop_.return_value = comments_
+        document = Document(cast(CT_Document, element("w:document/w:body/w:p/w:r")), document_part_)
+        run = document.paragraphs[0].runs[0]
+
+        comment = document.add_comment(run, "Comment text.")
+
+        comments_.add_comment.assert_called_once_with("Comment text.", "", "")
+        run_mark_comment_range_.assert_called_once_with(run, run, 42)
+        assert comment is comment_
+
     @pytest.mark.parametrize(
         ("level", "style"), [(0, "Title"), (1, "Heading 1"), (2, "Heading 2"), (9, "Heading 9")]
     )
@@ -288,10 +308,18 @@ def _block_width_prop_(self, request: FixtureRequest):
     def body_prop_(self, request: FixtureRequest):
         return property_mock(request, Document, "_body")
 
+    @pytest.fixture
+    def comment_(self, request: FixtureRequest):
+        return instance_mock(request, Comment)
+
     @pytest.fixture
     def comments_(self, request: FixtureRequest):
         return instance_mock(request, Comments)
 
+    @pytest.fixture
+    def comments_prop_(self, request: FixtureRequest):
+        return property_mock(request, Document, "comments")
+
     @pytest.fixture
     def core_properties_(self, request: FixtureRequest):
         return instance_mock(request, CoreProperties)
@@ -325,6 +353,10 @@ def picture_(self, request: FixtureRequest):
     def run_(self, request: FixtureRequest):
         return instance_mock(request, Run)
 
+    @pytest.fixture
+    def run_mark_comment_range_(self, request: FixtureRequest):
+        return method_mock(request, Run, "mark_comment_range")
+
     @pytest.fixture
     def Section_(self, request: FixtureRequest):
         return class_mock(request, "docx.document.Section")

From e3a321d26195fdd6e368f59b63be06b1277dac14 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 17:51:50 -0700
Subject: [PATCH 363/367] comments: add Run.mark_comment_range()

---
 src/docx/oxml/text/run.py | 33 ++++++++++++++++++++++++++++++++-
 src/docx/text/run.py      |  7 ++++++-
 tests/text/test_run.py    | 13 +++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/docx/oxml/text/run.py b/src/docx/oxml/text/run.py
index 88efae83c..7496aa616 100644
--- a/src/docx/oxml/text/run.py
+++ b/src/docx/oxml/text/run.py
@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, Iterator, List
+from typing import TYPE_CHECKING, Callable, Iterator, List, cast
 
 from docx.oxml.drawing import CT_Drawing
 from docx.oxml.ns import qn
+from docx.oxml.parser import OxmlElement
 from docx.oxml.simpletypes import ST_BrClear, ST_BrType
 from docx.oxml.text.font import CT_RPr
 from docx.oxml.xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
@@ -87,6 +88,19 @@ def iter_items() -> Iterator[str | CT_Drawing | CT_LastRenderedPageBreak]:
 
         return list(iter_items())
 
+    def insert_comment_range_end_and_reference_below(self, comment_id: int) -> None:
+        """Insert a `w:commentRangeEnd` and `w:commentReference` element after this run.
+
+        The `w:commentRangeEnd` element is the immediate sibling of this `w:r` and is followed by
+        a `w:r` containing the `w:commentReference` element.
+        """
+        self.addnext(self._new_comment_reference_run(comment_id))
+        self.addnext(OxmlElement("w:commentRangeEnd", attrs={qn("w:id"): str(comment_id)}))
+
+    def insert_comment_range_start_above(self, comment_id: int) -> None:
+        """Insert a `w:commentRangeStart` element with `comment_id` before this run."""
+        self.addprevious(OxmlElement("w:commentRangeStart", attrs={qn("w:id"): str(comment_id)}))
+
     @property
     def lastRenderedPageBreaks(self) -> List[CT_LastRenderedPageBreak]:
         """All `w:lastRenderedPageBreaks` descendants of this run."""
@@ -132,6 +146,23 @@ def _insert_rPr(self, rPr: CT_RPr) -> CT_RPr:
         self.insert(0, rPr)
         return rPr
 
+    def _new_comment_reference_run(self, comment_id: int) -> CT_R:
+        """Return a new `w:r` element with `w:commentReference` referencing `comment_id`.
+
+        Should look like this:
+
+            <w:r>
+              <w:rPr><w:rStyle w:val="CommentReference"/></w:rPr>
+              <w:commentReference w:id="0"/>
+            </w:r>
+
+        """
+        r = cast(CT_R, OxmlElement("w:r"))
+        rPr = r.get_or_add_rPr()
+        rPr.style = "CommentReference"
+        r.append(OxmlElement("w:commentReference", attrs={qn("w:id"): str(comment_id)}))
+        return r
+
 
 # ------------------------------------------------------------------------------------
 # Run inner-content elements
diff --git a/src/docx/text/run.py b/src/docx/text/run.py
index d49876eaf..57ea31fa4 100644
--- a/src/docx/text/run.py
+++ b/src/docx/text/run.py
@@ -178,7 +178,12 @@ def mark_comment_range(self, last_run: Run, comment_id: int) -> None:
 
         `comment_id` identfies the comment that references this range.
         """
-        raise NotImplementedError
+        # -- insert `w:commentRangeStart` with `comment_id` before this (first) run --
+        self._r.insert_comment_range_start_above(comment_id)
+
+        # -- insert `w:commentRangeEnd` and `w:commentReference` run with `comment_id` after
+        # -- `last_run`
+        last_run._r.insert_comment_range_end_and_reference_below(comment_id)
 
     @property
     def style(self) -> CharacterStyle:
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
index a54120fdd..910f445d1 100644
--- a/tests/text/test_run.py
+++ b/tests/text/test_run.py
@@ -11,6 +11,7 @@
 from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK, WD_UNDERLINE
+from docx.oxml.text.paragraph import CT_P
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
 from docx.shape import InlineShape
@@ -122,6 +123,18 @@ def it_can_iterate_its_inner_content_items(
         actual = [type(item).__name__ for item in inner_content]
         assert actual == expected, f"expected: {expected}, got: {actual}"
 
+    def it_can_mark_a_comment_reference_range(self, paragraph_: Mock):
+        p = cast(CT_P, element('w:p/w:r/w:t"referenced text"'))
+        run = last_run = Run(p.r_lst[0], paragraph_)
+
+        run.mark_comment_range(last_run, comment_id=42)
+
+        assert p.xml == xml(
+            'w:p/(w:commentRangeStart{w:id=42},w:r/w:t"referenced text"'
+            ",w:commentRangeEnd{w:id=42}"
+            ",w:r/(w:rPr/w:rStyle{w:val=CommentReference},w:commentReference{w:id=42}))"
+        )
+
     def it_knows_its_character_style(
         self, part_prop_: Mock, document_part_: Mock, paragraph_: Mock
     ):

From a809d6cc8aec18648850d8b94d554f05621e433a Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 9 Jun 2025 18:05:15 -0700
Subject: [PATCH 364/367] comments: add Comment.text

---
 features/doc-add-comment.feature |  1 -
 src/docx/comments.py             | 10 ++++++++++
 tests/test_comments.py           | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/features/doc-add-comment.feature b/features/doc-add-comment.feature
index 73560044a..36f46244a 100644
--- a/features/doc-add-comment.feature
+++ b/features/doc-add-comment.feature
@@ -4,7 +4,6 @@ Feature: Add a comment to a document
   I need a way to add a comment specifying both its content and its reference
 
 
-  @wip
   Scenario: Document.add_comment(runs, text, author, initials)
     Given a document having a comments part
      When I assign comment = document.add_comment(runs, "A comment", "John Doe", "JD")
diff --git a/src/docx/comments.py b/src/docx/comments.py
index f0b359ee7..9b69cbcec 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -144,6 +144,16 @@ def initials(self) -> str | None:
     def initials(self, value: str | None):
         self._comment_elm.initials = value
 
+    @property
+    def text(self) -> str:
+        """The text content of this comment as a string.
+
+        Only content in paragraphs is included and of course all emphasis and styling is stripped.
+
+        Paragraph boundaries are indicated with a newline ("\n")
+        """
+        return "\n".join(p.text for p in self.paragraphs)
+
     @property
     def timestamp(self) -> dt.datetime | None:
         """The date and time this comment was authored.
diff --git a/tests/test_comments.py b/tests/test_comments.py
index bdc38af9a..0f292ec8a 100644
--- a/tests/test_comments.py
+++ b/tests/test_comments.py
@@ -209,6 +209,26 @@ def it_knows_the_date_and_time_it_was_authored(self, comments_part_: Mock):
 
         assert comment.timestamp == dt.datetime(2023, 10, 1, 12, 34, 56, tzinfo=dt.timezone.utc)
 
+    @pytest.mark.parametrize(
+        ("cxml", "expected_value"),
+        [
+            ("w:comment{w:id=42}", ""),
+            ('w:comment{w:id=42}/w:p/w:r/w:t"Comment text."', "Comment text."),
+            (
+                'w:comment{w:id=42}/(w:p/w:r/w:t"First para",w:p/w:r/w:t"Second para")',
+                "First para\nSecond para",
+            ),
+            (
+                'w:comment{w:id=42}/(w:p/w:r/w:t"First para",w:p,w:p/w:r/w:t"Second para")',
+                "First para\n\nSecond para",
+            ),
+        ],
+    )
+    def it_can_summarize_its_content_as_text(
+        self, cxml: str, expected_value: str, comments_part_: Mock
+    ):
+        assert Comment(cast(CT_Comment, element(cxml)), comments_part_).text == expected_value
+
     def it_provides_access_to_the_paragraphs_it_contains(self, comments_part_: Mock):
         comment_elm = cast(
             CT_Comment,

From 4fbe1f684e08aa7eebb0ce6bfedfce512b5c95a2 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Wed, 11 Jun 2025 21:07:55 -0700
Subject: [PATCH 365/367] docs: add Comments docs

- developer/analysis docs
- user docs
- API docs
---
 docs/_static/img/comment-parts.png      | Bin 0 -> 30058 bytes
 docs/api/comments.rst                   |  27 ++
 docs/conf.py                            |   6 +-
 docs/dev/analysis/features/comments.rst | 419 ++++++++++++++++++++++++
 docs/dev/analysis/index.rst             |   1 +
 docs/index.rst                          |   2 +
 docs/user/comments.rst                  | 168 ++++++++++
 pyproject.toml                          |  26 +-
 src/docx/comments.py                    |   2 +-
 src/docx/document.py                    |   6 +-
 src/docx/templates/default-comments.xml |  11 +-
 uv.lock                                 | 303 +++++++++++------
 12 files changed, 846 insertions(+), 125 deletions(-)
 create mode 100644 docs/_static/img/comment-parts.png
 create mode 100644 docs/api/comments.rst
 create mode 100644 docs/dev/analysis/features/comments.rst
 create mode 100644 docs/user/comments.rst

diff --git a/docs/_static/img/comment-parts.png b/docs/_static/img/comment-parts.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7db1be54bbbb04abf5286053f9aaea94c26eab9
GIT binary patch
literal 30058
zcma%j1zc3y`ZnFAh;$2xASvBaBBeCaDUH-HbW15IU4kOr&Cs19B00>^AUSjm@omq&
z_uO;t{hxC`elxO|z1LoAz3W|XJkL8uzED#n#G}GPK|vu@dM2lVf`SPL+A%m-z`xvW
zRA?wDsQR|DvM-cmWf@+$I$PU1SfQXijQ5C>Q0{(l@9lzJ?Oc@mx6#}Tld5OM_g#v~
z<bRU9>Ltcdnn-{39jwH(<@{}ScF>3<I%9E}2`4z}_TwVc)BBI7-3$cEmYZnc;oUxC
zA~YXWzf<tDpjZvp@#EKwPu88-R7R<Vj)%Ftvuo~7C{Aa^Z>tk%!Nv%M$3_~zK5Du2
zrc4)mCz20^_+M1Cvpl^B{*>tdBIf4^D5!&^s(FL26WQY@_*mZe!Hms*<f387*micl
zO4RvV;XLv>@dMJTO#5PLRYO6~lM33NQwdCa5#>2$k-#U_5wbFOahp+Z4%B|MvhM^g
zp$OKSeZ(PudD;In?I8(wS8xo4rFmF0d+I%*8$Yr3b&8JTd+)bS?Wy@YdRfcPmZ!07
z{Xb(EvZY$vOOX?T6KcqGsc6bkX!|qU%TPMaKAsL-_=FwJv46WEF!aiierP7EZn_=_
z$XdrrPsv(U73C4o#z8?1w?)AKTByLA3V5TSpeMXV!3KWc1>SNW(f)N66aEqXUu~3_
zUpLBV$|@-Vzcnpft*o5fY@FTSpS6+#kD9jC(sS2SRS~stcH}a%bT+r*0z1C>)dfWy
zEDAIot=!ERz>W@1ZlYibrr+)m1=_zp=4N8}?G|@?2_`+&7Ywq_u2u|!Ts&MnOp<sE
z3=HC~me!&gati<K4*Vs-WaIAsMwFY|)6<j7lb_4k^))xIh=>R`4<9!l-(%p8$8KIu
z?q=Y}PHxQqc*wt=BWLAi;cENF-PYNO;n#D`%$+^lC776g4fOlZKjvu#w*B`=PHz8P
z7O+6>Ust$!xp=sLe>Tun{MV<VFKoe94*GJoj(~W8F(i4P@QMF+|9@Ti_lSS!srQGT
z0z7}}`iD#Z*;U)k%2n3c5g5~5^50wY&vE~F@t+;VxqmJF52E;ooPYZi5VRzoIQQ?H
zCW*K7(D)n$MH)p(PDTrix|4++_(O|446&!76?M$jDkOt>kJD5}J^*6g39sTf#fl=l
z2VnxqV>(1cMLm(1L4ApO=fk7c5cklm+w2UlSrw2qk_$hxgkQ-R_-Py5;o5*@rraAR
z!NQG0`O`}d_Z_X6jwop78QlYEw12-UbxAuGdOfx$lRm66B_t#~7#z=kmhgauExNEa
zJM+VXJFw)>dTB;ye9r<g{{Gd4p=CbJ6tM;WKDgcXwY*DA&eOrisyVBe$*+;oDe=$K
z`H$HFe=-!o4re7cX_<U5o<bB^acB2<K8#mW$Vlq*FX6`ikFlRINTS;8Rwf<%@L;P|
zbe~9sCUU}PFCp5s-uK`uHJ0pulEr@x-eIi9u=U{6y|~TnNA<g2Lxpt&p&-lFZLud{
zgR1lq@WL>H+F0^$A0dr~7GKyH^8`dO0KRO-+iSji@B^ehr|sL|;HmDTNNe4~hB9P+
zmjU&!UqP)|(j6LDQQl7$5iymSo}=#l0dTp}%kr>$@J}Bb|E??W)F2A9>^7%7(H;-(
zO08U&U~8mytH%f1$D;|{cPDU!{(kF#tM39Y8cWXUCTHqYgeqytR?UP~yjn{Zovdbv
zHL3nfoBmUR(!OY4nicuyd4q~?h^uJ1NoR8FGN>w)xlghv5eG`uAO3d#Or6;lcdX(@
zh^}d$iiyu(yOJ%yL|4xuaF1Tf_&bO9Z?pZ4*nX{@2i3VtOWpkp<LrS_SOLKYFzKQZ
zA*TQb9pQug?{=&N3DAEl{2!J7_cjXJI-iAIb2$`C?xe5+;t0){4Bg2twpS|tHnBo`
zOz}Uuldz(UfwbozcN$@OL~K3t=>J@-<|<S}$)O+t(>Q5;)=2xG`oGhPq4O^1LHz55
z_)a6|86U>|A*DYaFlk&Zx~rC`z2d@>8KQXFU~f6iS;nS<kMpbGkI$zfbtGKit6-S?
z60PBX&P~CzH#QMt*(d+h@pE3=pRZO5-PJ1!AZ1SATrtwsdUG~4snAyqubLS4YVah3
zn(-%=Iv3r8Ct-yAdAk^BQ6u(7o!bSCMDYKlNT$vVJgpT2k6K@hO&cY-7j8F8gIW2@
z37qztHE)F^B=twF-LvQrZ=;<5mjIPJCZM^+CG|1y-S3=uD2hDN%f|^jbI;WKeT)90
z@m!j8Mj%Zh9p)tG4*L$R3i5z`zvrn^9OY=)&3puC-`ltUAA=9Oo@u}wCAFbtL!tyQ
z#twT^bM0aG{s*O^NIN+W4Y1G?U*`XzgJ6u7kyFcwS&8s7n`($vbHTDviJVrTdf!fQ
zI;#4T1f61X{Qt0l)pN|ra3`f*l;znWQ&o8|88k6&v)q6L8owJuh=*A0{$DnL2bJGJ
zmzP!vQ7_#GX=*F!pnEK2X58!f<K;LlpLp0A&$Iv3!~Z<UC^!tWwEDZxd>d4`7hq33
z@7d|~`P2rd?5o9kqIV1Zwe|W<I?ohQ^mmfGiFjdYBR08shg=o3ZY8Yw-kW<mu!Y2O
zf&2e8+<zKX@I=uv?E3;4jxVgUcNiRwsoKK_m#FZ>IjK!w@{|38<NCk!;Q*(wFgtmJ
z$PBhtYj5Q|dF*LW*Ziv78(2D+M_=K8^nPX+%UWO1wN0CGX)XUOP;usMo9&cO?V~Wy
zSb~K=oz6d=)PJ-Yh)|VZPjiCCO!`<~)#ceVsn+5tNurU1arT+ym!EVq{SV0v2nIc~
zlM^h3aY5^MYE|B>1{T~?N=UGZQa<q0tcJn4q@=YyHs<$O>Sgu9!^LP8KCwPY$E6?V
zGc2je&)shumJ$K|_pJW#2`B)qNQ}AKa!-Ns8t$tvY#*{SU$pF_QT)SJUqLk6$biVE
z@z%*RKJ|%qI8j`WQ~YN%v8g4#kSowTu8#!q_p(gMw(r4Zf@J<yh;bHZVmHc3nEX@2
z#5tVFNk<LJRe8Nuiie=0fNwXhJ!t~@&vz3<oP2cYa2~_>UC#17q4k-bFk8MB_5--T
zRzFpkXIRJItN8$B&~1JG(9XitfO-yh(j<OE#<Z8+s+6ri*vmG+j*#8Nu{~43kRqn~
zo#$@E1T22L+<0#$=I5j8c~$?jd)^i4<(gn_0(v^+|D{5|8!8B6&@L1-R2pf&`kD+j
z%>^~fbAMnPPBY(>SG%jB`aFfZjoMhda`?rJKrD=J;UzH0qf+J-30x-MgxA6r%`H<(
zVXQgna!V2saofK?_5W<>GY6`iN%d7E;L4^9tb05XEV!q=azy+6i?X(@pP|((yMg6w
zbzMR_p5k#2D)+g3^!>q|*&0&as6BR#&k<T>ue4v)JFu?}B@Ng5mva=R?upNrJ$7L8
zF&9r(i*0D}e603;Q19e@mrr?T&EHzFnPD7Lrpbjqu0$95$MIPPnxFNm%oR-gW3mpn
ze<tyrgp&z2*=>E*A}h!e&%$C)po-5b5?kxrfZ9Fvk{kNK&U~^psaz6g>ewGc%lb_{
zjZc2A)|MHGFbO2B-?GxHheU0En|@46*M#`C6pvfM-NG!Bt;3HiDSiL%!^0jn9<!OJ
zl>9&G*>x<X*o|8nKR+l)4K#j`pSm;i;Sp4*aFI?aGN3YfZ@x)Z(0O(h|J3G_R*?qo
zHnykqXL<?m+ERlCuG_G)LQhB*{e6DB$031xd#pNP-<-ZfCMUl?cr_Y`^B+#{4`=6>
z&tss*NYF^o)|<X^vJBeh(B_}H;{<(7Dv&mNBiEnn+kSn@kEF6}-w2R44j<XGs#}rB
zODtikq4nQe-*<u-(N-vqfX{^Yv;OQ^|1ikm2NXG(^OyV}ZnX3HdgleF<-NVhqu|}$
zTsG|#^WMZY2xGJrG`UQpR?mgB@D^HS6qORXIV32RAz?iBaRLEx%Skn=%w%^6k}T>e
zpH4*E1`%4;Zbw<yZ4+^y7^T2NOPa@qejXUlNGhI&|HU*uqTq<1FNV0TCFwqYPbF}8
z?7(k55*LJyJ+!~nZMF5INTbGDRZKmWPGTg6SzW!a@9;y%)x{BTyK%e_9NgW~-G06t
zE$$egZqF&gqC~W#C9e_1`pXu?tJ>EWO*g$7zNa*Kh^LV|E@%rc?sN*6<s~hdn@k;Y
z3WlsTA~THp#EKV{P{!h{8`^!1|Jq+#zVC2uzh)(tIF36;EJ)d7TUJe#>esABFvrBD
z@xLD0ZCKzcGiXT0#J@k_cLrmNmAtgMZ(vquB(vDOU7pzNu|2dBE5*g3Q#wOtH1l{&
zzgDmM$@YtvF<Y->hqP3aX~i0b0}M2+GVu=DW3P0lxE9j$x2sDJ9jqbbdLZ#ok5Si#
zZ|<N{3v=xU^%lb!4rJ8uX6?!AdvFO$-@gi1XOwZoZ?BF(`4w%K#rjdJy;c?aH419t
z2Xa|Ft_3YeU&UNIG06vn7JQij;a9IqT^~=h2opjF*w8#-9w{Sf{Nbm3B8vv4;HW3I
z2F5X>khfZ;+A0Pw4DM%Xd7P?4Er0kNSzQFbFIFmfnAKlF<1X+zyfA`D$`fCEe$+}q
zsMYGnHEnattFZ_9=Dj8AORyLF@Bcy*fY7ee`^3)c_WEpBBYyU3T#<fl&<fc2SL>r0
zY$w~(DG4mfuQJFUY4IFfPZ>B1;3tZU+@T&MN5iIh6ZoS@v%eaCw1(jW{v@yM>-^@8
z$fmooYLOv%+isDan5Nd3>&oYCUa!kJFSi#c(9G^gTE8}fMht?dzoreu?0~peXum_8
zywLG=zIfOOXwFE=|E0<@NZ~RJ`)yA>K}M6C`0}c&VI!$RNnu8x>g*;H3bMVQ6N&Bc
z==NAKvQ~~sRweq~UoOAjTu%0~;;i}c(7-{;RPxYC)NuW-ffcl#mTzSv>2T7Z#tMGy
z!Rtp9jhKbS*mBYfwPc>!^g*(*V}$qLG|ZnCesh{d41je}>9)ZuwL=%@xs|qm;oyV1
zWKjfpxZAI)pV&{Sm=e~wZ)#9V`L|qMZda`LXJ=%KF16Z>=QY{B?cXy;V`mo?dC1(4
z!Lwxd{xW|x6PiA-qkoj|eX=#B;~M{fUHiV^6Oyvloj1@KLU`P0HjRgakSgtRGaIC&
zt$YX)iSWmDU8n=y4LgG^)>x7MRnT%6*zqk_b}c91=C@OuEa7uns}p~6GiP66g(S!j
zbWD&5!J2hR)gwDNTL>85u4s4KuH@dFZ>lL<*^QODi5rtds(evNGuJ<R{Hiw23D!I-
zjdCj6a=VsdQn{rFc%rq{MD^sQ?r^AdP&;$8>rPcaUiFr4xgmS^Tf!qx-C`}Jo3r-Y
z3uvT{!h0%~5NzUlB~!CH*To?0Az)VQz)n`t`0jV|hFeYDrVcfuPVLv{h<jCcEEgEJ
zdawHh{LBr1TQYb0mXO+VB$b!Xyaz|W+A`9`cDg*vee=6~LZSt2ji#n%89c+e&DNKz
zW&dd!uf<yeN<KMO)$|A9^!|;8u7fNZfQ~e7JZ0Po>WiVZKN<eOZjnPKw<H%&s}ngV
z-EQU_>SnPFJ6szcW(=ocq7?&u&?$S>E8zgRnZr}4GxWp}-lD%R;;}n7$$I$SN4l0I
zhg{G6O%dRFzJF1r7Fh}<-8p|3GrZgOdG*0;`%@Qor1Q%n!xFjX^$rH+ubV{AUc`|*
zKClt3rzqMTN1~M|rO(Ff@7+@mJsYw9*ts3hEJY?(7eer#y2XPwaoIvasa51<`6?&n
zS?E8{@ToAGBCUs(oZmFFLA^s{VI}qWj(cK1Fw^!3>yFn*?{S6Qxw>7l$t5P_9;CwL
zOCDrloqtT66!55EIn1en{1juVB8~j0ENZK3<XMCFBT+>vAt#458)77#-|<Um0cpJg
z5Nd29WEaL`@UH7kYR;H-jlJ@BxivmNTkWHEJ|4@m$yd*j)G-O$eO6)I%48Q#`f~i+
zkb5A*dS&Uc6u83&(MmoWaC^-x+T^ghp5YwhzV%}efduR|U8&vn7Q}f+>tU>+OD`G7
z@!YUOhOO*9;JUv`tylHaMHim$G<c3loXNQ_KFFKh@~4c^43et0=qI`rZV0Xhv=qJt
z`uUCVaKD>aabLe_jAS@bO>|JZ!3w0;OG7d9jg5<`pT_N77IrD3aU~|=E3PT@e5CDi
zt3=w-`2=ub2TdPyM4#Pzc?T9#1Oz@9E&I)D$p%*z9&yaB$K#3yw1(5FLa=)xKR<>z
z7?i~^(Fa^rnFvYgT7S)?d>IcjZUnu#MYP{CK^vUM5>tq_<gCZCvz$``+rtmCGNl4!
zESK`aPWdfntJmVmICSOQKXO!iPj2DpRZQj3+Ur23?Tn^Vl3#+y8e-oP{wW~p*i#Jb
zLhhZVRrUWPfYfK+M<UuY_Hp8;!mJ4mC_{Bl%shKVUOnxQ7we}F@NHfZFql1sc}yGK
zNM_AUlE*UU0lNY_m8qQIv?(E$5uhNsgh|#7<L*_TTpVpcUC!V>&dq*H!B)e`vmNLd
zi>8HSv2}Ou!D}W0YEPEJ>0eRrLK|X#YNAewW9S{vMna`-&OZgrRkYvC4GC<ED?H2M
zF?)*flsCo}i1_4MFLqP?uP-mUL{5`9bh&~p=)sFY0}w<T^*Dj+tvEUs!T#8a&J!{C
zX^!9NEN@o}b)$5K%#wsy>AcADV_tAj{Q)Ib)8gC<;|3>KYPbLS5;nC;M_@3usZ1CU
zj9gBKBlosSDq>6*(NKe+uxJXyH>jP+dAG5;6`sc6pv)^G0xCyn{o@5=OqLdIJszoQ
zn_RXQ?rFp*9vMux?A2Q2UdborYk0YFB5Rk0#3?1=btvWk8Jhq4u(IF|_~v3mz9uT)
z=WOpL-w1HVH=->I+7ZVMM|PN?C!Py_4W{3}LY*L^&N?+o@?l`8&P%Oqzf*k!ZiD*L
z<DcW*Q%f@Rwb?HjjkzE@d{AuaJ2P__D~alo@poCC4`g}5DLG>xF(4N>;8^<&&jh9o
znbX5|=@Vf$x4=H<QBHxbCe)=Kr`G{?c%kuUUi1~nEGJl+UTeSp1h`>g$HqZ+!Bi>a
zhQX9MWQ-(t7IxS}sy-tM*8-E1ZOYf2jy7)qRv^i|S6u2K$NzG$BAo1pri<~hEn3F0
z;LpwSr!Jz()HI3OI)xc8-_eMC2ZcDt;qL^KRIcM<amMj*2T5YyIZ7)G<f>$NYTAb8
zXa4l77(yJ{x7sOMXr|&G*fq5O*5|fqBb(HZsaw){v_9oMwa_K9DFGGry6R(WFqkY4
zpSn}JNwpd;gi`Nohn)g`Ro>b?IKSzT(O(H3B895*xp<1rbv^C%WunA#ag6XX&P(Kd
zh;&_PoO9a+>lpWa$F2&R#PX+s;R8Fy=^i^d#9h_+=Otn?=Vc9W*WP*uSaV%FVY~pv
zzSuOU)6o%8a=(FR*W<7F?QbHkxW1`JTt)1h(l1MullM0`LZ<|5l?mLX#lt)NE;kDd
zC|kD4xeRT#55&JZx1Q*j$c4ut(7Ng@+`o!!qzdnzc2=}nkEYib-4`gINxpm%_;~VC
zVX>2*ppG#Ch>@_P9VALhztd7YYP>oeR(;rhI%j_^K{6%4F<(C!)f)<Gm>_JH<|M`{
zH+bw@`g54OonVje4jm@Rs>>KAdWeMGiiLc7FE_pKzRa65r-p2LbgKgfX-gq=R->mj
zXSE(=b9LV)mdf7l)>J`$q8P`6-&ei+i&!oY<MbX{>W-ElOf|FDGO;sITEt^Zi{t5A
zUe=tE;Wzr5sVHQL(OBrvRADmImp?G&>`w%M^!B`~=cOf=*d1+&b|Zm|H%IY`bX9(-
z9qzyhKm4xDeSzeE)!9=-lFjH{BJfVSLwoq{%Uchr61x7^4Yvb5ii_UeK@PrkQjzRL
zL?DJ5F&fkH&q|~(OBhIxc_V@eJTWkAaHbFP0C%lJzzfBkiYJVDVL+}+Q$r9vKa-}d
z!%NsZE4*7ffx+FACm-!_*H~pM+Jjt%SAT;zuKnh6m_GH5M<vGan?k>M)o;;<V9uB2
zaKud_dZWpqSnzb>!p2a=>El_L=FCJ7NZnr19AeezleQ;VSG;wY%>V#$?UHxumHz_G
zs2s+XP7V7Q6G*0{5VT`|qC}39?L{{5S&;!9sy}R*@2EE<4W1sPc8nxAP)cMS1T4U7
zG!YCiPT5v3*Xt~gWCkd${x=}Z0PCbThz_Vpo&3;L{RVIGs$uv<vwOM+gYFo<V251i
z2-qjr(SCi>&?W4Qf1h(-nKZK26nlv_XsjO>F*q1GD!#m%!T&nuXHWK2jM|mmaA})W
zn6}PbFc~pt`2GWQEI+z{D;JCTn%86Q;oH8b!9jUz!zs{>@<en4+LPfFsoSfGsaUZ+
z;oHX2YIp2FD}SsVU!FzGjQkcNg1nBlhwzQe>5an{ix!>S24;pvgZnL9j~&9>Wb%as
zjBNx+<-0Ne6QTPjgx5j$Z1HGJiX10lz&l)z9I+<e$7s{FEy3MAo6A5d9$!g=@Er*C
z)ZZ6vD$?GZD2T1KpH_2EPz%b!Lj&=PZWjJrO-JKM+zC~CYKO*!g<<$b2m?F=5hgy_
zIbHBdk^Ldxeisu%AEQT~Jer&vRKh!KH(5L@c=`RKOh~HV?5tjsYrY9=7J81ER%#ih
z&8nK3H3lds`+#fvK_B&~*iA4#SA-df1A0yYDfA`%eMt(3pni$-;Amv#8$*y@o_}5`
zcxO1eBM}eW#qbHqz_!upNuh2o?H-$Qk&`IMFRpOnE_99VI_I}QNjA&ameDOXmD^-5
zulLPVaoH@FV5~3euk6-?7w5R9PnE!)KqPx%t%`Oac!f8YBmHqqIk(cR`z;pkvXt-o
z3TCN7X2;fP_p2`k4NmouD!wXrqe|`dIvGM{cDv>B2DJL+(mDr~jl?382R`2dE*K-3
zGgjg>RX@FB8-`g8=RL3mArYZ2JOth|5KtA3kW;1<rOk`0>x+$?kjbkPLTbU8%OGsJ
zRF+%s+m3I~ziqMcXOIzeH4Z%D(3Kj$dnz+9-*1SnE^+b!@shrjo+eX9=Vq}p#8D_)
zJW${TfaF+x`zRx*{#%}%^ho=Vxc~JUU&j(LagZoY49gI2zl=ZDo~_Cj9tSglVB<89
zovME9tLyU_%@9%tBJJgA&;F*hjv#bQb?#c5@ux#6+&MWZrj9;SypO)v%e^rW4xmgO
zlD3S6KO))C_L;WlTcN~5p!EF}_&0NeqXGa*eeWolb&Wi<--5_fP3!!Sr&uUV9HFf{
zZ%I``f*;S}s7*yGDKE{^63}4tw%Sg7=`=TJKmM-lh>J=CpWkQkOiXB2;&Zu@IGeXH
zK5)AG&7H89JyqBxZ{DS!_9mN3z%KRU_FPz8Eax@g7|aXtaV}GP_$db5+c&>ttbWi`
zt6H{*5$Rjl<wITv{~Q9&mxX;3S=16aBKuw-3f*xEaSrK-k!4a+3B7Zqga7N45Y$k)
zJ1qhGl%`)%#n%FncTXh-=E6@#0#VVg*q96rDB@hsc==WUgJ$0_Y$BRmX}kF?H^d~H
zo&$V|n#0YC4<f~5#)qr2QX?|KcTs0|ep2trdm6rpL|}3z*iDzydhRnBLz*7RvWk75
z6-Y>6?AXS~AJ`$8jh`!DkmWvtkuK!+^RLjp`!f^t2k6s>CI~Q8Gv%9^ZeItF=jK1B
z6yhxGe%w#r?0nT}bvL|qbg2_o?`U9;mbR;>_*S$U!uW(4pNg{cz`>lsyn7h~wUg>T
z57#Hk<uYjawHi;qw+_1gu|<E(`=Y(-b;c2$A`SU!=q>+O;cj}lK-%X8YFQ4;Iyn2n
z<kcVJuVcM&aB8@q^!jrHTf|s=8U3;J+`Um`{LVfN#PDmij`wH!O-j1mIoJ-b3=M(6
zD_LZ>p7HW)me{mli2vrp0X&XrwU+#Cj?*P7m|&^i{)ez=?Gl|qSz?I?KpuNnyey~`
zgfo*WPENqs_bH}k%cZ|5AF@&P9@M4o+*m+j>ax;u2&=lNlIs(b6q{LGTq}+4+UP>L
zTk6g;6C(3aJS#8=!_yEP$@cV3?EPm9-A2gp4z!HQM48Chp_#jDGq$&%Lc1Uurhmn3
z?8sp71g+PMNpi@B6V;WtlG?F0%SHHun*wK|37~S>E9Kb+PkBIzQA{P2X{THaL~Z+B
z_^jD^4%e3_tRLyUf93*tYKq>J0N+>$Q?uB8WtHlvKqI0p?C!|jN_rV<cM$rt?_Sf!
zP~po@J1=l%C@`cuh%mc+KuF?TvS8jG9SjHgMcr5jw}^d`IL4di5w{;Qryw8=ta?Ol
z49@kvI_PIrk;PEFjl(1g@Uc{eP>8sGzD+YDVNPXl1F(wWbOobKdeZdfjtR`v(ECAS
zl(VaqR9&G3*z~@YRv#?rtILT+e==;sTg3!-4b!Tsqj2GG{3@elq*eL_t0%-jI}}Gx
z6t<_zFpus^>w(l27mEljk=@U+96ONo=HgeQE&+{^I^%+K-HBv4Dt-7tv@{2_9S^!I
z#h!{$T+M1PwK+RQjuGWh?ga2G{Su0&_VjZ0H0iXq<8;Sa=ft!J)ZfXpNbET2b5zS-
zeTuG9McjXJ6bw9NW6|+4N$J~%ENG1XfWU)b$$_t`<??yd?`l?Y23Lb~^GxJ0*HbUE
z-+dvvJ2)5*nCf1!k)bCU!g>0eI%Bje$q#h{oNo0-SKk*pDvx++8NNT>g$e~rK8UKb
zpH_HsBy_kKLj0v9kI7%IcRJ$L=x1n(e$Zu~;uEBBu;j<FM<9hC+y=A)2~2i`cgIJz
zQdz5^0iz_bKT7ra*S$Rg85q?^*JBEK5H(t;3o*SL_g5p-HYad-ck^z4A`P5d$(q*F
z?U^23_U~|O7i-C3OI>a218A%qHoEy%U<lEaoK{4GD;bP=i=A$K(3*MHYAxqsZ62Dp
zoV?p@i^tZF$U?;cIr*CiH7EPE^lN&VTavA9x^YzU_BKdEm-5M``kB|JslsQ6+3K6B
z#mH%|jV$t)(DWB$cuu4QtSYG_<L~@^mLw-+N(KsY{Hexe5`wp%-TxZe9zMQ+d9<N;
zpX(LH_`55dy$K-Y`)Qx#`eXVLr!Mrh_3)%UQ_0DZL5+1CYlr>M@ZSHj@M-WfmW!3a
zlzjczz3*42_DcT(G@dcU;xZs9C=XKa-KCsLoqtjjs4K)*qy0=(*P|!m4qB|YWx;DU
z)Au1NZ_c}zkEqj@A^?C!sq9tVUBRTR8|FmH*_nv~b#k&a%v0e?g29L1*u-T}O2{k+
znbGHGw=LZb)lQcpvCbQqk!`9Of*RG9N*6$0xl`kEDs3ZFP`Z4Ad!M&bv-34&<_;O%
zp6I~c#NGEJ0hXoA=ydv9m8n6K1T%r8SMc_$LuDU3G?2jFCXT1^KpXfjdJcECbfCve
z5Q21C$M|u7F^psnb-o5i?{bl@vpyqLsN!o96!hiHPhY3bmdRslDxPUj{(%UKzD9!P
zj}0S7OG7&`zWGTltcjv@;+99d$&9f(o_L6+YaFonpCYmy5sZf|2$39?ir<B1dd3nM
zL_#3i;f<{$9*Jgr0C;acDNmJG1~cgO(m(lq=Xp0!v0Ql=NNGYJa!xOXdaBrEmInJo
z;UOq6g3pQ2J(H%&N**3*Ks|!Bg~z0Qr*CWV{+=EASV<DNA<n80cIKrJ<N&Vgjt7tz
z_D^<U)+PYNrULH&Ts;5^kM%dZ2Mg(FvDK28pdg(RfY3@JvUg%U9c(Cxs?&6<BA&&Y
zG8_ICdj1c!nW@9z8GpPS&D|FFDOPfhb*i`L(|}X>B!S%aFPZ{~4nLc;`}5uxfYfhL
z=FsX0ZM}A$4#YL*wS8ko?EGCz9o!FLtAqG@s*IFUB1l$Fq)OJb^Y@Ksr1Vbzrpm|^
z!GyxwYCm1hXVFJ6jw`uK#`=+TIlbR!<7-wo1aG%q&D`D`xyR5b7V&MI`KvG%eAl=b
z61kIowZ~~auhHvOmdH(s;OJ9NAd^ya^;=2!SE^>p&G^FoR^xEtlF(;x@{mu-bnHQ;
z>(#2nQ5RVI-w|dd^&J~{OOxtz<fzcX01!r6-dtT+i)prcd)R*e9I5&N&rGsr(9ZLd
zGFPpUJRL;s1Jy3QD|B)j)?(d4;Q4bu`+fyfN4=reyA21SY~pWX9YdjSV^(GH`w$nh
zA2pDI!KmQhi+wuE8RI^)gWyt^o}(9DI=_LCK`qRIIh$;mZ-QG7%eCu27@<`<s%zWQ
zzU7OXVQf(3JfcMttDZlAkbn1)&K%>8J;OWMR$AFHM&14$(6UUEem;z)Uv3ab7Jpz|
zb<K$B^*lQoVAz1OzLJG*<3*4(`o~I%oqCLs6`0(KWh)jLOxq@WB<8c{v)!3Ks`@+i
zS?M37C=p~^lVmObj&FdKfE&0jCU^{3Q18xc<EkK#03hCa!^ME|M<7+PBSUx+`V<6t
zw7tx^(CYYbFBu!5-DO>kz(XV*{54Vc&k7iZ_kkjVrW4h3nyS9x46(N)O6wO+9ITz6
zC@v2E3$XpAyFswbzzyDQTolMfekJmsa(`ii!;m6TTv5_R)Zlr|y~Tk}O*IVauQ2i1
z%($QXq01-t0%!KlAE*6a?Vv6>lrOyS55=N`c5(%J+S)Ky%`iG=H1QtLvt8q#z9nBe
zHNl>8jSv2o`u$Zv#`8hui&!c2Q*m>0YP(OZaYC|e=-C&e$)`p@4VeO}^ScZYRh=t{
zv7j@wxWcj8uRq{>(;DOV!dLIn_Hfk|f6Jxg7BKEt=(7ZHzGAp7eZ{CeU6#E1*^*r|
z@AH!)W6c<+sYmVVW2gThCP1WU%E_GZK$@igi&O%Fgv9Up%F0cyYo7s*`+K#OG5}1U
zJGrv#u;T7ep)qfK9@-jZx^;3ZuQ@=X9(*(?xi{;XQjB(h?9=$CSRQI&aHheAZ4~Pv
z%1-^xuO75yOlFk%ke22V=pRCkb$5U=CI==JlGV1}C`~Xi+LGumYr3<J!BBrjDX1rT
z>6N*oGKu@_>G)OP9N)z_xorOY2nU*hXT(+g6Q&YDMa$9T2#2}sy5!i>EY8tKUIBWR
zyEs!!zxH?jj$X5S(L6vm9^N1k!vM%l-cTj#u{AK?<hHVB!HByvigCX@_Sq=kpzD?o
zbS*5$)0(o^Ry9Ezyn#S+qFc!SwuqqC1e8#BWzYUeh)KqH{_Iz2_XgTxufj*MWk%Tt
zH-2OOhwC%WpZhydeb&PJqFH|pEs@pX$^T`D-H$%b@lq}^`s-uj<eZxu%^O%=ksj6V
zmJkTiI3kNiGQW_~tf^o-1zmq~r7tPl<d^uc<#pP9jsz6k)#MJKs36~M<7@Joagheg
zube#-G-q3_niF*mAnE`T?!?RMk38j!p<Az)6^G+oU7szSQvN8`R(_uJs7_Jy0$@~E
z+mL%l6$iljQ$mPD2NvK-9BC(xpZp(t2c+mZROmcXviqQx5E<Qy5%HWQ;WH@h0eiVE
zn9L*V_n0jX6OCj6kfaCMZ0kGE$9!c**9()beZxK}Mi~djdFPU@*9Qed6WvmG^hkLA
zaTZT$(D+k0Kh)%S2`jj_uNHp&ejAmsdN78iJQfSDik2vqnUL7X!yiogyhV?yep9K*
z%B^%88nkWR>Z)`ayPHqVRBf7drYj4pR?;Z?d`7%~xpqP9(jTP^NcM^)aOV^NYG>un
z0K#)9;tum_2RiYwx;Fr>&t9HPn;=qL@=bAQKr?35zxdLPEYH<0d~VLv#J#*4fWgA%
zbN~6`b_YmQPo_Ojo?H7NtwF_{3qS7#9=A$BysDoRrLwl<%s<puvmM!le@`^W{il2H
zVI#SD93Al32gILUmZ92$hwzLp+{sR_wGTV9asI5(gm({4`%c3B;%Fz$bsD<@Itg=M
z-gKQ~+;#KKhb@4OZw#+uKg?Ey`g$9T(KKk1VDG8<J;tFESM0+$twpXCaZ4W7%)yct
zz+Id5-u~fgr#1A{Y_+02yKv^@uqC%EUmd%*d1BHgpcheAwd%$+<D4R@v9ZYl6)K%D
z(_g&t#||9vvw1f@`zcPbg<k{?b2CKE5HxG`D-KQ%_`<Qm7l2!;SJfqVb|s;_Wa9@^
zg;=|+dTTbhS{0eJw?XIghf9wg_o&W@ug{GfwHTGG%bu5nIR5T{q^EGtNxv+UTnj`k
z6yH&GQICnSu%LE@?7DC6D;0&wg1KK=ro0;ExToMxdhT)KkhVWfAU3+`D7w1k-pv}D
zqD_61^c}gEQUbzTUW64@V0MOV45W5sySJAvv?xiy+GCp*?W~5CC#VF<O0C15f8UL;
zFh51GQ~z4Nh1Z-^`Psel7NTG0E2Tr3yVa6BrS#SnNOgSX@nHbuXLYdL>vD#P50Dgg
z<}N^>Q~lt3_Yf-!i+q&atpplJ1`r892Y{52(aY`I8)St(`~$ZMoIAQ9!DJU}EX;rT
zrM2FX<^83bMPU{5XeIkjL1TcSd|>PnGqkuM<uor0R5HYH8aBRo{^21bz_iB!!7Xm}
z7H^OfkN@qpXBv-LFsELnbiKnY)30od21piv!DFTZ2EXtkOQ0a9+IE6<7C;>r`5k@~
z#+z1R<xB(g5ND+wz;EScdcwUlYQCH`JgdwF)&wObFDJP6*{z#)r~yb>*DhSPMx%O_
zNfCP<y(f-yPkhRZAUef5Wsd-k@dFLO$@s&9x2V@$E_Q;=*AaU;;>{Y>sW_$9ZQo?P
z<nEB+Y;9>e|LzEbN=YjN%%BzOM*M!Tnna~2pvD@{AqRQAW!1uF|J*nCMT><3VYUBg
zX%qFG)YGvR@y*?84|^5&vBbW^rg&iUF5U%?z7Fch2DSU1Pn=b=takfoB_``LRQc$#
zbLOn<sPHX-oQHNKaN|0%<xrOMGdRi6*m`E<UbcV_8X*kjUH4Z30xB_*lr5c2gwsA<
z(9ur+(5TrxQe+SAgGhRv?bU~2g!Aneohc5~U92OnflMGh5dRL@sStO|e(*gG9TkOG
zy2ldU$8ih($k84r9ORhPZA+$0AEiI^VzN8{%_yiNdL%%vz0{-~4q_C8XcnkVO)myY
zx7-|WPpbnYK1)T*VU)v6WoJxy!wrzqS#|N^2|CR`EIgaBh@JIsF>)IfaD_THTtH#X
z9yOx=GQngxd%tR2S}xWzPMdm4u-0`AUBY(L0WP~t);*S77y+<4WwTbcg6xgSK>XXM
z)sI4?_i<r3`SH=2*`YBF!odxTn2wVKR-m4<H{FT1r!-F<QEmk3!$APEODZXEe(ryB
z@fu3+FH67RcV@)FRoFJE(S9m7&XW$?<AZM(mKlye@r@+15cyZyAx(gav-hR3WT5=H
zpmDQQ9v0%xiT6o8b3&ABS$ONi1(q)47e@mRrj$Glxf*3xQWB3SThR08i^LT>_2E+W
zLJlyd-st;vl2&KuE#<MeIGwDYX3ArqE;qYTEfNP@&npyHLyKnV<oPdX4nzo%YX$S!
zUt{RSmmr1>iMrD{`ih5n6_i=bLT66KzMjE;91+N=EaEd7rW%BwQyZHYXzv4Uk(gCZ
zUOLl<;Q>7AOs0xGauvPHgRvFMqf^If{hIUopRU^hP}K**MIK@zEiP`ICw`J^Y!{9<
zH2Q7+W%_MTD)iZMG4E}um<TTz*Ccb@eK%MC<FcUGN^9+U_zQDr4k5z#*0K4pE<<q0
zN9tYmp@jj>y|bB}O#Ar}TWhhf?Vgk6S1yj{^K|0FN4Z%L^CI7JsepA(6FaGrEv;gv
z0vg{`h7~xb<R|9>wRo>ro(FT2!Tw!C#fF0#8a2KwB86(`wt98m$$V@_%Wfmlh>f?7
z=OGL$`?ryM6_$oMKEJ{z1}U7Y^Oact8j-3~>9@$Dg6u~C=9UD+8>tlUc03|VR{CR8
zfGkYO)Ffo^l~D%=9p&OLu$N56W)DCZt>l?MQRQ)9Sm1O4=tVN0)zAQ;(7Y+-#IN$5
zD*)L~eoQ2D3h=wtM|rtdcGD-+Y4fRXP64tpMbL3>0N}wN45x56$b<rwBDi`thr`@c
zW8iBU1u$UbF=tmzcdG}NiUJOL$uk-xV*rFZi$N0tz!g(;Lp)87uoMh?hN(P}^LI0O
z7#6W~cnZ-Nsq_(^^Df~f)|7~uj@RHJ_JVVCwEc^I6x_?`F%maaY194(6?^QsG}!Tw
z!W#pk<u-hRzD$oPeT{ktecPGJTtBs$@b(;R0*Xa^1j+t*f91aaxIFpnMvO%;x)4QN
zBT!z2dCHBGxdK!j2xd@CvmM_Fxi_%RUD!se$8x}Zq_CD~g;a~buy1WAq?)kqlN4+F
zXBr}Xic=U@{tAaFulgRVMz8bKy%rXE#aaO*ZPQ-iTJ@rK=ybc}p>RDR4c)|Yz@tzC
zDk%l{rBf)bP$fghGifg}0iGhdo<xsVZ^297x7VURslO9}J4!#J7B?%!6J@T;@?wpV
z{_Lbz_jZ=taOwa<q}X<yGD%rWkCJCg`NDEJw%T;fHDI}21G&R-Qlgboe?mPdQIN$(
zrkoQ0iN4LK*XmlCg^J~DR=urx`%Z)Hu%e`&N!yK|hRQ7Ih6&>?wcydPg37i09_{fL
zwzrN8kD$lI{mfJiah*c263Y4QwIy|UVyr(ETZzyOhidWkhZSORIUZcI6+3J_YLcYv
z%VpV%7uzGo^)sPI*4RIi6~|hitc%~^qH`?XE~zgJmV9bYkRpG~GleWE{P8rbrkm<X
zJVZ@GD2pWED}U=6H`z=k7#k}Gb`w`yHvO#a>g2VTMr%fZ?zmGlo_A$z<HzoC*Nq~h
ziMk_XaFgr8qR<-DR`ZHZn_W|l=plW^sC!qC;~IQo>}Wewmq!?l_h7xjMDWh|uCr!E
zuE9wPJ>0i_k%p_<=ekkdg#IW=Ox#*z{}S?9Cv0fl!0(Xs%**7n^!uYE*#_pAQ5O?*
z)n22~tyb#$vTm0!_Mb?>PsqIqC8?na6MxS35v0NCV;vPy0Y?_LdOPM6kLNze<Zif&
zkSAVWIrS^h+#i$as!RTSu?ag#P?0}wKk+%~63Q8zZdcVg@JL#`v+SKzG8k01H7D{b
z)mi5sd^c(#i=EbZJyuM1+G=A|&~_}k&9wRL;qC?+)yQZo?L_X+zI_w6A<Ap-UMLGa
z>@e^&ztQk$&aK*X@-S7DWK|K4lv9~?#$O-ssE~3Vu>i>l?YmtC44t)7@10^V?q3I;
zi?7EnEYmKhyl>oa5vf+f4-jM9u)FP0<+Fl2v=cUbFV>NuJnBev9TwvrhO8*eq2xlt
z*MvN!tlK&Ew-M~E1=+XWg@n==+o973N503`wt1@H04K@*On<3p&*;%bg44~LmtvN$
zSV8=;GzJf{`h5@<Q8*ItkOxg_Xg+K~n|>w<QrW)x=_fzAetk{Egpr}-GTUdb%8j9$
zBF{z#U8<i^j+k0-q{lkqD@orSk|Lly$ri+L?k8aT{Xq?fi=%91covTT0y9HGSHfqY
zoQ(B*y%TKCLAjE+U$)Vca)D&Y#P>jcr`lofSGB{`L9)s2@~e2IYaq|acs~SKsV#$^
zcT@t;V<b-Xw!427d=g7tz3I9M90aHh8}nm;K>ln50SQI~+J~N~0C?DyMf^CS4><;g
zWu}zzB7Nem)5+-${pfCxgv!zSsNXm(+L^l4wIw>%OgP)!4!SO3R_9)PzwSV6v^5~F
zYp^P_phhQ5WK-`e-f39yw`N3-W+0z7_9+93Q5PKN?gn217^z*3(th)sG74~zUTlXZ
zIZzN$@6nR$46g2&C2pdn*q6@O%kG>YqW3$FhtV@D#(Y?b5&NoLcL-EuP1NJ(ISbz@
z-~Mq{kMw)PArZ^P)JrxATksCSZ18v%&uquL20K{#7mCEk#M6oxt}a$3Rj%z=pgaBE
zZl7=*_F3*4vy>YNB#~r<6U!%r%f4SHzLXV>EX1|WoXje&7PQ~i4v~y7h<E1rw0Qe7
zZ}V}Wb{@2B(2?QT<KXnuX3#z4zt0_K`>1P0K(36ieB1Z=TPA9ZLwpl(R}WV$`W>>g
zcR%SvNx|_enDmFwAGOG0+%ER>w#`6Hs*YnDpQ40+!^oZMjS6U0l!6KNY;K80I=uL(
zcz=tSzhJm&OyaIZPH?2`!R1y%B;RH{xz*BElB;VD@(HzDn*G<yC`tOW0V7r>nJ3ZY
zBqw9umu5KuyHQDNi_L^dD>)#i%-dmhso}*8L?V{x&qXw*rO!<@mYZ_|<pVbZE#}fv
zl)_FQOx`B-+UqFgjD_RyneoOgqUHEOkWOzhZtm(3fH6Ng<rjC3x^H`K_moy_cE|{`
zj$UvWS~?WVDZ9B|o7TF+Ug>|H4{=d|cISU4`pOXX<zCgh*;sd;4*4(*<aXdwmO)#S
zU;ONBlV?bmk5ii%rr$yz1OeKaXG}Q>(11@Pa--j0##&wNbl|I(7`{2@J^a>>zE(Ac
zrO%pJB4mO+#qee98*0H)E-Jq+wsJ%bOxyHEeJspjQ`SS;Znux{Fq{rs<|Z*xYQXQc
zp((oSUZb4DKL6Ic0`FOd^pfZT&V8fp!}C_Y!#2sgG(1DwNX(E}3WnzWUN&>R5A(0-
z_4Cm28rqOiR$-8~CM$@y?d@VuAT{`D97vsFk^Fhelw-b1WWwQ6D8jMhE>lOP3F|YH
z>l=&8yFsW51Ps>qZ1DA0Bjz)=PfDC?lrq{cV94-BF*XVsC^DuI9Sf|1CWU^7*#A7{
zddIbY$p`i__OU_U2e<*Ld8sRv?pY{}u29R!=0<7;;&mf&=dO-+qBeMel5_bt%;ny5
zw0(BZmj!CH4e9wT)uW8f%v?>YcTL>;1$WGNY_|{k>7Cn&85M|WMejj4PsbOcE6am$
zT7W!iIK{-Dy)ssYL6$0QdVon$+9rJT9loW#*pkGKSdPhVmoiPB7}^H$Wi`Fq2=BTd
zQSRk?A$Y_cc=t7>q;Dg_B$fbV2?7e(R{C%#_ho|SjGPsQX+@n}V)2>-N_x|7^ci&N
zGMU%}o(rCGP0;q6_+PBCW?Rtug{u-@%`D{;cT$`RsktlCS~g-ky1lBkS;9vM6N&Ta
zEu+yPIy+GC_6Q?>p1%tT0%iS-aRrZIqh}wPjnh&do36=uM%*^GfAj2VSm=}7441(s
zzkms4VqbSGSdo&;TXuD6Q8qAW=fIC|E*2_%6W*on67uA7vFTu9{wpcA%n4kpR>btU
z!u(j0{lkfa;zu9CKp<^A3vPmQv2zfkvNDmqWBar|dzP<7s_g_dKx4$?Quvngnoa}t
zhImJfVgO6L4iUmy{^`4m-OK%@$7dPRSTAh~)#|-Ahy5^57^*ujSF4V=)TiNR0c!j*
z1cEq~O&8Cg!fk7er{O~*EcmL0ou9L~_OVBXQx+b+fAZ;ui_D+2*VeA#TdtXAk%ym<
z4D=wcDe6ep=lDak$<~U&^N!}FRmsMfJlFOpZ^C17`preuP|luGmS~kXS87N?9ic36
zbEG!Oyvfa}TS>@vfaOo@&FcLs(qw!#TOGmbuXh@<+>;5PFE*Q6y*cG49)30|my^qM
zD^MZ9@kxus-KD|0GiP!S$JPa@UH+`xf0uHblrI26H}$dx)}X%*AuW`e7&9yOZt4z3
z3u41+L(God;Iy1%-L&C=CVAP4UU=6oaOo6(P;%D2Q~G9_-DvIU=!0<Gs}tuoQ;2E9
zk>f*Ia<MI~W6QHlV<{~6zB6wH(ai}Ww`A@ENRSUIx+D$(gGBjRDk=QHvTFdDO%j19
zdm<|e@jFpZFlB+9mD{s6EMx_@Ij_JyD<tigJvWlEp%S<pWR{6yE@xlQOcI^_Z{@M!
zZHZHL+xDQ#15sPx%it3#))DIw<LQ3ybND+8UeGW{Z0Qn#=LF594)tS=1sB(2x;=3g
z>~Y3-PkdsK=yzfXLoZ3`AkeR|h$q<}FF<qLH>PBqstg*$<3U{HB25jjs)OXp_%2U!
z^>ow4PI+EGQJg%;4PKlZk;G7{sp*hB^wPEqS$BEFV3QV%+V5Eo(afQ<c|F;1+t3Y$
zSnw7un!}F}cF^{@F@N2+EIs>Xmp|U&zb;D3a5FPK&XkS)F(#!0?r#m0>HgA8kDlGh
z=9I2ek&kYJoSD$2;32@uW@ugtohZdY&wlUJ^y4-yrofLcD$_Tn>Du4=M-Gud;_6YF
zQni!))q)Zw?Xcf3g#1MuM&_GHHzs8Xu^>(mImu9WP$X9t11==tjd0GJA8vV&64H@C
z$&E}m!>Y$-HE1%_v%4iaWl^)?@2_m8t$aRRFRo_ID12-ufydXy_~!<283x3NA3ig2
z_e2Iy<3^|L^cmK1U)X!hA<`>u)RIWI6juk?a^BhE8E<#usO90C&3olRM9B@`1R2z^
z^qiWS2J5i3tavZA(i221lfdpQ`2qM2zK$weONgfM{s$B+Rzrpi+7PUtVw~1I{ejW-
zj?g(x+!?Njwx%QV*?NV9HVw-<wR%zQ9N&_vQ_`(I6ck>cU;h_CK*CNz<n`Bu))7en
zgbZcF#E4z_%})L*ERgQQ*q<i)@=`#amU`1a>uIvO&Zbey7s5|ZC4E|?B(5w>+$&zT
z<@x&e%kqMV2Qq!vhBC~1VBi$oTs+F%2=rQ7wq^_J+344HtbEm-j87PisScXlr$;=0
zc%bG|c2$w~ISb!ti7a&pIyLAw8+y5u52v2sf8q$2t6}b5>vW75X;hebZg~#?k`FK+
zTSj#|QzYY;SG+DUojS;+^S71?HNvs|^kcaLSIUT3Y^Z1FhPk~`^IDig^%yT3xw({c
zo`*DhL?M}%mw=DcKW6A&R@=7yYWVQlWs06pCP!LYf_xw_y#Ih|^h(~8VX<vutYO4N
z7n{kqM6BYV>8YiAmss^Hqnyru`RhlMpN*tf-PStS9?dH147O>gfS%J{OwR;6f19RG
z8>FmD%-F7|4WJCN8jWvtx?`!!?Cp0|ehlH+r6+9FijbEsl@}C{^TfDJgS9O;?h8N=
zZ=CjEE$4e5oiV)@-Xg>zHY6tV*0}2UTv2_BG%qDhGblJizC|H=?bA_r*J%P@EF9N!
z_;M7vJR%AY^PDk;m4Y5{U7ENgayNe>IP(-5{i3KKo;Oy>*tYM4d3oOwC?c6BUVtMT
zB~(L1f0APbVZEo1R;AvlPWowJyufX9KX`9hpd_TA3c-t2Vk(3#NF2cTg6`rNy<JVL
zZszI79GP)itJbe=1LUwO+ABJ9>SRr>H!%zAJ|TYP1j?2_#HwIP8>fagZ08T+?8)=Q
z#8-J6)AK@jthl9MV~62M6z1l~o9vzh$(84>K{<npg0}1yufb1Mp&g{Cg`_ua>#J@f
zC5VD;w>SFvmI>lsPou;SVQOjQC+>uM8~^as_t9h)-b575Mt-Cqyz_)+z(!GoQ~R5s
zcvnc;*K$b*)h<+OD)IwX-(LTSVlMQ#NkXopYS?03SFEH>O|V-RP_EW88DB>q<GS{}
zlmgZUa6FJnf{NaX4}(!R7tT*XZ>00ovP50K$zZdHy8>V5xRI+W#E_BLVT`rMQ`o<Z
zdr3!A8^k8X`pyG2I>WT1o|R(h-5IzGNp1qZ-E-|{T%i+G6b6l^19iCTc;{Dc+%kA!
znBzjXtK(!>2DgZxrq7s1L5jjlFx6VBvZ3EA8l~^!KG?3%N;%l04PL0aR3;C&>d;h}
z_E7HiEM-2E$m8>seBIJ6d1)_33Fng7I;R+i?FJ5Db#_^)LR=eqnBAO<Uspy)$A}9$
ziRse&Bv^O)GgP`u>#%d)y)=B2FQ(F#dYH)l?SpnFef^!KMzvnB3Qt6!Vr8`X%Uh|2
zEE~$Px2%Tbv%8((+qXWx<Fso7Lm~$J!ddx5Lzi0~!l=~H2sfzbJ+>BEO9O~)$SgD1
z=VV34siH8pHQJy#b4ll#1!ModfIX6K5OFOmssL7$p8+>Y*W0I3W4s_xQPEO&>=}yd
zjS&+R8)jD`TOItY^Qg&3Xxk-T-c^2eZ0AWl+w?-Mf+}t1Pp-;onU<?v^6&ZD2BgP4
zE)RP22%;9*iDqI}S^1jRGvN@g6IiDQ*$=;M3M_<}3J%ph*h}m#Ue<PZH`$Kp)>|?m
zWS-a-!vy7hl}}%8qedI)-~%9&D){hTSK!N;e%k&{&=4+SATvBn<J%D1i1ohe*+rgM
zj3Q73#Key_^@w6bX39g2`4bY;(fs4xdXXjY@%->R+MzL#+E4HXvQoSr*OBPJoNl4k
zYmE`J0jl=X#@h=k@OM)ct#_cXr5yFIuSRzJt5vo3K~`QKT;Q8<^!w(BB3MiY&Dms$
zQ&pt(%Q3>KQ6llt<rsP%yGHTZ$GhzGr7P@Ma^LJ&`ESZw-z9rpT&uWe;~`lFSF)l9
zel``cw#f#XRC1Y<ma>SxUHi=+eZz2NZc)z?okWxmJDuX^aRA_%;F4bfQE)fc0~?dO
z<<#?UZE{|A46(AsPk=%a1B`*1HOg$NDG~kmna1Jv?Z&eYYPf<bqub}z9pX6K{Wq_7
z*S0z!5}$C09(^?a_5~A4!4p)_ihnF3d<PMVOFGYG&}A<n+;KOvgPbhWSz^kJ?1?j6
zy!6%LQ4qpUcyWo2z;b*gtds1x0f7HpH}g}zP@6uCXv0K?onUS=SF>EcW(YmiPQPxm
z#{Z0R?emtjgbMq2U<-t6Y6>NtW32RP*JZ5n+2eaC(+1(H!hhuV=*$1B>nfn4+SWha
z0)ik&3xWcYQc|LXAfYHAl9D2wLk=mO(h`HT5`#3%&>&qR-JQb>Imi(I!+rO@`|f*x
z*J80|4YOy*_npJu-!G1Czfue+l&z&3qi#LIEFH-}qmrb47p{?s0rfS$B#)ja=TwxI
z=bAdR3q}))OZ^D+50fx>pv^`cU?t9-z->Euu;?V*OL6o2B)JSXgJlg(os#r7e;f2z
z)d(IKMAp7zobJ^1wna@Z<b#3$t9x7WghI;n=TBBF{0@9#5^Og5t#LaRYokn*tjqYk
zPU)!K^5x~x-uII_nj<%79s3G%x18kUxqc=bJ~qh~J=i*hF*!yO*RX7?G*kBQ`Q||$
zwZryGl5JvFs*3CrX$gNS|BT{Iwsh&2XaKd5Ii1e7DBJ+j*$*EH6P{+;4L41y1<m?^
zY$C=iE~#J2i3yag2cfl2V-OC_`91hT<I4&s7$V8M<u|$J-|;7n!G6Ww1%l6$7#5|0
zq#Z{c%nOegkl5%75C%smj=m={Y;o5kOhDauBv2}qAEE2~nGC#Q06{PbE8*I})Fs3b
zmNy!?sMm94eTSYf+pc!h4GpwU&SkNT87yovTatb#KbQhJ!Orfi-STI8Az-Xktw>0V
zG9%6G3do=|T<nVUtp&po@H6mt>-ogDLL#B8d<*BN8)(TH&g82^1qkeT!lM;wd(1ad
z-o|TwGwE;{uXsZJiV~=O^ptO8md1(W>;8ht4!ljJz4QL2?hKzDd`~efxncKsz4M17
zSxrWElZikV%;kx^$_+It)zXJcdH8~(t&ctX)Mtq-E5zQfNN22VwP+G)+^lWBF#hiQ
zdWM{2oz9_!<6Dbg2rR-uRLaJrHITh)ZobwrN3uPW)4>_1d0RTC3)#3hQ)`JrCr327
zP`2X-9qVF?ah$>=h4cXw`j6d?I#FSk9gbuYK%Tj9d!o#Jd`ICY4c-)t3s9P`e62{n
zA66G|>yyu?yDDa}zvvGqzVCIJsNFz;+*&d4#9ouHb;Sxd#)|YsEapq69tB&$n^^-$
z&1@c$QtJep-^)n2OJ|28uOs?QdOOhZS+hF(Ynclq{l%J4#`6a`g`Zf97*ad=G}*t{
ziFEcJDSxAvuXPkt8MYxtdU%`<8hB<%`wM_NG<)6LXt`2Ug@%pg-S}m4tOqt5(sbrC
zP*p4IJ`6H9tEn>v)m$PTru-B&#B1V`d^w`=K*HH^3T@W@(`Y4No#okhA9;on8(pvP
zNv7GVWI(kOM!I_gEQd*vl3+{*J#4vnOUp-LM{((D;xIBMcwLlJlsRYe0<w8VUDogD
zFV{U@T0hF!=VtDE-(Y9@Wu4Fjvbpgdorfde1f>Mjcihc`sjEZ2E44$gUvC<VH}fM2
z0q35AqHHOt>ym=S*)kI~UoRACc_Kw`yG(&g>f1r%pnOH(z*oYW9HLBQOK;0zOu7dE
zn9<YzS1MZ8Tob1kc$`Bn*pjIP*KXCS`EGK`_IGWyL-j*-V(XAN@kz9msK&Q}meQN2
zl=@5KPpdSonp6XBi)`V`7A!d0N%L+I+L}Elyx3}KmalK=dO8z)N3{$|=SO_ZC9Z)r
zMP|_ka}I(Q02rqrJ-T%6^k^IZvA4jqOcQ2pfJuKKk_3s_YC5EN9)o`2+|V=|>#YOT
zpIW~m75ulmLhAMBBC`)P`mM*c&J-1*VdgE%&#Tg2gtZIJf1{vB(UA;_Ei$>0@v$-!
zR!|t!=@C@u8KmkFOv~wd95HI#D2sK(hPp<c!Qw*9x5sJ?G;1^$Dd*0~KWK;ZK>KhE
zyIXdGAAJmDs^@KH!DlJTQ?&5!)^w&C7+~Y-{4SXfUNO>*O*oc7@=xal*o5hbywx=X
z4vdfI8ZOi~CyGMs=dtyuR5Md`;)X@m59j)ekm}k{LH^z8;!M(`<L*}WxfU;KSybzF
zvmh>)0FBL{?RrGIw?=vE_bN!Dxgwf0`tqLocg%4AQbgCTx3Qr4g-y*S|6YQUII3bD
zrPz;<bTEsj6@)EM_KADl)DeUZ(C}BV#MfG^-n%oyFlabqQ0jfOnZhf0c%6AK<>Zz&
zaIVDDzZ70ZZkbn-&3P3jkIdWBX9QxdSQW+~R;&m*RroIeV<N?y0BW0RyA9|$7lV)z
zr7QV=#Vj#WEiJ!a?E%1V*aY<6eU6j{2DIlbge;5|6bu89+53Ss0p=~PI)u1bq3#&{
zRK0rB)}v*F#!tI=PAiSIhKti}r!KY-ytFFUiD6bfNhz$wf#oT3W;$NyqnQiMydM|L
z6qb3ghkHrD&Mx9!riAdZaxGAcQMi(#rX}16<n0pj1%#uf(T)t1{jw(uxHb1E8v?Z@
zH*Rt!xW14_90WjI6-9-`ImO>{S7&TA0a$n)&?&;O-K^NX9;fx8$>xu|YO+QjK;!N-
z=dnIn1)%Tk?dX6Fy&<R0qfT?U*pLl~2&*C+jI8S6=$83)4D|)M@%^c)28eo;E&N)M
zChRWQx=fcXowE;gM;1PJDQyE*BXb7`9psv=)onX*hUsndGZ0q-tU(Vq{y24L#{e?T
zR6(XObJNDU$P>4IqUN<@%_l@2npLivqIV2?F^rU&iOkW;@|7b9Qd9)H@6do^xkQ9r
z*y*&IYY#Hmu@-cGn0B0=z3tnrtsK|%vFB+=7p;VbtwnZCNzunmAt;o^O(@0Yx-K%5
z{=GR~T6|enid84otFDbt&YsA%Q4p70@(7LPkxbV{quTg80{nZ}47u{70iptnUPQRg
zax90Ie2ru93F@lVp5@6`bv|K9y5{j4Ck`G!4&u$Cuy8U}tTfO49E1g@%hE|?@*^|K
z+FD*Jiu7nzu41q9Y*0TL<)xO|aAvXDC=j1Kw%rmT(H8V7I(s<&_S%o2u$1`klYWV>
zJgVqmTcegPV3NV@d95dxo@9*1xMYN5D!qm67m+8hWnn$qL$q+kg@f!L94!?bu^ERz
z07)O@?An=y)ug*Gg$Wu?P9M(G0DCN*dOkyk7W^L-mKp~RzQ_i&YKrWFU*$aLN;AWR
zJA4RWnlTd0@s4(rOLyFYgg?D-L`+q3WE+2faJ&c#qJF!`z!G`(9-SS*S8i?a&E&&X
zB_GdFpE}4bbe*!4?Z%Uoi-W;RuKDHx1FlSNBBe6kKDLb}3c+8yFl4o=m;3f$rnKIG
z_;RF!b2Wh8?-*ZRiD`bk@D@$UJ-m|64c?kuzw!YH;u7v)?Uh(hH%%9uph_2~4e%Kv
z;k2O{$yOkp6hoOgymqIUp1`|rJ>+55oI_qp)4Ak)0m$hi(E!q5JsyG`E#q_A1xPKe
zHLSePkH+^8M>M9_{V)W5aYu&FeJa!y=0)vv=1+YaT;i`V%@CPdiB7dj6<;(fcj=!j
z%tzHk94%yQlNhE5P(`BPCKK*#W=W(jY+GhS;}e#>^)F7i&b^nkmSujm`11?$x=1-e
zN#5^2$zDG-p5MB*ooBN7x)%qOnYH?;R{h9n)%>DoRhx#nQ6lORN0d~;HitF3NSCdD
znd&hkC-}on=eMC*cbTEGm@mngs5mQkKK8b*!VGvLSXF#e9^^ve#xQH>uFomGAK)Qp
zIq_mP^@Wk6jpBIvh?f|&Q8LwFdKaiCIa4O?xsc(s^4MsRJXu)-6RY>_l&(_JGzQ|v
zl}gp>f4x8~y6=A6E`LCGU5d}}yO;a^DE#4g`{Xxzmkp)q)2P7NZkO|RZQGUcPNR>z
zP+9)ApDJ8*CmDg=QEjbWiu2<Od-OihXJ7(lM}YhZc+x#Dc_VT~2hRm)zc{i8a;Aqw
z?e1oL>}ei=FiObL#8a};$Hk8>fD3P9v`D8HaLBk%A%*gLRrp+P&iB%%H$gE2Ac*J(
zOzu&BHF96XXTboRA+D}gx6~hHCBHUuV$RO5j6j%TcD&6#m`-~{=NM7G8(u$qf0OCn
zi|in28VA5vWy<49F>Hz#=MMOr1d!S4qXFK?Dq7Oemz6+LGEu~OtV<FJUmg!}rwAV4
zX#&)gKkA$<=><)KewB&Y&Afg;R(y|gZo1Mc{<(WdEEs^*uh_%Iwq{@mK<>Nnh^6!Q
zPY7Z5?CObSiz#3h$npa&D=s|UeadeDl5cI^)fn=Wh51o;R}Vg6@CP(t>Ck(5ftHn6
z3S}=gIB75)`rZLZneh1KF~^8ipv+!&1Q;}=>cAP^)m;JZP~#ae1`*K0%(Zq?ex6rQ
z?b6V3FFAb2jugC`^7_1~(AuPJfAPT$(2YN~t$)apQmH~oHcu3aG+`GZ^R=JWN+Uu!
zgFj6~JKf#=`Xh(H?S0f)SlLZX`l?~R1H7VSHf2JXGM<LO)RED#3t^OfjK$ZQxsRfA
z+pF=UTz|k?OCU@Wh&Y3pJ3BZhml7&4Njahh-)rd4<Yk0sdM|79!|vAjOja+;_P;)6
zKDbtsm^?0P{4@EAWQnKSw(Kc$U#mB%V&uMlgJvls%H`yzV~y~Z^$ae~2jC=eumz*u
z=wYt8WhQB_umh)r?VC6|H?>z75tGjEmD-wiZ8N%3nOB+4)ArvWqew9EbG3K}4$Ho$
zkgN5MY7;I#PH-+km41ok(^}VhTcSspv@b_+Weu}37C)e>bCfpERlw8xUQQ9h-UQLj
z>+%FPXkMh)M2!IQm~;gb2F*A6VBRS10cz*>*^<2SvHgq#<ucpF6}->rTg7b5W9jGe
zp53Ge43Ny#*xRPUilgt8*Vw}lqQJk(thcjEyw9Q~*66N?n`h@`O)WwBM6ahFakv3u
zdVuj+(+A|@c*ZuM^%Y^eMZdb>?+jQvb?|zY)-I9gQK<8Vw-A~|!XB;31X(1@MRO4V
ztg%(M=>??}BtXx<3#c&4AM)swK8R}qWb;B6eRP+#D3T!8iMD3XI~xi{c`7tspRm`1
z9wFdEY|KwyDTzwjIHAxT0CLJrN9oUknY4u52Xt{oSxt+N+`I(>#$#Gi$`r_Dbj)U8
z&6dQ2?&CKTlJDzjqgFb);@E93uoL_l2v{8;_*}0#s0ru<T3K<+7XS#xl;o?ucrvM_
za3CUB^c%N4HvcW12OZ6}PJe88uTD#`YB-|sk|uT6(^tr+=OWt@u?y%Dw4_+}B=RW;
zUHx%?@I5E5x38!Nobgowxc=FjZ{Uo+H}zfo6dDg-7iiM>vS>G+ta4dt6&b41i)tQG
zRN5DuFC{~=bR$~|4ZekYUlv%rur{VrP%TXE62e*X6p)k>4`Yw+Z2#6zQ5dBq%Q|)6
zFkaN$dxCvfi;PqYxSy%^z8o6lj%}eV4m?_r(f1W-osmgB$vG7NRcxG?;%e5>Nj({`
z9xB0Fc71xjIl6hP5nFbbhV5C%qbgOMHc`1Q&EQ0J@%^n+-}Ix9nd4ooURp3>YdTl0
zA$UKS4<_XZ*}K%Qcx%Kc$XiO`qK&z=>*X$4fVNAKQ*V;o&^Sg0PGAJx)mo}s(IrJU
zi>dWNm~W8{$R!BByAAx7>*0DUfa2;^<XoN@jM+}5poj@Vdpca~J}flYoD=z=i@y!&
zl|knOKa<p_>Y$%#7aRV77~mby2AP)Zhu$2a9f%)+Y~A6ivg5g`21C?hY%r|Oj1g{u
zhL}>`89TSZqu!Y&4jWTir2gUo{Gn&9)Wbtuo{RlxrCh71PvAsDOCw%>?}JnuotU=(
z#i(F1zpgwoN%x%bU<*@cGb!Yi%jEOe;&waEAGq00DITjyy{fZWW1BC7?pj&6zn>m2
z3T=kE1>CS7{Q}66ywu)+phBDfodk7pgey_2`yCRqSS}Kxk;Qq}Qa<@*08OZhxg!q_
zMU+*xm{pc(Vb^3WY;OU#^$!6$+08ErQt_qQ**x3E86S(n*OoJQX2{#Eh%Sxsw;9gB
zU*A-{uYJ=ex?_L}IKMU!GDr#WRg4?Pdh~05l^U#Fs;1w2WmD5CD+4ma<UsZ^Zv+)0
zcZJPXmWc!9sj+j;19sA2nYu+%Y*}B`-Sp~fPhm=2Z|;A28TvW$Z{D;sPEvnqNE%eq
zX-X{!gz#vxL>SE5e0lt;5!lEA-1|>ky&VAiL&aT4B9tLzg8Xq!MAm|TIk$O_@=Y3$
zJ{-Ng;bKC19F;Drz`De~P~hzbW4E1cFmU?mXs5-Rdw9Wth<jXvI~gX{c=VCceO;vd
z{gY2j*UH%f_c{_FfoWsRHcA2h)k_Kj(_VVbO){@RBV#2OoKwUR&nCjGiNcfQG<<fH
zIPD884BbeoSx!$3QX3s)v`t$LoX^wv;@nd+zMV(;sxf3=q`Y&t#)<nHe3}D0IYlcA
z`g9(dYt4{QY<T~&-m&!OeJyXOFIyZo;IsSU0K2KGH`Qrh4pD6D(2&<lUmaZolXW*(
zn)EWOf`XqAYdih1<t3aAZ=m=oC8WO6;j{gzqd6r)-i?U?cRv0;@h;4`DbTjQnjbMS
zSwh13?L*#kxSvmt90-&=lIba+n4n+)8hq>HWo(CU10w<}J*R~>c{nyL5Xas-xNs{t
zN~RO&;UzDf7MRV=wU7MuaBW=}yapHAf3|t}oI*EO!`pcF+Pmy?cTwTDzM!AIY0mxf
zF9ok7^#y5MOe4w5jQ3x`zxRdqe{7Sc1c&E4R^hg)nbl^D4hljWA!X`?2C(Xe*wyYo
z6eQ9gu;kTVH#Mu^r~U|&M=u;bmhX^Hp%2?_IfWfObZ^ear(e{)-s<dCLYb2$W}k_0
zmTUfw{MsjvHogSdz@|997TI2?l$p}Dk3_iQWzykX^@P)e_GN=lT`0x|5uVzZU=Hfn
z{jBLFkxfxy+O`z)e~MlF@SL7tHCcU*T0nE_o9~E0(c5CSZBp|M6)S0|=ryS9#VaK5
zX`}po6Ls(sST0xqPt7cYWd!3!?Iq|BiEvMP&@fo{^JY-2ZgdzbAeA%aDJmTMT%X$F
z=JO^M5nl!#fTI@Ao>qzK&1Aj^tHQm0QiJcjf<QJV=CITo81s}rx7D@ae^!z6B`Y3@
zKkenRf#DSIe|;EZpfT+Qtr0a=STfn&KdGiU(9Tb6(|ed%C}a7HYCQ7(TPv#QL)RaA
z-G@><_uKGsZ(VMCHO=hJ6$!mRg>uF=JXmtRI+_~@3purEOLTEkgopd$XQ~n%b4?`6
zCyBPm(GeNy!1oi*8jVYjRyRWI#g1FBQ;ab!u6@*$eGa~;Hjr7NjG8~$j0}V#4!0h{
z4^clIChzV)GNoMq$;BctZ$H6#Bqgam<hjsiw?tspeB1|a;P6IT6hK?7$)M|NbNvxW
z^3#{G==%f>0caD{jGU<4;5q&a$ngTWm{2zUgX5MT!tp-&J_Uo+qND_(JM%cBc@Tf*
zS&H#Nt<r8e*PH4MGhIo|5dsp&g&DsnS}<(~g9|BG$szI}v9mq`UTc(pAw14&te^I}
z^+)?`QOiEc^NY{%DA&VV9XDbwmc=B>$4i_Jrum;GcOnzHbs(mJ)OJJ5!_NHiIiIQz
zW5T%LooRmJ`~yeMGs^nHEXG8~d*40>?pPA?VaZy0fe-EakhBRP<e4mQIpgFn#)Bmc
z{h2|^s(ShDzbM1ab{bf?cr8u10$;ZB-+{@_X2-3Vd-tO<sr<sU|2E#K<H!nlhzAmT
zN})r~Fi|b05nA(k_Z2@EbE~(CMwEW0=<K3ofhT>k+Trz!Zs*HmuDqa*t`J!t`<Q)S
z0dOSm=uT?^AAHK&BZFTch@D99+Sgafn!{n_JV|r&K{?-q!8JZ37pYuE@5g@G&=kfg
z`=SZ$H*$*%gHP)al0EUWrPak~hfY>*pQ6+~Ycbn014=Mq6blbD>Y|5p=!vfYk-$kl
z#-yF&Rq!m~X|${XYtoZ4Uj+rvgtwTsG^E(#_b~sLYv*|^^5qXo!G3Bs;k+uLry9P$
z!pxuNsF``RRTHGA3mkX1v#d0-*>@7fG`%CRKJOXjjbP|hJFyO)*;n@^KAp`WFE;r!
zTKIvRwhPXio!Pl;p<W@|6MG)fw}U?V;$PFqz&5X%VWZnvHbb91?%l%{QujnHvR<y@
zGBEqLkkzwo)10zX<uTbq<A%MJb(S8<dEf0Q)W$HKvA;Rq>5GQ~l*6@e)I6T}{18(T
zPA#xHmafg=FWZo)n7t0jxmqr;BIe`pc-&jDu_2o=U}i38^ewy8;!zi>*<Q&E<0Wr(
zC`;fIpp;#LE)jc*GtKH9?H-Qnj~&29-IyG6RN*xC^n^F0@Es|JNN13HTTlCRYm4*E
z8c^>-fC{pZdQypw=V|=yGoYpc2>a@@BvCIe_u$(jr=@cCL}2FHl)T2JE|~!Q8#ZbJ
z#)pyQr46EMJeQl{i4O%2!hOf58;Bi$D!@+F9$0&Q-95-mX&Fp}g44{<>z$tVYU#qg
zGL}*v2i>;P2u!4@;KGtmf$VWbt|QA?-3iM!;RJi^b?`I{+9g!w>?Ejbs~Nk;*r-z`
zD~9eJQeH-QAqE1?*ONlJHf<&GBB)9sKkGBD1qUROp6Sc`3Suo0&~PJ+6bbZQBYej7
zr6W(~_6K@5Gl|@DxAQbh&F<;+8?CMBzr#~)(;z?G^$bfG_x~Y}?KnHxmqjkaf3~v$
zO~q)CG4P(uE@j&Qw5zo$>7DhDJiP-#JP=d6CWyit(K6zV89ZOWx<gfLQ@?gF;z(z;
z7XOR3x9Y6fm)EzIlQy93$aODsC2QThkHby3S_z%gfTJput<2<%LstS^{_6d_BDZU3
zmHmu0E9$XwRxEXM5VXa&M??QcTv)^&R4eX4FTd;dx%0sJfNYU&_^Z#Os%)3?lhXfE
zp0z$T{&1lNuk%#6r<Y&+zW>zTd^9gB?9B$1LhQ0yq>h2S4lgw`j@0|rA{05~5MYj|
zjM>h;!*O=d{LywxG_eLY&u3XJ{n*%Yq5KV-NzBW^)%;QG4%IGD=oD-ESbpGHN$Lh*
zO|cl>r=VII;ufbhiAjI9av{tY%2SU^)Q+$VVaZuSar=~nUAJYGfjCdR5IXtpmFLRH
ze@dWLl$Is@L_vgTfGG5kGJ?<$lw4Ud|8!0p+tc6TfSt7`YS?Bt=Tl{+%`Yu(vkcUP
zbmN9y;^DRP5RrjBLS_?%&f`Ymj5`!T-#w;w6_l8*T}yq=B}`YQnw>I^i8Zdzc&LmU
ze`B1htz#^rZ=l2#46_|l#2zP$J3VLEjeZ+N5UU(5=V$zA<>C$3E%;v0i0Vu`R`V!S
zdOKpbbeDsM+uAD0*5PqywkJR1EIjd-6``%SK=YLptyt~yyX&<(ua^w{POkA=C$IVg
zPciAhXxRA-wcCT<sh3`UOg{bICyAOLU=q?s+_Q`DT!D^a>f$XnLm=9Ip@foo5z(p@
zB0cIx29V|Z&d$iSHQ37`G~x+_tkOS$6_;$RS#zU)SwnExYk?wX6;Qt67fo1VlV0~`
zaYUZyo1Ax?N)RAY9Iyxqzi#^de0%NFN#~OrjVFZz#|Kz}x-B+dXAA9S8H4)XB~pbN
z5;u4>+hxhCIZ&q*;DR#hKrG5j1J3ijbI3<!XVV6g@eR=R$rWjJnQ40pp1KAjl<>PA
z_@tn%VfHvJ|F%@Vrb|xHg=!ls9l?-sKkgvLc%eIS_f!Jzp+;e400TQDs~SBpBGd}$
zNLXzAK*!AQ<jm(i7=ZI|s*_r&s~N;TxHk|c*CN7jSv5!o@keXC)bLaCVbm*nY>wFx
zNSV_1g|2XvA4sgNVTczS0I_$uM}^ooG3HfSK#V55BlH1Hw&%bFkY*CFK7i&(uH1Nn
zKA@qN1wH8^*Y73WcIsfeC*)@M^{nnkZy)TdS~w?+=EB;9;?J^fR@rrjRxf&*xj3><
z#VV3iB@KCEVeiZB($2_-XU*JgzV1X{YSp?-J;^kfuJ&&msroR&8h^utP|7)wzJRi9
ztjNJnnH2pJo96a=cbqndz^;#q1Xhk2J1DFp3X1BRrD^XNY@6%zi%INVd9?Zu(@U9%
z7N1oPQf9K=g%KGM2K_?i29)lWzJ45(4%ICx^Zb&>j4FHH{WP}+DzkLvE`*gWDP-w<
zi_Rgn$}BFd=>CHd32`<%xF~4#$g&2ycgn)syV(#Sy1xXY-s#P(CSPRISa@XCDIE?`
z!e{dEX<DhgEYix&taJY?y@?aSCFK!&*Vw>y8+LB$1{rURH;?MP!8y@2P)GG3uEd0l
z<8e?3T};a>GQ0=HZ`ypb+4Q3B6sE@y3QEooF3r|+h&wNtn6*itHi&ub<aE-;<tKhL
z+y5AP$h@6+B$FTd02=A&0UW`a=Twb7=aW}rxQvo4r0bs@OhaeWUZAFwvxcaeo0bDE
z6D|Sofca#F-0%S<uNOr(ygnhg&KsJV)XP1qNRWTa$abhx=FsN4qxoS!zZfWKhI3f&
zyIfaRX%SKo(PCN%-T+|3xk{hHo%%>Vj{82snDv3N>nCkkx3%GZt2l;}#G&8aS2>-g
z2slZusnc$q#>Q_ubkep{(XY}OH(To{j+U?DL1zdEL}H`TM<)`;A+wDZZfZcCXV}gz
zy1&@StM%f?dq*1YH>NuJF9G(BL<0d4g6Wn>?~g^`BrIYejpop(XL2MdcP<qVv4jx?
z!hW3_bak(%%=`3+-evxyymeJ@cz%}{PXXkDIypVP;kw}8&Th@s8&^eYK0bNxPa*RJ
zf=FKA?N{?}MH6=ScD~e?817O|j@HrKhFeN3hwaurN^nR@oZZc_2)WAJEQjlUXi4}^
z;EQiA^b$w0$1S)2D)s)ChjO!>QnRxS$YZAzlizF|0OQm0S8A1fj4+4O&}@<NF3(D`
z|LJvq`~WA#SYjh8X1h(FGF3MiVa4b!eKq+1`SD`Lez$3H5d2K|8NJVeg|^7BG<TKt
zC&?X4IQP@20#xJrEGhgC2mCG&PKqCmv;NrwuY4(i6-3IxTg_#F%X0nY_iKMn{J-2m
zCYXpHS=acrmh!(IEF4yKA=ly&fYBH3T1c>$WnU*jzOd2%m-UWW9F~;A^o(<Z@#CKk
zjH8u#aL~Cys=6DaO!RM_{s9Cb<r|E9^ZA17ET>kK%8rFlpp$#E9{rZbm~fvve*%P4
zQsHX4ACjAmp55#W-F2VY8X{0z$!3pEjELDP*3kQ9+VTN?`}jv@A}?paO_QdLa{1xP
za;jk=D8c{##DJ_?E`<UW1w~1`<EI=QdRt^)yG8f7#XUSjRgl%6_*=d9><osa{$;jd
zOu;dv3AOrlr=S~<9$y)=XaY5}D@i=Fd!E<a9g&g*4%|V_JZVZb?tFgIoi*;i_S^pv
z^PN#V)QYb>!j!d9Z(s7=>owS$-jtrw>G~l2YaE_MIrhJ9!;zy9JpRlpM~Y({9DpD|
z^&e&m|A=-O7qtU*QT}R$q$5)p;`!VndN*u0`iXqS!aca;t-tX5|LFZ+q51Roqu573
zB?%@G*Q=5QVe~H-Z9|gJOCL+_FKGqpM1Xe8zI#!!jsJNU{tsjHe;+}wUa&@CwY!9F
zovLX1ODog3KiwWc&$_q)(|EpqA7hZRm#G+Q{f{C4PqK2vDmDwvx{e4<elDMWCgN6z
z<ZR{IZZ&Vp8L9*vRulvN@wkvndt`LnvS`3vKfXtEEnjH1um(J+j9Liy^5`TSw_bLE
zux6VWCRPLVxYsekZ^$eJG--?kv%sz*M3lAECunFB|K*uSjk%m37B&tZ5hd%R1uMLL
z3~GNGU1~Qd=3}-kth4Ghm;F!zqv{or$`=jwk)DIBDRqdc{N3V`^sMmm-HIvD`p-Ar
zwf&7QPJ9N3dEP-`KdUU&=NfYty%g`43)7#a_k4ZxgHiW9-TBU69|wA^!=Ia<=eM`F
zAB<XnasBlNcTfK_!?W!g`{Z%g1~?pUIF@`=KIYT8V@-vQF|<_QPMzbg;@IV$gIshH
z{xySt5A0trq;3>aN`LnBb((iYCihOQBDEF`?|BjK>au7QA^Hp{E>Vz5<^O8)*Gw|C
zSsP|z+;*)v;syENG<@GV$R2%o_`)CaszK+@*+}@W@5Fz7^lI(?{+8xJJk3=@e@~DN
zQgN5MsUSnu=_G6_#-UMc|0W(%R`@9L{~v9p4(l(^hPzc?XLvN40P9Tkow-e~{;CSu
z!O!m%Ms#leD@K3!^Vhd5sAu7#rC$yD+-%UPmf1TM9OS<L?(|NP>r)iC^WERk{bx%z
zfAt?+uYrDu7b-SxG_HZmWDzxGhI~-0-%Jb3ABq$Ih0Cg`LA;6@T|5$CVIT?8s7O8Z
z*U<6~4o5pW{6|dx(HEEh?wp|(f~MHsBf(4>^2Tzj0W1ZpN-Z-)84?lvnS1|e0c7LJ
z?dOZ0pfu%sUg+d6xzgR9H3?s0rHQ?`XSa(6M}<1^kVYJ~|5*3G*253WpK8NTnrhZ1
zKZ&|oqf5qX^7QGHjPKUYZFh>)->t_0&WL!v(2>eivigK`_Q&IrH~nVn$A*wQ%4ah!
z-LP=9IQ<{j$bXL$$Y1|QmRnlGnaKs5)<|#Z0})pZDF_`nW_mki;T${n{%_(IJLIEQ
z<z=~BwILzs6-7R8U4;AVOBAHU8jm9O@2UKAb;L<I%rvlMwGanXqcYAxd%7+snO{%9
z*-Jij`o9TVGrPaa2z5EjB9QhHIt(vK<~xwH>(Z9*HHuP|qL2TXy8rICS=-hk|68BF
zWFXX~LFbDDw4f@P65MOJyUp$%6ZZQxG-v_CABfQGI<rDG`*k#r>$DRw7rgNc=VVrD
z|GRR3yraT8y8A4-QUjiuQR)XZf74@@i?0SrH=ie+Gd1~Lfa4#PAKrh9DL;x2+Eubn
ztxV{C3QOJPA1T7yPYXxSw#xsevt7LW&#JA*U)~}k8@Oi+CeH6VLfnL3o*0hX(!l5M
zz4={#23fb!UqOR~b)?hVLSiEQ@s+8{(%zk@x>wxLQPn=O-^3X8D643uVqT2q+jzS7
zc_GM16B|O-$am1*tJP-yyT15wm~ug_nPv^J29SamxjHQMVVo1Xgk0+YZFV5>Wl8$+
z@2(kf;#{k~pWl34cIN2Mw1+*NjyZPflzYIH8DGqu+*`bCem71Bs;4pNu$dSV^h1Zr
zq{%_PS)a8Hd<dCg44OLU&OdYT-?utC|9fT{{a#UxePEr&@jH6={EUtpk+Wb6JuNsz
zJkM`hi4(iDW(Er>kE1O+^?NH5Q(uEmVIT}W4U$X#*>9GyjC4lmSY-iC**J3i3Z~No
zK6KJJ$$XEN;de(LJo!zinMoOSG3y1r4~a2jKIR`g*Lh4+b&FC5^>=@FrKl}z%z~%C
z91Cr7#mgQkFEn-{T$5{xElgqBt-cptzil@{nw#WfSmybv3RHt8o)}qZP!db|0t;U#
zB9XDRjHZ2n!KVJrYOoIBbpMq78rkr5#@?uEd~~;lK$v(&n5xd+6~m&=eoXQTWL|vr
PY)xeab@|fA#sU8aWL~ea

literal 0
HcmV?d00001

diff --git a/docs/api/comments.rst b/docs/api/comments.rst
new file mode 100644
index 000000000..a54ecc9ce
--- /dev/null
+++ b/docs/api/comments.rst
@@ -0,0 +1,27 @@
+
+.. _comments_api:
+
+Comment-related objects
+=======================
+
+.. currentmodule:: docx.comments
+
+
+|Comments| objects
+------------------
+
+.. autoclass:: Comments()
+   :members:
+   :inherited-members:
+   :exclude-members:
+       part
+
+
+|Comment| objects
+------------------
+
+.. autoclass:: Comment()
+   :members:
+   :inherited-members:
+   :exclude-members:
+       part
diff --git a/docs/conf.py b/docs/conf.py
index 60e28fa4c..883ecb81d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -83,8 +83,6 @@
 
 .. |CharacterStyle| replace:: :class:`.CharacterStyle`
 
-.. |Comments| replace:: :class:`.Comments`
-
 .. |Cm| replace:: :class:`.Cm`
 
 .. |ColorFormat| replace:: :class:`.ColorFormat`
@@ -93,6 +91,10 @@
 
 .. |_Columns| replace:: :class:`._Columns`
 
+.. |Comment| replace:: :class:`.Comment`
+
+.. |Comments| replace:: :class:`.Comments`
+
 .. |CoreProperties| replace:: :class:`.CoreProperties`
 
 .. |datetime| replace:: :class:`.datetime.datetime`
diff --git a/docs/dev/analysis/features/comments.rst b/docs/dev/analysis/features/comments.rst
new file mode 100644
index 000000000..153079caf
--- /dev/null
+++ b/docs/dev/analysis/features/comments.rst
@@ -0,0 +1,419 @@
+
+Comments
+========
+
+Word allows *comments* to be added to a document. This is an aspect of the *reviewing*
+feature-set and is typically used by a second party to provide feedback to the author
+without changing the document itself.
+
+The procedure is simple:
+
+- You select some range of text with the mouse or Shift+Arrow keys
+- You press the *New Comment* button (Review toolbar)
+- You type or paste in your comment
+
+.. image:: /_static/img/comment-parts.png
+
+**Comment Anatomy.** Each comment has two parts, the *comment-reference* and the
+*comment-content*:
+
+The *comment-refererence*, sometimes *comment-anchor*, is the text you selected before
+pressing the *New Comment* button. It is a *range* in the document content delimited by
+a start marker and an end marker, and containing the *id* of the comment that refers to
+it.
+
+The *comment-content* is whatever content you typed or pasted in. The content for each
+comment is stored in the separate *comments-part* (part-name ``word/comments.xml``) as a
+distinct comment object. Each comment has a unique id, allowing a comment reference to
+be associated with its content and vice versa.
+
+**Comment Reference.** The comment-reference is a *range*. A range must both start and
+end at an even *run* boundary. Intuitively, a range corresponds to a *selection* of text
+in the Word UI, one formed by dragging with the mouse or using the *Shift-Arrow* keys.
+
+In general a range can span "run containers", such as paragraphs, such that the range
+begins in one paragraph and ends in a later paragraph. However, a range must enclose
+*contiguous* runs, such that a range that contains only two vertically adjacent cells in
+a multi-column table is not possible (even though such a selection with the mouse is
+possible).
+
+**Comment Content.** Interestingly, although commonly used to contain a single line of
+plain text, the comment-content can contain essentially any content that can appear in
+the document body. This includes rich text with emphasis, runs with a different typeface
+and size, both paragraph and character styles, hyperlinks, images, and tables. Note that
+tables do not appear in the comment as displayed in the *comment-sidebar* although they
+do apper in the *reviewing-pane*.
+
+**Comment Metadata.** Each comment can be assigned *author*, *initals*, and *date*
+metadata. In Word, these fields are assigned automatically based on values in ``Settings
+> User`` of the installed Word application. These may be configured automatically in an
+enterprise installation, based on the user account, but by default they are empty.
+
+*author* metadata is required, although silently assigned the empty string by Word if
+the user name is not configured. *initials* is optional, but always set by Word, to the
+empty string if not configured. *date* is also optional, but always set by Word to the
+date and time the comment was added (seconds resolution, UTC).
+
+**Additional Features.** Later versions of Word allow a comment to be *resolved*. A
+comment in this state will appear grayed-out in the Word UI. Later versions of Word also
+allow a comment to be *replied to*, forming a *comment thread*. Neither of these
+features is supported by the initial implementation of comments in *python-docx*.
+
+The resolved-status and replies features are implemented as *extensions* and involve two
+additional comment-related parts:
+
+- `commentsExtended.xml` - contains completion (resolved) status and parent-id for
+  threading comment responses; keys to `w15:paraId` of comment paragraph in
+  `comments.xml`
+- `commentsIds.xml` - maps `w16cid:paraId` to `w16cid:durableId`, not sure what that is
+  exactly.
+
+**Applicability.** Note that comments cannot be added to a header or footer and cannot
+be nested inside a comment itself. In general the *python-docx* API will not allow these
+operations but if you outsmart it then the resulting comment will either be silently
+removed or trigger a repair error when the document is loaded by Word.
+
+
+Word Behavior
+-------------
+
+- A DOCX package does not contain a ``comments.xml`` part by default. It is added to the
+  package when the first comment is added to the document.
+
+- A newly-created comment contains a single paragraph
+
+- Word starts `w:id` at 0 and increments from there. It appears to use a
+  `max(comment_ids) + 1` algorithm rather than aggressively filling in id numbering
+  gaps.
+
+- Word-behavior: looks like Word doesn't allow a "zero-length" comment reference; if you
+  insert a comment when no text is selected, the word prior to the insertion-point is
+  selected.
+
+- Word allows a comment to be applied to a range that starts before any character and
+  ends after any later character. However, the XML range-markers can only be placed
+  between runs. Word accommodates this be breaking runs as necessary to start and stop
+  at the desired character positions.
+
+
+MS API
+------
+
+.. highlight:: python
+
+**Document**::
+
+    Document.Comments
+
+**Comments**
+
+https://learn.microsoft.com/en-us/office/vba/api/word.comments::
+
+    Comments.Add(Range, Text) -> Comment
+
+    # -- retrieve comment by array idx, not comment_id key --
+    Comments.Item(idx: Long) -> Comment
+
+    Comments.Count() -> Long
+
+    # -- restrict visible comments to those by a particular reviewer
+    Comments.ShowBy = "Travis McGuillicuddy"
+
+**Comment**
+
+https://learn.microsoft.com/en-us/office/vba/api/word.comment::
+
+    # -- delete comment and all replies to it --
+    Comment.DeleteRecursively() -> void
+
+    # -- open OLE object embedded in comment for editing --
+    Comment.Edit() -> void
+
+    # -- get the "parent" comment when this comment is a reply --
+    Comment.Ancestor() -> Comment | Nothing
+
+    # -- author of this comment, with email and name fields --
+    Comment.Contact -> CoAuthor
+
+    Comment.Date -> Date
+    Comment.Done -> bool
+    Comment.IsInk -> bool
+
+    # -- content of the comment, contrast with `Reference` below --
+    Comment.Range -> Range
+
+    # -- content within document this comment refers to --
+    Comment.Reference -> Range
+
+    Comment.Replies -> Comments
+
+    # -- described in API docs like the same thing as `Reference` --
+    Comment.Scope -> Range
+
+
+Candidate Protocol
+------------------
+
+.. highlight:: python
+
+The critical required reference for adding a comment is the *range* referred to by the
+comment; i.e. the "selection" of text that is being commented on. Because this range
+must start and end at an even run boundary, it is enough to specify the first and last
+run in the range, where a single run can be both the start and end run::
+
+    >>> paragraph = document.add_paragraph("Hello, world!")
+    >>> document.add_comment(
+    ...    runs=paragraph.runs,
+    ...    text="I have this to say about that"
+    ...    author="Steve Canny",
+    ...    initials="SC",
+    ... )
+    <docx.comments.Comment object at 0x02468ACE>
+
+A single run can be provided when that is more convenient::
+
+    >>> paragraph = document.add_paragraph("Summary: ")
+    >>> run = paragraph.add_run("{{place-summary-here}}
+    >>> document.add_comment(
+    ...     run, text="The AI model will replace this placeholder with a summary"
+    ... )
+    <docx.comments.Comment object at 0x02468ACE>
+
+Note that `author` and `initials` are optional parameters; both default to the empty
+string.
+
+`text` is also an optional parameter and also defaults to the empty string. Omitting a
+`text` argument (or passing `text=""`) produces a comment containing a single paragraph
+you can immediately add runs to and add additional paragraphs after:
+
+    >>> paragraph = document.add_paragraph("Summary: ")
+    >>> run = paragraph.add_run("{{place-summary-here}}")
+    >>> comment = document.add_comment(run)
+    >>> paragraph = comment.paragraphs[0]
+    >>> paragraph.add_run("The ")
+    >>> paragraph.add_run("AI model").bold = True
+    >>> paragraph.add_run(" will replace this placeholder with a ")
+    >>> paragraph.add_run("summary").bold = True
+    <docx.comments.Comment object at 0x02468ACE>
+
+A method directly on |Run| may also be convenient, since you will always have the first
+run of the range in hand when adding a comment but may not have ready access to the
+``document`` object::
+
+    >>> runs = find_sequence_of_one_or_more_runs_to_comment_on()
+    >>> runs[0].add_comment(
+    ...     last_run=runs[-1],
+    ...     text="The AI model will replace this placeholder with a summary",
+    ... )
+    <docx.comments.Comment object at 0x02468ACE>
+
+However, in this situation we would need to qualify the runs as being inside the
+document part and not in a header or footer or comment, and perhaps other invalid
+comment locations. I believe comments can be applied to footnotes and endnotes though.
+
+
+Specimen XML
+------------
+
+.. highlight:: xml
+
+``comments.xml`` (namespace declarations may vary)::
+
+    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <w:comments
+        xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+        xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
+        xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+        xmlns:p="... others omitted for brevity ...">
+    >
+      <w:comment w:id="0" w:author="Steve Canny" w:initials="SJC" w:date="2025-06-10T22:27:56Z">
+        <w:p>
+          <w:r>
+            <w:rPr>
+              <w:rStyle w:val="CommentReference"/>
+            </w:rPr>
+            <w:annotationRef/>
+          </w:r>
+          <w:r>
+            <w:t>I have this to say about that</w:t>
+          </w:r>
+        </w:p>
+      </w:comment>
+    </w:comments>
+
+
+Comment reference in document body::
+
+    <w:p>
+      <w:commentRangeStart w:id="0"/>
+      <w:r>
+        <w:t>Hello, world!</w:t>
+      </w:r>
+      <w:commentRangeEnd w:id="0"/>
+      <w:r>
+        <w:rPr>
+          <w:rStyle w:val="CommentReference"/>
+        </w:rPr>
+        <w:commentReference w:id="0"/>
+      </w:r>
+    </w:p>
+
+
+**Notes**
+
+- `w:comment` is a *block-item* container, and can contain any content that can appear
+  in a document body or table cell, including both paragraphs and tables (and whatever
+  can go inside those, like images, hyperlinks, etc.
+
+- Word places the `w:annotationRef`-containing run as the first run in the first
+  paragraph of the comment. I haven't been able to detect any behavior change caused by
+  leaving this out or placing it elsewhere in the comment content.
+
+- Relationships referenced from within `w:comment` content are relationships *from the
+  comments part* to the image part, hyperlink, etc.
+
+- `w:commentRangeStart` and `w:commentRangeEnd` elements are *optional*. The
+  authoritative position of the comment is the required `w:commentReference` element.
+  This means the *ending* location of a comment anchor can be efficiently found using
+  XPath.
+
+
+Schema Excerpt
+--------------
+
+**Notes:**
+
+- `commentRangeStart` and `commentRangeEnd` are both type `CT_MarkupRange` and both
+  belong to `EG_RunLevelElts` (peers of `w:r`) which gives them their positioning in the
+  document structure.
+
+- These two markers can occur at the *block* level, at the *run* level, or at the *table
+  row* or *cell* level. However Word only seems to use them as peers of `w:r`. These can
+  occur as a sibling to:
+
+  - a *paragraph* (`w:p`)
+  - a *table* (`w:tbl`)
+  - a *run* (`w:r`)
+  - a *table row* (`w:tr`)
+  - a *table cell* (`w:tc`)
+
+.. code-block:: xml
+
+    <!-- marker types that appear in `document.xml` to mark the referenced range -->
+
+    <xsd:element name="commentRangeStart" type="CT_MarkupRange"/>
+    <xsd:element name="commentRangeEnd" type="CT_MarkupRange"/>
+    <xsd:element name="commentReference" type="CT_Markup"/>
+
+    <xsd:complexType name="CT_MarkupRange">
+      <xsd:attribute name="id" type="ST_DecimalNumber" use="required"/>
+      <xsd:attribute name="displacedByCustomXml" type="ST_DisplacedByCustomXml" use="optional"/>
+    </xsd:complexType>
+
+    <xsd:simpleType name="ST_DisplacedByCustomXml">
+      <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="next"/>
+        <xsd:enumeration value="prev"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:complexType name="CT_Markup">
+      <xsd:attribute name="id" type="ST_DecimalNumber" use="required"/>
+    </xsd:complexType>
+
+    <!-- CT_Comment (individual comment in comments.xml) consolidated -->
+
+    <xsd:complexType name="CT_Comment">  <!-- denormalized -->
+      <xsd:attribute name="id" type="ST_DecimalNumber" use="required"/>
+      <xsd:attribute name="author" type="s:ST_String" use="required"/>
+      <xsd:attribute name="date" type="ST_DateTime" use="optional"/>
+      <xsd:attribute name="initials" type="s:ST_String" use="optional"/>
+
+      <xsd:sequence>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+          <xsd:element name="customXml" type="CT_CustomXmlBlock"/>
+          <xsd:element name="sdt" type="CT_SdtBlock"/>
+          <xsd:element name="p" type="CT_P" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="tbl" type="CT_Tbl" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:group ref="EG_RunLevelElts" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="altChunk" type="CT_AltChunk" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:choice>
+      </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="EG_RunLevelElts">
+      <xsd:choice>
+        <xsd:element name="proofErr" minOccurs="0" type="CT_ProofErr"/>
+        <xsd:element name="permStart" minOccurs="0" type="CT_PermStart"/>
+        <xsd:element name="permEnd" minOccurs="0" type="CT_Perm"/>
+        <xsd:group ref="EG_RangeMarkupElements" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ins" type="CT_RunTrackChange" minOccurs="0"/>
+        <xsd:element name="del" type="CT_RunTrackChange" minOccurs="0"/>
+        <xsd:element name="moveFrom" type="CT_RunTrackChange"/>
+        <xsd:element name="moveTo" type="CT_RunTrackChange"/>
+        <xsd:group ref="EG_MathContent" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:group>
+
+    <!-- referenced types -->
+
+    <xsd:complexType name="CT_Comment">
+      <xsd:complexContent>
+        <xsd:extension base="CT_TrackChange">
+          <xsd:sequence>
+            <xsd:group ref="EG_BlockLevelElts" minOccurs="0" maxOccurs="unbounded"/>
+          </xsd:sequence>
+          <xsd:attribute name="initials" type="s:ST_String" use="optional"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="CT_TrackChange">
+      <xsd:complexContent>
+        <xsd:extension base="CT_Markup">
+          <xsd:attribute name="author" type="s:ST_String" use="required"/>
+          <xsd:attribute name="date" type="ST_DateTime" use="optional"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="CT_Markup">
+      <xsd:attribute name="id" type="ST_DecimalNumber" use="required"/>
+    </xsd:complexType>
+
+    <xsd:group name="EG_BlockLevelElts">
+      <xsd:choice>
+        <xsd:group ref="EG_BlockLevelChunkElts" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="altChunk" type="CT_AltChunk" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="EG_BlockLevelChunkElts">
+      <xsd:choice>
+        <xsd:group ref="EG_ContentBlockContent" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="EG_ContentBlockContent">
+      <xsd:choice>
+        <xsd:element name="customXml" type="CT_CustomXmlBlock"/>
+        <xsd:element name="sdt" type="CT_SdtBlock"/>
+        <xsd:element name="p" type="CT_P" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="tbl" type="CT_Tbl" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:group ref="EG_RunLevelElts" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="EG_RunLevelElts">
+      <xsd:choice>
+        <xsd:element name="proofErr" minOccurs="0" type="CT_ProofErr"/>
+        <xsd:element name="permStart" minOccurs="0" type="CT_PermStart"/>
+        <xsd:element name="permEnd" minOccurs="0" type="CT_Perm"/>
+        <xsd:group ref="EG_RangeMarkupElements" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="ins" type="CT_RunTrackChange" minOccurs="0"/>
+        <xsd:element name="del" type="CT_RunTrackChange" minOccurs="0"/>
+        <xsd:element name="moveFrom" type="CT_RunTrackChange"/>
+        <xsd:element name="moveTo" type="CT_RunTrackChange"/>
+        <xsd:group ref="EG_MathContent" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:group>
diff --git a/docs/dev/analysis/index.rst b/docs/dev/analysis/index.rst
index b32bf5cc1..25bf5fb4e 100644
--- a/docs/dev/analysis/index.rst
+++ b/docs/dev/analysis/index.rst
@@ -10,6 +10,7 @@ Feature Analysis
 .. toctree::
    :titlesonly:
 
+   features/comments
    features/header
    features/settings
    features/text/index
diff --git a/docs/index.rst b/docs/index.rst
index 1b1029787..aee0acfbf 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -81,6 +81,7 @@ User Guide
    user/api-concepts
    user/styles-understanding
    user/styles-using
+   user/comments
    user/shapes
 
 
@@ -96,6 +97,7 @@ API Documentation
    api/text
    api/table
    api/section
+   api/comments
    api/shape
    api/dml
    api/shared
diff --git a/docs/user/comments.rst b/docs/user/comments.rst
new file mode 100644
index 000000000..869d6f5f1
--- /dev/null
+++ b/docs/user/comments.rst
@@ -0,0 +1,168 @@
+.. _comments:
+
+Working with Comments
+=====================
+
+Word allows *comments* to be added to a document. This is an aspect of the *reviewing*
+feature-set and is typically used by a second party to provide feedback to the author
+without changing the document itself.
+
+The procedure is simple:
+
+- You select some range of text with the mouse or Shift+Arrow keys
+- You press the *New Comment* button (Review toolbar)
+- You type or paste in your comment
+
+.. image:: /_static/img/comment-parts.png
+
+A comment can only be added to the main document. A comment cannot be added in a header,
+a footer, or within a comment. A comment _can_ be added to a footnote or endnote, but
+those are not yet supported by *python-docx*.
+
+**Comment Anatomy.** Each comment has two parts, the *comment-reference* and the
+*comment-content*:
+
+The **comment-refererence**, sometimes *comment-anchor*, is the text in the main
+document you selected before pressing the *New Comment* button. It is a so-called
+*range* in the main document that starts at the first selected character and ends after
+the last one.
+
+The **comment-content**, sometimes just *comment*, is whatever content you typed or
+pasted in. The content for each comment is stored in a separate comment object, and
+these comment objects are stored in a separate *comments-part* (part-name
+``word/comments.xml``), not in the main document. Each comment is assigned a unique id
+when it is created, allowing the comment reference to be associated with its content and
+vice versa.
+
+**Comment Reference.** The comment-reference is a *range*. A range must both start and
+end at an even *run* boundary. Intuitively, a range corresponds to a *selection* of text
+in the Word UI, one formed by dragging with the mouse or using the *Shift-Arrow* keys.
+
+In the XML, this range is delimited by a start marker `<w:commentRangeStart/>` and an
+end marker `<w:commentRangeEnd/>`, both of which contain the *id* of the comment they
+delimit. The start marker appears before the run starting with the first character of
+the range and the end marker appears immediately after the run ending with the last
+character of the range. Adding a comment that references an arbitrary range of text in
+an existing document may require splitting runs on the desired character boundaries.
+
+In general a range can span paragraphs, such that the range begins in one paragraph and
+ends in a later paragraph. However, a range must enclose *contiguous* runs, such that a
+range that contains only two vertically adjacent cells in a multi-column table is not
+possible (even though Word allows such a selection with the mouse).
+
+**Comment Content.** Interestingly, although commonly used to contain a single line of
+plain text, the comment-content can contain essentially any content that can appear in
+the document body. This includes rich text with emphasis, runs with a different typeface
+and size, both paragraph and character styles, hyperlinks, images, and tables. Note that
+tables do not appear in the comment as displayed in the *comment-sidebar* although they
+do apper in the *reviewing-pane*.
+
+**Comment Metadata.** Each comment can be assigned *author*, *initals*, and *date*
+metadata. In Word, these fields are assigned automatically based on values in ``Settings
+> User`` of the installed Word application. These might be configured automatically in
+an enterprise installation, based on the user account, but by default they are empty.
+
+*author* metadata is required, although silently assigned the empty string by Word if
+the user name is not configured. *initials* is optional, but always set by Word, to the
+empty string if not configured. *date* is also optional, but always set by Word to the
+UTC date and time the comment was added, with seconds resolution (no milliseconds or
+microseconds).
+
+**Additional Features.** Later versions of Word allow a comment to be *resolved*. A
+comment in this state will appear grayed-out in the Word UI. Later versions of Word also
+allow a comment to be *replied to*, forming a *comment thread*. Neither of these
+features is supported by the initial implementation of comments in *python-docx*.
+
+**Applicability.** Note that comments cannot be added to a header or footer and cannot
+be nested inside a comment itself. In general the *python-docx* API will not allow these
+operations but if you outsmart it then the resulting comment will either be silently
+removed or trigger a repair error when the document is loaded by Word.
+
+
+Adding a Comment
+----------------
+
+A simple example is adding a comment to a paragraph::
+
+    >>> from docx import Document
+    >>> document = Document()
+    >>> paragraph = document.add_paragraph("Hello, world!")
+
+    >>> comment = document.add_comment(
+    ...    runs=paragraph.runs,
+    ...    text="I have this to say about that"
+    ...    author="Steve Canny",
+    ...    initials="SC",
+    ... )
+    >>> comment
+    <docx.comments.Comment object at 0x02468ACE>
+    >>> comment.id
+    0
+    >>> comment.author
+    'Steve Canny'
+    >>> comment.initials
+    'SC'
+    >>> comment.date
+    datetime.datetime(2025, 6, 11, 20, 42, 30, 0, tzinfo=datetime.timezone.utc)
+    >>> comment.text
+    'I have this to say about that'
+
+The API documentation for :meth:`.Document.add_comment` provides further details.
+
+
+Accessing and using the Comments collection
+-------------------------------------------
+
+The comments collection is accessed via the :attr:`.Document.comments` property::
+
+    >>> comments = document.comments
+    >>> comments
+    <docx.parts.comments.Comments object at 0x02468ACE>
+    >>> len(comments)
+    1
+
+The comments collection supports random access to a comment by its id::
+
+    >>> comment = comments.get(0)
+    >>> comment
+    <docx.comments.Comment object at 0x02468ACE>
+
+
+Adding rich content to a comment
+--------------------------------
+
+A comment is a _block-item container_, just like the document body or a table cell, so
+it can contain any content that can appear in those places. It does not contain
+page-layout sections and cannot contain a comment reference, but it can contain multiple
+paragraphs and/or tables, and runs within paragraphs can have emphasis such as bold or
+italic, and have images or hyperlinks.
+
+A comment created with `text=""` will contain a single paragraph with a single empty run
+containing the so-called *annotation reference* but no text. It's probably best to leave
+this run as it is but you can freely add additional runs to the paragraph that contain
+whatever content you like.
+
+The methods for adding this content are the same as those used for the document and
+table cells::
+
+    >>> paragraph = document.add_paragraph("The rain in Spain.")
+    >>> comment = document.add_comment(
+    ...     runs=paragraph.runs,
+    ...     text="",
+    ... )
+    >>> cmt_para = comment.paragraphs[0]
+    >>> cmt_para.add_run("Please finish this thought. I believe it should be ")
+    >>> cmt_para.add_run("falls mainly in the plain.").bold = True
+
+
+Updating comment metadata
+-------------------------
+
+The author and initials metadata can be updated as desired::
+
+    >>> comment.author = "John Smith"
+    >>> comment.initials = "JS"
+    >>> comment.author
+    'John Smith'
+    >>> comment.initials
+    'JS'
diff --git a/pyproject.toml b/pyproject.toml
index 7c343f2e2..bb347f8d3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,22 @@ dynamic = ["version"]
 keywords = ["docx", "office", "openxml", "word"]
 license = { text = "MIT" }
 readme = "README.md"
-requires-python = ">=3.9"
+# requires-python = ">=3.9"
+requires-python = ">=3.9,<3.10"
+
+[dependency-groups]
+dev = [
+    "Jinja2==2.11.3",
+    "MarkupSafe==0.23",
+    "Sphinx==1.8.6",
+    "alabaster<0.7.14",
+    "behave>=1.2.6",
+    "pyparsing>=3.2.3",
+    "pyright>=1.1.401",
+    "pytest>=8.4.0",
+    "ruff>=0.11.13",
+    "types-lxml-multi-subclass>=2025.3.30",
+]
 
 [project.urls]
 Changelog = "https://github.com/python-openxml/python-docx/blob/master/HISTORY.rst"
@@ -109,12 +124,3 @@ known-local-folder = ["helpers"]
 [tool.setuptools.dynamic]
 version = {attr = "docx.__version__"}
 
-[dependency-groups]
-dev = [
-    "behave>=1.2.6",
-    "pyparsing>=3.2.3",
-    "pyright>=1.1.401",
-    "pytest>=8.4.0",
-    "ruff>=0.11.13",
-    "types-lxml-multi-subclass>=2025.3.30",
-]
diff --git a/src/docx/comments.py b/src/docx/comments.py
index 9b69cbcec..8ea195224 100644
--- a/src/docx/comments.py
+++ b/src/docx/comments.py
@@ -150,7 +150,7 @@ def text(self) -> str:
 
         Only content in paragraphs is included and of course all emphasis and styling is stripped.
 
-        Paragraph boundaries are indicated with a newline ("\n")
+        Paragraph boundaries are indicated with a newline (`"\\\\n"`)
         """
         return "\n".join(p.text for p in self.paragraphs)
 
diff --git a/src/docx/document.py b/src/docx/document.py
index 1168c4ae8..73757b46d 100644
--- a/src/docx/document.py
+++ b/src/docx/document.py
@@ -39,7 +39,11 @@ def __init__(self, element: CT_Document, part: DocumentPart):
         self.__body = None
 
     def add_comment(
-        self, runs: Run | Sequence[Run], text: str, author: str = "", initials: str | None = ""
+        self,
+        runs: Run | Sequence[Run],
+        text: str | None = "",
+        author: str = "",
+        initials: str | None = "",
     ) -> Comment:
         """Add a comment to the document, anchored to the specified runs.
 
diff --git a/src/docx/templates/default-comments.xml b/src/docx/templates/default-comments.xml
index 2afdda20b..2a36ca987 100644
--- a/src/docx/templates/default-comments.xml
+++ b/src/docx/templates/default-comments.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <w:comments
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
+  xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
+  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
   xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-  mc:Ignorable="w14 w15 w16se w16cid wp14"/>
+  xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main"
+  xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
+  xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
+/>
diff --git a/uv.lock b/uv.lock
index bbef867c8..da04bfabf 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,6 +1,24 @@
 version = 1
 revision = 1
-requires-python = ">=3.9"
+requires-python = "==3.9.*"
+
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/94/71/a8ee96d1fd95ca04a0d2e2d9c4081dac4c2d2b12f7ddb899c8cb9bfd1532/alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2", size = 11454 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/64/88/c7083fc61120ab661c5d0b82cb77079fc1429d3f913a456c1c82cf4658f7/alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3", size = 13857 },
+]
+
+[[package]]
+name = "babel"
+version = "2.17.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/6b/d52e42361e1aa00709585ecc30b3f9684b3ab62530771402248b1b1d6240/babel-2.17.0.tar.gz", hash = "sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d", size = 9951852 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b7/b8/3fe70c75fe32afc4bb507f75563d39bc5642255d1d94f1f23604725780bf/babel-2.17.0-py3-none-any.whl", hash = "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2", size = 10182537 },
+]
 
 [[package]]
 name = "beautifulsoup4"
@@ -29,6 +47,37 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a8/6c/ec9169548b6c4cb877aaa6773408ca08ae2a282805b958dbc163cb19822d/behave-1.2.6-py2.py3-none-any.whl", hash = "sha256:ebda1a6c9e5bfe95c5f9f0a2794e01c7098b3dde86c10a95d8621c5907ff6f1c", size = 136779 },
 ]
 
+[[package]]
+name = "certifi"
+version = "2025.4.26"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e8/9e/c05b3920a3b7d20d3d3310465f50348e5b3694f4f88c6daf736eef3024c4/certifi-2025.4.26.tar.gz", hash = "sha256:0a816057ea3cdefcef70270d2c515e4506bbc954f417fa5ade2021213bb8f0c6", size = 160705 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4a/7e/3db2bd1b1f9e95f7cddca6d6e75e2f2bd9f51b1246e546d88addca0106bd/certifi-2025.4.26-py3-none-any.whl", hash = "sha256:30350364dfe371162649852c63336a15c70c6510c2ad5015b21c2345311805f3", size = 159618 },
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.4.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz", hash = "sha256:5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63", size = 126367 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/28/f8/dfb01ff6cc9af38552c69c9027501ff5a5117c4cc18dcd27cb5259fa1888/charset_normalizer-3.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:005fa3432484527f9732ebd315da8da8001593e2cf46a3d817669f062c3d9ed4", size = 201671 },
+    { url = "https://files.pythonhosted.org/packages/32/fb/74e26ee556a9dbfe3bd264289b67be1e6d616329403036f6507bb9f3f29c/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e92fca20c46e9f5e1bb485887d074918b13543b1c2a1185e69bb8d17ab6236a7", size = 144744 },
+    { url = "https://files.pythonhosted.org/packages/ad/06/8499ee5aa7addc6f6d72e068691826ff093329fe59891e83b092ae4c851c/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:50bf98d5e563b83cc29471fa114366e6806bc06bc7a25fd59641e41445327836", size = 154993 },
+    { url = "https://files.pythonhosted.org/packages/f1/a2/5e4c187680728219254ef107a6949c60ee0e9a916a5dadb148c7ae82459c/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:721c76e84fe669be19c5791da68232ca2e05ba5185575086e384352e2c309597", size = 147382 },
+    { url = "https://files.pythonhosted.org/packages/4c/fe/56aca740dda674f0cc1ba1418c4d84534be51f639b5f98f538b332dc9a95/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82d8fd25b7f4675d0c47cf95b594d4e7b158aca33b76aa63d07186e13c0e0ab7", size = 149536 },
+    { url = "https://files.pythonhosted.org/packages/53/13/db2e7779f892386b589173dd689c1b1e304621c5792046edd8a978cbf9e0/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3daeac64d5b371dea99714f08ffc2c208522ec6b06fbc7866a450dd446f5c0f", size = 151349 },
+    { url = "https://files.pythonhosted.org/packages/69/35/e52ab9a276186f729bce7a0638585d2982f50402046e4b0faa5d2c3ef2da/charset_normalizer-3.4.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:dccab8d5fa1ef9bfba0590ecf4d46df048d18ffe3eec01eeb73a42e0d9e7a8ba", size = 146365 },
+    { url = "https://files.pythonhosted.org/packages/a6/d8/af7333f732fc2e7635867d56cb7c349c28c7094910c72267586947561b4b/charset_normalizer-3.4.2-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:aaf27faa992bfee0264dc1f03f4c75e9fcdda66a519db6b957a3f826e285cf12", size = 154499 },
+    { url = "https://files.pythonhosted.org/packages/7a/3d/a5b2e48acef264d71e036ff30bcc49e51bde80219bb628ba3e00cf59baac/charset_normalizer-3.4.2-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:eb30abc20df9ab0814b5a2524f23d75dcf83cde762c161917a2b4b7b55b1e518", size = 157735 },
+    { url = "https://files.pythonhosted.org/packages/85/d8/23e2c112532a29f3eef374375a8684a4f3b8e784f62b01da931186f43494/charset_normalizer-3.4.2-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:c72fbbe68c6f32f251bdc08b8611c7b3060612236e960ef848e0a517ddbe76c5", size = 154786 },
+    { url = "https://files.pythonhosted.org/packages/c7/57/93e0169f08ecc20fe82d12254a200dfaceddc1c12a4077bf454ecc597e33/charset_normalizer-3.4.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:982bb1e8b4ffda883b3d0a521e23abcd6fd17418f6d2c4118d257a10199c0ce3", size = 150203 },
+    { url = "https://files.pythonhosted.org/packages/2c/9d/9bf2b005138e7e060d7ebdec7503d0ef3240141587651f4b445bdf7286c2/charset_normalizer-3.4.2-cp39-cp39-win32.whl", hash = "sha256:43e0933a0eff183ee85833f341ec567c0980dae57c464d8a508e1b2ceb336471", size = 98436 },
+    { url = "https://files.pythonhosted.org/packages/6d/24/5849d46cf4311bbf21b424c443b09b459f5b436b1558c04e45dbb7cc478b/charset_normalizer-3.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:d11b54acf878eef558599658b0ffca78138c8c3655cf4f3a4a673c437e67732e", size = 105772 },
+    { url = "https://files.pythonhosted.org/packages/20/94/c5790835a017658cbfabd07f3bfb549140c3ac458cfc196323996b10095a/charset_normalizer-3.4.2-py3-none-any.whl", hash = "sha256:7f56930ab0abd1c45cd15be65cc741c28b1c9a34876ce8c17a2fa107810c0af0", size = 52626 },
+]
+
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -47,18 +96,45 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ee/58/257350f7db99b4ae12b614a36256d9cc870d71d9e451e79c2dc3b23d7c3c/cssselect-1.3.0-py3-none-any.whl", hash = "sha256:56d1bf3e198080cc1667e137bc51de9cadfca259f03c2d4e09037b3e01e30f0d", size = 18786 },
 ]
 
+[[package]]
+name = "docutils"
+version = "0.17.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/4c/17/559b4d020f4b46e0287a2eddf2d8ebf76318fd3bd495f1625414b052fdc9/docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125", size = 2016138 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4c/5e/6003a0d1f37725ec2ebd4046b657abb9372202655f96e76795dca8c0063c/docutils-0.17.1-py2.py3-none-any.whl", hash = "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61", size = 575533 },
+]
+
 [[package]]
 name = "exceptiongroup"
 version = "1.3.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749 }
 wheels = [
     { url = "https://files.pythonhosted.org/packages/36/f4/c6e662dade71f56cd2f3735141b265c3c79293c109549c1e6933b0651ffc/exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10", size = 16674 },
 ]
 
+[[package]]
+name = "idna"
+version = "3.10"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442 },
+]
+
+[[package]]
+name = "imagesize"
+version = "1.4.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a7/84/62473fb57d61e31fef6e36d64a179c8781605429fd927b5dd608c997be31/imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a", size = 1280026 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ff/62/85c4c919272577931d407be5ba5d71c20f0b616d31a0befe0ae45bb79abd/imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b", size = 8769 },
+]
+
 [[package]]
 name = "iniconfig"
 version = "2.1.0"
@@ -68,80 +144,24 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050 },
 ]
 
+[[package]]
+name = "jinja2"
+version = "2.11.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markupsafe" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7/Jinja2-2.11.3.tar.gz", hash = "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6", size = 257589 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7e/c2/1eece8c95ddbc9b1aeb64f5783a9e07a286de42191b7204d67b7496ddf35/Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", size = 125699 },
+]
+
 [[package]]
 name = "lxml"
 version = "5.4.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/76/3d/14e82fc7c8fb1b7761f7e748fd47e2ec8276d137b6acfe5a4bb73853e08f/lxml-5.4.0.tar.gz", hash = "sha256:d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd", size = 3679479 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f5/1f/a3b6b74a451ceb84b471caa75c934d2430a4d84395d38ef201d539f38cd1/lxml-5.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e7bc6df34d42322c5289e37e9971d6ed114e3776b45fa879f734bded9d1fea9c", size = 8076838 },
-    { url = "https://files.pythonhosted.org/packages/36/af/a567a55b3e47135b4d1f05a1118c24529104c003f95851374b3748139dc1/lxml-5.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6854f8bd8a1536f8a1d9a3655e6354faa6406621cf857dc27b681b69860645c7", size = 4381827 },
-    { url = "https://files.pythonhosted.org/packages/50/ba/4ee47d24c675932b3eb5b6de77d0f623c2db6dc466e7a1f199792c5e3e3a/lxml-5.4.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:696ea9e87442467819ac22394ca36cb3d01848dad1be6fac3fb612d3bd5a12cf", size = 5204098 },
-    { url = "https://files.pythonhosted.org/packages/f2/0f/b4db6dfebfefe3abafe360f42a3d471881687fd449a0b86b70f1f2683438/lxml-5.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ef80aeac414f33c24b3815ecd560cee272786c3adfa5f31316d8b349bfade28", size = 4930261 },
-    { url = "https://files.pythonhosted.org/packages/0b/1f/0bb1bae1ce056910f8db81c6aba80fec0e46c98d77c0f59298c70cd362a3/lxml-5.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b9c2754cef6963f3408ab381ea55f47dabc6f78f4b8ebb0f0b25cf1ac1f7609", size = 5529621 },
-    { url = "https://files.pythonhosted.org/packages/21/f5/e7b66a533fc4a1e7fa63dd22a1ab2ec4d10319b909211181e1ab3e539295/lxml-5.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7a62cc23d754bb449d63ff35334acc9f5c02e6dae830d78dab4dd12b78a524f4", size = 4983231 },
-    { url = "https://files.pythonhosted.org/packages/11/39/a38244b669c2d95a6a101a84d3c85ba921fea827e9e5483e93168bf1ccb2/lxml-5.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f82125bc7203c5ae8633a7d5d20bcfdff0ba33e436e4ab0abc026a53a8960b7", size = 5084279 },
-    { url = "https://files.pythonhosted.org/packages/db/64/48cac242347a09a07740d6cee7b7fd4663d5c1abd65f2e3c60420e231b27/lxml-5.4.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:b67319b4aef1a6c56576ff544b67a2a6fbd7eaee485b241cabf53115e8908b8f", size = 4927405 },
-    { url = "https://files.pythonhosted.org/packages/98/89/97442835fbb01d80b72374f9594fe44f01817d203fa056e9906128a5d896/lxml-5.4.0-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:a8ef956fce64c8551221f395ba21d0724fed6b9b6242ca4f2f7beb4ce2f41997", size = 5550169 },
-    { url = "https://files.pythonhosted.org/packages/f1/97/164ca398ee654eb21f29c6b582685c6c6b9d62d5213abc9b8380278e9c0a/lxml-5.4.0-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:0a01ce7d8479dce84fc03324e3b0c9c90b1ece9a9bb6a1b6c9025e7e4520e78c", size = 5062691 },
-    { url = "https://files.pythonhosted.org/packages/d0/bc/712b96823d7feb53482d2e4f59c090fb18ec7b0d0b476f353b3085893cda/lxml-5.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:91505d3ddebf268bb1588eb0f63821f738d20e1e7f05d3c647a5ca900288760b", size = 5133503 },
-    { url = "https://files.pythonhosted.org/packages/d4/55/a62a39e8f9da2a8b6002603475e3c57c870cd9c95fd4b94d4d9ac9036055/lxml-5.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a3bcdde35d82ff385f4ede021df801b5c4a5bcdfb61ea87caabcebfc4945dc1b", size = 4999346 },
-    { url = "https://files.pythonhosted.org/packages/ea/47/a393728ae001b92bb1a9e095e570bf71ec7f7fbae7688a4792222e56e5b9/lxml-5.4.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:aea7c06667b987787c7d1f5e1dfcd70419b711cdb47d6b4bb4ad4b76777a0563", size = 5627139 },
-    { url = "https://files.pythonhosted.org/packages/5e/5f/9dcaaad037c3e642a7ea64b479aa082968de46dd67a8293c541742b6c9db/lxml-5.4.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:a7fb111eef4d05909b82152721a59c1b14d0f365e2be4c742a473c5d7372f4f5", size = 5465609 },
-    { url = "https://files.pythonhosted.org/packages/a7/0a/ebcae89edf27e61c45023005171d0ba95cb414ee41c045ae4caf1b8487fd/lxml-5.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:43d549b876ce64aa18b2328faff70f5877f8c6dede415f80a2f799d31644d776", size = 5192285 },
-    { url = "https://files.pythonhosted.org/packages/42/ad/cc8140ca99add7d85c92db8b2354638ed6d5cc0e917b21d36039cb15a238/lxml-5.4.0-cp310-cp310-win32.whl", hash = "sha256:75133890e40d229d6c5837b0312abbe5bac1c342452cf0e12523477cd3aa21e7", size = 3477507 },
-    { url = "https://files.pythonhosted.org/packages/e9/39/597ce090da1097d2aabd2f9ef42187a6c9c8546d67c419ce61b88b336c85/lxml-5.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:de5b4e1088523e2b6f730d0509a9a813355b7f5659d70eb4f319c76beea2e250", size = 3805104 },
-    { url = "https://files.pythonhosted.org/packages/81/2d/67693cc8a605a12e5975380d7ff83020dcc759351b5a066e1cced04f797b/lxml-5.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:98a3912194c079ef37e716ed228ae0dcb960992100461b704aea4e93af6b0bb9", size = 8083240 },
-    { url = "https://files.pythonhosted.org/packages/73/53/b5a05ab300a808b72e848efd152fe9c022c0181b0a70b8bca1199f1bed26/lxml-5.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0ea0252b51d296a75f6118ed0d8696888e7403408ad42345d7dfd0d1e93309a7", size = 4387685 },
-    { url = "https://files.pythonhosted.org/packages/d8/cb/1a3879c5f512bdcd32995c301886fe082b2edd83c87d41b6d42d89b4ea4d/lxml-5.4.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b92b69441d1bd39f4940f9eadfa417a25862242ca2c396b406f9272ef09cdcaa", size = 4991164 },
-    { url = "https://files.pythonhosted.org/packages/f9/94/bbc66e42559f9d04857071e3b3d0c9abd88579367fd2588a4042f641f57e/lxml-5.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20e16c08254b9b6466526bc1828d9370ee6c0d60a4b64836bc3ac2917d1e16df", size = 4746206 },
-    { url = "https://files.pythonhosted.org/packages/66/95/34b0679bee435da2d7cae895731700e519a8dfcab499c21662ebe671603e/lxml-5.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7605c1c32c3d6e8c990dd28a0970a3cbbf1429d5b92279e37fda05fb0c92190e", size = 5342144 },
-    { url = "https://files.pythonhosted.org/packages/e0/5d/abfcc6ab2fa0be72b2ba938abdae1f7cad4c632f8d552683ea295d55adfb/lxml-5.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ecf4c4b83f1ab3d5a7ace10bafcb6f11df6156857a3c418244cef41ca9fa3e44", size = 4825124 },
-    { url = "https://files.pythonhosted.org/packages/5a/78/6bd33186c8863b36e084f294fc0a5e5eefe77af95f0663ef33809cc1c8aa/lxml-5.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cef4feae82709eed352cd7e97ae062ef6ae9c7b5dbe3663f104cd2c0e8d94ba", size = 4876520 },
-    { url = "https://files.pythonhosted.org/packages/3b/74/4d7ad4839bd0fc64e3d12da74fc9a193febb0fae0ba6ebd5149d4c23176a/lxml-5.4.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:df53330a3bff250f10472ce96a9af28628ff1f4efc51ccba351a8820bca2a8ba", size = 4765016 },
-    { url = "https://files.pythonhosted.org/packages/24/0d/0a98ed1f2471911dadfc541003ac6dd6879fc87b15e1143743ca20f3e973/lxml-5.4.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:aefe1a7cb852fa61150fcb21a8c8fcea7b58c4cb11fbe59c97a0a4b31cae3c8c", size = 5362884 },
-    { url = "https://files.pythonhosted.org/packages/48/de/d4f7e4c39740a6610f0f6959052b547478107967362e8424e1163ec37ae8/lxml-5.4.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:ef5a7178fcc73b7d8c07229e89f8eb45b2908a9238eb90dcfc46571ccf0383b8", size = 4902690 },
-    { url = "https://files.pythonhosted.org/packages/07/8c/61763abd242af84f355ca4ef1ee096d3c1b7514819564cce70fd18c22e9a/lxml-5.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d2ed1b3cb9ff1c10e6e8b00941bb2e5bb568b307bfc6b17dffbbe8be5eecba86", size = 4944418 },
-    { url = "https://files.pythonhosted.org/packages/f9/c5/6d7e3b63e7e282619193961a570c0a4c8a57fe820f07ca3fe2f6bd86608a/lxml-5.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:72ac9762a9f8ce74c9eed4a4e74306f2f18613a6b71fa065495a67ac227b3056", size = 4827092 },
-    { url = "https://files.pythonhosted.org/packages/71/4a/e60a306df54680b103348545706a98a7514a42c8b4fbfdcaa608567bb065/lxml-5.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f5cb182f6396706dc6cc1896dd02b1c889d644c081b0cdec38747573db88a7d7", size = 5418231 },
-    { url = "https://files.pythonhosted.org/packages/27/f2/9754aacd6016c930875854f08ac4b192a47fe19565f776a64004aa167521/lxml-5.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:3a3178b4873df8ef9457a4875703488eb1622632a9cee6d76464b60e90adbfcd", size = 5261798 },
-    { url = "https://files.pythonhosted.org/packages/38/a2/0c49ec6941428b1bd4f280650d7b11a0f91ace9db7de32eb7aa23bcb39ff/lxml-5.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e094ec83694b59d263802ed03a8384594fcce477ce484b0cbcd0008a211ca751", size = 4988195 },
-    { url = "https://files.pythonhosted.org/packages/7a/75/87a3963a08eafc46a86c1131c6e28a4de103ba30b5ae903114177352a3d7/lxml-5.4.0-cp311-cp311-win32.whl", hash = "sha256:4329422de653cdb2b72afa39b0aa04252fca9071550044904b2e7036d9d97fe4", size = 3474243 },
-    { url = "https://files.pythonhosted.org/packages/fa/f9/1f0964c4f6c2be861c50db380c554fb8befbea98c6404744ce243a3c87ef/lxml-5.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:fd3be6481ef54b8cfd0e1e953323b7aa9d9789b94842d0e5b142ef4bb7999539", size = 3815197 },
-    { url = "https://files.pythonhosted.org/packages/f8/4c/d101ace719ca6a4ec043eb516fcfcb1b396a9fccc4fcd9ef593df34ba0d5/lxml-5.4.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b5aff6f3e818e6bdbbb38e5967520f174b18f539c2b9de867b1e7fde6f8d95a4", size = 8127392 },
-    { url = "https://files.pythonhosted.org/packages/11/84/beddae0cec4dd9ddf46abf156f0af451c13019a0fa25d7445b655ba5ccb7/lxml-5.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:942a5d73f739ad7c452bf739a62a0f83e2578afd6b8e5406308731f4ce78b16d", size = 4415103 },
-    { url = "https://files.pythonhosted.org/packages/d0/25/d0d93a4e763f0462cccd2b8a665bf1e4343dd788c76dcfefa289d46a38a9/lxml-5.4.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:460508a4b07364d6abf53acaa0a90b6d370fafde5693ef37602566613a9b0779", size = 5024224 },
-    { url = "https://files.pythonhosted.org/packages/31/ce/1df18fb8f7946e7f3388af378b1f34fcf253b94b9feedb2cec5969da8012/lxml-5.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:529024ab3a505fed78fe3cc5ddc079464e709f6c892733e3f5842007cec8ac6e", size = 4769913 },
-    { url = "https://files.pythonhosted.org/packages/4e/62/f4a6c60ae7c40d43657f552f3045df05118636be1165b906d3423790447f/lxml-5.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ca56ebc2c474e8f3d5761debfd9283b8b18c76c4fc0967b74aeafba1f5647f9", size = 5290441 },
-    { url = "https://files.pythonhosted.org/packages/9e/aa/04f00009e1e3a77838c7fc948f161b5d2d5de1136b2b81c712a263829ea4/lxml-5.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a81e1196f0a5b4167a8dafe3a66aa67c4addac1b22dc47947abd5d5c7a3f24b5", size = 4820165 },
-    { url = "https://files.pythonhosted.org/packages/c9/1f/e0b2f61fa2404bf0f1fdf1898377e5bd1b74cc9b2cf2c6ba8509b8f27990/lxml-5.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00b8686694423ddae324cf614e1b9659c2edb754de617703c3d29ff568448df5", size = 4932580 },
-    { url = "https://files.pythonhosted.org/packages/24/a2/8263f351b4ffe0ed3e32ea7b7830f845c795349034f912f490180d88a877/lxml-5.4.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:c5681160758d3f6ac5b4fea370495c48aac0989d6a0f01bb9a72ad8ef5ab75c4", size = 4759493 },
-    { url = "https://files.pythonhosted.org/packages/05/00/41db052f279995c0e35c79d0f0fc9f8122d5b5e9630139c592a0b58c71b4/lxml-5.4.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:2dc191e60425ad70e75a68c9fd90ab284df64d9cd410ba8d2b641c0c45bc006e", size = 5324679 },
-    { url = "https://files.pythonhosted.org/packages/1d/be/ee99e6314cdef4587617d3b3b745f9356d9b7dd12a9663c5f3b5734b64ba/lxml-5.4.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:67f779374c6b9753ae0a0195a892a1c234ce8416e4448fe1e9f34746482070a7", size = 4890691 },
-    { url = "https://files.pythonhosted.org/packages/ad/36/239820114bf1d71f38f12208b9c58dec033cbcf80101cde006b9bde5cffd/lxml-5.4.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:79d5bfa9c1b455336f52343130b2067164040604e41f6dc4d8313867ed540079", size = 4955075 },
-    { url = "https://files.pythonhosted.org/packages/d4/e1/1b795cc0b174efc9e13dbd078a9ff79a58728a033142bc6d70a1ee8fc34d/lxml-5.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3d3c30ba1c9b48c68489dc1829a6eede9873f52edca1dda900066542528d6b20", size = 4838680 },
-    { url = "https://files.pythonhosted.org/packages/72/48/3c198455ca108cec5ae3662ae8acd7fd99476812fd712bb17f1b39a0b589/lxml-5.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1af80c6316ae68aded77e91cd9d80648f7dd40406cef73df841aa3c36f6907c8", size = 5391253 },
-    { url = "https://files.pythonhosted.org/packages/d6/10/5bf51858971c51ec96cfc13e800a9951f3fd501686f4c18d7d84fe2d6352/lxml-5.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:4d885698f5019abe0de3d352caf9466d5de2baded00a06ef3f1216c1a58ae78f", size = 5261651 },
-    { url = "https://files.pythonhosted.org/packages/2b/11/06710dd809205377da380546f91d2ac94bad9ff735a72b64ec029f706c85/lxml-5.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aea53d51859b6c64e7c51d522c03cc2c48b9b5d6172126854cc7f01aa11f52bc", size = 5024315 },
-    { url = "https://files.pythonhosted.org/packages/f5/b0/15b6217834b5e3a59ebf7f53125e08e318030e8cc0d7310355e6edac98ef/lxml-5.4.0-cp312-cp312-win32.whl", hash = "sha256:d90b729fd2732df28130c064aac9bb8aff14ba20baa4aee7bd0795ff1187545f", size = 3486149 },
-    { url = "https://files.pythonhosted.org/packages/91/1e/05ddcb57ad2f3069101611bd5f5084157d90861a2ef460bf42f45cced944/lxml-5.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:1dc4ca99e89c335a7ed47d38964abcb36c5910790f9bd106f2a8fa2ee0b909d2", size = 3817095 },
-    { url = "https://files.pythonhosted.org/packages/87/cb/2ba1e9dd953415f58548506fa5549a7f373ae55e80c61c9041b7fd09a38a/lxml-5.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:773e27b62920199c6197130632c18fb7ead3257fce1ffb7d286912e56ddb79e0", size = 8110086 },
-    { url = "https://files.pythonhosted.org/packages/b5/3e/6602a4dca3ae344e8609914d6ab22e52ce42e3e1638c10967568c5c1450d/lxml-5.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ce9c671845de9699904b1e9df95acfe8dfc183f2310f163cdaa91a3535af95de", size = 4404613 },
-    { url = "https://files.pythonhosted.org/packages/4c/72/bf00988477d3bb452bef9436e45aeea82bb40cdfb4684b83c967c53909c7/lxml-5.4.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9454b8d8200ec99a224df8854786262b1bd6461f4280064c807303c642c05e76", size = 5012008 },
-    { url = "https://files.pythonhosted.org/packages/92/1f/93e42d93e9e7a44b2d3354c462cd784dbaaf350f7976b5d7c3f85d68d1b1/lxml-5.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cccd007d5c95279e529c146d095f1d39ac05139de26c098166c4beb9374b0f4d", size = 4760915 },
-    { url = "https://files.pythonhosted.org/packages/45/0b/363009390d0b461cf9976a499e83b68f792e4c32ecef092f3f9ef9c4ba54/lxml-5.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fce1294a0497edb034cb416ad3e77ecc89b313cff7adbee5334e4dc0d11f422", size = 5283890 },
-    { url = "https://files.pythonhosted.org/packages/19/dc/6056c332f9378ab476c88e301e6549a0454dbee8f0ae16847414f0eccb74/lxml-5.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:24974f774f3a78ac12b95e3a20ef0931795ff04dbb16db81a90c37f589819551", size = 4812644 },
-    { url = "https://files.pythonhosted.org/packages/ee/8a/f8c66bbb23ecb9048a46a5ef9b495fd23f7543df642dabeebcb2eeb66592/lxml-5.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:497cab4d8254c2a90bf988f162ace2ddbfdd806fce3bda3f581b9d24c852e03c", size = 4921817 },
-    { url = "https://files.pythonhosted.org/packages/04/57/2e537083c3f381f83d05d9b176f0d838a9e8961f7ed8ddce3f0217179ce3/lxml-5.4.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:e794f698ae4c5084414efea0f5cc9f4ac562ec02d66e1484ff822ef97c2cadff", size = 4753916 },
-    { url = "https://files.pythonhosted.org/packages/d8/80/ea8c4072109a350848f1157ce83ccd9439601274035cd045ac31f47f3417/lxml-5.4.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:2c62891b1ea3094bb12097822b3d44b93fc6c325f2043c4d2736a8ff09e65f60", size = 5289274 },
-    { url = "https://files.pythonhosted.org/packages/b3/47/c4be287c48cdc304483457878a3f22999098b9a95f455e3c4bda7ec7fc72/lxml-5.4.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:142accb3e4d1edae4b392bd165a9abdee8a3c432a2cca193df995bc3886249c8", size = 4874757 },
-    { url = "https://files.pythonhosted.org/packages/2f/04/6ef935dc74e729932e39478e44d8cfe6a83550552eaa072b7c05f6f22488/lxml-5.4.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:1a42b3a19346e5601d1b8296ff6ef3d76038058f311902edd574461e9c036982", size = 4947028 },
-    { url = "https://files.pythonhosted.org/packages/cb/f9/c33fc8daa373ef8a7daddb53175289024512b6619bc9de36d77dca3df44b/lxml-5.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4291d3c409a17febf817259cb37bc62cb7eb398bcc95c1356947e2871911ae61", size = 4834487 },
-    { url = "https://files.pythonhosted.org/packages/8d/30/fc92bb595bcb878311e01b418b57d13900f84c2b94f6eca9e5073ea756e6/lxml-5.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4f5322cf38fe0e21c2d73901abf68e6329dc02a4994e483adbcf92b568a09a54", size = 5381688 },
-    { url = "https://files.pythonhosted.org/packages/43/d1/3ba7bd978ce28bba8e3da2c2e9d5ae3f8f521ad3f0ca6ea4788d086ba00d/lxml-5.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:0be91891bdb06ebe65122aa6bf3fc94489960cf7e03033c6f83a90863b23c58b", size = 5242043 },
-    { url = "https://files.pythonhosted.org/packages/ee/cd/95fa2201041a610c4d08ddaf31d43b98ecc4b1d74b1e7245b1abdab443cb/lxml-5.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:15a665ad90054a3d4f397bc40f73948d48e36e4c09f9bcffc7d90c87410e478a", size = 5021569 },
-    { url = "https://files.pythonhosted.org/packages/2d/a6/31da006fead660b9512d08d23d31e93ad3477dd47cc42e3285f143443176/lxml-5.4.0-cp313-cp313-win32.whl", hash = "sha256:d5663bc1b471c79f5c833cffbc9b87d7bf13f87e055a5c86c363ccd2348d7e82", size = 3485270 },
-    { url = "https://files.pythonhosted.org/packages/fc/14/c115516c62a7d2499781d2d3d7215218c0731b2c940753bf9f9b7b73924d/lxml-5.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:bcb7a1096b4b6b24ce1ac24d4942ad98f983cd3810f9711bcd0293f43a9d8b9f", size = 3814606 },
     { url = "https://files.pythonhosted.org/packages/1e/04/acd238222ea25683e43ac7113facc380b3aaf77c53e7d88c4f544cef02ca/lxml-5.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bda3ea44c39eb74e2488297bb39d47186ed01342f0022c8ff407c250ac3f498e", size = 8082189 },
     { url = "https://files.pythonhosted.org/packages/d6/4e/cc7fe9ccb9999cc648492ce970b63c657606aefc7d0fba46b17aa2ba93fb/lxml-5.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ceaf423b50ecfc23ca00b7f50b64baba85fb3fb91c53e2c9d00bc86150c7e40", size = 4384950 },
     { url = "https://files.pythonhosted.org/packages/56/bf/acd219c489346d0243a30769b9d446b71e5608581db49a18c8d91a669e19/lxml-5.4.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:664cdc733bc87449fe781dbb1f309090966c11cc0c0cd7b84af956a02a8a4729", size = 5209823 },
@@ -153,12 +173,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/07/53/979165f50a853dab1cf3b9e53105032d55f85c5993f94afc4d9a61a22877/lxml-5.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a99d86351f9c15e4a901fc56404b485b1462039db59288b203f8c629260a142", size = 5192346 },
     { url = "https://files.pythonhosted.org/packages/17/2b/f37b5ae28949143f863ba3066b30eede6107fc9a503bd0d01677d4e2a1e0/lxml-5.4.0-cp39-cp39-win32.whl", hash = "sha256:3e6d5557989cdc3ebb5302bbdc42b439733a841891762ded9514e74f60319ad6", size = 3478275 },
     { url = "https://files.pythonhosted.org/packages/9a/d5/b795a183680126147665a8eeda8e802c180f2f7661aa9a550bba5bcdae63/lxml-5.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:a8c9b7f16b63e65bbba889acb436a1034a82d34fa09752d754f88d708eca80e1", size = 3806275 },
-    { url = "https://files.pythonhosted.org/packages/c6/b0/e4d1cbb8c078bc4ae44de9c6a79fec4e2b4151b1b4d50af71d799e76b177/lxml-5.4.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1b717b00a71b901b4667226bba282dd462c42ccf618ade12f9ba3674e1fabc55", size = 3892319 },
-    { url = "https://files.pythonhosted.org/packages/5b/aa/e2bdefba40d815059bcb60b371a36fbfcce970a935370e1b367ba1cc8f74/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27a9ded0f0b52098ff89dd4c418325b987feed2ea5cc86e8860b0f844285d740", size = 4211614 },
-    { url = "https://files.pythonhosted.org/packages/3c/5f/91ff89d1e092e7cfdd8453a939436ac116db0a665e7f4be0cd8e65c7dc5a/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b7ce10634113651d6f383aa712a194179dcd496bd8c41e191cec2099fa09de5", size = 4306273 },
-    { url = "https://files.pythonhosted.org/packages/be/7c/8c3f15df2ca534589717bfd19d1e3482167801caedfa4d90a575facf68a6/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:53370c26500d22b45182f98847243efb518d268374a9570409d2e2276232fd37", size = 4208552 },
-    { url = "https://files.pythonhosted.org/packages/7d/d8/9567afb1665f64d73fc54eb904e418d1138d7f011ed00647121b4dd60b38/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c6364038c519dffdbe07e3cf42e6a7f8b90c275d4d1617a69bb59734c1a2d571", size = 4331091 },
-    { url = "https://files.pythonhosted.org/packages/f1/ab/fdbbd91d8d82bf1a723ba88ec3e3d76c022b53c391b0c13cad441cdb8f9e/lxml-5.4.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b12cb6527599808ada9eb2cd6e0e7d3d8f13fe7bbb01c6311255a15ded4c7ab4", size = 3487862 },
     { url = "https://files.pythonhosted.org/packages/ad/fb/d19b67e4bb63adc20574ba3476cf763b3514df1a37551084b890254e4b15/lxml-5.4.0-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9459e6892f59ecea2e2584ee1058f5d8f629446eab52ba2305ae13a32a059530", size = 3891034 },
     { url = "https://files.pythonhosted.org/packages/c9/5d/6e1033ee0cdb2f9bc93164f9df14e42cb5bbf1bbed3bf67f687de2763104/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:47fb24cc0f052f0576ea382872b3fc7e1f7e3028e53299ea751839418ade92a6", size = 4207420 },
     { url = "https://files.pythonhosted.org/packages/f3/4b/23ac79efc32d913259d66672c5f93daac7750a3d97cdc1c1a9a5d1c1b46c/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50441c9de951a153c698b9b99992e806b71c1f36d14b154592580ff4a9d0d877", size = 4305106 },
@@ -167,6 +181,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a1/25/d381abcfd00102d3304aa191caab62f6e3bcbac93ee248771db6be153dfd/lxml-5.4.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:63e7968ff83da2eb6fdda967483a7a023aa497d85ad8f05c3ad9b1f2e8c84987", size = 3486416 },
 ]
 
+[[package]]
+name = "markupsafe"
+version = "0.23"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz", hash = "sha256:a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3", size = 13416 }
+
 [[package]]
 name = "nodeenv"
 version = "1.9.1"
@@ -253,12 +273,12 @@ version = "8.4.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
-    { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
+    { name = "exceptiongroup" },
     { name = "iniconfig" },
     { name = "packaging" },
     { name = "pluggy" },
     { name = "pygments" },
-    { name = "tomli", marker = "python_full_version < '3.11'" },
+    { name = "tomli" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/fb/aa/405082ce2749be5398045152251ac69c0f3578c7077efc53431303af97ce/pytest-8.4.0.tar.gz", hash = "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6", size = 1515232 }
 wheels = [
@@ -275,11 +295,15 @@ dependencies = [
 
 [package.dev-dependencies]
 dev = [
+    { name = "alabaster" },
     { name = "behave" },
+    { name = "jinja2" },
+    { name = "markupsafe" },
     { name = "pyparsing" },
     { name = "pyright" },
     { name = "pytest" },
     { name = "ruff" },
+    { name = "sphinx" },
     { name = "types-lxml-multi-subclass" },
 ]
 
@@ -291,14 +315,33 @@ requires-dist = [
 
 [package.metadata.requires-dev]
 dev = [
+    { name = "alabaster", specifier = "<0.7.14" },
     { name = "behave", specifier = ">=1.2.6" },
+    { name = "jinja2", specifier = "==2.11.3" },
+    { name = "markupsafe", specifier = "==0.23" },
     { name = "pyparsing", specifier = ">=3.2.3" },
     { name = "pyright", specifier = ">=1.1.401" },
     { name = "pytest", specifier = ">=8.4.0" },
     { name = "ruff", specifier = ">=0.11.13" },
+    { name = "sphinx", specifier = "==1.8.6" },
     { name = "types-lxml-multi-subclass", specifier = ">=2025.3.30" },
 ]
 
+[[package]]
+name = "requests"
+version = "2.32.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "charset-normalizer" },
+    { name = "idna" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e1/0a/929373653770d8a0d7ea76c37de6e41f11eb07559b103b1c02cafb3f7cf8/requests-2.32.4.tar.gz", hash = "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422", size = 135258 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c", size = 64847 },
+]
+
 [[package]]
 name = "ruff"
 version = "0.11.13"
@@ -324,6 +367,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/bf/b273dd11673fed8a6bd46032c0ea2a04b2ac9bfa9c628756a5856ba113b0/ruff-0.11.13-py3-none-win_arm64.whl", hash = "sha256:b4385285e9179d608ff1d2fb9922062663c658605819a6876d8beef0c30b7f3b", size = 10683928 },
 ]
 
+[[package]]
+name = "setuptools"
+version = "80.9.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/18/5d/3bf57dcd21979b887f014ea83c24ae194cfcd12b9e0fda66b957c69d1fca/setuptools-80.9.0.tar.gz", hash = "sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c", size = 1319958 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any.whl", hash = "sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922", size = 1201486 },
+]
+
 [[package]]
 name = "six"
 version = "1.17.0"
@@ -333,6 +385,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050 },
 ]
 
+[[package]]
+name = "snowballstemmer"
+version = "3.0.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/75/a7/9810d872919697c9d01295633f5d574fb416d47e535f258272ca1f01f447/snowballstemmer-3.0.1.tar.gz", hash = "sha256:6d5eeeec8e9f84d4d56b847692bacf79bc2c8e90c7f80ca4444ff8b6f2e52895", size = 105575 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c8/78/3565d011c61f5a43488987ee32b6f3f656e7f107ac2782dd57bdd7d91d9a/snowballstemmer-3.0.1-py3-none-any.whl", hash = "sha256:6cd7b3897da8d6c9ffb968a6781fa6532dce9c3618a4b127d920dab764a19064", size = 103274 },
+]
+
 [[package]]
 name = "soupsieve"
 version = "2.7"
@@ -342,42 +403,57 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e7/9c/0e6afc12c269578be5c0c1c9f4b49a8d32770a080260c333ac04cc1c832d/soupsieve-2.7-py3-none-any.whl", hash = "sha256:6e60cc5c1ffaf1cebcc12e8188320b72071e922c2e897f737cadce79ad5d30c4", size = 36677 },
 ]
 
+[[package]]
+name = "sphinx"
+version = "1.8.6"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "alabaster" },
+    { name = "babel" },
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "docutils" },
+    { name = "imagesize" },
+    { name = "jinja2" },
+    { name = "packaging" },
+    { name = "pygments" },
+    { name = "requests" },
+    { name = "setuptools" },
+    { name = "six" },
+    { name = "snowballstemmer" },
+    { name = "sphinxcontrib-websupport" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/95/74/5cef400220b2f22a4c85540b9ba20234525571b8b851be8a9ac219326a11/Sphinx-1.8.6.tar.gz", hash = "sha256:e096b1b369dbb0fcb95a31ba8c9e1ae98c588e601f08eada032248e1696de4b1", size = 5816141 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c7/da/e1b65da61267aeb92a76b6b6752430bcc076d98b723687929eb3d2e0d128/Sphinx-1.8.6-py2.py3-none-any.whl", hash = "sha256:5973adbb19a5de30e15ab394ec8bc05700317fa83f122c349dd01804d983720f", size = 3110177 },
+]
+
+[[package]]
+name = "sphinxcontrib-serializinghtml"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3b/44/6716b257b0aa6bfd51a1b31665d1c205fb12cb5ad56de752dfa15657de2f/sphinxcontrib_serializinghtml-2.0.0.tar.gz", hash = "sha256:e9d912827f872c029017a53f0ef2180b327c3f7fd23c87229f7a8e8b70031d4d", size = 16080 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/52/a7/d2782e4e3f77c8450f727ba74a8f12756d5ba823d81b941f1b04da9d033a/sphinxcontrib_serializinghtml-2.0.0-py3-none-any.whl", hash = "sha256:6e2cb0eef194e10c27ec0023bfeb25badbbb5868244cf5bc5bdc04e4464bf331", size = 92072 },
+]
+
+[[package]]
+name = "sphinxcontrib-websupport"
+version = "1.2.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "sphinxcontrib-serializinghtml" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/da/aa/b03a3f569a52b6f21a579d168083a27036c1f606269e34abdf5b70fe3a2c/sphinxcontrib-websupport-1.2.4.tar.gz", hash = "sha256:4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232", size = 602360 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e9/e5/2a547830845e6e6e5d97b3246fc1e3ec74cba879c9adc5a8e27f1291bca3/sphinxcontrib_websupport-1.2.4-py2.py3-none-any.whl", hash = "sha256:6fc9287dfc823fe9aa432463edd6cea47fa9ebbf488d7f289b322ffcfca075c7", size = 39924 },
+]
+
 [[package]]
 name = "tomli"
 version = "2.2.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff/tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", size = 17175 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/43/ca/75707e6efa2b37c77dadb324ae7d9571cb424e61ea73fad7c56c2d14527f/tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", size = 131077 },
-    { url = "https://files.pythonhosted.org/packages/c7/16/51ae563a8615d472fdbffc43a3f3d46588c264ac4f024f63f01283becfbb/tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", size = 123429 },
-    { url = "https://files.pythonhosted.org/packages/f1/dd/4f6cd1e7b160041db83c694abc78e100473c15d54620083dbd5aae7b990e/tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", size = 226067 },
-    { url = "https://files.pythonhosted.org/packages/a9/6b/c54ede5dc70d648cc6361eaf429304b02f2871a345bbdd51e993d6cdf550/tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", size = 236030 },
-    { url = "https://files.pythonhosted.org/packages/1f/47/999514fa49cfaf7a92c805a86c3c43f4215621855d151b61c602abb38091/tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", size = 240898 },
-    { url = "https://files.pythonhosted.org/packages/73/41/0a01279a7ae09ee1573b423318e7934674ce06eb33f50936655071d81a24/tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", size = 229894 },
-    { url = "https://files.pythonhosted.org/packages/55/18/5d8bc5b0a0362311ce4d18830a5d28943667599a60d20118074ea1b01bb7/tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", size = 245319 },
-    { url = "https://files.pythonhosted.org/packages/92/a3/7ade0576d17f3cdf5ff44d61390d4b3febb8a9fc2b480c75c47ea048c646/tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", size = 238273 },
-    { url = "https://files.pythonhosted.org/packages/72/6f/fa64ef058ac1446a1e51110c375339b3ec6be245af9d14c87c4a6412dd32/tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", size = 98310 },
-    { url = "https://files.pythonhosted.org/packages/6a/1c/4a2dcde4a51b81be3530565e92eda625d94dafb46dbeb15069df4caffc34/tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", size = 108309 },
-    { url = "https://files.pythonhosted.org/packages/52/e1/f8af4c2fcde17500422858155aeb0d7e93477a0d59a98e56cbfe75070fd0/tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", size = 132762 },
-    { url = "https://files.pythonhosted.org/packages/03/b8/152c68bb84fc00396b83e7bbddd5ec0bd3dd409db4195e2a9b3e398ad2e3/tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", size = 123453 },
-    { url = "https://files.pythonhosted.org/packages/c8/d6/fc9267af9166f79ac528ff7e8c55c8181ded34eb4b0e93daa767b8841573/tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", size = 233486 },
-    { url = "https://files.pythonhosted.org/packages/5c/51/51c3f2884d7bab89af25f678447ea7d297b53b5a3b5730a7cb2ef6069f07/tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", size = 242349 },
-    { url = "https://files.pythonhosted.org/packages/ab/df/bfa89627d13a5cc22402e441e8a931ef2108403db390ff3345c05253935e/tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", size = 252159 },
-    { url = "https://files.pythonhosted.org/packages/9e/6e/fa2b916dced65763a5168c6ccb91066f7639bdc88b48adda990db10c8c0b/tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", size = 237243 },
-    { url = "https://files.pythonhosted.org/packages/b4/04/885d3b1f650e1153cbb93a6a9782c58a972b94ea4483ae4ac5cedd5e4a09/tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", size = 259645 },
-    { url = "https://files.pythonhosted.org/packages/9c/de/6b432d66e986e501586da298e28ebeefd3edc2c780f3ad73d22566034239/tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", size = 244584 },
-    { url = "https://files.pythonhosted.org/packages/1c/9a/47c0449b98e6e7d1be6cbac02f93dd79003234ddc4aaab6ba07a9a7482e2/tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", size = 98875 },
-    { url = "https://files.pythonhosted.org/packages/ef/60/9b9638f081c6f1261e2688bd487625cd1e660d0a85bd469e91d8db969734/tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", size = 109418 },
-    { url = "https://files.pythonhosted.org/packages/04/90/2ee5f2e0362cb8a0b6499dc44f4d7d48f8fff06d28ba46e6f1eaa61a1388/tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7", size = 132708 },
-    { url = "https://files.pythonhosted.org/packages/c0/ec/46b4108816de6b385141f082ba99e315501ccd0a2ea23db4a100dd3990ea/tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", size = 123582 },
-    { url = "https://files.pythonhosted.org/packages/a0/bd/b470466d0137b37b68d24556c38a0cc819e8febe392d5b199dcd7f578365/tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", size = 232543 },
-    { url = "https://files.pythonhosted.org/packages/d9/e5/82e80ff3b751373f7cead2815bcbe2d51c895b3c990686741a8e56ec42ab/tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", size = 241691 },
-    { url = "https://files.pythonhosted.org/packages/05/7e/2a110bc2713557d6a1bfb06af23dd01e7dde52b6ee7dadc589868f9abfac/tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", size = 251170 },
-    { url = "https://files.pythonhosted.org/packages/64/7b/22d713946efe00e0adbcdfd6d1aa119ae03fd0b60ebed51ebb3fa9f5a2e5/tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", size = 236530 },
-    { url = "https://files.pythonhosted.org/packages/38/31/3a76f67da4b0cf37b742ca76beaf819dca0ebef26d78fc794a576e08accf/tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", size = 258666 },
-    { url = "https://files.pythonhosted.org/packages/07/10/5af1293da642aded87e8a988753945d0cf7e00a9452d3911dd3bb354c9e2/tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", size = 243954 },
-    { url = "https://files.pythonhosted.org/packages/5b/b9/1ed31d167be802da0fc95020d04cd27b7d7065cc6fbefdd2f9186f60d7bd/tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", size = 98724 },
-    { url = "https://files.pythonhosted.org/packages/c7/32/b0963458706accd9afcfeb867c0f9175a741bf7b19cd424230714d722198/tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", size = 109383 },
     { url = "https://files.pythonhosted.org/packages/6e/c2/61d3e0f47e2b74ef40a68b9e6ad5984f6241a942f7cd3bbfbdbd03861ea9/tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", size = 14257 },
 ]
 
@@ -398,7 +474,7 @@ dependencies = [
     { name = "beautifulsoup4" },
     { name = "cssselect" },
     { name = "types-html5lib" },
-    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/b7/3a/7f6d1d3b921404efef20ed1ddc2b6f1333e3f0bc5b91da37874e786ff835/types_lxml_multi_subclass-2025.3.30.tar.gz", hash = "sha256:7ac7a78e592fdba16951668968b21511adda49bbefbc0f130e55501b70e068b4", size = 153188 }
 wheels = [
@@ -413,3 +489,12 @@ sdist = { url = "https://files.pythonhosted.org/packages/d1/bc/51647cd02527e87d0
 wheels = [
     { url = "https://files.pythonhosted.org/packages/69/e0/552843e0d356fbb5256d21449fa957fa4eff3bbc135a74a691ee70c7c5da/typing_extensions-4.14.0-py3-none-any.whl", hash = "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af", size = 43839 },
 ]
+
+[[package]]
+name = "urllib3"
+version = "2.4.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/8a/78/16493d9c386d8e60e442a35feac5e00f0913c0f4b7c217c11e8ec2ff53e0/urllib3-2.4.0.tar.gz", hash = "sha256:414bc6535b787febd7567804cc015fee39daab8ad86268f1310a9250697de466", size = 390672 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl", hash = "sha256:4e16665048960a0900c702d4a66415956a584919c03361cac9f1df5c5dd7e813", size = 128680 },
+]

From 1fe660198aab18a421c95d019f53b2aa22d2fe2f Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Thu, 12 Jun 2025 20:57:40 -0700
Subject: [PATCH 366/367] build: small adjustments for tox

---
 pyproject.toml |   4 +-
 tox.ini        |   2 +-
 uv.lock        | 262 ++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 260 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index bb347f8d3..3650ce4d1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,8 +30,7 @@ dynamic = ["version"]
 keywords = ["docx", "office", "openxml", "word"]
 license = { text = "MIT" }
 readme = "README.md"
-# requires-python = ">=3.9"
-requires-python = ">=3.9,<3.10"
+requires-python = ">=3.9"
 
 [dependency-groups]
 dev = [
@@ -44,6 +43,7 @@ dev = [
     "pyright>=1.1.401",
     "pytest>=8.4.0",
     "ruff>=0.11.13",
+    "tox>=4.26.0",
     "types-lxml-multi-subclass>=2025.3.30",
 ]
 
diff --git a/tox.ini b/tox.ini
index 37acaa5fa..1f4741b6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38, py39, py310, py311, py312
+envlist = py39, py310, py311, py312, py313
 
 [testenv]
 deps = -rrequirements-test.txt
diff --git a/uv.lock b/uv.lock
index da04bfabf..675fe6777 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,6 +1,6 @@
 version = 1
 revision = 1
-requires-python = "==3.9.*"
+requires-python = ">=3.9"
 
 [[package]]
 name = "alabaster"
@@ -47,6 +47,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a8/6c/ec9169548b6c4cb877aaa6773408ca08ae2a282805b958dbc163cb19822d/behave-1.2.6-py2.py3-none-any.whl", hash = "sha256:ebda1a6c9e5bfe95c5f9f0a2794e01c7098b3dde86c10a95d8621c5907ff6f1c", size = 136779 },
 ]
 
+[[package]]
+name = "cachetools"
+version = "6.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c0/b0/f539a1ddff36644c28a61490056e5bae43bd7386d9f9c69beae2d7e7d6d1/cachetools-6.0.0.tar.gz", hash = "sha256:f225782b84438f828328fc2ad74346522f27e5b1440f4e9fd18b20ebfd1aa2cf", size = 30160 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6a/c3/8bb087c903c95a570015ce84e0c23ae1d79f528c349cbc141b5c4e250293/cachetools-6.0.0-py3-none-any.whl", hash = "sha256:82e73ba88f7b30228b5507dce1a1f878498fc669d972aef2dde4f3a3c24f103e", size = 10964 },
+]
+
 [[package]]
 name = "certifi"
 version = "2025.4.26"
@@ -56,12 +65,73 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/4a/7e/3db2bd1b1f9e95f7cddca6d6e75e2f2bd9f51b1246e546d88addca0106bd/certifi-2025.4.26-py3-none-any.whl", hash = "sha256:30350364dfe371162649852c63336a15c70c6510c2ad5015b21c2345311805f3", size = 159618 },
 ]
 
+[[package]]
+name = "chardet"
+version = "5.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f3/0d/f7b6ab21ec75897ed80c17d79b15951a719226b9fababf1e40ea74d69079/chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7", size = 2069618 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/38/6f/f5fbc992a329ee4e0f288c1fe0e2ad9485ed064cac731ed2fe47dcc38cbf/chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970", size = 199385 },
+]
+
 [[package]]
 name = "charset-normalizer"
 version = "3.4.2"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/e4/33/89c2ced2b67d1c2a61c19c6751aa8902d46ce3dacb23600a283619f5a12d/charset_normalizer-3.4.2.tar.gz", hash = "sha256:5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63", size = 126367 }
 wheels = [
+    { url = "https://files.pythonhosted.org/packages/95/28/9901804da60055b406e1a1c5ba7aac1276fb77f1dde635aabfc7fd84b8ab/charset_normalizer-3.4.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7c48ed483eb946e6c04ccbe02c6b4d1d48e51944b6db70f697e089c193404941", size = 201818 },
+    { url = "https://files.pythonhosted.org/packages/d9/9b/892a8c8af9110935e5adcbb06d9c6fe741b6bb02608c6513983048ba1a18/charset_normalizer-3.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b2d318c11350e10662026ad0eb71bb51c7812fc8590825304ae0bdd4ac283acd", size = 144649 },
+    { url = "https://files.pythonhosted.org/packages/7b/a5/4179abd063ff6414223575e008593861d62abfc22455b5d1a44995b7c101/charset_normalizer-3.4.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9cbfacf36cb0ec2897ce0ebc5d08ca44213af24265bd56eca54bee7923c48fd6", size = 155045 },
+    { url = "https://files.pythonhosted.org/packages/3b/95/bc08c7dfeddd26b4be8c8287b9bb055716f31077c8b0ea1cd09553794665/charset_normalizer-3.4.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18dd2e350387c87dabe711b86f83c9c78af772c748904d372ade190b5c7c9d4d", size = 147356 },
+    { url = "https://files.pythonhosted.org/packages/a8/2d/7a5b635aa65284bf3eab7653e8b4151ab420ecbae918d3e359d1947b4d61/charset_normalizer-3.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8075c35cd58273fee266c58c0c9b670947c19df5fb98e7b66710e04ad4e9ff86", size = 149471 },
+    { url = "https://files.pythonhosted.org/packages/ae/38/51fc6ac74251fd331a8cfdb7ec57beba8c23fd5493f1050f71c87ef77ed0/charset_normalizer-3.4.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5bf4545e3b962767e5c06fe1738f951f77d27967cb2caa64c28be7c4563e162c", size = 151317 },
+    { url = "https://files.pythonhosted.org/packages/b7/17/edee1e32215ee6e9e46c3e482645b46575a44a2d72c7dfd49e49f60ce6bf/charset_normalizer-3.4.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:7a6ab32f7210554a96cd9e33abe3ddd86732beeafc7a28e9955cdf22ffadbab0", size = 146368 },
+    { url = "https://files.pythonhosted.org/packages/26/2c/ea3e66f2b5f21fd00b2825c94cafb8c326ea6240cd80a91eb09e4a285830/charset_normalizer-3.4.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:b33de11b92e9f75a2b545d6e9b6f37e398d86c3e9e9653c4864eb7e89c5773ef", size = 154491 },
+    { url = "https://files.pythonhosted.org/packages/52/47/7be7fa972422ad062e909fd62460d45c3ef4c141805b7078dbab15904ff7/charset_normalizer-3.4.2-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:8755483f3c00d6c9a77f490c17e6ab0c8729e39e6390328e42521ef175380ae6", size = 157695 },
+    { url = "https://files.pythonhosted.org/packages/2f/42/9f02c194da282b2b340f28e5fb60762de1151387a36842a92b533685c61e/charset_normalizer-3.4.2-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:68a328e5f55ec37c57f19ebb1fdc56a248db2e3e9ad769919a58672958e8f366", size = 154849 },
+    { url = "https://files.pythonhosted.org/packages/67/44/89cacd6628f31fb0b63201a618049be4be2a7435a31b55b5eb1c3674547a/charset_normalizer-3.4.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:21b2899062867b0e1fde9b724f8aecb1af14f2778d69aacd1a5a1853a597a5db", size = 150091 },
+    { url = "https://files.pythonhosted.org/packages/1f/79/4b8da9f712bc079c0f16b6d67b099b0b8d808c2292c937f267d816ec5ecc/charset_normalizer-3.4.2-cp310-cp310-win32.whl", hash = "sha256:e8082b26888e2f8b36a042a58307d5b917ef2b1cacab921ad3323ef91901c71a", size = 98445 },
+    { url = "https://files.pythonhosted.org/packages/7d/d7/96970afb4fb66497a40761cdf7bd4f6fca0fc7bafde3a84f836c1f57a926/charset_normalizer-3.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:f69a27e45c43520f5487f27627059b64aaf160415589230992cec34c5e18a509", size = 105782 },
+    { url = "https://files.pythonhosted.org/packages/05/85/4c40d00dcc6284a1c1ad5de5e0996b06f39d8232f1031cd23c2f5c07ee86/charset_normalizer-3.4.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:be1e352acbe3c78727a16a455126d9ff83ea2dfdcbc83148d2982305a04714c2", size = 198794 },
+    { url = "https://files.pythonhosted.org/packages/41/d9/7a6c0b9db952598e97e93cbdfcb91bacd89b9b88c7c983250a77c008703c/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aa88ca0b1932e93f2d961bf3addbb2db902198dca337d88c89e1559e066e7645", size = 142846 },
+    { url = "https://files.pythonhosted.org/packages/66/82/a37989cda2ace7e37f36c1a8ed16c58cf48965a79c2142713244bf945c89/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d524ba3f1581b35c03cb42beebab4a13e6cdad7b36246bd22541fa585a56cccd", size = 153350 },
+    { url = "https://files.pythonhosted.org/packages/df/68/a576b31b694d07b53807269d05ec3f6f1093e9545e8607121995ba7a8313/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28a1005facc94196e1fb3e82a3d442a9d9110b8434fc1ded7a24a2983c9888d8", size = 145657 },
+    { url = "https://files.pythonhosted.org/packages/92/9b/ad67f03d74554bed3aefd56fe836e1623a50780f7c998d00ca128924a499/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fdb20a30fe1175ecabed17cbf7812f7b804b8a315a25f24678bcdf120a90077f", size = 147260 },
+    { url = "https://files.pythonhosted.org/packages/a6/e6/8aebae25e328160b20e31a7e9929b1578bbdc7f42e66f46595a432f8539e/charset_normalizer-3.4.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0f5d9ed7f254402c9e7d35d2f5972c9bbea9040e99cd2861bd77dc68263277c7", size = 149164 },
+    { url = "https://files.pythonhosted.org/packages/8b/f2/b3c2f07dbcc248805f10e67a0262c93308cfa149a4cd3d1fe01f593e5fd2/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:efd387a49825780ff861998cd959767800d54f8308936b21025326de4b5a42b9", size = 144571 },
+    { url = "https://files.pythonhosted.org/packages/60/5b/c3f3a94bc345bc211622ea59b4bed9ae63c00920e2e8f11824aa5708e8b7/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:f0aa37f3c979cf2546b73e8222bbfa3dc07a641585340179d768068e3455e544", size = 151952 },
+    { url = "https://files.pythonhosted.org/packages/e2/4d/ff460c8b474122334c2fa394a3f99a04cf11c646da895f81402ae54f5c42/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e70e990b2137b29dc5564715de1e12701815dacc1d056308e2b17e9095372a82", size = 155959 },
+    { url = "https://files.pythonhosted.org/packages/a2/2b/b964c6a2fda88611a1fe3d4c400d39c66a42d6c169c924818c848f922415/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:0c8c57f84ccfc871a48a47321cfa49ae1df56cd1d965a09abe84066f6853b9c0", size = 153030 },
+    { url = "https://files.pythonhosted.org/packages/59/2e/d3b9811db26a5ebf444bc0fa4f4be5aa6d76fc6e1c0fd537b16c14e849b6/charset_normalizer-3.4.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6b66f92b17849b85cad91259efc341dce9c1af48e2173bf38a85c6329f1033e5", size = 148015 },
+    { url = "https://files.pythonhosted.org/packages/90/07/c5fd7c11eafd561bb51220d600a788f1c8d77c5eef37ee49454cc5c35575/charset_normalizer-3.4.2-cp311-cp311-win32.whl", hash = "sha256:daac4765328a919a805fa5e2720f3e94767abd632ae410a9062dff5412bae65a", size = 98106 },
+    { url = "https://files.pythonhosted.org/packages/a8/05/5e33dbef7e2f773d672b6d79f10ec633d4a71cd96db6673625838a4fd532/charset_normalizer-3.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:e53efc7c7cee4c1e70661e2e112ca46a575f90ed9ae3fef200f2a25e954f4b28", size = 105402 },
+    { url = "https://files.pythonhosted.org/packages/d7/a4/37f4d6035c89cac7930395a35cc0f1b872e652eaafb76a6075943754f095/charset_normalizer-3.4.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0c29de6a1a95f24b9a1aa7aefd27d2487263f00dfd55a77719b530788f75cff7", size = 199936 },
+    { url = "https://files.pythonhosted.org/packages/ee/8a/1a5e33b73e0d9287274f899d967907cd0bf9c343e651755d9307e0dbf2b3/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cddf7bd982eaa998934a91f69d182aec997c6c468898efe6679af88283b498d3", size = 143790 },
+    { url = "https://files.pythonhosted.org/packages/66/52/59521f1d8e6ab1482164fa21409c5ef44da3e9f653c13ba71becdd98dec3/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcbe676a55d7445b22c10967bceaaf0ee69407fbe0ece4d032b6eb8d4565982a", size = 153924 },
+    { url = "https://files.pythonhosted.org/packages/86/2d/fb55fdf41964ec782febbf33cb64be480a6b8f16ded2dbe8db27a405c09f/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d41c4d287cfc69060fa91cae9683eacffad989f1a10811995fa309df656ec214", size = 146626 },
+    { url = "https://files.pythonhosted.org/packages/8c/73/6ede2ec59bce19b3edf4209d70004253ec5f4e319f9a2e3f2f15601ed5f7/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e594135de17ab3866138f496755f302b72157d115086d100c3f19370839dd3a", size = 148567 },
+    { url = "https://files.pythonhosted.org/packages/09/14/957d03c6dc343c04904530b6bef4e5efae5ec7d7990a7cbb868e4595ee30/charset_normalizer-3.4.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf713fe9a71ef6fd5adf7a79670135081cd4431c2943864757f0fa3a65b1fafd", size = 150957 },
+    { url = "https://files.pythonhosted.org/packages/0d/c8/8174d0e5c10ccebdcb1b53cc959591c4c722a3ad92461a273e86b9f5a302/charset_normalizer-3.4.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a370b3e078e418187da8c3674eddb9d983ec09445c99a3a263c2011993522981", size = 145408 },
+    { url = "https://files.pythonhosted.org/packages/58/aa/8904b84bc8084ac19dc52feb4f5952c6df03ffb460a887b42615ee1382e8/charset_normalizer-3.4.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:a955b438e62efdf7e0b7b52a64dc5c3396e2634baa62471768a64bc2adb73d5c", size = 153399 },
+    { url = "https://files.pythonhosted.org/packages/c2/26/89ee1f0e264d201cb65cf054aca6038c03b1a0c6b4ae998070392a3ce605/charset_normalizer-3.4.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7222ffd5e4de8e57e03ce2cef95a4c43c98fcb72ad86909abdfc2c17d227fc1b", size = 156815 },
+    { url = "https://files.pythonhosted.org/packages/fd/07/68e95b4b345bad3dbbd3a8681737b4338ff2c9df29856a6d6d23ac4c73cb/charset_normalizer-3.4.2-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:bee093bf902e1d8fc0ac143c88902c3dfc8941f7ea1d6a8dd2bcb786d33db03d", size = 154537 },
+    { url = "https://files.pythonhosted.org/packages/77/1a/5eefc0ce04affb98af07bc05f3bac9094513c0e23b0562d64af46a06aae4/charset_normalizer-3.4.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:dedb8adb91d11846ee08bec4c8236c8549ac721c245678282dcb06b221aab59f", size = 149565 },
+    { url = "https://files.pythonhosted.org/packages/37/a0/2410e5e6032a174c95e0806b1a6585eb21e12f445ebe239fac441995226a/charset_normalizer-3.4.2-cp312-cp312-win32.whl", hash = "sha256:db4c7bf0e07fc3b7d89ac2a5880a6a8062056801b83ff56d8464b70f65482b6c", size = 98357 },
+    { url = "https://files.pythonhosted.org/packages/6c/4f/c02d5c493967af3eda9c771ad4d2bbc8df6f99ddbeb37ceea6e8716a32bc/charset_normalizer-3.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:5a9979887252a82fefd3d3ed2a8e3b937a7a809f65dcb1e068b090e165bbe99e", size = 105776 },
+    { url = "https://files.pythonhosted.org/packages/ea/12/a93df3366ed32db1d907d7593a94f1fe6293903e3e92967bebd6950ed12c/charset_normalizer-3.4.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:926ca93accd5d36ccdabd803392ddc3e03e6d4cd1cf17deff3b989ab8e9dbcf0", size = 199622 },
+    { url = "https://files.pythonhosted.org/packages/04/93/bf204e6f344c39d9937d3c13c8cd5bbfc266472e51fc8c07cb7f64fcd2de/charset_normalizer-3.4.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eba9904b0f38a143592d9fc0e19e2df0fa2e41c3c3745554761c5f6447eedabf", size = 143435 },
+    { url = "https://files.pythonhosted.org/packages/22/2a/ea8a2095b0bafa6c5b5a55ffdc2f924455233ee7b91c69b7edfcc9e02284/charset_normalizer-3.4.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3fddb7e2c84ac87ac3a947cb4e66d143ca5863ef48e4a5ecb83bd48619e4634e", size = 153653 },
+    { url = "https://files.pythonhosted.org/packages/b6/57/1b090ff183d13cef485dfbe272e2fe57622a76694061353c59da52c9a659/charset_normalizer-3.4.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:98f862da73774290f251b9df8d11161b6cf25b599a66baf087c1ffe340e9bfd1", size = 146231 },
+    { url = "https://files.pythonhosted.org/packages/e2/28/ffc026b26f441fc67bd21ab7f03b313ab3fe46714a14b516f931abe1a2d8/charset_normalizer-3.4.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c9379d65defcab82d07b2a9dfbfc2e95bc8fe0ebb1b176a3190230a3ef0e07c", size = 148243 },
+    { url = "https://files.pythonhosted.org/packages/c0/0f/9abe9bd191629c33e69e47c6ef45ef99773320e9ad8e9cb08b8ab4a8d4cb/charset_normalizer-3.4.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e635b87f01ebc977342e2697d05b56632f5f879a4f15955dfe8cef2448b51691", size = 150442 },
+    { url = "https://files.pythonhosted.org/packages/67/7c/a123bbcedca91d5916c056407f89a7f5e8fdfce12ba825d7d6b9954a1a3c/charset_normalizer-3.4.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c95a1e2902a8b722868587c0e1184ad5c55631de5afc0eb96bc4b0d738092c0", size = 145147 },
+    { url = "https://files.pythonhosted.org/packages/ec/fe/1ac556fa4899d967b83e9893788e86b6af4d83e4726511eaaad035e36595/charset_normalizer-3.4.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ef8de666d6179b009dce7bcb2ad4c4a779f113f12caf8dc77f0162c29d20490b", size = 153057 },
+    { url = "https://files.pythonhosted.org/packages/2b/ff/acfc0b0a70b19e3e54febdd5301a98b72fa07635e56f24f60502e954c461/charset_normalizer-3.4.2-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:32fc0341d72e0f73f80acb0a2c94216bd704f4f0bce10aedea38f30502b271ff", size = 156454 },
+    { url = "https://files.pythonhosted.org/packages/92/08/95b458ce9c740d0645feb0e96cea1f5ec946ea9c580a94adfe0b617f3573/charset_normalizer-3.4.2-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:289200a18fa698949d2b39c671c2cc7a24d44096784e76614899a7ccf2574b7b", size = 154174 },
+    { url = "https://files.pythonhosted.org/packages/78/be/8392efc43487ac051eee6c36d5fbd63032d78f7728cb37aebcc98191f1ff/charset_normalizer-3.4.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4a476b06fbcf359ad25d34a057b7219281286ae2477cc5ff5e3f70a246971148", size = 149166 },
+    { url = "https://files.pythonhosted.org/packages/44/96/392abd49b094d30b91d9fbda6a69519e95802250b777841cf3bda8fe136c/charset_normalizer-3.4.2-cp313-cp313-win32.whl", hash = "sha256:aaeeb6a479c7667fbe1099af9617c83aaca22182d6cf8c53966491a0f1b7ffb7", size = 98064 },
+    { url = "https://files.pythonhosted.org/packages/e9/b0/0200da600134e001d91851ddc797809e2fe0ea72de90e09bec5a2fbdaccb/charset_normalizer-3.4.2-cp313-cp313-win_amd64.whl", hash = "sha256:aa6af9e7d59f9c12b33ae4e9450619cf2488e2bbe9b44030905877f0b2324980", size = 105641 },
     { url = "https://files.pythonhosted.org/packages/28/f8/dfb01ff6cc9af38552c69c9027501ff5a5117c4cc18dcd27cb5259fa1888/charset_normalizer-3.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:005fa3432484527f9732ebd315da8da8001593e2cf46a3d817669f062c3d9ed4", size = 201671 },
     { url = "https://files.pythonhosted.org/packages/32/fb/74e26ee556a9dbfe3bd264289b67be1e6d616329403036f6507bb9f3f29c/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e92fca20c46e9f5e1bb485887d074918b13543b1c2a1185e69bb8d17ab6236a7", size = 144744 },
     { url = "https://files.pythonhosted.org/packages/ad/06/8499ee5aa7addc6f6d72e068691826ff093329fe59891e83b092ae4c851c/charset_normalizer-3.4.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:50bf98d5e563b83cc29471fa114366e6806bc06bc7a25fd59641e41445327836", size = 154993 },
@@ -96,6 +166,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ee/58/257350f7db99b4ae12b614a36256d9cc870d71d9e451e79c2dc3b23d7c3c/cssselect-1.3.0-py3-none-any.whl", hash = "sha256:56d1bf3e198080cc1667e137bc51de9cadfca259f03c2d4e09037b3e01e30f0d", size = 18786 },
 ]
 
+[[package]]
+name = "distlib"
+version = "0.3.9"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0d/dd/1bec4c5ddb504ca60fc29472f3d27e8d4da1257a854e1d96742f15c1d02d/distlib-0.3.9.tar.gz", hash = "sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403", size = 613923 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/91/a1/cf2472db20f7ce4a6be1253a81cfdf85ad9c7885ffbed7047fb72c24cf87/distlib-0.3.9-py2.py3-none-any.whl", hash = "sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87", size = 468973 },
+]
+
 [[package]]
 name = "docutils"
 version = "0.17.1"
@@ -110,13 +189,22 @@ name = "exceptiongroup"
 version = "1.3.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "typing-extensions" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749 }
 wheels = [
     { url = "https://files.pythonhosted.org/packages/36/f4/c6e662dade71f56cd2f3735141b265c3c79293c109549c1e6933b0651ffc/exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10", size = 16674 },
 ]
 
+[[package]]
+name = "filelock"
+version = "3.18.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0a/10/c23352565a6544bdc5353e0b15fc1c563352101f30e24bf500207a54df9a/filelock-3.18.0.tar.gz", hash = "sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2", size = 18075 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4d/36/2a115987e2d8c300a974597416d9de88f2444426de9571f4b59b2cca3acc/filelock-3.18.0-py3-none-any.whl", hash = "sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de", size = 16215 },
+]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -162,6 +250,74 @@ version = "5.4.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/76/3d/14e82fc7c8fb1b7761f7e748fd47e2ec8276d137b6acfe5a4bb73853e08f/lxml-5.4.0.tar.gz", hash = "sha256:d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd", size = 3679479 }
 wheels = [
+    { url = "https://files.pythonhosted.org/packages/f5/1f/a3b6b74a451ceb84b471caa75c934d2430a4d84395d38ef201d539f38cd1/lxml-5.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e7bc6df34d42322c5289e37e9971d6ed114e3776b45fa879f734bded9d1fea9c", size = 8076838 },
+    { url = "https://files.pythonhosted.org/packages/36/af/a567a55b3e47135b4d1f05a1118c24529104c003f95851374b3748139dc1/lxml-5.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6854f8bd8a1536f8a1d9a3655e6354faa6406621cf857dc27b681b69860645c7", size = 4381827 },
+    { url = "https://files.pythonhosted.org/packages/50/ba/4ee47d24c675932b3eb5b6de77d0f623c2db6dc466e7a1f199792c5e3e3a/lxml-5.4.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:696ea9e87442467819ac22394ca36cb3d01848dad1be6fac3fb612d3bd5a12cf", size = 5204098 },
+    { url = "https://files.pythonhosted.org/packages/f2/0f/b4db6dfebfefe3abafe360f42a3d471881687fd449a0b86b70f1f2683438/lxml-5.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ef80aeac414f33c24b3815ecd560cee272786c3adfa5f31316d8b349bfade28", size = 4930261 },
+    { url = "https://files.pythonhosted.org/packages/0b/1f/0bb1bae1ce056910f8db81c6aba80fec0e46c98d77c0f59298c70cd362a3/lxml-5.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b9c2754cef6963f3408ab381ea55f47dabc6f78f4b8ebb0f0b25cf1ac1f7609", size = 5529621 },
+    { url = "https://files.pythonhosted.org/packages/21/f5/e7b66a533fc4a1e7fa63dd22a1ab2ec4d10319b909211181e1ab3e539295/lxml-5.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7a62cc23d754bb449d63ff35334acc9f5c02e6dae830d78dab4dd12b78a524f4", size = 4983231 },
+    { url = "https://files.pythonhosted.org/packages/11/39/a38244b669c2d95a6a101a84d3c85ba921fea827e9e5483e93168bf1ccb2/lxml-5.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f82125bc7203c5ae8633a7d5d20bcfdff0ba33e436e4ab0abc026a53a8960b7", size = 5084279 },
+    { url = "https://files.pythonhosted.org/packages/db/64/48cac242347a09a07740d6cee7b7fd4663d5c1abd65f2e3c60420e231b27/lxml-5.4.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:b67319b4aef1a6c56576ff544b67a2a6fbd7eaee485b241cabf53115e8908b8f", size = 4927405 },
+    { url = "https://files.pythonhosted.org/packages/98/89/97442835fbb01d80b72374f9594fe44f01817d203fa056e9906128a5d896/lxml-5.4.0-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:a8ef956fce64c8551221f395ba21d0724fed6b9b6242ca4f2f7beb4ce2f41997", size = 5550169 },
+    { url = "https://files.pythonhosted.org/packages/f1/97/164ca398ee654eb21f29c6b582685c6c6b9d62d5213abc9b8380278e9c0a/lxml-5.4.0-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:0a01ce7d8479dce84fc03324e3b0c9c90b1ece9a9bb6a1b6c9025e7e4520e78c", size = 5062691 },
+    { url = "https://files.pythonhosted.org/packages/d0/bc/712b96823d7feb53482d2e4f59c090fb18ec7b0d0b476f353b3085893cda/lxml-5.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:91505d3ddebf268bb1588eb0f63821f738d20e1e7f05d3c647a5ca900288760b", size = 5133503 },
+    { url = "https://files.pythonhosted.org/packages/d4/55/a62a39e8f9da2a8b6002603475e3c57c870cd9c95fd4b94d4d9ac9036055/lxml-5.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a3bcdde35d82ff385f4ede021df801b5c4a5bcdfb61ea87caabcebfc4945dc1b", size = 4999346 },
+    { url = "https://files.pythonhosted.org/packages/ea/47/a393728ae001b92bb1a9e095e570bf71ec7f7fbae7688a4792222e56e5b9/lxml-5.4.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:aea7c06667b987787c7d1f5e1dfcd70419b711cdb47d6b4bb4ad4b76777a0563", size = 5627139 },
+    { url = "https://files.pythonhosted.org/packages/5e/5f/9dcaaad037c3e642a7ea64b479aa082968de46dd67a8293c541742b6c9db/lxml-5.4.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:a7fb111eef4d05909b82152721a59c1b14d0f365e2be4c742a473c5d7372f4f5", size = 5465609 },
+    { url = "https://files.pythonhosted.org/packages/a7/0a/ebcae89edf27e61c45023005171d0ba95cb414ee41c045ae4caf1b8487fd/lxml-5.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:43d549b876ce64aa18b2328faff70f5877f8c6dede415f80a2f799d31644d776", size = 5192285 },
+    { url = "https://files.pythonhosted.org/packages/42/ad/cc8140ca99add7d85c92db8b2354638ed6d5cc0e917b21d36039cb15a238/lxml-5.4.0-cp310-cp310-win32.whl", hash = "sha256:75133890e40d229d6c5837b0312abbe5bac1c342452cf0e12523477cd3aa21e7", size = 3477507 },
+    { url = "https://files.pythonhosted.org/packages/e9/39/597ce090da1097d2aabd2f9ef42187a6c9c8546d67c419ce61b88b336c85/lxml-5.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:de5b4e1088523e2b6f730d0509a9a813355b7f5659d70eb4f319c76beea2e250", size = 3805104 },
+    { url = "https://files.pythonhosted.org/packages/81/2d/67693cc8a605a12e5975380d7ff83020dcc759351b5a066e1cced04f797b/lxml-5.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:98a3912194c079ef37e716ed228ae0dcb960992100461b704aea4e93af6b0bb9", size = 8083240 },
+    { url = "https://files.pythonhosted.org/packages/73/53/b5a05ab300a808b72e848efd152fe9c022c0181b0a70b8bca1199f1bed26/lxml-5.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0ea0252b51d296a75f6118ed0d8696888e7403408ad42345d7dfd0d1e93309a7", size = 4387685 },
+    { url = "https://files.pythonhosted.org/packages/d8/cb/1a3879c5f512bdcd32995c301886fe082b2edd83c87d41b6d42d89b4ea4d/lxml-5.4.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b92b69441d1bd39f4940f9eadfa417a25862242ca2c396b406f9272ef09cdcaa", size = 4991164 },
+    { url = "https://files.pythonhosted.org/packages/f9/94/bbc66e42559f9d04857071e3b3d0c9abd88579367fd2588a4042f641f57e/lxml-5.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20e16c08254b9b6466526bc1828d9370ee6c0d60a4b64836bc3ac2917d1e16df", size = 4746206 },
+    { url = "https://files.pythonhosted.org/packages/66/95/34b0679bee435da2d7cae895731700e519a8dfcab499c21662ebe671603e/lxml-5.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7605c1c32c3d6e8c990dd28a0970a3cbbf1429d5b92279e37fda05fb0c92190e", size = 5342144 },
+    { url = "https://files.pythonhosted.org/packages/e0/5d/abfcc6ab2fa0be72b2ba938abdae1f7cad4c632f8d552683ea295d55adfb/lxml-5.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ecf4c4b83f1ab3d5a7ace10bafcb6f11df6156857a3c418244cef41ca9fa3e44", size = 4825124 },
+    { url = "https://files.pythonhosted.org/packages/5a/78/6bd33186c8863b36e084f294fc0a5e5eefe77af95f0663ef33809cc1c8aa/lxml-5.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cef4feae82709eed352cd7e97ae062ef6ae9c7b5dbe3663f104cd2c0e8d94ba", size = 4876520 },
+    { url = "https://files.pythonhosted.org/packages/3b/74/4d7ad4839bd0fc64e3d12da74fc9a193febb0fae0ba6ebd5149d4c23176a/lxml-5.4.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:df53330a3bff250f10472ce96a9af28628ff1f4efc51ccba351a8820bca2a8ba", size = 4765016 },
+    { url = "https://files.pythonhosted.org/packages/24/0d/0a98ed1f2471911dadfc541003ac6dd6879fc87b15e1143743ca20f3e973/lxml-5.4.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:aefe1a7cb852fa61150fcb21a8c8fcea7b58c4cb11fbe59c97a0a4b31cae3c8c", size = 5362884 },
+    { url = "https://files.pythonhosted.org/packages/48/de/d4f7e4c39740a6610f0f6959052b547478107967362e8424e1163ec37ae8/lxml-5.4.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:ef5a7178fcc73b7d8c07229e89f8eb45b2908a9238eb90dcfc46571ccf0383b8", size = 4902690 },
+    { url = "https://files.pythonhosted.org/packages/07/8c/61763abd242af84f355ca4ef1ee096d3c1b7514819564cce70fd18c22e9a/lxml-5.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:d2ed1b3cb9ff1c10e6e8b00941bb2e5bb568b307bfc6b17dffbbe8be5eecba86", size = 4944418 },
+    { url = "https://files.pythonhosted.org/packages/f9/c5/6d7e3b63e7e282619193961a570c0a4c8a57fe820f07ca3fe2f6bd86608a/lxml-5.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:72ac9762a9f8ce74c9eed4a4e74306f2f18613a6b71fa065495a67ac227b3056", size = 4827092 },
+    { url = "https://files.pythonhosted.org/packages/71/4a/e60a306df54680b103348545706a98a7514a42c8b4fbfdcaa608567bb065/lxml-5.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f5cb182f6396706dc6cc1896dd02b1c889d644c081b0cdec38747573db88a7d7", size = 5418231 },
+    { url = "https://files.pythonhosted.org/packages/27/f2/9754aacd6016c930875854f08ac4b192a47fe19565f776a64004aa167521/lxml-5.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:3a3178b4873df8ef9457a4875703488eb1622632a9cee6d76464b60e90adbfcd", size = 5261798 },
+    { url = "https://files.pythonhosted.org/packages/38/a2/0c49ec6941428b1bd4f280650d7b11a0f91ace9db7de32eb7aa23bcb39ff/lxml-5.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:e094ec83694b59d263802ed03a8384594fcce477ce484b0cbcd0008a211ca751", size = 4988195 },
+    { url = "https://files.pythonhosted.org/packages/7a/75/87a3963a08eafc46a86c1131c6e28a4de103ba30b5ae903114177352a3d7/lxml-5.4.0-cp311-cp311-win32.whl", hash = "sha256:4329422de653cdb2b72afa39b0aa04252fca9071550044904b2e7036d9d97fe4", size = 3474243 },
+    { url = "https://files.pythonhosted.org/packages/fa/f9/1f0964c4f6c2be861c50db380c554fb8befbea98c6404744ce243a3c87ef/lxml-5.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:fd3be6481ef54b8cfd0e1e953323b7aa9d9789b94842d0e5b142ef4bb7999539", size = 3815197 },
+    { url = "https://files.pythonhosted.org/packages/f8/4c/d101ace719ca6a4ec043eb516fcfcb1b396a9fccc4fcd9ef593df34ba0d5/lxml-5.4.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b5aff6f3e818e6bdbbb38e5967520f174b18f539c2b9de867b1e7fde6f8d95a4", size = 8127392 },
+    { url = "https://files.pythonhosted.org/packages/11/84/beddae0cec4dd9ddf46abf156f0af451c13019a0fa25d7445b655ba5ccb7/lxml-5.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:942a5d73f739ad7c452bf739a62a0f83e2578afd6b8e5406308731f4ce78b16d", size = 4415103 },
+    { url = "https://files.pythonhosted.org/packages/d0/25/d0d93a4e763f0462cccd2b8a665bf1e4343dd788c76dcfefa289d46a38a9/lxml-5.4.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:460508a4b07364d6abf53acaa0a90b6d370fafde5693ef37602566613a9b0779", size = 5024224 },
+    { url = "https://files.pythonhosted.org/packages/31/ce/1df18fb8f7946e7f3388af378b1f34fcf253b94b9feedb2cec5969da8012/lxml-5.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:529024ab3a505fed78fe3cc5ddc079464e709f6c892733e3f5842007cec8ac6e", size = 4769913 },
+    { url = "https://files.pythonhosted.org/packages/4e/62/f4a6c60ae7c40d43657f552f3045df05118636be1165b906d3423790447f/lxml-5.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ca56ebc2c474e8f3d5761debfd9283b8b18c76c4fc0967b74aeafba1f5647f9", size = 5290441 },
+    { url = "https://files.pythonhosted.org/packages/9e/aa/04f00009e1e3a77838c7fc948f161b5d2d5de1136b2b81c712a263829ea4/lxml-5.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a81e1196f0a5b4167a8dafe3a66aa67c4addac1b22dc47947abd5d5c7a3f24b5", size = 4820165 },
+    { url = "https://files.pythonhosted.org/packages/c9/1f/e0b2f61fa2404bf0f1fdf1898377e5bd1b74cc9b2cf2c6ba8509b8f27990/lxml-5.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00b8686694423ddae324cf614e1b9659c2edb754de617703c3d29ff568448df5", size = 4932580 },
+    { url = "https://files.pythonhosted.org/packages/24/a2/8263f351b4ffe0ed3e32ea7b7830f845c795349034f912f490180d88a877/lxml-5.4.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:c5681160758d3f6ac5b4fea370495c48aac0989d6a0f01bb9a72ad8ef5ab75c4", size = 4759493 },
+    { url = "https://files.pythonhosted.org/packages/05/00/41db052f279995c0e35c79d0f0fc9f8122d5b5e9630139c592a0b58c71b4/lxml-5.4.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:2dc191e60425ad70e75a68c9fd90ab284df64d9cd410ba8d2b641c0c45bc006e", size = 5324679 },
+    { url = "https://files.pythonhosted.org/packages/1d/be/ee99e6314cdef4587617d3b3b745f9356d9b7dd12a9663c5f3b5734b64ba/lxml-5.4.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:67f779374c6b9753ae0a0195a892a1c234ce8416e4448fe1e9f34746482070a7", size = 4890691 },
+    { url = "https://files.pythonhosted.org/packages/ad/36/239820114bf1d71f38f12208b9c58dec033cbcf80101cde006b9bde5cffd/lxml-5.4.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:79d5bfa9c1b455336f52343130b2067164040604e41f6dc4d8313867ed540079", size = 4955075 },
+    { url = "https://files.pythonhosted.org/packages/d4/e1/1b795cc0b174efc9e13dbd078a9ff79a58728a033142bc6d70a1ee8fc34d/lxml-5.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3d3c30ba1c9b48c68489dc1829a6eede9873f52edca1dda900066542528d6b20", size = 4838680 },
+    { url = "https://files.pythonhosted.org/packages/72/48/3c198455ca108cec5ae3662ae8acd7fd99476812fd712bb17f1b39a0b589/lxml-5.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1af80c6316ae68aded77e91cd9d80648f7dd40406cef73df841aa3c36f6907c8", size = 5391253 },
+    { url = "https://files.pythonhosted.org/packages/d6/10/5bf51858971c51ec96cfc13e800a9951f3fd501686f4c18d7d84fe2d6352/lxml-5.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:4d885698f5019abe0de3d352caf9466d5de2baded00a06ef3f1216c1a58ae78f", size = 5261651 },
+    { url = "https://files.pythonhosted.org/packages/2b/11/06710dd809205377da380546f91d2ac94bad9ff735a72b64ec029f706c85/lxml-5.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:aea53d51859b6c64e7c51d522c03cc2c48b9b5d6172126854cc7f01aa11f52bc", size = 5024315 },
+    { url = "https://files.pythonhosted.org/packages/f5/b0/15b6217834b5e3a59ebf7f53125e08e318030e8cc0d7310355e6edac98ef/lxml-5.4.0-cp312-cp312-win32.whl", hash = "sha256:d90b729fd2732df28130c064aac9bb8aff14ba20baa4aee7bd0795ff1187545f", size = 3486149 },
+    { url = "https://files.pythonhosted.org/packages/91/1e/05ddcb57ad2f3069101611bd5f5084157d90861a2ef460bf42f45cced944/lxml-5.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:1dc4ca99e89c335a7ed47d38964abcb36c5910790f9bd106f2a8fa2ee0b909d2", size = 3817095 },
+    { url = "https://files.pythonhosted.org/packages/87/cb/2ba1e9dd953415f58548506fa5549a7f373ae55e80c61c9041b7fd09a38a/lxml-5.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:773e27b62920199c6197130632c18fb7ead3257fce1ffb7d286912e56ddb79e0", size = 8110086 },
+    { url = "https://files.pythonhosted.org/packages/b5/3e/6602a4dca3ae344e8609914d6ab22e52ce42e3e1638c10967568c5c1450d/lxml-5.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ce9c671845de9699904b1e9df95acfe8dfc183f2310f163cdaa91a3535af95de", size = 4404613 },
+    { url = "https://files.pythonhosted.org/packages/4c/72/bf00988477d3bb452bef9436e45aeea82bb40cdfb4684b83c967c53909c7/lxml-5.4.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9454b8d8200ec99a224df8854786262b1bd6461f4280064c807303c642c05e76", size = 5012008 },
+    { url = "https://files.pythonhosted.org/packages/92/1f/93e42d93e9e7a44b2d3354c462cd784dbaaf350f7976b5d7c3f85d68d1b1/lxml-5.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cccd007d5c95279e529c146d095f1d39ac05139de26c098166c4beb9374b0f4d", size = 4760915 },
+    { url = "https://files.pythonhosted.org/packages/45/0b/363009390d0b461cf9976a499e83b68f792e4c32ecef092f3f9ef9c4ba54/lxml-5.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fce1294a0497edb034cb416ad3e77ecc89b313cff7adbee5334e4dc0d11f422", size = 5283890 },
+    { url = "https://files.pythonhosted.org/packages/19/dc/6056c332f9378ab476c88e301e6549a0454dbee8f0ae16847414f0eccb74/lxml-5.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:24974f774f3a78ac12b95e3a20ef0931795ff04dbb16db81a90c37f589819551", size = 4812644 },
+    { url = "https://files.pythonhosted.org/packages/ee/8a/f8c66bbb23ecb9048a46a5ef9b495fd23f7543df642dabeebcb2eeb66592/lxml-5.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:497cab4d8254c2a90bf988f162ace2ddbfdd806fce3bda3f581b9d24c852e03c", size = 4921817 },
+    { url = "https://files.pythonhosted.org/packages/04/57/2e537083c3f381f83d05d9b176f0d838a9e8961f7ed8ddce3f0217179ce3/lxml-5.4.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:e794f698ae4c5084414efea0f5cc9f4ac562ec02d66e1484ff822ef97c2cadff", size = 4753916 },
+    { url = "https://files.pythonhosted.org/packages/d8/80/ea8c4072109a350848f1157ce83ccd9439601274035cd045ac31f47f3417/lxml-5.4.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:2c62891b1ea3094bb12097822b3d44b93fc6c325f2043c4d2736a8ff09e65f60", size = 5289274 },
+    { url = "https://files.pythonhosted.org/packages/b3/47/c4be287c48cdc304483457878a3f22999098b9a95f455e3c4bda7ec7fc72/lxml-5.4.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:142accb3e4d1edae4b392bd165a9abdee8a3c432a2cca193df995bc3886249c8", size = 4874757 },
+    { url = "https://files.pythonhosted.org/packages/2f/04/6ef935dc74e729932e39478e44d8cfe6a83550552eaa072b7c05f6f22488/lxml-5.4.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:1a42b3a19346e5601d1b8296ff6ef3d76038058f311902edd574461e9c036982", size = 4947028 },
+    { url = "https://files.pythonhosted.org/packages/cb/f9/c33fc8daa373ef8a7daddb53175289024512b6619bc9de36d77dca3df44b/lxml-5.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4291d3c409a17febf817259cb37bc62cb7eb398bcc95c1356947e2871911ae61", size = 4834487 },
+    { url = "https://files.pythonhosted.org/packages/8d/30/fc92bb595bcb878311e01b418b57d13900f84c2b94f6eca9e5073ea756e6/lxml-5.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4f5322cf38fe0e21c2d73901abf68e6329dc02a4994e483adbcf92b568a09a54", size = 5381688 },
+    { url = "https://files.pythonhosted.org/packages/43/d1/3ba7bd978ce28bba8e3da2c2e9d5ae3f8f521ad3f0ca6ea4788d086ba00d/lxml-5.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:0be91891bdb06ebe65122aa6bf3fc94489960cf7e03033c6f83a90863b23c58b", size = 5242043 },
+    { url = "https://files.pythonhosted.org/packages/ee/cd/95fa2201041a610c4d08ddaf31d43b98ecc4b1d74b1e7245b1abdab443cb/lxml-5.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:15a665ad90054a3d4f397bc40f73948d48e36e4c09f9bcffc7d90c87410e478a", size = 5021569 },
+    { url = "https://files.pythonhosted.org/packages/2d/a6/31da006fead660b9512d08d23d31e93ad3477dd47cc42e3285f143443176/lxml-5.4.0-cp313-cp313-win32.whl", hash = "sha256:d5663bc1b471c79f5c833cffbc9b87d7bf13f87e055a5c86c363ccd2348d7e82", size = 3485270 },
+    { url = "https://files.pythonhosted.org/packages/fc/14/c115516c62a7d2499781d2d3d7215218c0731b2c940753bf9f9b7b73924d/lxml-5.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:bcb7a1096b4b6b24ce1ac24d4942ad98f983cd3810f9711bcd0293f43a9d8b9f", size = 3814606 },
     { url = "https://files.pythonhosted.org/packages/1e/04/acd238222ea25683e43ac7113facc380b3aaf77c53e7d88c4f544cef02ca/lxml-5.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bda3ea44c39eb74e2488297bb39d47186ed01342f0022c8ff407c250ac3f498e", size = 8082189 },
     { url = "https://files.pythonhosted.org/packages/d6/4e/cc7fe9ccb9999cc648492ce970b63c657606aefc7d0fba46b17aa2ba93fb/lxml-5.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ceaf423b50ecfc23ca00b7f50b64baba85fb3fb91c53e2c9d00bc86150c7e40", size = 4384950 },
     { url = "https://files.pythonhosted.org/packages/56/bf/acd219c489346d0243a30769b9d446b71e5608581db49a18c8d91a669e19/lxml-5.4.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:664cdc733bc87449fe781dbb1f309090966c11cc0c0cd7b84af956a02a8a4729", size = 5209823 },
@@ -173,6 +329,12 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/07/53/979165f50a853dab1cf3b9e53105032d55f85c5993f94afc4d9a61a22877/lxml-5.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a99d86351f9c15e4a901fc56404b485b1462039db59288b203f8c629260a142", size = 5192346 },
     { url = "https://files.pythonhosted.org/packages/17/2b/f37b5ae28949143f863ba3066b30eede6107fc9a503bd0d01677d4e2a1e0/lxml-5.4.0-cp39-cp39-win32.whl", hash = "sha256:3e6d5557989cdc3ebb5302bbdc42b439733a841891762ded9514e74f60319ad6", size = 3478275 },
     { url = "https://files.pythonhosted.org/packages/9a/d5/b795a183680126147665a8eeda8e802c180f2f7661aa9a550bba5bcdae63/lxml-5.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:a8c9b7f16b63e65bbba889acb436a1034a82d34fa09752d754f88d708eca80e1", size = 3806275 },
+    { url = "https://files.pythonhosted.org/packages/c6/b0/e4d1cbb8c078bc4ae44de9c6a79fec4e2b4151b1b4d50af71d799e76b177/lxml-5.4.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1b717b00a71b901b4667226bba282dd462c42ccf618ade12f9ba3674e1fabc55", size = 3892319 },
+    { url = "https://files.pythonhosted.org/packages/5b/aa/e2bdefba40d815059bcb60b371a36fbfcce970a935370e1b367ba1cc8f74/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27a9ded0f0b52098ff89dd4c418325b987feed2ea5cc86e8860b0f844285d740", size = 4211614 },
+    { url = "https://files.pythonhosted.org/packages/3c/5f/91ff89d1e092e7cfdd8453a939436ac116db0a665e7f4be0cd8e65c7dc5a/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b7ce10634113651d6f383aa712a194179dcd496bd8c41e191cec2099fa09de5", size = 4306273 },
+    { url = "https://files.pythonhosted.org/packages/be/7c/8c3f15df2ca534589717bfd19d1e3482167801caedfa4d90a575facf68a6/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:53370c26500d22b45182f98847243efb518d268374a9570409d2e2276232fd37", size = 4208552 },
+    { url = "https://files.pythonhosted.org/packages/7d/d8/9567afb1665f64d73fc54eb904e418d1138d7f011ed00647121b4dd60b38/lxml-5.4.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c6364038c519dffdbe07e3cf42e6a7f8b90c275d4d1617a69bb59734c1a2d571", size = 4331091 },
+    { url = "https://files.pythonhosted.org/packages/f1/ab/fdbbd91d8d82bf1a723ba88ec3e3d76c022b53c391b0c13cad441cdb8f9e/lxml-5.4.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b12cb6527599808ada9eb2cd6e0e7d3d8f13fe7bbb01c6311255a15ded4c7ab4", size = 3487862 },
     { url = "https://files.pythonhosted.org/packages/ad/fb/d19b67e4bb63adc20574ba3476cf763b3514df1a37551084b890254e4b15/lxml-5.4.0-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9459e6892f59ecea2e2584ee1058f5d8f629446eab52ba2305ae13a32a059530", size = 3891034 },
     { url = "https://files.pythonhosted.org/packages/c9/5d/6e1033ee0cdb2f9bc93164f9df14e42cb5bbf1bbed3bf67f687de2763104/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:47fb24cc0f052f0576ea382872b3fc7e1f7e3028e53299ea751839418ade92a6", size = 4207420 },
     { url = "https://files.pythonhosted.org/packages/f3/4b/23ac79efc32d913259d66672c5f93daac7750a3d97cdc1c1a9a5d1c1b46c/lxml-5.4.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50441c9de951a153c698b9b99992e806b71c1f36d14b154592580ff4a9d0d877", size = 4305106 },
@@ -227,6 +389,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d5/b3/f6cc950042bfdbe98672e7c834d930f85920fb7d3359f59096e8d2799617/parse_type-0.6.4-py2.py3-none-any.whl", hash = "sha256:83d41144a82d6b8541127bf212dd76c7f01baff680b498ce8a4d052a7a5bce4c", size = 27442 },
 ]
 
+[[package]]
+name = "platformdirs"
+version = "4.3.8"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fe/8b/3c73abc9c759ecd3f1f7ceff6685840859e8070c4d947c93fae71f6a0bf2/platformdirs-4.3.8.tar.gz", hash = "sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc", size = 21362 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fe/39/979e8e21520d4e47a0bbe349e2713c0aac6f3d853d0e5b34d76206c439aa/platformdirs-4.3.8-py3-none-any.whl", hash = "sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4", size = 18567 },
+]
+
 [[package]]
 name = "pluggy"
 version = "1.6.0"
@@ -254,6 +425,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/05/e7/df2285f3d08fee213f2d041540fa4fc9ca6c2d44cf36d3a035bf2a8d2bcc/pyparsing-3.2.3-py3-none-any.whl", hash = "sha256:a749938e02d6fd0b59b356ca504a24982314bb090c383e3cf201c95ef7e2bfcf", size = 111120 },
 ]
 
+[[package]]
+name = "pyproject-api"
+version = "1.9.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "packaging" },
+    { name = "tomli", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/19/fd/437901c891f58a7b9096511750247535e891d2d5a5a6eefbc9386a2b41d5/pyproject_api-1.9.1.tar.gz", hash = "sha256:43c9918f49daab37e302038fc1aed54a8c7a91a9fa935d00b9a485f37e0f5335", size = 22710 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ef/e6/c293c06695d4a3ab0260ef124a74ebadba5f4c511ce3a4259e976902c00b/pyproject_api-1.9.1-py3-none-any.whl", hash = "sha256:7d6238d92f8962773dd75b5f0c4a6a27cce092a14b623b811dba656f3b628948", size = 13158 },
+]
+
 [[package]]
 name = "pyright"
 version = "1.1.401"
@@ -273,12 +457,12 @@ version = "8.4.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
-    { name = "exceptiongroup" },
+    { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
     { name = "iniconfig" },
     { name = "packaging" },
     { name = "pluggy" },
     { name = "pygments" },
-    { name = "tomli" },
+    { name = "tomli", marker = "python_full_version < '3.11'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/fb/aa/405082ce2749be5398045152251ac69c0f3578c7077efc53431303af97ce/pytest-8.4.0.tar.gz", hash = "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6", size = 1515232 }
 wheels = [
@@ -304,6 +488,7 @@ dev = [
     { name = "pytest" },
     { name = "ruff" },
     { name = "sphinx" },
+    { name = "tox" },
     { name = "types-lxml-multi-subclass" },
 ]
 
@@ -324,6 +509,7 @@ dev = [
     { name = "pytest", specifier = ">=8.4.0" },
     { name = "ruff", specifier = ">=0.11.13" },
     { name = "sphinx", specifier = "==1.8.6" },
+    { name = "tox", specifier = ">=4.26.0" },
     { name = "types-lxml-multi-subclass", specifier = ">=2025.3.30" },
 ]
 
@@ -454,9 +640,61 @@ version = "2.2.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff/tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", size = 17175 }
 wheels = [
+    { url = "https://files.pythonhosted.org/packages/43/ca/75707e6efa2b37c77dadb324ae7d9571cb424e61ea73fad7c56c2d14527f/tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249", size = 131077 },
+    { url = "https://files.pythonhosted.org/packages/c7/16/51ae563a8615d472fdbffc43a3f3d46588c264ac4f024f63f01283becfbb/tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6", size = 123429 },
+    { url = "https://files.pythonhosted.org/packages/f1/dd/4f6cd1e7b160041db83c694abc78e100473c15d54620083dbd5aae7b990e/tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a", size = 226067 },
+    { url = "https://files.pythonhosted.org/packages/a9/6b/c54ede5dc70d648cc6361eaf429304b02f2871a345bbdd51e993d6cdf550/tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee", size = 236030 },
+    { url = "https://files.pythonhosted.org/packages/1f/47/999514fa49cfaf7a92c805a86c3c43f4215621855d151b61c602abb38091/tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e", size = 240898 },
+    { url = "https://files.pythonhosted.org/packages/73/41/0a01279a7ae09ee1573b423318e7934674ce06eb33f50936655071d81a24/tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4", size = 229894 },
+    { url = "https://files.pythonhosted.org/packages/55/18/5d8bc5b0a0362311ce4d18830a5d28943667599a60d20118074ea1b01bb7/tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106", size = 245319 },
+    { url = "https://files.pythonhosted.org/packages/92/a3/7ade0576d17f3cdf5ff44d61390d4b3febb8a9fc2b480c75c47ea048c646/tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8", size = 238273 },
+    { url = "https://files.pythonhosted.org/packages/72/6f/fa64ef058ac1446a1e51110c375339b3ec6be245af9d14c87c4a6412dd32/tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff", size = 98310 },
+    { url = "https://files.pythonhosted.org/packages/6a/1c/4a2dcde4a51b81be3530565e92eda625d94dafb46dbeb15069df4caffc34/tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b", size = 108309 },
+    { url = "https://files.pythonhosted.org/packages/52/e1/f8af4c2fcde17500422858155aeb0d7e93477a0d59a98e56cbfe75070fd0/tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea", size = 132762 },
+    { url = "https://files.pythonhosted.org/packages/03/b8/152c68bb84fc00396b83e7bbddd5ec0bd3dd409db4195e2a9b3e398ad2e3/tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8", size = 123453 },
+    { url = "https://files.pythonhosted.org/packages/c8/d6/fc9267af9166f79ac528ff7e8c55c8181ded34eb4b0e93daa767b8841573/tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192", size = 233486 },
+    { url = "https://files.pythonhosted.org/packages/5c/51/51c3f2884d7bab89af25f678447ea7d297b53b5a3b5730a7cb2ef6069f07/tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222", size = 242349 },
+    { url = "https://files.pythonhosted.org/packages/ab/df/bfa89627d13a5cc22402e441e8a931ef2108403db390ff3345c05253935e/tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77", size = 252159 },
+    { url = "https://files.pythonhosted.org/packages/9e/6e/fa2b916dced65763a5168c6ccb91066f7639bdc88b48adda990db10c8c0b/tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6", size = 237243 },
+    { url = "https://files.pythonhosted.org/packages/b4/04/885d3b1f650e1153cbb93a6a9782c58a972b94ea4483ae4ac5cedd5e4a09/tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd", size = 259645 },
+    { url = "https://files.pythonhosted.org/packages/9c/de/6b432d66e986e501586da298e28ebeefd3edc2c780f3ad73d22566034239/tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e", size = 244584 },
+    { url = "https://files.pythonhosted.org/packages/1c/9a/47c0449b98e6e7d1be6cbac02f93dd79003234ddc4aaab6ba07a9a7482e2/tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98", size = 98875 },
+    { url = "https://files.pythonhosted.org/packages/ef/60/9b9638f081c6f1261e2688bd487625cd1e660d0a85bd469e91d8db969734/tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4", size = 109418 },
+    { url = "https://files.pythonhosted.org/packages/04/90/2ee5f2e0362cb8a0b6499dc44f4d7d48f8fff06d28ba46e6f1eaa61a1388/tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7", size = 132708 },
+    { url = "https://files.pythonhosted.org/packages/c0/ec/46b4108816de6b385141f082ba99e315501ccd0a2ea23db4a100dd3990ea/tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", size = 123582 },
+    { url = "https://files.pythonhosted.org/packages/a0/bd/b470466d0137b37b68d24556c38a0cc819e8febe392d5b199dcd7f578365/tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", size = 232543 },
+    { url = "https://files.pythonhosted.org/packages/d9/e5/82e80ff3b751373f7cead2815bcbe2d51c895b3c990686741a8e56ec42ab/tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", size = 241691 },
+    { url = "https://files.pythonhosted.org/packages/05/7e/2a110bc2713557d6a1bfb06af23dd01e7dde52b6ee7dadc589868f9abfac/tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", size = 251170 },
+    { url = "https://files.pythonhosted.org/packages/64/7b/22d713946efe00e0adbcdfd6d1aa119ae03fd0b60ebed51ebb3fa9f5a2e5/tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", size = 236530 },
+    { url = "https://files.pythonhosted.org/packages/38/31/3a76f67da4b0cf37b742ca76beaf819dca0ebef26d78fc794a576e08accf/tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", size = 258666 },
+    { url = "https://files.pythonhosted.org/packages/07/10/5af1293da642aded87e8a988753945d0cf7e00a9452d3911dd3bb354c9e2/tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", size = 243954 },
+    { url = "https://files.pythonhosted.org/packages/5b/b9/1ed31d167be802da0fc95020d04cd27b7d7065cc6fbefdd2f9186f60d7bd/tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", size = 98724 },
+    { url = "https://files.pythonhosted.org/packages/c7/32/b0963458706accd9afcfeb867c0f9175a741bf7b19cd424230714d722198/tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", size = 109383 },
     { url = "https://files.pythonhosted.org/packages/6e/c2/61d3e0f47e2b74ef40a68b9e6ad5984f6241a942f7cd3bbfbdbd03861ea9/tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", size = 14257 },
 ]
 
+[[package]]
+name = "tox"
+version = "4.26.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cachetools" },
+    { name = "chardet" },
+    { name = "colorama" },
+    { name = "filelock" },
+    { name = "packaging" },
+    { name = "platformdirs" },
+    { name = "pluggy" },
+    { name = "pyproject-api" },
+    { name = "tomli", marker = "python_full_version < '3.11'" },
+    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+    { name = "virtualenv" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/fd/3c/dcec0c00321a107f7f697fd00754c5112572ea6dcacb40b16d8c3eea7c37/tox-4.26.0.tar.gz", hash = "sha256:a83b3b67b0159fa58e44e646505079e35a43317a62d2ae94725e0586266faeca", size = 197260 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/de/14/f58b4087cf248b18c795b5c838c7a8d1428dfb07cb468dad3ec7f54041ab/tox-4.26.0-py3-none-any.whl", hash = "sha256:75f17aaf09face9b97bd41645028d9f722301e912be8b4c65a3f938024560224", size = 172761 },
+]
+
 [[package]]
 name = "types-html5lib"
 version = "1.1.11.20250516"
@@ -474,7 +712,7 @@ dependencies = [
     { name = "beautifulsoup4" },
     { name = "cssselect" },
     { name = "types-html5lib" },
-    { name = "typing-extensions" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/b7/3a/7f6d1d3b921404efef20ed1ddc2b6f1333e3f0bc5b91da37874e786ff835/types_lxml_multi_subclass-2025.3.30.tar.gz", hash = "sha256:7ac7a78e592fdba16951668968b21511adda49bbefbc0f130e55501b70e068b4", size = 153188 }
 wheels = [
@@ -498,3 +736,17 @@ sdist = { url = "https://files.pythonhosted.org/packages/8a/78/16493d9c386d8e60e
 wheels = [
     { url = "https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl", hash = "sha256:4e16665048960a0900c702d4a66415956a584919c03361cac9f1df5c5dd7e813", size = 128680 },
 ]
+
+[[package]]
+name = "virtualenv"
+version = "20.31.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "distlib" },
+    { name = "filelock" },
+    { name = "platformdirs" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/56/2c/444f465fb2c65f40c3a104fd0c495184c4f2336d65baf398e3c75d72ea94/virtualenv-20.31.2.tar.gz", hash = "sha256:e10c0a9d02835e592521be48b332b6caee6887f332c111aa79a09b9e79efc2af", size = 6076316 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f3/40/b1c265d4b2b62b58576588510fc4d1fe60a86319c8de99fd8e9fec617d2c/virtualenv-20.31.2-py3-none-any.whl", hash = "sha256:36efd0d9650ee985f0cad72065001e66d49a6f24eb44d98980f630686243cf11", size = 6057982 },
+]

From e45454602b53e8e572b179ccf1c91093ec9f4ed7 Mon Sep 17 00:00:00 2001
From: Steve Canny <stcanny@gmail.com>
Date: Mon, 16 Jun 2025 13:45:03 -0700
Subject: [PATCH 367/367] release: prepare v1.2.0 release

---
 HISTORY.rst          |   8 +
 Makefile             |  17 +--
 pyproject.toml       |   1 +
 src/docx/__init__.py |   2 +-
 uv.lock              | 355 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 373 insertions(+), 10 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 0dab17d87..69bba4161 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,13 @@
 Release History
 ---------------
 
+1.2.0 (2025-06-16)
+++++++++++++++++++
+
+- Add support for comments
+- Drop support for Python 3.8, add testing for Python 3.13
+
+
 1.1.2 (2024-05-01)
 ++++++++++++++++++
 
@@ -10,6 +17,7 @@ Release History
 - Fix #1385 Support use of Part._rels by python-docx-template
 - Add support and testing for Python 3.12
 
+
 1.1.1 (2024-04-29)
 ++++++++++++++++++
 
diff --git a/Makefile b/Makefile
index da0d7a4ac..2b2fb4121 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 BEHAVE = behave
 MAKE   = make
 PYTHON = python
-BUILD  = $(PYTHON) -m build
 TWINE  = $(PYTHON) -m twine
 
 .PHONY: accept build clean cleandocs coverage docs install opendocs sdist test
@@ -24,10 +23,10 @@ help:
 	@echo "  wheel        generate a binary distribution into dist/"
 
 accept:
-	$(BEHAVE) --stop
+	uv run $(BEHAVE) --stop
 
 build:
-	$(BUILD)
+	uv build
 
 clean:
 	# find . -type f -name \*.pyc -exec rm {} \;
@@ -38,7 +37,7 @@ cleandocs:
 	$(MAKE) -C docs clean
 
 coverage:
-	py.test --cov-report term-missing --cov=docx tests/
+	uv run pytest --cov-report term-missing --cov=docx tests/
 
 docs:
 	$(MAKE) -C docs html
@@ -50,16 +49,16 @@ opendocs:
 	open docs/.build/html/index.html
 
 sdist:
-	$(BUILD) --sdist .
+	uv build --sdist
 
 test:
-	pytest -x
+	uv run pytest -x
 
 test-upload: sdist wheel
-	$(TWINE) upload --repository testpypi dist/*
+	uv run $(TWINE) upload --repository testpypi dist/*
 
 upload: clean sdist wheel
-	$(TWINE) upload dist/*
+	uv run $(TWINE) upload dist/*
 
 wheel:
-	$(BUILD) --wheel .
+	uv build --wheel
diff --git a/pyproject.toml b/pyproject.toml
index 3650ce4d1..b3dc0be02 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,6 +44,7 @@ dev = [
     "pytest>=8.4.0",
     "ruff>=0.11.13",
     "tox>=4.26.0",
+    "twine>=6.1.0",
     "types-lxml-multi-subclass>=2025.3.30",
 ]
 
diff --git a/src/docx/__init__.py b/src/docx/__init__.py
index 987e8a267..fd06c84d2 100644
--- a/src/docx/__init__.py
+++ b/src/docx/__init__.py
@@ -13,7 +13,7 @@
 if TYPE_CHECKING:
     from docx.opc.part import Part
 
-__version__ = "1.1.2"
+__version__ = "1.2.0"
 
 
 __all__ = ["Document"]
diff --git a/uv.lock b/uv.lock
index 675fe6777..7888c5298 100644
--- a/uv.lock
+++ b/uv.lock
@@ -20,6 +20,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b7/b8/3fe70c75fe32afc4bb507f75563d39bc5642255d1d94f1f23604725780bf/babel-2.17.0-py3-none-any.whl", hash = "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2", size = 10182537 },
 ]
 
+[[package]]
+name = "backports-tarfile"
+version = "1.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/86/72/cd9b395f25e290e633655a100af28cb253e4393396264a98bd5f5951d50f/backports_tarfile-1.2.0.tar.gz", hash = "sha256:d75e02c268746e1b8144c278978b6e98e85de6ad16f8e4b0844a154557eca991", size = 86406 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b9/fa/123043af240e49752f1c4bd24da5053b6bd00cad78c2be53c0d1e8b975bc/backports.tarfile-1.2.0-py3-none-any.whl", hash = "sha256:77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34", size = 30181 },
+]
+
 [[package]]
 name = "beautifulsoup4"
 version = "4.13.4"
@@ -65,6 +74,55 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/4a/7e/3db2bd1b1f9e95f7cddca6d6e75e2f2bd9f51b1246e546d88addca0106bd/certifi-2025.4.26-py3-none-any.whl", hash = "sha256:30350364dfe371162649852c63336a15c70c6510c2ad5015b21c2345311805f3", size = 159618 },
 ]
 
+[[package]]
+name = "cffi"
+version = "1.17.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pycparser" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824", size = 516621 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/de/cc/4635c320081c78d6ffc2cab0a76025b691a91204f4aa317d568ff9280a2d/cffi-1.17.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382", size = 426024 },
+    { url = "https://files.pythonhosted.org/packages/b6/7b/3b2b250f3aab91abe5f8a51ada1b717935fdaec53f790ad4100fe2ec64d1/cffi-1.17.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702", size = 448188 },
+    { url = "https://files.pythonhosted.org/packages/d3/48/1b9283ebbf0ec065148d8de05d647a986c5f22586b18120020452fff8f5d/cffi-1.17.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3", size = 455571 },
+    { url = "https://files.pythonhosted.org/packages/40/87/3b8452525437b40f39ca7ff70276679772ee7e8b394934ff60e63b7b090c/cffi-1.17.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6", size = 436687 },
+    { url = "https://files.pythonhosted.org/packages/8d/fb/4da72871d177d63649ac449aec2e8a29efe0274035880c7af59101ca2232/cffi-1.17.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17", size = 446211 },
+    { url = "https://files.pythonhosted.org/packages/ab/a0/62f00bcb411332106c02b663b26f3545a9ef136f80d5df746c05878f8c4b/cffi-1.17.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8", size = 461325 },
+    { url = "https://files.pythonhosted.org/packages/36/83/76127035ed2e7e27b0787604d99da630ac3123bfb02d8e80c633f218a11d/cffi-1.17.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e", size = 438784 },
+    { url = "https://files.pythonhosted.org/packages/21/81/a6cd025db2f08ac88b901b745c163d884641909641f9b826e8cb87645942/cffi-1.17.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be", size = 461564 },
+    { url = "https://files.pythonhosted.org/packages/94/dd/a3f0118e688d1b1a57553da23b16bdade96d2f9bcda4d32e7d2838047ff7/cffi-1.17.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4", size = 445259 },
+    { url = "https://files.pythonhosted.org/packages/2e/ea/70ce63780f096e16ce8588efe039d3c4f91deb1dc01e9c73a287939c79a6/cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41", size = 469200 },
+    { url = "https://files.pythonhosted.org/packages/1c/a0/a4fa9f4f781bda074c3ddd57a572b060fa0df7655d2a4247bbe277200146/cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1", size = 477235 },
+    { url = "https://files.pythonhosted.org/packages/62/12/ce8710b5b8affbcdd5c6e367217c242524ad17a02fe5beec3ee339f69f85/cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6", size = 459721 },
+    { url = "https://files.pythonhosted.org/packages/ff/6b/d45873c5e0242196f042d555526f92aa9e0c32355a1be1ff8c27f077fd37/cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d", size = 467242 },
+    { url = "https://files.pythonhosted.org/packages/1a/52/d9a0e523a572fbccf2955f5abe883cfa8bcc570d7faeee06336fbd50c9fc/cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6", size = 477999 },
+    { url = "https://files.pythonhosted.org/packages/44/74/f2a2460684a1a2d00ca799ad880d54652841a780c4c97b87754f660c7603/cffi-1.17.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f", size = 454242 },
+    { url = "https://files.pythonhosted.org/packages/f8/4a/34599cac7dfcd888ff54e801afe06a19c17787dfd94495ab0c8d35fe99fb/cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b", size = 478604 },
+    { url = "https://files.pythonhosted.org/packages/cc/b6/db007700f67d151abadf508cbfd6a1884f57eab90b1bb985c4c8c02b0f28/cffi-1.17.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36", size = 454803 },
+    { url = "https://files.pythonhosted.org/packages/1a/df/f8d151540d8c200eb1c6fba8cd0dfd40904f1b0682ea705c36e6c2e97ab3/cffi-1.17.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5", size = 478850 },
+    { url = "https://files.pythonhosted.org/packages/28/c0/b31116332a547fd2677ae5b78a2ef662dfc8023d67f41b2a83f7c2aa78b1/cffi-1.17.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff", size = 485729 },
+    { url = "https://files.pythonhosted.org/packages/91/2b/9a1ddfa5c7f13cab007a2c9cc295b70fbbda7cb10a286aa6810338e60ea1/cffi-1.17.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99", size = 471256 },
+    { url = "https://files.pythonhosted.org/packages/b2/d5/da47df7004cb17e4955df6a43d14b3b4ae77737dff8bf7f8f333196717bf/cffi-1.17.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93", size = 479424 },
+    { url = "https://files.pythonhosted.org/packages/0b/ac/2a28bcf513e93a219c8a4e8e125534f4f6db03e3179ba1c45e949b76212c/cffi-1.17.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3", size = 484568 },
+    { url = "https://files.pythonhosted.org/packages/d4/38/ca8a4f639065f14ae0f1d9751e70447a261f1a30fa7547a828ae08142465/cffi-1.17.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8", size = 488736 },
+    { url = "https://files.pythonhosted.org/packages/0e/2d/eab2e858a91fdff70533cab61dcff4a1f55ec60425832ddfdc9cd36bc8af/cffi-1.17.1-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3", size = 454792 },
+    { url = "https://files.pythonhosted.org/packages/75/b2/fbaec7c4455c604e29388d55599b99ebcc250a60050610fadde58932b7ee/cffi-1.17.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683", size = 478893 },
+    { url = "https://files.pythonhosted.org/packages/4f/b7/6e4a2162178bf1935c336d4da8a9352cccab4d3a5d7914065490f08c0690/cffi-1.17.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5", size = 485810 },
+    { url = "https://files.pythonhosted.org/packages/c7/8a/1d0e4a9c26e54746dc08c2c6c037889124d4f59dffd853a659fa545f1b40/cffi-1.17.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4", size = 471200 },
+    { url = "https://files.pythonhosted.org/packages/26/9f/1aab65a6c0db35f43c4d1b4f580e8df53914310afc10ae0397d29d697af4/cffi-1.17.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd", size = 479447 },
+    { url = "https://files.pythonhosted.org/packages/5f/e4/fb8b3dd8dc0e98edf1135ff067ae070bb32ef9d509d6cb0f538cd6f7483f/cffi-1.17.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed", size = 484358 },
+    { url = "https://files.pythonhosted.org/packages/f1/47/d7145bf2dc04684935d57d67dff9d6d795b2ba2796806bb109864be3a151/cffi-1.17.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9", size = 488469 },
+    { url = "https://files.pythonhosted.org/packages/ed/65/25a8dc32c53bf5b7b6c2686b42ae2ad58743f7ff644844af7cdb29b49361/cffi-1.17.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8", size = 424910 },
+    { url = "https://files.pythonhosted.org/packages/42/7a/9d086fab7c66bd7c4d0f27c57a1b6b068ced810afc498cc8c49e0088661c/cffi-1.17.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576", size = 447200 },
+    { url = "https://files.pythonhosted.org/packages/da/63/1785ced118ce92a993b0ec9e0d0ac8dc3e5dbfbcaa81135be56c69cabbb6/cffi-1.17.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87", size = 454565 },
+    { url = "https://files.pythonhosted.org/packages/74/06/90b8a44abf3556599cdec107f7290277ae8901a58f75e6fe8f970cd72418/cffi-1.17.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0", size = 435635 },
+    { url = "https://files.pythonhosted.org/packages/bd/62/a1f468e5708a70b1d86ead5bab5520861d9c7eacce4a885ded9faa7729c3/cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3", size = 445218 },
+    { url = "https://files.pythonhosted.org/packages/5b/95/b34462f3ccb09c2594aa782d90a90b045de4ff1f70148ee79c69d37a0a5a/cffi-1.17.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595", size = 460486 },
+    { url = "https://files.pythonhosted.org/packages/fc/fc/a1e4bebd8d680febd29cf6c8a40067182b64f00c7d105f8f26b5bc54317b/cffi-1.17.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a", size = 437911 },
+    { url = "https://files.pythonhosted.org/packages/e6/c3/21cab7a6154b6a5ea330ae80de386e7665254835b9e98ecc1340b3a7de9a/cffi-1.17.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e", size = 460632 },
+]
+
 [[package]]
 name = "chardet"
 version = "5.2.0"
@@ -157,6 +215,43 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 },
 ]
 
+[[package]]
+name = "cryptography"
+version = "45.0.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cffi", marker = "platform_python_implementation != 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/fe/c8/a2a376a8711c1e11708b9c9972e0c3223f5fc682552c82d8db844393d6ce/cryptography-45.0.4.tar.gz", hash = "sha256:7405ade85c83c37682c8fe65554759800a4a8c54b2d96e0f8ad114d31b808d57", size = 744890 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ba/14/93b69f2af9ba832ad6618a03f8a034a5851dc9a3314336a3d71c252467e1/cryptography-45.0.4-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:680806cf63baa0039b920f4976f5f31b10e772de42f16310a6839d9f21a26b0d", size = 4205335 },
+    { url = "https://files.pythonhosted.org/packages/67/30/fae1000228634bf0b647fca80403db5ca9e3933b91dd060570689f0bd0f7/cryptography-45.0.4-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4ca0f52170e821bc8da6fc0cc565b7bb8ff8d90d36b5e9fdd68e8a86bdf72036", size = 4431487 },
+    { url = "https://files.pythonhosted.org/packages/6d/5a/7dffcf8cdf0cb3c2430de7404b327e3db64735747d641fc492539978caeb/cryptography-45.0.4-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:f3fe7a5ae34d5a414957cc7f457e2b92076e72938423ac64d215722f6cf49a9e", size = 4208922 },
+    { url = "https://files.pythonhosted.org/packages/c6/f3/528729726eb6c3060fa3637253430547fbaaea95ab0535ea41baa4a6fbd8/cryptography-45.0.4-cp311-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:25eb4d4d3e54595dc8adebc6bbd5623588991d86591a78c2548ffb64797341e2", size = 3900433 },
+    { url = "https://files.pythonhosted.org/packages/d9/4a/67ba2e40f619e04d83c32f7e1d484c1538c0800a17c56a22ff07d092ccc1/cryptography-45.0.4-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:ce1678a2ccbe696cf3af15a75bb72ee008d7ff183c9228592ede9db467e64f1b", size = 4464163 },
+    { url = "https://files.pythonhosted.org/packages/7e/9a/b4d5aa83661483ac372464809c4b49b5022dbfe36b12fe9e323ca8512420/cryptography-45.0.4-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:49fe9155ab32721b9122975e168a6760d8ce4cffe423bcd7ca269ba41b5dfac1", size = 4208687 },
+    { url = "https://files.pythonhosted.org/packages/db/b7/a84bdcd19d9c02ec5807f2ec2d1456fd8451592c5ee353816c09250e3561/cryptography-45.0.4-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:2882338b2a6e0bd337052e8b9007ced85c637da19ef9ecaf437744495c8c2999", size = 4463623 },
+    { url = "https://files.pythonhosted.org/packages/d8/84/69707d502d4d905021cac3fb59a316344e9f078b1da7fb43ecde5e10840a/cryptography-45.0.4-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:23b9c3ea30c3ed4db59e7b9619272e94891f8a3a5591d0b656a7582631ccf750", size = 4332447 },
+    { url = "https://files.pythonhosted.org/packages/f3/ee/d4f2ab688e057e90ded24384e34838086a9b09963389a5ba6854b5876598/cryptography-45.0.4-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b0a97c927497e3bc36b33987abb99bf17a9a175a19af38a892dc4bbb844d7ee2", size = 4572830 },
+    { url = "https://files.pythonhosted.org/packages/fe/51/8c584ed426093aac257462ae62d26ad61ef1cbf5b58d8b67e6e13c39960e/cryptography-45.0.4-cp37-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:6a5bf57554e80f75a7db3d4b1dacaa2764611ae166ab42ea9a72bcdb5d577637", size = 4195746 },
+    { url = "https://files.pythonhosted.org/packages/5c/7d/4b0ca4d7af95a704eef2f8f80a8199ed236aaf185d55385ae1d1610c03c2/cryptography-45.0.4-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:46cf7088bf91bdc9b26f9c55636492c1cce3e7aaf8041bbf0243f5e5325cfb2d", size = 4424456 },
+    { url = "https://files.pythonhosted.org/packages/1d/45/5fabacbc6e76ff056f84d9f60eeac18819badf0cefc1b6612ee03d4ab678/cryptography-45.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:7bedbe4cc930fa4b100fc845ea1ea5788fcd7ae9562e669989c11618ae8d76ee", size = 4198495 },
+    { url = "https://files.pythonhosted.org/packages/55/b7/ffc9945b290eb0a5d4dab9b7636706e3b5b92f14ee5d9d4449409d010d54/cryptography-45.0.4-cp37-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:eaa3e28ea2235b33220b949c5a0d6cf79baa80eab2eb5607ca8ab7525331b9ff", size = 3885540 },
+    { url = "https://files.pythonhosted.org/packages/7f/e3/57b010282346980475e77d414080acdcb3dab9a0be63071efc2041a2c6bd/cryptography-45.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:7ef2dde4fa9408475038fc9aadfc1fb2676b174e68356359632e980c661ec8f6", size = 4452052 },
+    { url = "https://files.pythonhosted.org/packages/37/e6/ddc4ac2558bf2ef517a358df26f45bc774a99bf4653e7ee34b5e749c03e3/cryptography-45.0.4-cp37-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:6a3511ae33f09094185d111160fd192c67aa0a2a8d19b54d36e4c78f651dc5ad", size = 4198024 },
+    { url = "https://files.pythonhosted.org/packages/3a/c0/85fa358ddb063ec588aed4a6ea1df57dc3e3bc1712d87c8fa162d02a65fc/cryptography-45.0.4-cp37-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:06509dc70dd71fa56eaa138336244e2fbaf2ac164fc9b5e66828fccfd2b680d6", size = 4451442 },
+    { url = "https://files.pythonhosted.org/packages/33/67/362d6ec1492596e73da24e669a7fbbaeb1c428d6bf49a29f7a12acffd5dc/cryptography-45.0.4-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:5f31e6b0a5a253f6aa49be67279be4a7e5a4ef259a9f33c69f7d1b1191939872", size = 4325038 },
+    { url = "https://files.pythonhosted.org/packages/53/75/82a14bf047a96a1b13ebb47fb9811c4f73096cfa2e2b17c86879687f9027/cryptography-45.0.4-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:944e9ccf67a9594137f942d5b52c8d238b1b4e46c7a0c2891b7ae6e01e7c80a4", size = 4560964 },
+    { url = "https://files.pythonhosted.org/packages/c4/b9/357f18064ec09d4807800d05a48f92f3b369056a12f995ff79549fbb31f1/cryptography-45.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:7aad98a25ed8ac917fdd8a9c1e706e5a0956e06c498be1f713b61734333a4507", size = 4143732 },
+    { url = "https://files.pythonhosted.org/packages/c4/9c/7f7263b03d5db329093617648b9bd55c953de0b245e64e866e560f9aac07/cryptography-45.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3530382a43a0e524bc931f187fc69ef4c42828cf7d7f592f7f249f602b5a4ab0", size = 4385424 },
+    { url = "https://files.pythonhosted.org/packages/a6/5a/6aa9d8d5073d5acc0e04e95b2860ef2684b2bd2899d8795fc443013e263b/cryptography-45.0.4-pp310-pypy310_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:6b613164cb8425e2f8db5849ffb84892e523bf6d26deb8f9bb76ae86181fa12b", size = 4142438 },
+    { url = "https://files.pythonhosted.org/packages/42/1c/71c638420f2cdd96d9c2b287fec515faf48679b33a2b583d0f1eda3a3375/cryptography-45.0.4-pp310-pypy310_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:96d4819e25bf3b685199b304a0029ce4a3caf98947ce8a066c9137cc78ad2c58", size = 4384622 },
+    { url = "https://files.pythonhosted.org/packages/28/9a/a7d5bb87d149eb99a5abdc69a41e4e47b8001d767e5f403f78bfaafc7aa7/cryptography-45.0.4-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:03dbff8411206713185b8cebe31bc5c0eb544799a50c09035733716b386e61a4", size = 4146899 },
+    { url = "https://files.pythonhosted.org/packages/17/11/9361c2c71c42cc5c465cf294c8030e72fb0c87752bacbd7a3675245e3db3/cryptography-45.0.4-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:51dfbd4d26172d31150d84c19bbe06c68ea4b7f11bbc7b3a5e146b367c311349", size = 4388900 },
+    { url = "https://files.pythonhosted.org/packages/c0/76/f95b83359012ee0e670da3e41c164a0c256aeedd81886f878911581d852f/cryptography-45.0.4-pp311-pypy311_pp73-manylinux_2_34_aarch64.whl", hash = "sha256:0339a692de47084969500ee455e42c58e449461e0ec845a34a6a9b9bf7df7fb8", size = 4146422 },
+    { url = "https://files.pythonhosted.org/packages/09/ad/5429fcc4def93e577a5407988f89cf15305e64920203d4ac14601a9dc876/cryptography-45.0.4-pp311-pypy311_pp73-manylinux_2_34_x86_64.whl", hash = "sha256:0cf13c77d710131d33e63626bd55ae7c0efb701ebdc2b3a7952b9b23a0412862", size = 4388475 },
+]
+
 [[package]]
 name = "cssselect"
 version = "1.3.0"
@@ -205,6 +300,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/4d/36/2a115987e2d8c300a974597416d9de88f2444426de9571f4b59b2cca3acc/filelock-3.18.0-py3-none-any.whl", hash = "sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de", size = 16215 },
 ]
 
+[[package]]
+name = "id"
+version = "1.5.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/22/11/102da08f88412d875fa2f1a9a469ff7ad4c874b0ca6fed0048fe385bdb3d/id-1.5.0.tar.gz", hash = "sha256:292cb8a49eacbbdbce97244f47a97b4c62540169c976552e497fd57df0734c1d", size = 15237 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9f/cb/18326d2d89ad3b0dd143da971e77afd1e6ca6674f1b1c3df4b6bec6279fc/id-1.5.0-py3-none-any.whl", hash = "sha256:f1434e1cef91f2cbb8a4ec64663d5a23b9ed43ef44c4c957d02583d61714c658", size = 13611 },
+]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -223,6 +330,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ff/62/85c4c919272577931d407be5ba5d71c20f0b616d31a0befe0ae45bb79abd/imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b", size = 8769 },
 ]
 
+[[package]]
+name = "importlib-metadata"
+version = "8.7.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "zipp" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/76/66/650a33bd90f786193e4de4b3ad86ea60b53c89b669a5c7be931fac31cdb0/importlib_metadata-8.7.0.tar.gz", hash = "sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000", size = 56641 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/20/b0/36bd937216ec521246249be3bf9855081de4c5e06a0c9b4219dbeda50373/importlib_metadata-8.7.0-py3-none-any.whl", hash = "sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd", size = 27656 },
+]
+
 [[package]]
 name = "iniconfig"
 version = "2.1.0"
@@ -232,6 +351,51 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050 },
 ]
 
+[[package]]
+name = "jaraco-classes"
+version = "3.4.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "more-itertools" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/06/c0/ed4a27bc5571b99e3cff68f8a9fa5b56ff7df1c2251cc715a652ddd26402/jaraco.classes-3.4.0.tar.gz", hash = "sha256:47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd", size = 11780 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7f/66/b15ce62552d84bbfcec9a4873ab79d993a1dd4edb922cbfccae192bd5b5f/jaraco.classes-3.4.0-py3-none-any.whl", hash = "sha256:f662826b6bed8cace05e7ff873ce0f9283b5c924470fe664fff1c2f00f581790", size = 6777 },
+]
+
+[[package]]
+name = "jaraco-context"
+version = "6.0.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "backports-tarfile", marker = "python_full_version < '3.12'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/df/ad/f3777b81bf0b6e7bc7514a1656d3e637b2e8e15fab2ce3235730b3e7a4e6/jaraco_context-6.0.1.tar.gz", hash = "sha256:9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3", size = 13912 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ff/db/0c52c4cf5e4bd9f5d7135ec7669a3a767af21b3a308e1ed3674881e52b62/jaraco.context-6.0.1-py3-none-any.whl", hash = "sha256:f797fc481b490edb305122c9181830a3a5b76d84ef6d1aef2fb9b47ab956f9e4", size = 6825 },
+]
+
+[[package]]
+name = "jaraco-functools"
+version = "4.1.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "more-itertools" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ab/23/9894b3df5d0a6eb44611c36aec777823fc2e07740dabbd0b810e19594013/jaraco_functools-4.1.0.tar.gz", hash = "sha256:70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d", size = 19159 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9f/4f/24b319316142c44283d7540e76c7b5a6dbd5db623abd86bb7b3491c21018/jaraco.functools-4.1.0-py3-none-any.whl", hash = "sha256:ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649", size = 10187 },
+]
+
+[[package]]
+name = "jeepney"
+version = "0.9.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7b/6f/357efd7602486741aa73ffc0617fb310a29b588ed0fd69c2399acbb85b0c/jeepney-0.9.0.tar.gz", hash = "sha256:cf0e9e845622b81e4a28df94c40345400256ec608d0e55bb8a3feaa9163f5732", size = 106758 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b2/a3/e137168c9c44d18eff0376253da9f1e9234d0239e0ee230d2fee6cea8e55/jeepney-0.9.0-py3-none-any.whl", hash = "sha256:97e5714520c16fc0a45695e5365a2e11b81ea79bba796e26f9f1d178cb182683", size = 49010 },
+]
+
 [[package]]
 name = "jinja2"
 version = "2.11.3"
@@ -244,6 +408,24 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/7e/c2/1eece8c95ddbc9b1aeb64f5783a9e07a286de42191b7204d67b7496ddf35/Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", size = 125699 },
 ]
 
+[[package]]
+name = "keyring"
+version = "25.6.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "importlib-metadata", marker = "python_full_version < '3.12'" },
+    { name = "jaraco-classes" },
+    { name = "jaraco-context" },
+    { name = "jaraco-functools" },
+    { name = "jeepney", marker = "sys_platform == 'linux'" },
+    { name = "pywin32-ctypes", marker = "sys_platform == 'win32'" },
+    { name = "secretstorage", marker = "sys_platform == 'linux'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/70/09/d904a6e96f76ff214be59e7aa6ef7190008f52a0ab6689760a98de0bf37d/keyring-25.6.0.tar.gz", hash = "sha256:0b39998aa941431eb3d9b0d4b2460bc773b9df6fed7621c2dfb291a7e0187a66", size = 62750 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d3/32/da7f44bcb1105d3e88a0b74ebdca50c59121d2ddf71c9e34ba47df7f3a56/keyring-25.6.0-py3-none-any.whl", hash = "sha256:552a3f7af126ece7ed5c89753650eec89c7eaae8617d0aa4d9ad2b75111266bd", size = 39085 },
+]
+
 [[package]]
 name = "lxml"
 version = "5.4.0"
@@ -343,12 +525,73 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a1/25/d381abcfd00102d3304aa191caab62f6e3bcbac93ee248771db6be153dfd/lxml-5.4.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:63e7968ff83da2eb6fdda967483a7a023aa497d85ad8f05c3ad9b1f2e8c84987", size = 3486416 },
 ]
 
+[[package]]
+name = "markdown-it-py"
+version = "3.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "mdurl" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz", hash = "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb", size = 74596 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl", hash = "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", size = 87528 },
+]
+
 [[package]]
 name = "markupsafe"
 version = "0.23"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz", hash = "sha256:a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3", size = 13416 }
 
+[[package]]
+name = "mdurl"
+version = "0.1.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979 },
+]
+
+[[package]]
+name = "more-itertools"
+version = "10.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ce/a0/834b0cebabbfc7e311f30b46c8188790a37f89fc8d756660346fe5abfd09/more_itertools-10.7.0.tar.gz", hash = "sha256:9fddd5403be01a94b204faadcff459ec3568cf110265d3c54323e1e866ad29d3", size = 127671 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2b/9f/7ba6f94fc1e9ac3d2b853fdff3035fb2fa5afbed898c4a72b8a020610594/more_itertools-10.7.0-py3-none-any.whl", hash = "sha256:d43980384673cb07d2f7d2d918c616b30c659c089ee23953f601d6609c67510e", size = 65278 },
+]
+
+[[package]]
+name = "nh3"
+version = "0.2.21"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/37/30/2f81466f250eb7f591d4d193930df661c8c23e9056bdc78e365b646054d8/nh3-0.2.21.tar.gz", hash = "sha256:4990e7ee6a55490dbf00d61a6f476c9a3258e31e711e13713b2ea7d6616f670e", size = 16581 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7f/81/b83775687fcf00e08ade6d4605f0be9c4584cb44c4973d9f27b7456a31c9/nh3-0.2.21-cp313-cp313t-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:fcff321bd60c6c5c9cb4ddf2554e22772bb41ebd93ad88171bbbb6f271255286", size = 1297678 },
+    { url = "https://files.pythonhosted.org/packages/22/ee/d0ad8fb4b5769f073b2df6807f69a5e57ca9cea504b78809921aef460d20/nh3-0.2.21-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31eedcd7d08b0eae28ba47f43fd33a653b4cdb271d64f1aeda47001618348fde", size = 733774 },
+    { url = "https://files.pythonhosted.org/packages/ea/76/b450141e2d384ede43fe53953552f1c6741a499a8c20955ad049555cabc8/nh3-0.2.21-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d426d7be1a2f3d896950fe263332ed1662f6c78525b4520c8e9861f8d7f0d243", size = 760012 },
+    { url = "https://files.pythonhosted.org/packages/97/90/1182275db76cd8fbb1f6bf84c770107fafee0cb7da3e66e416bcb9633da2/nh3-0.2.21-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9d67709bc0d7d1f5797b21db26e7a8b3d15d21c9c5f58ccfe48b5328483b685b", size = 923619 },
+    { url = "https://files.pythonhosted.org/packages/29/c7/269a7cfbec9693fad8d767c34a755c25ccb8d048fc1dfc7a7d86bc99375c/nh3-0.2.21-cp313-cp313t-musllinux_1_2_armv7l.whl", hash = "sha256:55823c5ea1f6b267a4fad5de39bc0524d49a47783e1fe094bcf9c537a37df251", size = 1000384 },
+    { url = "https://files.pythonhosted.org/packages/68/a9/48479dbf5f49ad93f0badd73fbb48b3d769189f04c6c69b0df261978b009/nh3-0.2.21-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:818f2b6df3763e058efa9e69677b5a92f9bc0acff3295af5ed013da544250d5b", size = 918908 },
+    { url = "https://files.pythonhosted.org/packages/d7/da/0279c118f8be2dc306e56819880b19a1cf2379472e3b79fc8eab44e267e3/nh3-0.2.21-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:b3b5c58161e08549904ac4abd450dacd94ff648916f7c376ae4b2c0652b98ff9", size = 909180 },
+    { url = "https://files.pythonhosted.org/packages/26/16/93309693f8abcb1088ae143a9c8dbcece9c8f7fb297d492d3918340c41f1/nh3-0.2.21-cp313-cp313t-win32.whl", hash = "sha256:637d4a10c834e1b7d9548592c7aad760611415fcd5bd346f77fd8a064309ae6d", size = 532747 },
+    { url = "https://files.pythonhosted.org/packages/a2/3a/96eb26c56cbb733c0b4a6a907fab8408ddf3ead5d1b065830a8f6a9c3557/nh3-0.2.21-cp313-cp313t-win_amd64.whl", hash = "sha256:713d16686596e556b65e7f8c58328c2df63f1a7abe1277d87625dcbbc012ef82", size = 528908 },
+    { url = "https://files.pythonhosted.org/packages/ba/1d/b1ef74121fe325a69601270f276021908392081f4953d50b03cbb38b395f/nh3-0.2.21-cp38-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:a772dec5b7b7325780922dd904709f0f5f3a79fbf756de5291c01370f6df0967", size = 1316133 },
+    { url = "https://files.pythonhosted.org/packages/b8/f2/2c7f79ce6de55b41e7715f7f59b159fd59f6cdb66223c05b42adaee2b645/nh3-0.2.21-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d002b648592bf3033adfd875a48f09b8ecc000abd7f6a8769ed86b6ccc70c759", size = 758328 },
+    { url = "https://files.pythonhosted.org/packages/6d/ad/07bd706fcf2b7979c51b83d8b8def28f413b090cf0cb0035ee6b425e9de5/nh3-0.2.21-cp38-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2a5174551f95f2836f2ad6a8074560f261cf9740a48437d6151fd2d4d7d617ab", size = 747020 },
+    { url = "https://files.pythonhosted.org/packages/75/99/06a6ba0b8a0d79c3d35496f19accc58199a1fb2dce5e711a31be7e2c1426/nh3-0.2.21-cp38-abi3-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:b8d55ea1fc7ae3633d758a92aafa3505cd3cc5a6e40470c9164d54dff6f96d42", size = 944878 },
+    { url = "https://files.pythonhosted.org/packages/79/d4/dc76f5dc50018cdaf161d436449181557373869aacf38a826885192fc587/nh3-0.2.21-cp38-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6ae319f17cd8960d0612f0f0ddff5a90700fa71926ca800e9028e7851ce44a6f", size = 903460 },
+    { url = "https://files.pythonhosted.org/packages/cd/c3/d4f8037b2ab02ebf5a2e8637bd54736ed3d0e6a2869e10341f8d9085f00e/nh3-0.2.21-cp38-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:63ca02ac6f27fc80f9894409eb61de2cb20ef0a23740c7e29f9ec827139fa578", size = 839369 },
+    { url = "https://files.pythonhosted.org/packages/11/a9/1cd3c6964ec51daed7b01ca4686a5c793581bf4492cbd7274b3f544c9abe/nh3-0.2.21-cp38-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5f77e62aed5c4acad635239ac1290404c7e940c81abe561fd2af011ff59f585", size = 739036 },
+    { url = "https://files.pythonhosted.org/packages/fd/04/bfb3ff08d17a8a96325010ae6c53ba41de6248e63cdb1b88ef6369a6cdfc/nh3-0.2.21-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:087ffadfdcd497658c3adc797258ce0f06be8a537786a7217649fc1c0c60c293", size = 768712 },
+    { url = "https://files.pythonhosted.org/packages/9e/aa/cfc0bf545d668b97d9adea4f8b4598667d2b21b725d83396c343ad12bba7/nh3-0.2.21-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ac7006c3abd097790e611fe4646ecb19a8d7f2184b882f6093293b8d9b887431", size = 930559 },
+    { url = "https://files.pythonhosted.org/packages/78/9d/6f5369a801d3a1b02e6a9a097d56bcc2f6ef98cffebf03c4bb3850d8e0f0/nh3-0.2.21-cp38-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:6141caabe00bbddc869665b35fc56a478eb774a8c1dfd6fba9fe1dfdf29e6efa", size = 1008591 },
+    { url = "https://files.pythonhosted.org/packages/a6/df/01b05299f68c69e480edff608248313cbb5dbd7595c5e048abe8972a57f9/nh3-0.2.21-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:20979783526641c81d2f5bfa6ca5ccca3d1e4472474b162c6256745fbfe31cd1", size = 925670 },
+    { url = "https://files.pythonhosted.org/packages/3d/79/bdba276f58d15386a3387fe8d54e980fb47557c915f5448d8c6ac6f7ea9b/nh3-0.2.21-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a7ea28cd49293749d67e4fcf326c554c83ec912cd09cd94aa7ec3ab1921c8283", size = 917093 },
+    { url = "https://files.pythonhosted.org/packages/e7/d8/c6f977a5cd4011c914fb58f5ae573b071d736187ccab31bfb1d539f4af9f/nh3-0.2.21-cp38-abi3-win32.whl", hash = "sha256:6c9c30b8b0d291a7c5ab0967ab200598ba33208f754f2f4920e9343bdd88f79a", size = 537623 },
+    { url = "https://files.pythonhosted.org/packages/23/fc/8ce756c032c70ae3dd1d48a3552577a325475af2a2f629604b44f571165c/nh3-0.2.21-cp38-abi3-win_amd64.whl", hash = "sha256:bb0014948f04d7976aabae43fcd4cb7f551f9f8ce785a4c9ef66e6c2590f8629", size = 535283 },
+]
+
 [[package]]
 name = "nodeenv"
 version = "1.9.1"
@@ -407,6 +650,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538 },
 ]
 
+[[package]]
+name = "pycparser"
+version = "2.22"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", size = 172736 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc", size = 117552 },
+]
+
 [[package]]
 name = "pygments"
 version = "2.19.1"
@@ -489,6 +741,7 @@ dev = [
     { name = "ruff" },
     { name = "sphinx" },
     { name = "tox" },
+    { name = "twine" },
     { name = "types-lxml-multi-subclass" },
 ]
 
@@ -510,9 +763,33 @@ dev = [
     { name = "ruff", specifier = ">=0.11.13" },
     { name = "sphinx", specifier = "==1.8.6" },
     { name = "tox", specifier = ">=4.26.0" },
+    { name = "twine", specifier = ">=6.1.0" },
     { name = "types-lxml-multi-subclass", specifier = ">=2025.3.30" },
 ]
 
+[[package]]
+name = "pywin32-ctypes"
+version = "0.2.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/85/9f/01a1a99704853cb63f253eea009390c88e7131c67e66a0a02099a8c917cb/pywin32-ctypes-0.2.3.tar.gz", hash = "sha256:d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755", size = 29471 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/de/3d/8161f7711c017e01ac9f008dfddd9410dff3674334c233bde66e7ba65bbf/pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8", size = 30756 },
+]
+
+[[package]]
+name = "readme-renderer"
+version = "43.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "docutils" },
+    { name = "nh3" },
+    { name = "pygments" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/fe/b5/536c775084d239df6345dccf9b043419c7e3308bc31be4c7882196abc62e/readme_renderer-43.0.tar.gz", hash = "sha256:1818dd28140813509eeed8d62687f7cd4f7bad90d4db586001c5dc09d4fde311", size = 31768 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/45/be/3ea20dc38b9db08387cf97997a85a7d51527ea2057d71118feb0aa8afa55/readme_renderer-43.0-py3-none-any.whl", hash = "sha256:19db308d86ecd60e5affa3b2a98f017af384678c63c88e5d4556a380e674f3f9", size = 13301 },
+]
+
 [[package]]
 name = "requests"
 version = "2.32.4"
@@ -528,6 +805,41 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c", size = 64847 },
 ]
 
+[[package]]
+name = "requests-toolbelt"
+version = "1.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb/requests-toolbelt-1.0.0.tar.gz", hash = "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6", size = 206888 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3f/51/d4db610ef29373b879047326cbf6fa98b6c1969d6f6dc423279de2b1be2c/requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06", size = 54481 },
+]
+
+[[package]]
+name = "rfc3986"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/85/40/1520d68bfa07ab5a6f065a186815fb6610c86fe957bc065754e47f7b0840/rfc3986-2.0.0.tar.gz", hash = "sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c", size = 49026 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ff/9a/9afaade874b2fa6c752c36f1548f718b5b83af81ed9b76628329dab81c1b/rfc3986-2.0.0-py2.py3-none-any.whl", hash = "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", size = 31326 },
+]
+
+[[package]]
+name = "rich"
+version = "14.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markdown-it-py" },
+    { name = "pygments" },
+    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a1/53/830aa4c3066a8ab0ae9a9955976fb770fe9c6102117c8ec4ab3ea62d89e8/rich-14.0.0.tar.gz", hash = "sha256:82f1bc23a6a21ebca4ae0c45af9bdbc492ed20231dcb63f297d6d1021a9d5725", size = 224078 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0d/9b/63f4c7ebc259242c89b3acafdb37b41d1185c07ff0011164674e9076b491/rich-14.0.0-py3-none-any.whl", hash = "sha256:1c9491e1951aac09caffd42f448ee3d04e58923ffe14993f6e83068dc395d7e0", size = 243229 },
+]
+
 [[package]]
 name = "ruff"
 version = "0.11.13"
@@ -553,6 +865,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/bf/b273dd11673fed8a6bd46032c0ea2a04b2ac9bfa9c628756a5856ba113b0/ruff-0.11.13-py3-none-win_arm64.whl", hash = "sha256:b4385285e9179d608ff1d2fb9922062663c658605819a6876d8beef0c30b7f3b", size = 10683928 },
 ]
 
+[[package]]
+name = "secretstorage"
+version = "3.3.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cryptography" },
+    { name = "jeepney" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/53/a4/f48c9d79cb507ed1373477dbceaba7401fd8a23af63b837fa61f1dcd3691/SecretStorage-3.3.3.tar.gz", hash = "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77", size = 19739 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/24/b4293291fa1dd830f353d2cb163295742fa87f179fcc8a20a306a81978b7/SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99", size = 15221 },
+]
+
 [[package]]
 name = "setuptools"
 version = "80.9.0"
@@ -695,6 +1020,27 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/de/14/f58b4087cf248b18c795b5c838c7a8d1428dfb07cb468dad3ec7f54041ab/tox-4.26.0-py3-none-any.whl", hash = "sha256:75f17aaf09face9b97bd41645028d9f722301e912be8b4c65a3f938024560224", size = 172761 },
 ]
 
+[[package]]
+name = "twine"
+version = "6.1.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "id" },
+    { name = "importlib-metadata", marker = "python_full_version < '3.10'" },
+    { name = "keyring", marker = "platform_machine != 'ppc64le' and platform_machine != 's390x'" },
+    { name = "packaging" },
+    { name = "readme-renderer" },
+    { name = "requests" },
+    { name = "requests-toolbelt" },
+    { name = "rfc3986" },
+    { name = "rich" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c8/a2/6df94fc5c8e2170d21d7134a565c3a8fb84f9797c1dd65a5976aaf714418/twine-6.1.0.tar.gz", hash = "sha256:be324f6272eff91d07ee93f251edf232fc647935dd585ac003539b42404a8dbd", size = 168404 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7c/b6/74e927715a285743351233f33ea3c684528a0d374d2e43ff9ce9585b73fe/twine-6.1.0-py3-none-any.whl", hash = "sha256:a47f973caf122930bf0fbbf17f80b83bc1602c9ce393c7845f289a3001dc5384", size = 40791 },
+]
+
 [[package]]
 name = "types-html5lib"
 version = "1.1.11.20250516"
@@ -750,3 +1096,12 @@ sdist = { url = "https://files.pythonhosted.org/packages/56/2c/444f465fb2c65f40c
 wheels = [
     { url = "https://files.pythonhosted.org/packages/f3/40/b1c265d4b2b62b58576588510fc4d1fe60a86319c8de99fd8e9fec617d2c/virtualenv-20.31.2-py3-none-any.whl", hash = "sha256:36efd0d9650ee985f0cad72065001e66d49a6f24eb44d98980f630686243cf11", size = 6057982 },
 ]
+
+[[package]]
+name = "zipp"
+version = "3.23.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e3/02/0f2892c661036d50ede074e376733dca2ae7c6eb617489437771209d4180/zipp-3.23.0.tar.gz", hash = "sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166", size = 25547 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2e/54/647ade08bf0db230bfea292f893923872fd20be6ac6f53b2b936ba839d75/zipp-3.23.0-py3-none-any.whl", hash = "sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e", size = 10276 },
+]